Merge pull request #17

Fix the order state/status flow.…

Author: r-martins

app/code/community/RicardoMartins/PagBank/Model/Method/Billet.php

@@ -56,9 +56,10 @@ public function order(Varien_Object $payment, $amount)
             $addData['charge_id'] = $charges['id'];
 
             $payment->setAdditionalData(serialize($addData));
+            $payment->setSkipOrderProcessing(true);
             $payment->save();
         } else {
-            Mage::throwException($this->_getHelper()->__("Erro na emissão do boleto!\nMotivo: " . $pay->error_description . ".\nPor favor tente novamente mais tarde!"));
+            Mage::throwException($this->_getHelper()->__("Erro na emissão do boleto!.\nPor favor tente novamente mais tarde!"));
         }
 
         return $this;

app/code/community/RicardoMartins/PagBank/Model/Method/Pix.php

@@ -52,9 +52,10 @@ public function order(Varien_Object $payment, $amount)
             $addData['pix']['created_at'] = $response['created_at'];
 
             $payment->setAdditionalData(serialize($addData));
+            $payment->setSkipOrderProcessing(true);
             $payment->save();
         } else {
-            Mage::throwException($this->_getHelper()->__("Erro na geração do QR Code!\nMotivo: " . $pay->error_description . ".\nPor favor tente novamente mais tarde!"));
+            Mage::throwException($this->_getHelper()->__("Erro na geração do QR Code!.\nPor favor tente novamente mais tarde!"));
         }
 
         return $this;

app/code/community/RicardoMartins/PagBank/Model/Observer.php

@@ -100,6 +100,16 @@ public function salesOrderPaymentPlaceEnd($observer)
                 $helper->writeLog(sprintf('Error handling PagBank return: %s', $e->getMessage()));
             }
         }
+
+        if ($method instanceof RicardoMartins_PagBank_Model_Method_Pix || $method instanceof RicardoMartins_PagBank_Model_Method_Billet) {
+            try {
+                $order->setState(Mage_Sales_Model_Order::STATE_PENDING_PAYMENT);
+            } catch (\Exception $e) {
+                $helper = Mage::helper('ricardomartins_pagbank');
+                $helper->writeLog(sprintf('Error handling PagBank return: %s', $e->getMessage()));
+            }
+        }
+
         return $this;
     }
 }

app/code/community/RicardoMartins/PagBank/etc/config.xml

@@ -52,6 +52,15 @@
         </payment>
     </default>
     <global>
+        <sales>
+            <order>
+                <states>
+                    <pending_payment>
+                        <visible_on_front>1</visible_on_front>
+                    </pending_payment>
+                </states>
+            </order>
+        </sales>
         <models>
             <ricardomartins_pagbank>
                 <class>RicardoMartins_PagBank_Model</class>
@@ -76,6 +85,14 @@
                     </ricardomartins_pagbank>
                 </observers>
             </admin_system_config_changed_section_payment>
+            <sales_order_payment_place_end>
+                <observers>
+                    <ricardomartins_pagbank>
+                        <class>ricardomartins_pagbank/observer</class>
+                        <method>salesOrderPaymentPlaceEnd</method>
+                    </ricardomartins_pagbank>
+                </observers>
+            </sales_order_payment_place_end>
         </events>
     </global>
     <frontend>
@@ -128,15 +145,6 @@
                     </ricardomartins_pagbank>
                 </observers>
             </payment_info_block_prepare_specific_information>
-            <sales_order_payment_place_end>
-                <observers>
-                    <ricardomartins_pagbank>
-                        <type>model</type>
-                        <class>ricardomartins_pagbank/observer</class>
-                        <method>salesOrderPaymentPlaceEnd</method>
-                    </ricardomartins_pagbank>
-                </observers>
-            </sales_order_payment_place_end>
         </events>
     </frontend>
     <adminhtml>