Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
VirtueMart
Shipping by Rules for VirtueMart
Commits
d63dd39e
Commit
d63dd39e
authored
Apr 28, 2016
by
Reinhold Kainhofer
Browse files
V6.1.5: Fix debug output; Fix error when undefined variable is used
parent
2c21c8af
Changes
7
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
d63dd39e
...
...
@@ -2,7 +2,7 @@ BASE=rules_shipping
BASE_ADV
=
rules_shipping_advanced
PLUGINTYPE
=
vmshipment
ZIPBASE
=
opentools_vm
VERSION
=
6.1.
4
VERSION
=
6.1.
5
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
...
...
library/rules_shipping_framework.php
View file @
d63dd39e
...
...
@@ -916,7 +916,7 @@ class ShippingRule {
return
$varname
;
}
elseif
(
$varname
==
'values'
)
{
return
$vals
;
}
elseif
(
$varname
==
'values_debug'
||
$varname
=
'debug_values'
)
{
}
elseif
(
$varname
==
'values_debug'
||
$varname
=
=
'debug_values'
)
{
$tmpvals
=
$vals
;
unset
(
$tmpvals
[
'debug_cart'
]);
unset
(
$tmpvals
[
'debug_products'
]);
...
...
releases/plg_opentools_vm_rules_shipping_advanced_v6.1.5.zip
0 → 100644
View file @
d63dd39e
File added
releases/plg_opentools_vm_rules_shipping_v6.1.5.zip
0 → 100644
View file @
d63dd39e
File added
rules_shipping.xml
View file @
d63dd39e
...
...
@@ -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.
4
</version>
<version>
6.1.
5
</version>
<description>
OTSHIPMENT_RULES_DESC
</description>
<files>
<filename
plugin=
"rules_shipping"
>
rules_shipping.php
</filename>
...
...
rules_shipping_advanced.xml
View file @
d63dd39e
...
...
@@ -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.
4
</version>
<version>
6.1.
5
</version>
<description>
OTSHIPMENT_RULES_ADV_DESC
</description>
<files>
<filename
plugin=
"rules_shipping_advanced"
>
rules_shipping_advanced.php
</filename>
...
...
rules_shipping_base.php
View file @
d63dd39e
...
...
@@ -370,8 +370,6 @@ class plgVmShipmentRules_Shipping_Base extends vmPSPlugin {
if
(
!
empty
(
$taxrules
)
){
foreach
(
$taxrules
as
&
$rule
){
$this
->
helper
->
warning
(
"<pre>inside taxrules, includes_tax=
$includes_tax
</pre>"
);
$this
->
helper
->
warning
(
"<pre>cartPrices: "
.
print_r
(
$cart
->
cartPrices
,
1
)
.
", rules: "
.
print_r
(
$rule
,
1
)
.
"</pre>"
);
//Quickn dirty
if
(
!
isset
(
$rule
[
'calc_kind'
]))
$rule
=
(
array
)
VmModel
::
getModel
(
'calc'
)
->
getCalc
(
$rule
[
'virtuemart_calc_id'
]);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment