Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix how discounts are displayed in cart summary when using vouchers #16235

Merged
merged 8 commits into from Nov 6, 2019
Merged

Fix how discounts are displayed in cart summary when using vouchers #16235

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
08b695f
Display "Free shipping" cart rule correctly
idnovate May 3, 2019
6922420
Apply correct cart voucher reductions values in cart summary presenta…
matthieu-rolland Oct 31, 2019
3dc0049
take taxes into account for percentage reduction amount
matthieu-rolland Oct 31, 2019
6faf288
Update src/Adapter/Presenter/Cart/CartPresenter.php
matthieu-rolland Nov 4, 2019
a9b6277
Update src/Adapter/Presenter/Cart/CartPresenter.php
matthieu-rolland Nov 4, 2019
7a54da0
Improve condition
matthieu-rolland Nov 5, 2019
915627a
improve function return
matthieu-rolland Nov 5, 2019
138b7f2
fix condition
matthieu-rolland Nov 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
83 changes: 72 additions & 11 deletions src/Adapter/Presenter/Cart/CartPresenter.php
View file
Open in desktop
Expand Up @@ -526,7 +526,7 @@ private function getTemplateVarVouchers(Cart $cart)
$vouchers = array();

$cartHasTax = null === $cart->id ? false : $cart::getTaxesAverageUsed($cart);

$freeShippingAlreadySet = false;
foreach ($cartVouchers as $cartVoucher) {
$vouchers[$cartVoucher['id_cart_rule']]['id_cart_rule'] = $cartVoucher['id_cart_rule'];
$vouchers[$cartVoucher['id_cart_rule']]['name'] = $cartVoucher['name'];
Expand All @@ -546,28 +546,51 @@ private function getTemplateVarVouchers(Cart $cart)
$cartVoucher['reduction_amount'] = $cartVoucher['value_real'];
}

if (isset($cartVoucher['reduction_percent']) && $cartVoucher['reduction_amount'] == '0.00') {
$cartVoucher['reduction_formatted'] = $cartVoucher['reduction_percent'] . '%';
} elseif (isset($cartVoucher['reduction_amount']) && $cartVoucher['reduction_amount'] > 0) {
$value = $this->includeTaxes() ? $cartVoucher['reduction_amount'] : $cartVoucher['value_tax_exc'];
$shippingReduction = $amountReduction = $percentageReduction = 0;
$freeShippingOnly = false;

if ($this->cartVoucherHasFreeShipping($cartVoucher)) {
if (!$freeShippingAlreadySet) {
$shippingReduction = $cart->getTotalShippingCost(null, $this->includeTaxes());
$freeShippingAlreadySet = true;
}
$freeShippingOnly = true;
}
if ($this->cartVoucherHasPercentReduction($cartVoucher)) {
$productsTotalExcludingTax = $cart->getOrderTotal(true, Cart::ONLY_PRODUCTS);
$percentageReduction = ($productsTotalExcludingTax / 100) * $cartVoucher['reduction_percent'];
$freeShippingOnly = false;
} elseif ($this->cartVoucherHasAmountReduction($cartVoucher)) {
$amountReduction = $this->includeTaxes() ? $cartVoucher['reduction_amount'] : $cartVoucher['value_tax_exc'];
$currencyFrom = new \Currency($cartVoucher['reduction_currency']);
$currencyTo = new \Currency($cart->id_currency);
if ($currencyFrom->conversion_rate == 0) {
$value = 0;
$amountReduction = 0;
} else {
// convert to default currency
$defaultCurrencyId = (int) Configuration::get('PS_CURRENCY_DEFAULT');
$value /= $currencyFrom->conversion_rate;
$amountReduction /= $currencyFrom->conversion_rate;
if ($defaultCurrencyId == $currencyTo->id) {
// convert to destination currency
$value *= $currencyTo->conversion_rate;
$amountReduction *= $currencyTo->conversion_rate;
}
}
// following will do currency conversion to current one
$cartVoucher['reduction_formatted'] = $this->priceFormatter->convertAndFormat($value);
$freeShippingOnly = false;
}
// when a voucher has only a shipping reduction, the value displayed must be "Free Shipping"
if ($freeShippingOnly) {
$cartVoucher['reduction_formatted'] = $this->translator->trans(
'Free Shipping',
matthieu-rolland marked this conversation as resolved.
Show resolved Hide resolved
[],
'Admin.Orderscustomers.Feature'
matthieu-rolland marked this conversation as resolved.
Show resolved Hide resolved
);
} else {
// In all other cases, the value displayed should be the total of applied reductions for the current voucher
$totalCartVoucherReduction = $shippingReduction + $amountReduction + $percentageReduction;
$cartVoucher['reduction_formatted'] = '-' . $this->priceFormatter->convertAndFormat($totalCartVoucherReduction);
}

$vouchers[$cartVoucher['id_cart_rule']]['reduction_formatted'] = '-' . $cartVoucher['reduction_formatted'];
$vouchers[$cartVoucher['id_cart_rule']]['reduction_formatted'] = $cartVoucher['reduction_formatted'];
$vouchers[$cartVoucher['id_cart_rule']]['delete_url'] = $this->link->getPageLink(
'cart',
true,
Expand All @@ -585,6 +608,44 @@ private function getTemplateVarVouchers(Cart $cart)
);
}

/**
* @param array $cartVoucher
*
* @return bool
*/
private function cartVoucherHasFreeShipping($cartVoucher)
{
return isset($cartVoucher['free_shipping']) && $cartVoucher['free_shipping'];
matthieu-rolland marked this conversation as resolved.
Show resolved Hide resolved
}

/**
* @param array $cartVoucher
*
* @return bool
*/
private function cartVoucherHasPercentReduction($cartVoucher)
{
if (
matthieu-rolland marked this conversation as resolved.
Show resolved Hide resolved
isset($cartVoucher['reduction_percent'])
PierreRambaud marked this conversation as resolved.
Show resolved Hide resolved
&& $cartVoucher['reduction_percent'] > 0
&& $cartVoucher['reduction_amount'] == '0.00'
) {
return true;
}

return false;
}

/**
* @param array $cartVoucher
*
* @return bool
*/
private function cartVoucherHasAmountReduction($cartVoucher)
{
return isset($cartVoucher['reduction_amount']) && $cartVoucher['reduction_amount'] > 0;
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those are three legacy conditions that I extracted in functions with a self explaining name for readability purpose.

/**
* Receives a string containing a list of attributes affected to the product and returns them as an array.
*
Expand Down