TheCoreDev/domokits
0
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

MAJ en Thelia 2.3.4

Browse Source
This commit is contained in:
Laurent LE CORRE
2020-05-03 08:14:07 +02:00
parent 72ddf49e60
commit 35a800ca0e
328 changed files with 9560 additions and 14163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/lib/Thelia/Module/BaseModule.php
View File

@@ -55,6 +55,12 @@ class BaseModule implements BaseModuleInterface
const IS_ACTIVATED = 1;
const IS_NOT_ACTIVATED = 0;
const IS_MANDATORY = 1;
const IS_NOT_MANDATORY = 0;
const IS_HIDDEN = 1;
const IS_NOT_HIDDEN = 0;
protected $reflected;
protected $dispatcher = null;
@@ -429,7 +435,9 @@ class BaseModule implements BaseModuleInterface
/** @var Country $country */
$country = $taxEngine->getDeliveryCountry();
$amount = $with_tax ? $cart->getTaxedAmount($country, $with_discount) : $cart->getTotalAmount($with_discount);
$state = $taxEngine->getDeliveryState();
$amount = $with_tax ? $cart->getTaxedAmount($country, $with_discount, $state) : $cart->getTotalAmount($with_discount);
if ($with_postage) {
if ($with_tax) {