@@ -56,10 +56,6 @@ public function __construct(
5656
5757 public static function fromArray (array $ data ): static
5858 {
59- $ metadata = isset ($ data ['metadata ' ])
60- ? new MetaDataDto (...$ data ['metadata ' ])
61- : null ;
62-
6359 $ totalAmount = null ;
6460 if (isset ($ data ['totalAmount ' ])) {
6561 $ ta = $ data ['totalAmount ' ];
@@ -99,14 +95,6 @@ public static function fromArray(array $data): static
9995 );
10096 }
10197
102- $ redirectUrl = isset ($ data ['redirectUrl ' ])
103- ? new RedirectUrlDto (...$ data ['redirectUrl ' ])
104- : null ;
105-
106- $ merchant = isset ($ data ['merchant ' ])
107- ? new MerchantDto (...$ data ['merchant ' ])
108- : null ;
109-
11098 $ paymentDetails = null ;
11199 if (isset ($ data ['paymentDetails ' ])) {
112100 $ pd = $ data ['paymentDetails ' ];
@@ -165,11 +153,11 @@ public static function fromArray(array $data): static
165153 totalAmount: $ totalAmount ?? new TotalAmountDto ,
166154 buyer: $ buyer ,
167155 items: $ data ['items ' ] ?? [],
168- redirectUrl: $ redirectUrl ,
156+ redirectUrl: new RedirectUrlDto (...( $ data [ ' redirectUrl ' ] ?? [])) ,
169157 status: $ data ['status ' ] ?? null ,
170158 paymentStatus: $ data ['paymentStatus ' ] ?? null ,
171159 requestReferenceNumber: $ data ['requestReferenceNumber ' ] ?? null ,
172- metadata: $ metadata ,
160+ metadata: new MetaDataDto (...( $ data [ ' metadata ' ] ?? [])) ,
173161 receiptNumber: $ data ['receiptNumber ' ] ?? null ,
174162 createdAt: $ data ['createdAt ' ] ?? null ,
175163 updatedAt: $ data ['updatedAt ' ] ?? null ,
@@ -178,7 +166,7 @@ public static function fromArray(array $data): static
178166 refundedAmount: $ data ['refundedAmount ' ] ?? 0 ,
179167 canPayPal: $ data ['canPayPal ' ] ?? null ,
180168 paymentScheme: $ data ['paymentScheme ' ] ?? null ,
181- merchant: $ merchant ,
169+ merchant: new MerchantDto (...( $ data [ ' merchant ' ] ?? [])) ,
182170 paymentDetails: $ paymentDetails ,
183171 transactionReferenceNumber: $ data ['transactionReferenceNumber ' ] ?? null ,
184172 );
0 commit comments