Skip to content

Fix issue #2675 where E_NOTICE is generated on admin order creation page #2676

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

Closed
erikhansen wants to merge 2 commits into from
Closed

Fix issue #2675 where E_NOTICE is generated on admin order creation page #2676

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
caf9a92
Fix issue #2675 where E_NOTICE is generated on admin order creation page
Dec 10, 2015
77c1aa2
Merge remote-tracking branch 'upstream/develop' into feature/error-wh…
erikhansen Jan 12, 2016
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
4 changes: 4 additions & 0 deletions app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Grandtotal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ public function includeTax()
*/
public function getTotalExclTax()
{
// The tax key will not exist if a quote contains no items
if (!isset($this->getTotals()['tax'])) {
return $this->getTotals()['grand_total']->getValue();
}
$excl = $this->getTotals()['grand_total']->getValue() - $this->getTotals()['tax']->getValue();
$excl = max($excl, 0);
return $excl;
Expand Down