Commit cc6a87d8 by dhn

Merge branch 'developer' of http://47.99.244.21:9999/root/joshine into Branch_developer

parents 2cd05ee1 8ba66b32
...@@ -95,8 +95,9 @@ class Totals extends Bar ...@@ -95,8 +95,9 @@ class Totals extends Bar
$totals = $collection->getFirstItem(); $totals = $collection->getFirstItem();
$this->addTotal(__('Revenue'), $totals->getRevenue()); $this->addTotal(__('Grand Total'), ($totals->getRevenue() + $totals->getShipping()));
$this->addTotal(__('Tax'), $totals->getTax()); $this->addTotal(__('Revenue'), $totals->getRevenue() );
//$this->addTotal(__('Tax'), $totals->getTax());
$this->addTotal(__('Shipping'), $totals->getShipping()); $this->addTotal(__('Shipping'), $totals->getShipping());
$this->addTotal(__('Quantity'), $totals->getQuantity() * 1, true); $this->addTotal(__('Quantity'), $totals->getQuantity() * 1, true);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment