diff --git a/web/modules/prelevementsepa/controllers/front/validation.php b/web/modules/prelevementsepa/controllers/front/validation.php index e0418ae6..8361f73b 100644 --- a/web/modules/prelevementsepa/controllers/front/validation.php +++ b/web/modules/prelevementsepa/controllers/front/validation.php @@ -60,8 +60,7 @@ class PrelevementSepaValidationModuleFrontController extends ModuleFrontControll } $currency = $this->context->currency; - $total = (float) $cart->getOrderTotal(false, Cart::BOTH) * 1.20; -// $total = (float)$cart->getOrderTotal(true, Cart::BOTH); + $total = (float)$cart->getOrderTotal(true, Cart::BOTH); $this->module->validateOrder( (int)$cart->id, diff --git a/web/modules/prelevementsepa/prelevementsepa.php b/web/modules/prelevementsepa/prelevementsepa.php index d8e6db66..da957a0e 100644 --- a/web/modules/prelevementsepa/prelevementsepa.php +++ b/web/modules/prelevementsepa/prelevementsepa.php @@ -777,9 +777,7 @@ class PrelevementSEPA extends PaymentModule $cart = $this->context->cart; $total = sprintf( $this->trans('%1$s (tax incl.)', array(), 'Modules.PrelevementSEPA.Shop'), -/* TheCoreDev le 16/04/2020 : Toujours le pb de calcul de la TVA --> finalement, on prend le HT et on le multiple par 1.2 - Tools::displayPrice($cart->getOrderTotal(true, Cart::BOTH)) */ - Tools::displayPrice($cart->getOrderTotal(false, Cart::BOTH) * 1.20) + Tools::displayPrice($cart->getOrderTotal(true, Cart::BOTH)) ); return array( diff --git a/web/modules/ps_checkpayment/ps_checkpayment.php b/web/modules/ps_checkpayment/ps_checkpayment.php index 7ee4ec36..1eabe3da 100644 --- a/web/modules/ps_checkpayment/ps_checkpayment.php +++ b/web/modules/ps_checkpayment/ps_checkpayment.php @@ -267,9 +267,7 @@ class Ps_Checkpayment extends PaymentModule $total = $this->trans( '%amount% (tax incl.)', array( - '%amount%' => Tools::displayPrice($cart->getOrderTotal(false, Cart::BOTH) * 1.20), -/* TheCoreDev le 16/04/2020 : Toujours le pb de calcul de la TVA (ano n°0000022) --> on utilise finalement le HT que l'on multiple par 1.2 - '%amount%' => Tools::displayPrice($cart->getOrderTotal(true, Cart::BOTH)), */ + '%amount%' => Tools::displayPrice($cart->getOrderTotal(true, Cart::BOTH)), ), 'Modules.Checkpayment.Admin' ); diff --git a/web/override/classes/Cart.php b/web/override/classes/Cart.php.BKP similarity index 99% rename from web/override/classes/Cart.php rename to web/override/classes/Cart.php.BKP index 8280964d..c5dc0a69 100644 --- a/web/override/classes/Cart.php +++ b/web/override/classes/Cart.php.BKP @@ -241,7 +241,8 @@ class Cart extends CartCore case Order::ROUND_ITEM: default: $product_price = $price; - $products_total[$id_tax_rules_group] += Tools::ps_round($product_price, $compute_precision) * (int) $product['cart_quantity']; + $products_total[$id_tax_rules_group] += Tools::ps_round($product_price, 6) * (int) $product['cart_quantity']; +// $products_total[$id_tax_rules_group] += Tools::ps_round($product_price, $compute_precision) * (int) $product['cart_quantity']; break; } } diff --git a/web/override/classes/PaymentModule.php b/web/override/classes/PaymentModule.php.BKP similarity index 100% rename from web/override/classes/PaymentModule.php rename to web/override/classes/PaymentModule.php.BKP diff --git a/web/override/controllers/admin/AdminOrdersController.php b/web/override/controllers/admin/AdminOrdersController.php.BKP similarity index 100% rename from web/override/controllers/admin/AdminOrdersController.php rename to web/override/controllers/admin/AdminOrdersController.php.BKP diff --git a/web/themes/classic/templates/checkout/_partials/order-confirmation-table.tpl b/web/themes/classic/templates/checkout/_partials/order-confirmation-table.tpl index 7006b8c8..8e54e6b1 100644 --- a/web/themes/classic/templates/checkout/_partials/order-confirmation-table.tpl +++ b/web/themes/classic/templates/checkout/_partials/order-confirmation-table.tpl @@ -114,13 +114,11 @@