Merge pull request #102 from imanghafoori1/dev

Code Clean up
larabook · Feb 21, 2018 · 60d8f88 · 60d8f88
2 parents 9de70a9 + 094e2c7
commit 60d8f88
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 29 deletions.
diff --git a/.styleci.yml b/.styleci.yml
@@ -0,0 +1,6 @@
+preset: laravel
+
+linting: true
+
+disabled:
+  - single_class_element_per_statement
diff --git a/src/Sadad/Sadad.php b/src/Sadad/Sadad.php
@@ -188,15 +188,17 @@ protected function verifyPayment()
 	private function getMessage($code, $message)
 	{
 		$result = SadadResult::codeResponse($code, $message);
-		if (!$result) {
-			$result = array(
-				'code' => SadadResult::UNKNOWN_CODE,
-				'message' => SadadResult::UNKNOWN_MESSAGE,
-				'fa' => 'خطای ناشناخته',
-				'en' => 'Unknown Error',
-				'retry' => false
-			);
+		if ($result) {
+			return $result;
 		}
+		$result = array(
+			'code' => SadadResult::UNKNOWN_CODE,
+			'message' => SadadResult::UNKNOWN_MESSAGE,
+			'fa' => 'خطای ناشناخته',
+			'en' => 'Unknown Error',
+			'retry' => false
+		);
+
 
 		return $result;
 	}

diff --git a/src/Saman/Saman.php b/src/Saman/Saman.php
@@ -141,32 +141,32 @@ protected function verifyPayment()
 
         $response = intval($response);
 
-        if ($response != $this->amount) {
-
-            //Reverse Transaction
-            if($response>0){
-                try {
-                    $soap = new SoapClient($this->serverUrl);
-                    $response = $soap->ReverseTransaction($fields["RefNum"], $fields["merchantID"], $fields["password"], $response);
-
-                } catch (\SoapFault $e) {
-                    $this->transactionFailed();
-                    $this->newLog('SoapFault', $e->getMessage());
-                    throw $e;
-                }
-            }
+        if ($response == $this->amount) {
+            $this->transactionSucceed();
+            return true;
+        }
 
-            //
-            $this->transactionFailed();
-            $this->newLog($response, SamanException::$errors[$response]);
-            throw new SamanException($response);
+        //Reverse Transaction
+        if($response>0){
+            try {
+                $soap = new SoapClient($this->serverUrl);
+                $response = $soap->ReverseTransaction($fields["RefNum"], $fields["merchantID"], $fields["password"], $response);
+
+            } catch (\SoapFault $e) {
+                $this->transactionFailed();
+                $this->newLog('SoapFault', $e->getMessage());
+                throw $e;
+            }
         }
 
+        //
+        $this->transactionFailed();
+        $this->newLog($response, SamanException::$errors[$response]);
+        throw new SamanException($response);
+
 
-        $this->transactionSucceed();
 
-        return true;
     }
 
 
-}
+}