fix: send extend bug

Author: recca0120

src/Message/PurchaseRequest.php

@@ -92,7 +92,7 @@ public function getData()
             'HoldTradeAMT' => $this->getHoldTradeAMT(),
         ];
 
-        return array_merge($sendFields, $this->getSendExtend($sendFields));
+        return static::filterValues(array_merge($sendFields, $this->getSendExtend($sendFields)));
     }
 
     /**
@@ -138,14 +138,12 @@ private function prepareItems()
      */
     private function getSendExtend($sendFields)
     {
-        return static::filterValues([
-            'SendExtend' => array_merge(
-                $this->getCreditFields($sendFields['ChoosePayment']),
-                $this->getATMFields($sendFields['ChoosePayment']),
-                $this->getCvsFields($sendFields['ChoosePayment']),
-                $this->getInvoiceFields($sendFields['InvoiceMark'])
-            ),
-        ]);
+        return array_merge(
+            $this->getCreditFields($sendFields['ChoosePayment']),
+            $this->getATMFields($sendFields['ChoosePayment']),
+            $this->getCvsFields($sendFields['ChoosePayment']),
+            $this->getInvoiceFields($sendFields['InvoiceMark'])
+        );
     }
 
     /**
@@ -157,7 +155,7 @@ private function getCreditFields($choosePayment)
         return in_array($choosePayment, [
             ECPay_PaymentMethod::ALL,
             ECPay_PaymentMethod::Credit,
-        ], true) ? static::filterValues([
+        ], true) ? [
             'CreditInstallment' => $this->getCreditInstallment(),
             'InstallmentAmount' => $this->getInstallmentAmount(),
             'Redeem' => $this->getRedeem(),
@@ -170,7 +168,7 @@ private function getCreditFields($choosePayment)
             'Frequency' => $this->getFrequency(),
             'ExecTimes' => $this->getExecTimes(),
             'PeriodReturnURL' => $this->getPeriodReturnURL(),
-        ]) : [];
+        ] : [];
     }
 
     /**
@@ -182,11 +180,11 @@ private function getATMFields($choosePayment)
         return in_array($choosePayment, [
             ECPay_PaymentMethod::ALL,
             ECPay_PaymentMethod::ATM,
-        ], true) ? static::filterValues([
+        ], true) ? [
             'ExpireDate' => $this->getExpireDate(),
             'PaymentInfoURL' => $this->getPaymentInfoURL(),
             'ClientRedirectURL' => $this->getClientRedirectURL(),
-        ]) : [];
+        ] : [];
     }
 
     /**
@@ -199,15 +197,15 @@ private function getCvsFields($choosePayment)
             ECPay_PaymentMethod::ALL,
             ECPay_PaymentMethod::CVS,
             ECPay_PaymentMethod::BARCODE,
-        ], true) ? static::filterValues([
+        ], true) ? [
             'Desc_1' => $this->getDesc_1(),
             'Desc_2' => $this->getDesc_2(),
             'Desc_3' => $this->getDesc_3(),
             'Desc_4' => $this->getDesc_4(),
             'PaymentInfoURL' => $this->getPaymentInfoURL(),
             'ClientRedirectURL' => $this->getClientRedirectURL(),
             'StoreExpireDate' => $this->getStoreExpireDate(),
-        ]) : [];
+        ] : [];
     }
 
     /**
@@ -216,7 +214,7 @@ private function getCvsFields($choosePayment)
      */
     private function getInvoiceFields($invoiceMark)
     {
-        return $invoiceMark === ECPay_InvoiceState::Yes ? static::filterValues([
+        return $invoiceMark === ECPay_InvoiceState::Yes ? [
             'RelateNumber' => $this->getRelateNumber(),
             'CustomerIdentifier' => $this->getCustomerIdentifier(),
             'CarruerType' => $this->getCarruerType(),
@@ -239,7 +237,7 @@ private function getInvoiceFields($invoiceMark)
             'InvoiceItemPrice' => $this->getInvoiceItemPrice(),
             'InvoiceItemTaxType' => $this->getInvoiceItemTaxType(),
             'InvType' => $this->getInvType(),
-        ]) : [];
+        ] : [];
     }
 
     private static function filterValues($values)

src/Message/PurchaseResponse.php

@@ -62,6 +62,19 @@ public function getRedirectData()
     {
         $ecPay = $this->createECPay($this->request);
         $ecPay->ServiceURL = $this->getRedirectUrl();
+        $data = $this->getData();
+
+        foreach (array_keys($ecPay->Send) as $key) {
+            if (empty($data[$key])) {
+                continue;
+            }
+            if (array_key_exists($key, $data)) {
+                $ecPay->Send[$key] = $data[$key];
+            } else {
+                $ecPay->SendExtend[$key] = $data[$key];
+            }
+        }
+
 
         try {
             return static::htmlToArray($ecPay->CheckoutString());

src/Traits/HasECPay.php

@@ -12,20 +12,13 @@ trait HasECPay
      */
     protected function createECPay($request)
     {
-        $data = $this->updateCheckMacValueFromGlobals($this->getData());
-
+        $this->updateCheckMacValueFromGlobals($request->getData());
         $ecPay = new ECPay_AllInOne();
         $ecPay->HashKey = $request->getHashKey();
         $ecPay->HashIV = $request->getHashIV();
         $ecPay->MerchantID = $request->getMerchantID();
         $ecPay->EncryptType = $request->getEncryptType();
 
-        foreach (array_keys($ecPay->Send) as $key) {
-            if (array_key_exists($key, $data) && ! empty($data[$key])) {
-                $ecPay->Send[$key] = $data[$key];
-            }
-        }
-
         return $ecPay;
     }
 

tests/Message/PurchaseRequestTest.php

@@ -3,9 +3,7 @@
 namespace Omnipay\ECPay\Tests\Message;
 
 use ECPay_ExtraPaymentInfo;
-use ECPay_InvoiceState;
 use ECPay_PaymentMethod;
-use ECPay_PaymentMethodItem;
 use Omnipay\Common\Item;
 use Omnipay\ECPay\Message\PurchaseRequest;
 use Omnipay\Tests\TestCase;
@@ -27,19 +25,14 @@ public function testGetData()
             'TradeDesc' => 'good to drink',
             'ChoosePayment' => ECPay_PaymentMethod::Credit,
             'Remark' => 'remark',
-            'ChooseSubPayment' => ECPay_PaymentMethodItem::None,
             'NeedExtraPaidInfo' => ECPay_ExtraPaymentInfo::No,
             'DeviceSource' => 'Desktop',
-            'IgnorePayment' => 'ignore_payment',
-            'PlatformID' => uniqid('platform_id', true),
-            'InvoiceMark' => ECPay_InvoiceState::No,
             'Items' => [[
                 'Name' => '歐付寶黑芝麻豆漿',
                 'Price' => 2000,
                 'Quantity' => 1,
                 'Currency' => '元',
             ]],
-            'StoreID' => uniqid('store_id', true),
             'CustomField1' => 'custom_field_1',
             'CustomField2' => 'custom_field_2',
             'CustomField3' => 'custom_field_3',
@@ -81,6 +74,6 @@ public function testSendData($results)
         self::assertTrue($response->isRedirect());
         self::assertEquals('POST', $response->getRedirectMethod());
         self::assertEquals('https://payment-stage.ecpay.com.tw/Cashier/AioCheckOut/V5', $response->getRedirectUrl());
-        self::assertNotEmpty('EB947B8C27DBF00C0129C83E9E5C6', $redirectData['CheckMacValue']);
+        self::assertNotEmpty($redirectData['CheckMacValue']);
     }
 }