Magento 1.9.3 Free Shipping Sales Rule Fix

patch.sh

diff --git a/app/code/core/Mage/SalesRule/etc/config.xml b/app/code/core/Mage/SalesRule/etc/config.xml
index d5e7763..6a0e898 100644
--- a/app/code/core/Mage/SalesRule/etc/config.xml
+++ b/app/code/core/Mage/SalesRule/etc/config.xml
@@ -134,8 +134,8 @@
                 <totals>
                     <freeshipping>
                         <class>salesrule/quote_freeshipping</class>
-                        <after>subtotal,tax_subtotal</after>
-                        <before>shipping</before>
+                        <after>subtotal</after>
+                        <before>tax_subtotal,shipping</before>
                     </freeshipping>
                     <discount>
                         <class>salesrule/quote_discount</class>
diff --git a/app/code/core/Mage/Tax/etc/config.xml b/app/code/core/Mage/Tax/etc/config.xml
index 3c6b038..2ac6df7 100644
--- a/app/code/core/Mage/Tax/etc/config.xml
+++ b/app/code/core/Mage/Tax/etc/config.xml
@@ -162,8 +162,8 @@
                 <totals>
                     <tax_subtotal>
                         <class>tax/sales_total_quote_subtotal</class>
-                        <after>subtotal</after>
-                        <before>tax,discount,msrp</before>
+                        <after>freeshipping</after>
+                        <before>tax,discount</before>
                     </tax_subtotal>
                     <tax_shipping>
                         <class>tax/sales_total_quote_shipping</class>