cancel url

Author: recca0120

src/Traits/HasYiPay.php

@@ -76,32 +76,33 @@ public function getPaymentInfoUrl()
         return $this->getParameter('paymentInfoUrl');
     }
 
-    public function checkCode($keys, $data)
-    {
-        $signed = [];
-        foreach ($keys as $key) {
-            $signed[$key] = $data[$key];
-        }
-
-        return (new Hasher($this->getKey(), $this->getIv()))->make($signed);
-    }
-
     protected function getUrls($data)
     {
         $type = (int) $data['type'];
+        $cancelUrl = $this->getCancelUrl() ?: $this->getReturnUrl();
 
         if (in_array($type, [3, 4], true) && ! empty($this->getPaymentInfoUrl())) {
             return [
                 'returnURL' => $this->getNotifyUrl(),
-                'cancelURL' => $this->getCancelUrl(),
+                'cancelURL' => $cancelUrl,
                 'backgroundURL' => $this->getPaymentInfoUrl(),
             ];
         }
 
         return [
             'returnURL' => $this->getReturnUrl(),
-            'cancelURL' => $this->getCancelUrl(),
+            'cancelURL' => $cancelUrl,
             'backgroundURL' => $this->getNotifyUrl(),
         ];
     }
+
+    public function checkCode($keys, $data)
+    {
+        $signed = [];
+        foreach ($keys as $key) {
+            $signed[$key] = $data[$key];
+        }
+
+        return (new Hasher($this->getKey(), $this->getIv()))->make($signed);
+    }
 }

tests/Message/AcceptNotificationRequestTest.php

@@ -42,18 +42,18 @@ public function testSendCreditCardData()
         self::assertEquals('OK', $request->getReply());
     }
 
-    public function testSendCVSData()
+    public function testSendATMData()
     {
         $httpRequest = $this->getHttpRequest();
         $httpRequest->request->replace([
             'merchantId' => '1604000006',
-            'type' => '3',
+            'type' => '4',
             'amount' => '1500',
             'orderNo' => 'YP2016111503353',
             'transactionNo' => 'C0216111500000000001',
             'statusCode' => '00',
-            'pinCode' => '1550D0332H2902',
-            'checkCode' => 'eef416eec27026d62d0aa519bda9f91e142c8a6d',
+            'account' => '63167185726653',
+            'checkCode' => '23b685ff8857b5d1c9e7e29bc81d19db09c328a3',
         ]);
 
         $request = new AcceptNotificationRequest($this->getHttpClient(), $httpRequest);
@@ -73,18 +73,18 @@ public function testSendCVSData()
         self::assertEquals('OK', $request->getReply());
     }
 
-    public function testSendATMData()
+    public function testSendCVSData()
     {
         $httpRequest = $this->getHttpRequest();
         $httpRequest->request->replace([
             'merchantId' => '1604000006',
-            'type' => '4',
+            'type' => '3',
             'amount' => '1500',
             'orderNo' => 'YP2016111503353',
             'transactionNo' => 'C0216111500000000001',
             'statusCode' => '00',
-            'account' => '63167185726653',
-            'checkCode' => '23b685ff8857b5d1c9e7e29bc81d19db09c328a3',
+            'pinCode' => '1550D0332H2902',
+            'checkCode' => 'eef416eec27026d62d0aa519bda9f91e142c8a6d',
         ]);
 
         $request = new AcceptNotificationRequest($this->getHttpClient(), $httpRequest);

tests/Message/GetPaymentInfoRequestTest.php

@@ -7,18 +7,23 @@
 
 class GetPaymentInfoRequestTest extends TestCase
 {
-    public function testSendCVSData()
+    public function testSendATMData()
     {
         $httpRequest = $this->getHttpRequest();
         $httpRequest->request->replace([
             'merchantId' => '1604000006',
-            'type' => '3',
+            'type' => '4',
             'amount' => '1500',
             'orderNo' => 'YP2016111503353',
             'transactionNo' => 'C0216111500000000001',
             'statusCode' => '00',
-            'pinCode' => '1550D0332H2902',
-            'checkCode' => 'eef416eec27026d62d0aa519bda9f91e142c8a6d',
+            'account' => '63167185726653',
+            'bankCode' => '822',
+            'bankName' => '中國信託商業銀行',
+            'bankBranchCode' => '0015',
+            'bankBranchName' => '商業銀行敦北分行',
+            'expirationDate' => '2025-01-01',
+            'checkCode' => '23b685ff8857b5d1c9e7e29bc81d19db09c328a3',
         ]);
 
         $request = new GetPaymentInfoRequest($this->getHttpClient(), $httpRequest);
@@ -42,23 +47,18 @@ public function testSendCVSData()
         self::assertEquals('OK', $response->getReply());
     }
 
-    public function testSendATMData()
+    public function testSendCVSData()
     {
         $httpRequest = $this->getHttpRequest();
         $httpRequest->request->replace([
             'merchantId' => '1604000006',
-            'type' => '4',
+            'type' => '3',
             'amount' => '1500',
             'orderNo' => 'YP2016111503353',
             'transactionNo' => 'C0216111500000000001',
             'statusCode' => '00',
-            'account' => '63167185726653',
-            'bankCode' => '822',
-            'bankName' => '中國信託商業銀行',
-            'bankBranchCode' => '0015',
-            'bankBranchName' => '商業銀行敦北分行',
-            'expirationDate' => '2025-01-01',
-            'checkCode' => '23b685ff8857b5d1c9e7e29bc81d19db09c328a3',
+            'pinCode' => '1550D0332H2902',
+            'checkCode' => 'eef416eec27026d62d0aa519bda9f91e142c8a6d',
         ]);
 
         $request = new GetPaymentInfoRequest($this->getHttpClient(), $httpRequest);