Merge branch 'dev' into dev

README.md

@@ -58,20 +58,22 @@ You can make connection to bank by several way (Facade , Service container):
     try {
        
        $gateway = \Gateway::make(new \Mellat());
-       // $gateway->setCallback(url('/path/to/calback/route')); You can also change the callback
+
+       // $gateway->setCallback(url('/path/to/callback/route')); You can also change the callback
        $gateway
             ->price(1000)
             // setShipmentPrice(10) // optional - just for paypal
             // setProductName("My Product") // optional - just for paypal
             ->ready();
+
        $refId =  $gateway->refId();
        $transID = $gateway->transactionId();
 
        // Your code here
 
        return $gateway->redirect();
        
-    } catch (Exception $e) {
+    } catch (\Exception $e) {
        
        	echo $e->getMessage();
     }
@@ -97,7 +99,7 @@ and in your callback :
        
        // Your code here
        
-    } catch (Exception $e) {
+    } catch (\Exception $e) {
        
        echo $e->getMessage();
     }  

migrations/2017_04_05_103357_alter_id_in_transactions_table.php

@@ -50,6 +50,13 @@ public function up()
 	 */
 	public function down()
 	{
+		// Don't check for foreign key constraints when executing below query in current session
+		DB::statement('set foreign_key_checks=0');
+
 		DB::statement("ALTER TABLE `" . $this->getTable() . "` CHANGE `id` `id` INT(10) UNSIGNED NOT NULL;");
+
+		// Ok! now DBMS can check for foregin key constraints
+		DB::statement('set foreign_key_checks=1');
+
 	}
 }

src/Pasargad/Parser.php

@@ -45,7 +45,7 @@ public static function makeXMLTree($data)
             }
         }
 
-        return $ret['resultObj'];
+        return $ret ;
     }
 
 

src/Pasargad/Pasargad.php

@@ -161,4 +161,5 @@ protected function verifyPayment()
             $this->transactionFailed();
             throw new PasargadErrorException(Enum::TRANSACTION_FAILED_TEXT, -1);
         }
+	}
 }