From dc63d5a91fcadca03ec799e2cfe5e17f5b1dc55e Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Sat, 13 May 2017 21:37:20 +0200
Subject: [PATCH] AwoCouponV1.2: Fix function signature
---
plugins/awocoupon/Makefile | 2 +-
plugins/awocoupon/awocoupon.php | 2 +-
plugins/awocoupon/awocoupon.xml | 4 ++--
..._opentools_vmshipmentrules_awocoupon_v1.2.zip | Bin 0 -> 4936 bytes
4 files changed, 4 insertions(+), 4 deletions(-)
create mode 100644 plugins/awocoupon/releases/plg_opentools_vmshipmentrules_awocoupon_v1.2.zip
diff --git a/plugins/awocoupon/Makefile b/plugins/awocoupon/Makefile
index 2060bf5..b91a56b 100644
--- a/plugins/awocoupon/Makefile
+++ b/plugins/awocoupon/Makefile
@@ -1,7 +1,7 @@
BASE=awocoupon
PLUGINTYPE=vmshipmentrules
ZIPBASE=opentools_$(PLUGINTYPE)
-VERSION=1.1
+VERSION=1.2
PLUGINFILES=$(BASE).php $(BASE).script.php $(BASE).xml index.html
diff --git a/plugins/awocoupon/awocoupon.php b/plugins/awocoupon/awocoupon.php
index f61692c..638d195 100644
--- a/plugins/awocoupon/awocoupon.php
+++ b/plugins/awocoupon/awocoupon.php
@@ -29,7 +29,7 @@ class plgVmShipmentRulesAwoCoupon extends VmPlugin {
* available in all rules.
* Please notice that this function might also be called for only a subset of products of the cart.
*/
- function onVmShippingRulesGetCartValues(&$cartvals, $cart, $products, $method, $cart_prices) {
+ function onVmShippingRulesGetCartValues(&$cartvals, $cart, $products, $method) {
// First, make sure coupons are processes (VM core processes third-party coupons AFTER the shipping)
// This does NOT update the cart_prices array, but at least it makes sure Awocoupon has processed the coupon
JPluginHelper::importPlugin('vmcoupon');
diff --git a/plugins/awocoupon/awocoupon.xml b/plugins/awocoupon/awocoupon.xml
index 2161f64..923e7b1 100644
--- a/plugins/awocoupon/awocoupon.xml
+++ b/plugins/awocoupon/awocoupon.xml
@@ -4,9 +4,9 @@
<creationDate>2014-11-10</creationDate>
<author>Reinhold Kainhofer, Open Tools</author>
<authorUrl>http://www.open-tools.net</authorUrl>
- <copyright>Copyright (C) 2014, Reinhold Kainhofer</copyright>
+ <copyright>Copyright (C) 2014-2017, Reinhold Kainhofer</copyright>
<license>GPL v3+</license>
- <version>1.1</version>
+ <version>1.2</version>
<description>VMSHIPMENTRULES_AWOCOUPON_DESC</description>
<files>
<filename plugin="awocoupon">awocoupon.php</filename>
diff --git a/plugins/awocoupon/releases/plg_opentools_vmshipmentrules_awocoupon_v1.2.zip b/plugins/awocoupon/releases/plg_opentools_vmshipmentrules_awocoupon_v1.2.zip
new file mode 100644
index 0000000000000000000000000000000000000000..653d907bd2d40a3f0ca4d4c3e81304a92070c0d5
GIT binary patch
literal 4936
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
H1VB6hSN<<2
literal 0
HcmV?d00001
--
GitLab