Merge pull request #150 from mollie/5.5.2

5.5.2
mollie · Oct 11, 2019 · eb3a9f4 · eb3a9f4
2 parents 289859d + bc41c20
commit eb3a9f4
Show file tree

Hide file tree

Showing 11 changed files with 79 additions and 13 deletions.
diff --git a/app/code/community/Mollie/Mpm/Block/Adminhtml/Sales/Creditmemo/PaymentFee.php b/app/code/community/Mollie/Mpm/Block/Adminhtml/Sales/Creditmemo/PaymentFee.php
@@ -22,7 +22,7 @@ public function initTotals()
         }
 
         $total = new Varien_Object();
-        $total->setLabel(__('Mollie Payment Fee'))
+        $total->setLabel(__('Payment Fee'))
             ->setValue($fee + $tax)
             ->setBaseValue($baseFee + $baseTax)
             ->setCode('mollie_mpm_payment_fee');

diff --git a/app/code/community/Mollie/Mpm/Block/Adminhtml/Sales/Invoice/PaymentFee.php b/app/code/community/Mollie/Mpm/Block/Adminhtml/Sales/Invoice/PaymentFee.php
@@ -18,7 +18,7 @@ public function initTotals()
         }
 
         $total = new Varien_Object();
-        $total->setLabel(__('Mollie Payment Fee'));
+        $total->setLabel(__('Payment Fee'));
         $total->setValue($fee + $tax);
         $total->setBaseValue($baseFee + $baseTax);
         $total->setCode('mollie_mpm_payment_fee');

diff --git a/app/code/community/Mollie/Mpm/Block/Adminhtml/Sales/Order/PaymentFee.php b/app/code/community/Mollie/Mpm/Block/Adminhtml/Sales/Order/PaymentFee.php
@@ -18,7 +18,7 @@ public function initTotals()
         }
 
         $total = new Varien_Object();
-        $total->setLabel(__('Mollie Payment Fee'))
+        $total->setLabel(__('Payment Fee'))
             ->setValue($fee + $tax)
             ->setBaseValue($baseFee + $baseTax)
             ->setCode('mollie_mpm_payment_fee');

diff --git a/app/code/community/Mollie/Mpm/Helper/OrderLines/PaymentFee.php b/app/code/community/Mollie/Mpm/Helper/OrderLines/PaymentFee.php
@@ -43,7 +43,7 @@ public function getOrderLine(Mage_Sales_Model_Order $order)
 
         return [
             'type' => 'surcharge',
-            'name' => Mage::helper('mpm')->__('Mollie Payment Fee'),
+            'name' => Mage::helper('mpm')->__('Payment Fee'),
             'quantity' => 1,
             'unitPrice' => $mollieHelper->getAmountArray($order->getOrderCurrencyCode(), $totalPaymentFee),
             'totalAmount' => $mollieHelper->getAmountArray($order->getOrderCurrencyCode(), $totalPaymentFee),

diff --git a/app/code/community/Mollie/Mpm/Model/Mollie.php b/app/code/community/Mollie/Mpm/Model/Mollie.php
@@ -171,6 +171,7 @@ public function processTransaction($orderId, $type = 'webhook', $paymentToken =
             $connection->rollback();
             throw $exception;
         } finally {
+            $this->commitOrder($order);
             $connection->commit();
         }
     }
@@ -324,4 +325,32 @@ public function getOrderIdByTransactionId($transactionId)
         return false;
     }
 
+    /**
+     * When wrapping a $order->save() in a transaction, the update of the grid is postponed to a later action.
+     * This function fixes 2 edge cases which prevents that the order grid is updated. Both are caused due to the fact
+     * that we update the order in a transaction.
+     *
+     * 1. Sometimes people disable the `controller_action_postdispatch` log observer, which calls all
+     *    afterCommitCallback methods outside of the transaction.
+     *
+     * 2. When disabling logging in the backend, these afterCommitCallback methods are also not called. This is due to
+     *    the fact that the code for triggering these goes trough the log module.
+     *
+     * In both cases we call the `commit()` method of the order ourselves, so the afterCommitCallbacks are still called.
+     *
+     * @param Mage_Sales_Model_Order $order
+     */
+    private function commitOrder(Mage_Sales_Model_Order $order)
+    {
+        $logObserver = Mage::getConfig()->getNode('frontend/events/controller_action_postdispatch/observers/log');
+        $logObserverIsDisabled = $logObserver && $logObserver->type == 'disabled';
+        $systemLogIsDisabled = $this->mollieHelper->getStoreConfig(Mage_Log_Helper_Data::XML_PATH_LOG_ENABLED) == '0';
+
+        if (!$logObserverIsDisabled && !$systemLogIsDisabled) {
+            return;
+        }
+
+        $order->getResource()->commit();
+    }
+
 }
diff --git a/app/code/community/Mollie/Mpm/Model/Observer.php b/app/code/community/Mollie/Mpm/Model/Observer.php
@@ -129,4 +129,23 @@ public function salesOrderShipmentTrackSaveAfter(Varien_Event_Observer $observer
             $mollieModel->updateShipmentTrack($shipment, $track, $order);
         }
     }
-}
+
+    public function restoreQuoteWhenReturningFromMollie(Varien_Event_Observer $observer)
+    {
+        $quoteId = Mage::getSingleton('checkout/session')->getLastQuoteId();
+
+        if (!$quoteId) {
+            return;
+        }
+
+        try {
+            $quote = Mage::getModel('sales/quote')->load($quoteId);
+
+            if (!$quote->getIsActive()) {
+                $quote->setIsActive(true)->save();
+            }
+        } catch (Exception $e) {
+            Mage::logException($e);
+        }
+    }
+}
diff --git a/app/code/community/Mollie/Mpm/Model/Totals/PaymentFee/Adminhtml/Quote.php b/app/code/community/Mollie/Mpm/Model/Totals/PaymentFee/Adminhtml/Quote.php
@@ -11,7 +11,7 @@ public function fetch(Mage_Sales_Model_Quote_Address $address)
             $address->addTotal(
                 array(
                     'code' => $this->getCode(),
-                    'title' => Mage::helper('mpm')->__('Mollie Payment Fee'),
+                    'title' => Mage::helper('mpm')->__('Payment Fee'),
                     'value' => $amount + $tax,
                 )
             );

diff --git a/app/code/community/Mollie/Mpm/Model/Totals/PaymentFee/Quote.php b/app/code/community/Mollie/Mpm/Model/Totals/PaymentFee/Quote.php
@@ -49,7 +49,7 @@ public function fetch(Mage_Sales_Model_Quote_Address $address)
             $address->addTotal(
                 array(
                     'code' => $this->getCode(),
-                    'title' => Mage::helper('mpm')->__('Mollie Payment Fee'),
+                    'title' => Mage::helper('mpm')->__('Payment Fee'),
                     'value' => $amount
                 )
             );

diff --git a/app/code/community/Mollie/Mpm/Model/Totals/PaymentFee/QuoteTax.php b/app/code/community/Mollie/Mpm/Model/Totals/PaymentFee/QuoteTax.php
@@ -32,7 +32,7 @@ public function collect(Mage_Sales_Model_Quote_Address $address)
 
         $address->setMollieMpmPaymentFeeTax($quote->getStore()->convertPrice($paymentFeeTax));
         $address->setBaseMollieMpmPaymentFeeTax($paymentFeeTax);
-        $address->setTaxAmount($address->getTaxAmount() + + $address->getMollieMpmPaymentFeeTax());
+        $address->setTaxAmount($address->getTaxAmount() + $address->getMollieMpmPaymentFeeTax());
         $address->setBaseTaxAmount($address->getBaseTaxAmount() + $address->getBaseMollieMpmPaymentFeeTax());
         $address->setGrandTotal($address->getGrandTotal() + $address->getMollieMpmPaymentFeeTax());
         $address->setBaseGrandTotal($address->getBaseGrandTotal() + $address->getBaseMollieMpmPaymentFeeTax());

diff --git a/app/code/community/Mollie/Mpm/Test/Helper/OrderLines/PaymentFeeTest.php b/app/code/community/Mollie/Mpm/Test/Helper/OrderLines/PaymentFeeTest.php
@@ -74,7 +74,7 @@ public function testGetOrderLine()
         $result = $instance->getOrderLine($order);
 
         $this->assertEquals('surcharge', $result['type']);
-        $this->assertEquals(Mage::helper('mpm')->__('Mollie Payment Fee'), $result['name']);
+        $this->assertEquals(Mage::helper('mpm')->__('Payment Fee'), $result['name']);
         $this->assertEquals(1, $result['quantity']);
         $this->assertEquals('EUR', $result['unitPrice']['currency']);
         $this->assertEquals($paymentFeeIncludingTax, $result['unitPrice']['value']);

diff --git a/app/code/community/Mollie/Mpm/etc/config.xml b/app/code/community/Mollie/Mpm/etc/config.xml
@@ -33,7 +33,7 @@
 <config>
     <modules>
         <Mollie_Mpm>
-            <version>5.5.1</version>
+            <version>5.5.2</version>
         </Mollie_Mpm>
     </modules>
     <global>
@@ -111,11 +111,11 @@
             </sales_order_creditmemo_save_after>
             <sales_order_shipment_save_before>
                 <observers>
-                    <mollie_sales_order_shipment_save_after>
+                    <mollie_sales_order_shipment_save_before>
                         <type>singleton</type>
                         <class>Mollie_Mpm_Model_Observer</class>
                         <method>salesOrderShipmentSaveBefore</method>
-                    </mollie_sales_order_shipment_save_after>
+                    </mollie_sales_order_shipment_save_before>
                 </observers>
             </sales_order_shipment_save_before>
             <sales_order_shipment_track_save_after>
@@ -127,6 +127,24 @@
                     </mollie_sales_order_shipment_track_save_after>
                 </observers>
             </sales_order_shipment_track_save_after>
+            <controller_action_predispatch_onestepcheckout_index_index>
+                <observers>
+                    <mollie_controller_action_predispatch_onestepcheckout_index_index>
+                        <type>singleton</type>
+                        <class>Mollie_Mpm_Model_Observer</class>
+                        <method>restoreQuoteWhenReturningFromMollie</method>
+                    </mollie_controller_action_predispatch_onestepcheckout_index_index>
+                </observers>
+            </controller_action_predispatch_onestepcheckout_index_index>
+            <controller_action_predispatch_checkout_onepage_index>
+                <observers>
+                    <mollie_controller_action_predispatch_onestepcheckout_index_index>
+                        <type>singleton</type>
+                        <class>Mollie_Mpm_Model_Observer</class>
+                        <method>restoreQuoteWhenReturningFromMollie</method>
+                    </mollie_controller_action_predispatch_onestepcheckout_index_index>
+                </observers>
+            </controller_action_predispatch_checkout_onepage_index>
         </events>
         <sales>
             <quote>
@@ -219,7 +237,7 @@
         <pdf>
             <totals>
                 <payment_fee translate="title">
-                    <title>Mollie payment fee</title>
+                    <title>Payment Fee</title>
                     <font_size>7</font_size>
                     <display_zero>0</display_zero>
                     <sort_order>100</sort_order>