fix bug

src/Action/Api/CreateTransactionAction.php

@@ -20,20 +20,16 @@ public function execute($request)
 
         $details = ArrayObject::ensureArrayObject($request->getModel());
 
-        $result = $this->api->createTransaction((array) $details);
-
-        if (isset($result['RtnCode']) === true) {
-            $details->replace($result);
-
-            return;
+        if (empty($details['GoodsAmount']) === true) {
+            $result = $this->api->createCvsMapTransaction((array) $details);
+            $endpoint = $this->api->getApiEndpoint();
+
+            throw new HttpPostRedirect(
+                $endpoint,
+                $result
+            );
         }
-
-        $endpoint = $this->api->getApiEndpoint();
-
-        throw new HttpPostRedirect(
-            $endpoint,
-            $result
-        );
+        $details->replace($this->api->createTransaction((array) $details));
     }
 
     /**

src/Action/Api/GetTransactionDataAction.php

@@ -19,9 +19,7 @@ public function execute($request)
 
         $details = ArrayObject::ensureArrayObject($request->getModel());
 
-        $result = $this->api->getTransactionData((array) $details);
-
-        $details->replace($result);
+        $details->replace($this->api->getTransactionData((array) $details));
     }
 
     /**

src/Action/CancelAction.php

@@ -27,8 +27,6 @@ public function execute($request)
         $details = ArrayObject::ensureArrayObject($request->getModel());
 
         $this->gateway->execute(new CancelTransaction($details));
-
-        $this->gateway->execute(new Sync($details));
     }
 
     /**

src/Action/CaptureAction.php

@@ -13,8 +13,9 @@
 use Payum\Core\Exception\RequestNotSupportedException;
 use Payum\Core\Security\GenericTokenFactoryAwareTrait;
 use Payum\Core\Security\GenericTokenFactoryAwareInterface;
+use PayumTW\Ecpay\Action\Api\BaseApiAwareAction;
 
-class CaptureAction implements ActionInterface, GatewayAwareInterface, GenericTokenFactoryAwareInterface
+class CaptureAction extends BaseApiAwareAction implements ActionInterface, GatewayAwareInterface, GenericTokenFactoryAwareInterface
 {
     use GatewayAwareTrait;
     use GenericTokenFactoryAwareTrait;
@@ -33,7 +34,10 @@ public function execute($request)
         $this->gateway->execute($httpRequest);
 
         if (isset($httpRequest->request['RtnCode']) === true) {
-            $this->gateway->execute(new Sync($details));
+            if ($this->api->verifyHash($httpRequest->request) === false) {
+                $httpRequest->request['RtnCode'] = '10400002';
+            }
+            $details->replace($httpRequest->request);
 
             return;
         }

src/Action/CaptureLogisticsAction.php

@@ -13,8 +13,9 @@
 use Payum\Core\Exception\RequestNotSupportedException;
 use Payum\Core\Security\GenericTokenFactoryAwareTrait;
 use Payum\Core\Security\GenericTokenFactoryAwareInterface;
+use PayumTW\Ecpay\Action\Api\BaseApiAwareAction;
 
-class CaptureLogisticsAction implements ActionInterface, GatewayAwareInterface, GenericTokenFactoryAwareInterface
+class CaptureLogisticsAction extends BaseApiAwareAction implements ActionInterface, GatewayAwareInterface, GenericTokenFactoryAwareInterface
 {
     use GatewayAwareTrait;
     use GenericTokenFactoryAwareTrait;
@@ -32,16 +33,17 @@ public function execute($request)
         $httpRequest = new GetHttpRequest();
         $this->gateway->execute($httpRequest);
 
+        // CVS
         if (isset($httpRequest->request['CVSStoreID']) === true) {
-            $this->gateway->execute(new Sync($details));
+            $details->replace($httpRequest->request);
 
             return;
         }
 
         $token = $request->getToken();
         $targetUrl = $token->getTargetUrl();
 
-        if ($details['GoodsAmount'] === 0) {
+        if (empty($details['GoodsAmount']) === true) {
             if (empty($details['ServerReplyURL']) === true) {
                 $details['ServerReplyURL'] = $targetUrl;
             }

src/Action/ConvertPaymentLogisticsAction.php

@@ -26,7 +26,7 @@ public function execute($request)
 
         $details['MerchantTradeNo'] = $payment->getNumber();
         $details['ReceiverEmail'] = $payment->getClientEmail();
-        $details['GoodsAmount'] = (int) $payment->getTotalAmount();
+        $details['GoodsAmount'] = $payment->getTotalAmount();
         $details['TradeDesc'] = $payment->getDescription();
 
         $details['AllPayLogisticsID'] = $details['MerchantTradeNo'];

src/Action/NotifyAction.php

@@ -34,7 +34,7 @@ public function execute($request)
             throw new HttpResponse('0|CheckMacValue verify fail.', 400, ['Content-Type' => 'text/plain']);
         }
 
-        $this->gateway->execute(new Sync($details));
+        $details->replace($httpRequest->request);
 
         throw new HttpResponse('1|OK', 200, ['Content-Type' => 'text/plain']);
     }

src/Action/RefundAction.php

@@ -27,8 +27,6 @@ public function execute($request)
         $details = ArrayObject::ensureArrayObject($request->getModel());
 
         $this->gateway->execute(new RefundTransaction($details));
-
-        $this->gateway->execute(new Sync($details));
     }
 
     /**

src/Action/SyncAction.php

@@ -26,13 +26,6 @@ public function execute($request)
 
         $details = ArrayObject::ensureArrayObject($request->getModel());
 
-        $httpRequest = new GetHttpRequest();
-        $this->gateway->execute($httpRequest);
-
-        $details->replace([
-            'response' => $httpRequest->request,
-        ]);
-
         $this->gateway->execute(new GetTransactionData($details));
     }
 

src/EcpayApi.php

@@ -170,19 +170,10 @@ public function refundTransaction($params)
      */
     public function getTransactionData($params)
     {
-        $details = [];
-        if (empty($params['response']) === false) {
-            if ($this->verifyHash($params['response']) === false) {
-                $details['RtnCode'] = '10400002';
-            } else {
-                $details = $params['response'];
-            }
-        } else {
-            $this->api->ServiceURL = $this->getApiEndpoint('QueryTradeInfo');
-            $this->api->Query['MerchantTradeNo'] = $params['MerchantTradeNo'];
-            $details = $this->api->QueryTradeInfo();
-            $details['RtnCode'] = $details['TradeStatus'] === '1' ? '1' : '2';
-        }
+        $this->api->ServiceURL = $this->getApiEndpoint('QueryTradeInfo');
+        $this->api->Query['MerchantTradeNo'] = $params['MerchantTradeNo'];
+        $details = $this->api->QueryTradeInfo();
+        $details['RtnCode'] = $details['TradeStatus'] === '1' ? '1' : '2';
 
         return $details;
     }

src/EcpayLogisticsApi.php

@@ -183,10 +183,6 @@ public function createPrintFamilyC2CBillTransaction(array $params)
      */
     public function createTransaction(array $params)
     {
-        if ($params['GoodsAmount'] === 0) {
-            return $this->createCvsMapTransaction($params);
-        }
-
         $this->api->Send = array_merge($this->api->Send, [
             'MerchantTradeNo' => '',
             'MerchantTradeDate' => date('Y/m/d H:i:s'),
@@ -217,6 +213,9 @@ public function createTransaction(array $params)
             array_intersect_key($params, $this->api->Send)
         );
 
+        $this->api->Send['GoodsAmount'] = (int) $this->api->Send['GoodsAmount'];
+        $this->api->Send['CollectionAmount'] = (int) $this->api->Send['CollectionAmount'];
+
         if (empty($this->api->Send['LogisticsType']) === true) {
             $this->api->Send['LogisticsType'] = LogisticsType::CVS;
             switch ($this->api->Send['LogisticsSubType']) {
@@ -380,13 +379,18 @@ public function cancelTransaction($params)
      */
     public function getTransactionData($params)
     {
-        $details = [];
-        if (empty($params['response']) === false) {
-            $details = $params['response'];
-        } else {
-            $details = $params;
-        }
+        $supportedParams = [
+            'AllPayLogisticsID' => '',
+            'PlatformID' => '',
+        ];
+
+        $this->api->Send = array_merge($this->api->Send, $supportedParams);
+
+        $this->api->Send = array_replace(
+            $this->api->Send,
+            array_intersect_key($params, $this->api->Send)
+        );
 
-        return $details;
+        return $this->api->QueryLogisticsInfo();
     }
 }

tests/Action/Api/CreateTransactionActionTest.php

@@ -24,6 +24,7 @@ public function test_api_http_post_redirect()
         $request = m::spy('PayumTW\Ecpay\Request\Api\CreateTransaction');
         $details = new ArrayObject([
             'foo' => 'bar',
+            'GoodsAmount' => 1
         ]);
         $endpoint = 'foo.endpoint';
 
@@ -57,7 +58,6 @@ public function test_api_http_post_redirect()
 
         $request->shouldHaveReceived('getModel')->twice();
         $api->shouldHaveReceived('createTransaction')->with((array) $details)->once();
-        $api->shouldHaveReceived('getApiEndpoint')->once();
     }
 
     public function test_logistics_api_http_post_redirect()
@@ -85,7 +85,7 @@ public function test_logistics_api_http_post_redirect()
             ->shouldReceive('getModel')->andReturn($details);
 
         $api
-            ->shouldReceive('createTransaction')->andReturn((array) $details)
+            ->shouldReceive('createCvsMapTransaction')->andReturn((array) $details)
             ->shouldReceive('getApiEndpoint')->andReturn($endpoint);
 
         $action = new CreateTransactionAction();
@@ -104,7 +104,7 @@ public function test_logistics_api_http_post_redirect()
         }
 
         $request->shouldHaveReceived('getModel')->twice();
-        $api->shouldHaveReceived('createTransaction')->with((array) $details)->once();
+        $api->shouldHaveReceived('createCvsMapTransaction')->with((array) $details)->once();
         $api->shouldHaveReceived('getApiEndpoint')->once();
     }
 
@@ -118,7 +118,10 @@ public function test_logistics_api_when_isset_rtn_code()
 
         $api = m::spy('PayumTW\Ecpay\Api');
         $request = m::spy('PayumTW\Ecpay\Request\Api\CreateTransaction');
-        $details = new ArrayObject(['RtnCode' => '300']);
+        $details = new ArrayObject([
+            'RtnCode' => '300',
+            'GoodsAmount' => 1
+        ]);
 
         /*
         |------------------------------------------------------------

tests/Action/CancelActionTest.php

@@ -44,6 +44,5 @@ public function test_cancel()
 
         $request->shouldHaveReceived('getModel')->twice();
         $gateway->shouldHaveReceived('execute')->with(m::type('PayumTW\Ecpay\Request\Api\CancelTransaction'))->once();
-        $gateway->shouldHaveReceived('execute')->with(m::type('Payum\Core\Request\Sync'))->once();
     }
 }

tests/Action/CaptureActionTest.php

@@ -79,6 +79,7 @@ public function test_execute_when_rtn_code_exists()
         |------------------------------------------------------------
         */
 
+        $api = m::spy('PayumTW\Ecpay\Api');
         $gateway = m::spy('Payum\Core\GatewayInterface');
         $tokenFactory = m::spy('Payum\Core\Security\GenericTokenFactoryInterface');
         $request = m::spy('Payum\Core\Request\Capture');
@@ -106,6 +107,7 @@ public function test_execute_when_rtn_code_exists()
             });
 
         $action = new CaptureAction();
+        $action->setApi($api);
         $action->setGateway($gateway);
         $action->setGenericTokenFactory($tokenFactory);
         $action->execute($request);
@@ -118,6 +120,5 @@ public function test_execute_when_rtn_code_exists()
 
         $request->shouldHaveReceived('getModel')->twice();
         $gateway->shouldHaveReceived('execute')->with(m::type('Payum\Core\Request\GetHttpRequest'))->once();
-        $gateway->shouldHaveReceived('execute')->with(m::type('Payum\Core\Request\Sync'))->once();
     }
 }

tests/Action/CaptureLogisticsActionTest.php

@@ -168,6 +168,5 @@ public function test_execute_when_csv_store_id_exists()
 
         $request->shouldHaveReceived('getModel')->twice();
         $gateway->shouldHaveReceived('execute')->with(m::type('Payum\Core\Request\GetHttpRequest'))->once();
-        $gateway->shouldHaveReceived('execute')->with(m::type('Payum\Core\Request\Sync'))->once();
     }
 }

tests/Action/NotifyActionTest.php

@@ -67,7 +67,6 @@ public function test_notify_success()
         $request->shouldHaveReceived('getModel')->twice();
         $gateway->shouldHaveReceived('execute')->with(m::type('Payum\Core\Request\GetHttpRequest'))->once();
         $api->shouldHaveReceived('verifyHash')->with($returnValue)->once();
-        $gateway->shouldHaveReceived('execute')->with(m::type('Payum\Core\Request\Sync'))->once();
     }
 
     public function test_notify_when_checksum_fail()

tests/Action/RefundActionTest.php

@@ -44,6 +44,5 @@ public function test_refund()
 
         $request->shouldHaveReceived('getModel')->twice();
         $gateway->shouldHaveReceived('execute')->with(m::type('PayumTW\Ecpay\Request\Api\RefundTransaction'))->once();
-        $gateway->shouldHaveReceived('execute')->with(m::type('Payum\Core\Request\Sync'))->once();
     }
 }