diff --git a/Makefile b/Makefile index 0e37e04d2697e7c2d4491b08900e2ac318bad50d..3ddaee2eb7be7bdcafc5abdc32e5ba3519b6ff4d 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ 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 diff --git a/releases/plg_vmshipment_rules_shipping_advanced_v2.4.5.zip b/releases/plg_vmshipment_rules_shipping_advanced_v2.4.5.zip new file mode 100644 index 0000000000000000000000000000000000000000..71a893145bdeec1c822e93f92471bf3b09ff2701 Binary files /dev/null and b/releases/plg_vmshipment_rules_shipping_advanced_v2.4.5.zip differ diff --git a/releases/plg_vmshipment_rules_shipping_v2.4.5.zip b/releases/plg_vmshipment_rules_shipping_v2.4.5.zip new file mode 100644 index 0000000000000000000000000000000000000000..d35769ea9a034d7db5297e0d42a963fd4efeb023 Binary files /dev/null and b/releases/plg_vmshipment_rules_shipping_v2.4.5.zip differ diff --git a/rules_shipping.xml b/rules_shipping.xml index ae1a9e68cdf37dd5d2f4ba0fb67aa6ee87725970..5b068f5ceed5bf0ed311ffef94da67646e4bf3d0 100644 --- a/rules_shipping.xml +++ b/rules_shipping.xml @@ -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> diff --git a/rules_shipping_advanced.xml b/rules_shipping_advanced.xml index 1256e26715e49e707cbb58599f680b2b5dae23a9..de90abfe440159c8f14ff4cd8de2cbf21348a70d 100644 --- a/rules_shipping_advanced.xml +++ b/rules_shipping_advanced.xml @@ -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> diff --git a/rules_shipping_base.php b/rules_shipping_base.php index 73fbc48209e0f122b1b0158e701177b7ca5e90a8..27db5f1d291a86d4f8df90b335e36670412640e6 100644 --- a/rules_shipping_base.php +++ b/rules_shipping_base.php @@ -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'], );