Skip to content

fix(print): guard division-by-zero & correct wcorder args #3

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(print): guard division-by-zero & correct wcorder args #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions include/admin/class-print.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,7 @@ public function create_html($order_id = 0, $MODE = "HTML", $part = "", $email_pr
case 'wcorder':
if ($item->get_subtotal() !== $item->get_total()) {
$discount_amount = $item->get_subtotal() - $item->get_total() > 0 ? wc_price(wc_format_decimal($item->get_subtotal() - $item->get_total(), ''), array('currency' => $order->get_currency())) : "";
$percentage = $this->calc_precentage((float)$item->get_subtotal(), (float)$item->get_total());
$percentage = $this->calc_precentage((float) $item->get_total(), (float) $item->get_subtotal());
$discount_precent = sprintf("%'02.1f%%", $percentage);
}
break;
Expand Down Expand Up @@ -894,9 +894,17 @@ public function create_html($order_id = 0, $MODE = "HTML", $part = "", $email_pr
ob_end_clean();
return $html_output;
}
public function calc_precentage($offprice = 0, $realprice = 0) {
// 100 - (newPrice / wasPrice) * 100
return round(100 - (($offprice / $realprice) * 100), 5);
public function calc_precentage($newPrice = 0, $wasPrice = 0){
$new = (float) $newPrice;
$was = (float) $wasPrice;
if ($was <= 0) {
return 0;
}
$pct = 100 - (($new / $was) * 100);
if (!is_finite($pct)) { return 0; }
if ($pct < 0) { $pct = 0; }
if ($pct > 100) { $pct = 100; }
return round($pct, 5);
}
public function create_pdf($order_id = 0, $force_download = false, $MODE = "I", $showerror = true) {
// 'D': download the PDF file
Expand Down