TheCoreDev/bio-concept-labo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correction anomalie 0000025 soumise le 5/05/2020 : on vire toutes les classes surchargées par le module InstallmentPayment et qui met le souk depuis le début dans le calcul de TVA

Browse Source
This commit is contained in:
Laurent LE CORRE
2020-05-05 16:27:01 +02:00
parent 23c666e59f
commit 193e608d4e
7 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
web/modules/prelevementsepa/controllers/front/validation.php
View File

@@ -60,8 +60,7 @@ class PrelevementSepaValidationModuleFrontController extends ModuleFrontControll
} }
$currency = $this->context->currency; $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( $this->module->validateOrder(
(int)$cart->id, (int)$cart->id,

4
web/modules/prelevementsepa/prelevementsepa.php
View File

@@ -777,9 +777,7 @@ class PrelevementSEPA extends PaymentModule
$cart = $this->context->cart; $cart = $this->context->cart;
$total = sprintf( $total = sprintf(
$this->trans('%1$s (tax incl.)', array(), 'Modules.PrelevementSEPA.Shop'), $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(true, Cart::BOTH)) */
Tools::displayPrice($cart->getOrderTotal(false, Cart::BOTH) * 1.20)
); );
return array( return array(

4
web/modules/ps_checkpayment/ps_checkpayment.php
View File

@@ -267,9 +267,7 @@ class Ps_Checkpayment extends PaymentModule
$total = $this->trans( $total = $this->trans(
'%amount% (tax incl.)', '%amount% (tax incl.)',
array( array(
'%amount%' => Tools::displayPrice($cart->getOrderTotal(false, Cart::BOTH) * 1.20), '%amount%' => Tools::displayPrice($cart->getOrderTotal(true, Cart::BOTH)),
/* 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)), */
), ),
'Modules.Checkpayment.Admin' 'Modules.Checkpayment.Admin'
); );

3
web/override/classes/Cart.php → web/override/classes/Cart.php.BKP
View File

@@ -241,7 +241,8 @@ class Cart extends CartCore
case Order::ROUND_ITEM: case Order::ROUND_ITEM:
default: default:
$product_price = $price; $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; break;
} }
} }

0
web/override/classes/PaymentModule.php → web/override/classes/PaymentModule.php.BKP
View File

0
web/override/controllers/admin/AdminOrdersController.php → web/override/controllers/admin/AdminOrdersController.php.BKP
View File

2
web/themes/classic/templates/checkout/_partials/order-confirmation-table.tpl
View File

@@ -114,13 +114,11 @@
<td><span class="text-uppercase">{$totals.total.label}</span> {$labels.tax_short}</td> <td><span class="text-uppercase">{$totals.total.label}</span> {$labels.tax_short}</td>
<td>{$totals.total.value}</td> <td>{$totals.total.value}</td>
</tr> </tr>
<!-- TheCoreDev : Anomalie 00000002 (affichage du total TTC en plus du total HT) //--> <!-- TheCoreDev : Anomalie 00000002 (affichage du total TTC en plus du total HT) //-->
<tr class="font-weight-bold"> <tr class="font-weight-bold">
<td><span class="text-uppercase">{$totals.total_including_tax.label}</span></td> <td><span class="text-uppercase">{$totals.total_including_tax.label}</span></td>
<td>{$totals.total_including_tax.value}</td> <td>{$totals.total_including_tax.value}</td>
</tr> </tr>
</table> </table>
{/block} {/block}