Merge pull request #1 from azambon/patch-3

Remove pending_payment initial status
bitbull-team · Dec 4, 2017 · 4905878 · 4905878
2 parents d315dae + 28adf66
commit 4905878
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -105,6 +105,7 @@ Author:
 
 Contributions:
 - [Ermanno Baschiera](https://github.com/ebaschiera)
+- [azambon](https://github.com/azambon)
 - For a full list of contributors visit [Magento Module Satispay on GitHub](https://github.com/bitbull-team/magento-module-satispay/graphs/contributors)
 
 ## License

diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "Bitbull/Satispay",
+    "name": "bitbull/satispay",
     "license": "OSL-3.0",
     "type": "magento-module",
     "description": "Magento module for Satispay Payment integration",

diff --git a/src/app/code/community/Bitbull/Satispay/Helper/Order.php b/src/app/code/community/Bitbull/Satispay/Helper/Order.php
@@ -64,6 +64,8 @@ public function update($order, $chargeId=null) {
     			->addObject($invoice->getOrder());
 
     		$transactionSave->save();
+
+		Mage::dispatchEvent('satispay_update_success', array('order' => $order, 'charge' => $charge));
 
         } elseif(in_array($charge->status, array(Satispay_Core_Client::PAYMENT_STATUS_DECLINED, Satispay_Core_Client::PAYMENT_STATUS_FAILURE))) {
             $helper->getLogger()->info('Charge in ' . $charge->status . ' status: cancelling order');
@@ -72,8 +74,11 @@ public function update($order, $chargeId=null) {
 			$order->addStatusHistoryComment('Charge in ' . $charge->status . ' status.');
 			$order->save();
 
+	    Mage::dispatchEvent('satispay_update_failure', array('order' => $order, 'charge' => $charge));
         } else {
             $helper->getLogger()->info('No action taken for status ' . $charge->status);
+
+	    Mage::dispatchEvent('satispay_update_other', array('order' => $order, 'charge' => $charge));
         }
     }
 }
diff --git a/src/app/code/community/Bitbull/Satispay/etc/config.xml b/src/app/code/community/Bitbull/Satispay/etc/config.xml
@@ -2,7 +2,7 @@
 <config>
     <modules>
         <Bitbull_Satispay>
-            <version>0.2.1</version>
+            <version>0.2.5</version>
         </Bitbull_Satispay>
     </modules>
     <global>
@@ -72,7 +72,6 @@
         <payment>
             <satispay>
                 <title>Pay with Satispay</title>
-                <order_status>pending_payment</order_status>
                 <payment_action>sale</payment_action>
                 <model>satispay/payment</model>
                 <default_country_code>+39</default_country_code>

diff --git a/src/app/code/community/Bitbull/Satispay/etc/system.xml b/src/app/code/community/Bitbull/Satispay/etc/system.xml
@@ -18,23 +18,23 @@
                             <sort_order>1</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
-                            <show_in_store>0</show_in_store>
+                            <show_in_store>1</show_in_store>
                         </active>
                         <title translate="label">
                             <label>Title</label>
                             <frontend_type>text</frontend_type>
                             <sort_order>2</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
-                            <show_in_store>0</show_in_store>
+                            <show_in_store>1</show_in_store>
                         </title>
                         <instructions translate="label">
                             <label>Instructions</label>
                             <frontend_type>textarea</frontend_type>
                             <sort_order>3</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
-                            <show_in_store>0</show_in_store>
+                            <show_in_store>1</show_in_store>
                         </instructions>
                         <staging translate="label">
                             <label>Staging Mode</label>
@@ -43,15 +43,15 @@
                             <sort_order>4</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
-                            <show_in_store>0</show_in_store>
+                            <show_in_store>1</show_in_store>
                         </staging>
                         <security_token translate="label">
                             <label>Security Token</label>
                             <frontend_type>textarea</frontend_type>
                             <sort_order>5</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
-                            <show_in_store>0</show_in_store>
+                            <show_in_store>1</show_in_store>
                         </security_token>
                         <default_country_code translate="label">
                             <label>Default Country Code</label>
@@ -60,15 +60,15 @@
                             <sort_order>6</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
-                            <show_in_store>0</show_in_store>
+                            <show_in_store>1</show_in_store>
                         </default_country_code>
                         <sort_order translate="label">
                             <label>Sort Order</label>
                             <frontend_type>text</frontend_type>
                             <sort_order>7</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
-                            <show_in_store>0</show_in_store>
+                            <show_in_store>1</show_in_store>
                             <frontend_class>validate-number</frontend_class>
                         </sort_order>
                         <debug translate="label comment">
@@ -79,7 +79,7 @@
                             <sort_order>110</sort_order>
                             <show_in_default>1</show_in_default>
                             <show_in_website>1</show_in_website>
-                            <show_in_store>0</show_in_store>
+                            <show_in_store>1</show_in_store>
                             <depends><active>1</active></depends>
                         </debug>
                     </fields>