Merge pull request #178 from mollie/5.5.7

5.5.7
mollie · May 5, 2020 · 4cf47e8 · 4cf47e8
2 parents 2e990ca + 9ff76b9
commit 4cf47e8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
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.6</version>
+            <version>5.5.7</version>
         </Mollie_Mpm>
     </modules>
     <global>
@@ -161,6 +161,12 @@
                         <after>subtotal,discount,shipping,tax</after>
                         <before>grand_total</before>
                     </mollie_mpm_payment_fee_tax>
+                    <!-- Copied from: https://github.com/fooman/totals-sorting-fix/blob/master/app/code/community/Fooman/TotalsSortingFix/etc/config.xml
+                         This is to fix calculation errors when there are multiple custom totals -->
+                    <tax_subtotal>
+                        <after>nominal,subtotal,msrp,freeshipping</after>
+                        <before>tax_subtotal,weee,shipping,tax_shipping,discount,tax,grand_total</before>
+                    </tax_subtotal>
                 </totals>
             </quote>
             <order_invoice>

diff --git a/skin/adminhtml/default/default/mollie/mpm/style.css b/skin/adminhtml/default/default/mollie/mpm/style.css
@@ -103,6 +103,7 @@
 
 .mollie-method .form-list td.label {
     font-weight: bold;
+    min-width: 120px;
 }
 
 .mollie-method img {
@@ -165,4 +166,4 @@ a.mollie-tooltip:hover span {
     color: #333D46;
     font-weight: lighter;
     line-height: normal;
-}
+}