fixes

Alsharie · May 16, 2023 · dc8abae · dc8abae
1 parent aa4ac2c
commit dc8abae
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ return [
         'password' => env('CASHPAY_CERT_PASSWORD'),
     ],
     'url' => [
-        'base' => env('CASHPAY_BASE_URL', 'https://www.tamkeen.com.ye:33291'),
+        'base' => env('CASHPAY_BASE_URL', 'https://www.tamkeen.com.ye:33291/CashPG'),
     ]
 ];
 ```

diff --git a/config/cashPay.php b/config/cashPay.php
@@ -11,6 +11,6 @@
         'password' => env('CASHPAY_CERT_PASSWORD'),
     ],
     'url' => [
-        'base' => env('CASHPAY_BASE_URL', 'https://www.tamkeen.com.ye:33291'),
+        'base' => env('CASHPAY_BASE_URL', 'https://www.tamkeen.com.ye:33291/CashPG'),
     ]
 ];
diff --git a/src/CashPay.php b/src/CashPay.php
@@ -25,8 +25,8 @@ public function initPayment()
         $this->setEncPassword();
         $this->generateMDToken();
 
-        if(!isset($this->attributes['CurrencyId'])){
-            $this->attributes['CurrencyId']=2;//rial Yemeni
+        if (!isset($this->attributes['CurrencyId'])) {
+            $this->attributes['CurrencyId'] = 2;//rial Yemeni
         }
 
         try {
@@ -39,7 +39,9 @@ public function initPayment()
 
             return new CashPayInitPaymentResponse((string)$response->getBody());
         } catch (\GuzzleHttp\Exception\RequestException $e) {
-            return new CashPayErrorResponse($e->getResponse()->getBody(),$e->getResponse()->getStatusCode());
+            return new CashPayErrorResponse($e->getResponse()->getBody(), $e->getResponse()->getStatusCode());
+        } catch (\Exception $e) {
+            return new CashPayErrorResponse($e->getMessage(), $e->getCode());
         }
     }
 
@@ -67,12 +69,13 @@ public function confirmPayment()
 
             return new CashPayConfirmPaymentResponse((string)$response->getBody());
         } catch (\GuzzleHttp\Exception\RequestException $e) {
-            return new CashPayErrorResponse($e->getResponse()->getBody(),$e->getResponse()->getStatusCode());
+            return new CashPayErrorResponse($e->getResponse()->getBody(), $e->getResponse()->getStatusCode());
+        } catch (\Exception $e) {
+            return new CashPayErrorResponse($e->getMessage(), $e->getCode());
         }
     }
 
 
-
     /**
      * It is used to check the state of an operation ( It is useful in cases of time out).
      * @return CashPayOperationStatusResponse|CashPayErrorResponse
@@ -96,7 +99,9 @@ public function operationStatus()
 
             return new CashPayOperationStatusResponse((string)$response->getBody());
         } catch (\GuzzleHttp\Exception\RequestException $e) {
-            return new CashPayErrorResponse($e->getResponse()->getBody(),$e->getResponse()->getStatusCode());
+            return new CashPayErrorResponse($e->getResponse()->getBody(), $e->getResponse()->getStatusCode());
+        } catch (\Exception $e) {
+            return new CashPayErrorResponse($e->getMessage(), $e->getCode());
         }
     }
 

diff --git a/src/Guzzle.php b/src/Guzzle.php
@@ -71,19 +71,19 @@ protected function sendRequest($path, $attributes, $headers, $security = [], str
 
     protected function getInitPaymentPath(): string
     {
-        return $this->basePath . '/' . "CashPG/api/CashPay/InitPayment";
+        return $this->basePath . '/' . "api/CashPay/InitPayment";
     }
 
 
     protected function getConfirmPaymentPath(): string
     {
-        return $this->basePath . '/' . "CashPG/api/CashPay/ConfirmPayment";
+        return $this->basePath . '/' . "api/CashPay/ConfirmPayment";
     }
 
 
     protected function getOperationStatusPath(): string
     {
-        return $this->basePath . '/' . "CashPG/api/Operation/OperationStatus";
+        return $this->basePath . '/' . "api/Operation/OperationStatus";
     }