Skip to content
Snippets Groups Projects
Commit 60e82875 authored by Reinhold Kainhofer's avatar Reinhold Kainhofer
Browse files

Version 2.4.5: Fix various price cart variables (upper/lower case confusion)

parent 70dc3781
No related branches found
No related tags found
No related merge requests found
BASE=rules_shipping
BASE_ADV=rules_shipping_advanced
PLUGINTYPE=vmshipment
VERSION=2.4.4
VERSION=2.4.5
PLUGINFILES=$(BASE).php $(BASE)_base.php $(BASE).script.php $(BASE).xml index.html
PLUGINFILES_ADV=$(BASE_ADV).php $(BASE)_base.php $(BASE_ADV).script.php $(BASE_ADV).xml index.html
......
File added
File added
......@@ -6,7 +6,7 @@
<authorUrl>http://www.open-tools.net</authorUrl>
<copyright>Copyright (C) 2013, Reinhold Kainhofer</copyright>
<license>GPL v3+</license>
<version>2.4.4</version>
<version>2.4.5</version>
<description>VMSHIPMENT_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, Reinhold Kainhofer</copyright>
<license>GPL v3+</license>
<version>2.4.4</version>
<version>2.4.5</version>
<description>VMSHIPMENT_RULES_ADV_DESC</description>
<files>
<filename plugin="rules_shipping_advanced">rules_shipping_advanced.php</filename>
......
......@@ -425,18 +425,18 @@ class plgVmShipmentRules_Shipping_Base extends vmPSPlugin {
'articles'=>$this->getOrderArticles($cart),
'products'=>$this->getOrderProducts($cart),
'amount'=>$cart_prices['salesPrice'],
'amountWithTax'=>$cart_prices['salesPrice'],
'amountWithoutTax'=>$cart_prices['priceWithoutTax'],
'basePrice'=>$cart_prices['basePrice'],
'basePriceWithTax'=>$cart_prices['basePriceWithTax'],
'discountedPriceWithoutTax'=>$cart_prices['discountedPriceWithoutTax'],
'salesPrice'=>$cart_prices['salesPrice'],
'taxAmount'=>$cart_prices['taxAmount'],
'salesPriceWithDiscount'=>$cart_prices['salesPriceWithDiscount'],
'discountAmount'=>$cart_prices['discountAmount'],
'priceWithoutTax'=>$cart_prices['priceWithoutTax'],
// 'discountBeforeTaxBill'=>$cart_prices['discountBeforeTaxBill'],
'amountwithtax'=>$cart_prices['salesPrice'],
'amountwithouttax'=>$cart_prices['priceWithoutTax'],
'baseprice'=>$cart_prices['basePrice'],
'basepricewithtax'=>$cart_prices['basePriceWithTax'],
'discountedpricewithouttax'=>$cart_prices['discountedPriceWithoutTax'],
'salesprice'=>$cart_prices['salesPrice'],
'taxamount'=>$cart_prices['taxAmount'],
'salespricewithdiscount'=>$cart_prices['salesPriceWithDiscount'],
'discountamount'=>$cart_prices['discountAmount'],
'pricewithouttax'=>$cart_prices['priceWithoutTax'],
// 'discountbeforetaxbill'=>$cart_prices['discountBeforeTaxBill'],
'country'=>$address['virtuemart_country_id'],
);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment