clean code

shetabit · Dec 26, 2019 · a97164c · a97164c
1 parent 2443f04
commit a97164c
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 21 deletions.
diff --git a/src/Drivers/Ipay/Idpay.php b/src/Drivers/Ipay/Idpay.php
@@ -73,13 +73,11 @@ public function purchase()
             $mail = $details['email'];
         }
 
-        $desc = null;
+        $desc = $this->settings->description;
         if (!empty($details['desc'])) {
             $desc = $details['desc'];
         } elseif (!empty($details['description'])) {
             $desc = $details['description'];
-        } else {
-            $desc = $this->settings->description;
         }
 
         $data = array(

diff --git a/src/Drivers/Nextpay/Nextpay.php b/src/Drivers/Nextpay/Nextpay.php
@@ -80,10 +80,10 @@ public function purchase()
         if (empty($body['code']) || $body['code'] != -1) {
             // error has happened
             throw new PurchaseFailedException($body['message']);
-        } else {
-            $this->invoice->transactionId($body['trans_id']);
         }
 
+        $this->invoice->transactionId($body['trans_id']);
+
         // return the transaction's id
         return $this->invoice->getTransactionId();
     }

diff --git a/src/Drivers/Payir/Payir.php b/src/Drivers/Payir/Payir.php
@@ -91,13 +91,13 @@ public function purchase()
         );
         $body = json_decode($response->getBody()->getContents(), true);
 
-        if ($body['status'] == 1) {
-            $this->invoice->transactionId($body['token']);
-        } else {
+        if ($body['status'] != 1) {
             // some error has happened
             throw new PurchaseFailedException($body['errorMessage']);
         }
 
+        $this->invoice->transactionId($body['token']);
+
         // return the transaction's id
         return $this->invoice->getTransactionId();
     }

diff --git a/src/Drivers/Paystar/Paystar.php b/src/Drivers/Paystar/Paystar.php
@@ -84,10 +84,10 @@ public function purchase()
         if (is_numeric($body)) {
             // some error has happened
             throw new PurchaseFailedException($this->translateStatus($body));
-        } else {
-            $this->invoice->transactionId($body);
         }
 
+        $this->invoice->transactionId($body);
+
         // return the transaction's id
         return $this->invoice->getTransactionId();
     }

diff --git a/src/Drivers/Poolam/Poolam.php b/src/Drivers/Poolam/Poolam.php
@@ -78,10 +78,10 @@ public function purchase()
         if (empty($body['status']) || $body['status'] != 1) {
             // some error has happened
             throw new PurchaseFailedException($body['status']);
-        } else {
-            $this->invoice->transactionId($body['invoice_key']);
         }
 
+        $this->invoice->transactionId($body['invoice_key']);
+
         // return the transaction's id
         return $this->invoice->getTransactionId();
     }

diff --git a/src/Drivers/Yekpay/Yekpay.php b/src/Drivers/Yekpay/Yekpay.php
@@ -90,13 +90,13 @@ public function purchase()
 
         $response = json_decode($client->request($data));
 
-        if ($response->Code == 100) {
-            $this->invoice->transactionId($response->Authority);
-        } else {
+        if ($response->Code != 100) {
             //"Request failed with Error code: $response->Code and Error message: $response->Description";
             throw new PurchaseFailedException($response->Description);
         }
 
+        $this->invoice->transactionId($response->Authority);
+
         // return the transaction's id
         return $this->invoice->getTransactionId();
     }

diff --git a/src/Drivers/Zibal/Zibal.php b/src/Drivers/Zibal/Zibal.php
@@ -61,12 +61,11 @@ public function purchase()
         // convert to toman
         $toman = $this->invoice->getAmount() * 10;
 
+        $orderId = crc32($this->invoice->getUuid()).time();
         if (!empty($details['orderId'])) {
             $orderId = $details['orderId'];
         } elseif (!empty($details['order_id'])) {
             $orderId = $details['order_id'];
-        } else {
-            $orderId = crc32($this->invoice->getUuid()).time();
         }
 
         $mobile = null;
@@ -99,10 +98,10 @@ public function purchase()
         if ($body->result != 100) {
             // some error has happened
             throw new PurchaseFailedException($body->message);
-        } else {
-            $this->invoice->transactionId($body->trackId);
         }
 
+        $this->invoice->transactionId($body->trackId);
+
         // return the transaction's id
         return $this->invoice->getTransactionId();
     }

diff --git a/src/PaymentManager.php b/src/PaymentManager.php
@@ -226,7 +226,7 @@ public function pay($initializeCallback = null)
     /**
      * Verifies the payment
      *
-     * @param null $finalizeCallback
+     * @param $finalizeCallback|null
      *
      * @return ReceiptInterface
      *

diff --git a/src/Traits/HasDetail.php b/src/Traits/HasDetail.php
@@ -15,7 +15,7 @@ trait HasDetail
      * Set a piece of data to the details.
      *
      * @param $key
-     * @param $value |null
+     * @param $value|null
      *
      * @return $this
      */