Skip to content

Commit

Permalink
bug/ETS-20_net-prices-setting-breaks-ratepay problem with calculator …
Browse files Browse the repository at this point in the history
…sending 0
  • Loading branch information
rpWhittington committed Aug 10, 2018
1 parent 0a81f10 commit 6bf294b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,13 @@ public function getAmount()
{
$basket = Shopware()->Session()->sOrderVariables['sBasket'];

return $basket['AmountWithTaxNumeric'];
$amountNumeric = $basket['AmountNumeric'];
$amountWithTaxNumeric = $basket['AmountWithTaxNumeric']; //set to zero in gross-price shops
if ($amountWithTaxNumeric > 0) {
return $amountWithTaxNumeric;
}

return $amountNumeric;
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@

$pi_amount = number_format($pi_amount, 2, $pi_decimalSeperator, $pi_thousandSeperator);
if ($pi_calculator->getErrorMsg() != '') {
// echo "<h1>" . $pi_calculator->getErrorMsg() . "</h1>"; TODO, fix empty error messages
if ($pi_calculator->getErrorMsg() == 'serveroff') {
echo "<div class='pirperror' id='pirperror'>" . $pi_lang_error . ":&nbsp;&nbsp;" . $pi_lang_server_off . "</div>";
}
Expand Down

0 comments on commit 6bf294b

Please sign in to comment.