File tree Expand file tree Collapse file tree 1 file changed +2
-2
lines changed
app/code/Magento/Sales/Model/Order/Creditmemo/Total Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -58,10 +58,10 @@ public function collect(\Magento\Sales\Model\Order\Creditmemo $creditmemo)
58
58
$ orderBaseShippingInclTax = $ order ->getBaseShippingInclTax ();
59
59
$ allowedTaxAmount = $ order ->getShippingTaxAmount () - $ order ->getShippingTaxRefunded ();
60
60
$ allowedAmountInclTax = $ allowedAmount + $ allowedTaxAmount ;
61
- $ baseAllowedAmountInclTaxDiff = $ orderBaseShippingInclTax
61
+ $ baseAllowedAmountInclTax = $ orderBaseShippingInclTax
62
62
- $ order ->getBaseShippingRefunded ()
63
63
- $ order ->getBaseShippingTaxRefunded ();
64
- $ baseAllowedAmountInclTax = $ this -> getBaseAllowedAmountInclTax ( $ baseAllowedAmountInclTaxDiff );
64
+ $ baseAllowedAmountInclTax = max ( $ baseAllowedAmountInclTax , 0 );
65
65
// Check if the desired shipping amount to refund was specified (from invoice or another source).
66
66
if ($ creditmemo ->hasBaseShippingAmount ()) {
67
67
// For the conditional logic, we will either use amounts that always include tax -OR- never include tax.
You can’t perform that action at this time.
0 commit comments