cancel url

Author: recca0120

src/Message/AbstractRequest.php

@@ -17,4 +17,24 @@ public function getEndpoint()
     {
         return $this->getTestMode() ? $this->testEndpoint : $this->liveEndpoint;
     }
+
+    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' => $cancelUrl,
+                'backgroundURL' => $this->getPaymentInfoUrl(),
+            ];
+        }
+
+        return [
+            'returnURL' => $this->getReturnUrl(),
+            'cancelURL' => $cancelUrl,
+            'backgroundURL' => $this->getNotifyUrl(),
+        ];
+    }
 }

src/Traits/HasYiPay.php

@@ -85,23 +85,4 @@ public function checkCode($keys, $data)
 
         return (new Hasher($this->getKey(), $this->getIv()))->make($signed);
     }
-
-    protected function getUrls($data)
-    {
-        $type = (int) $data['type'];
-
-        if (in_array($type, [3, 4], true) && ! empty($this->getPaymentInfoUrl())) {
-            return [
-                'returnURL' => $this->getNotifyUrl(),
-                'cancelURL' => $this->getCancelUrl(),
-                'backgroundURL' => $this->getPaymentInfoUrl(),
-            ];
-        }
-
-        return [
-            'returnURL' => $this->getReturnUrl(),
-            'cancelURL' => $this->getCancelUrl(),
-            'backgroundURL' => $this->getNotifyUrl(),
-        ];
-    }
 }