Commit cb6d9d8e authored by Reinhold Kainhofer's avatar Reinhold Kainhofer
Browse files

V6.1.1: Revert all changes from V6.1

parent b8c331ab
......@@ -2,7 +2,7 @@ BASE=rules_shipping
BASE_ADV=rules_shipping_advanced
PLUGINTYPE=vmshipment
ZIPBASE=opentools_vm
VERSION=6.1
VERSION=6.1.1
PLUGINFILES=$(BASE).php $(BASE)_base.php $(BASE)_framework_joomla.php $(BASE).script.php $(BASE).xml index.html
PLUGINFILES_ADV=$(BASE_ADV).php $(BASE)_base.php $(BASE)_framework_joomla.php $(BASE_ADV).script.php $(BASE_ADV).xml index.html
......
......@@ -6,7 +6,7 @@
<authorUrl>http://www.open-tools.net</authorUrl>
<copyright>Copyright (C) 2013-2014, Reinhold Kainhofer</copyright>
<license>GPL v3+</license>
<version>6.1</version>
<version>6.1.1</version>
<description>OTSHIPMENT_RULES_DESC</description>
<files>
<filename plugin="rules_shipping">rules_shipping.php</filename>
......
......@@ -6,7 +6,7 @@
<authorUrl>http://www.open-tools.net</authorUrl>
<copyright>Copyright (C) 2013-2014, Reinhold Kainhofer</copyright>
<license>GPL v3+</license>
<version>6.1</version>
<version>6.1.1</version>
<description>OTSHIPMENT_RULES_ADV_DESC</description>
<files>
<filename plugin="rules_shipping_advanced">rules_shipping_advanced.php</filename>
......
......@@ -292,10 +292,10 @@ class RulesShippingFrameworkJoomla extends RulesShippingFramework {
'pricewithouttax' => 0,
// Bill-related prices: Will not be affected by scoping! Totals before and after cart-wide discounts.
'billtotal' => $cart_prices['billTotal'],
'billdiscountamount' => $cart_prices['billDiscountAmount'],
'billtaxamount' => $cart_prices['billTaxAmount'],
'billsubtotal' => $cart_prices['billSub'],
// 'billtotal' => $cart_prices['billTotal'],
// 'billdiscountamount' => $cart_prices['billDiscountAmount'],
// 'billtaxamount' => $cart_prices['billTaxAmount'],
// 'billsubtotal' => $cart_prices['billSub'],
);
// JFactory::getApplication()->enqueueMessage("<pre>getOrderPrices, cart=".print_r($cart,1)."</pre>", 'error');
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment