Skip to content

[BackPort] resolve typos and correct variable names #19280

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

Merged
magento-engcom-team merged 3 commits into from
Jan 2, 2019
Merged

[BackPort] resolve typos and correct variable names #19280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2483bd8
resolve typos and correct variable names
viral-wagento Nov 20, 2018
85285a0
[backport-2.2-develop] for PR 19288 - fixed typos
viral-wagento Dec 12, 2018
db159b9
Update en_US.csv
viral-wagento Dec 12, 2018
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
10 changes: 5 additions & 5 deletions app/code/Magento/Sales/Model/Order.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,8 +665,8 @@ private function canCreditmemoForZeroTotalRefunded(float $totalRefunded): bool
$isRefundZero = abs($totalRefunded) < .0001;
// Case when Adjustment Fee (adjustment_negative) has been used for first creditmemo
$hasAdjustmentFee = abs($totalRefunded - $this->getAdjustmentNegative()) < .0001;
$hasActinFlag = $this->getActionFlag(self::ACTION_FLAG_EDIT) === false;
if ($isRefundZero || $hasAdjustmentFee || $hasActinFlag) {
$hasActionFlag = $this->getActionFlag(self::ACTION_FLAG_EDIT) === false;
if ($isRefundZero || $hasAdjustmentFee || $hasActionFlag) {
return false;
}

Expand All @@ -682,15 +682,15 @@ private function canCreditmemoForZeroTotalRefunded(float $totalRefunded): bool
private function canCreditmemoForZeroTotal(float $totalRefunded): bool
{
$totalPaid = $this->getTotalPaid();
//check if total paid is less than grandtotal
//check if total paid is less than grand total
$checkAmtTotalPaid = $totalPaid <= $this->getGrandTotal();
//case when amount is due for invoice
$dueAmountCondition = $this->canInvoice() && $checkAmtTotalPaid;
$hasDueAmount = $this->canInvoice() && $checkAmtTotalPaid;
//case when paid amount is refunded and order has creditmemo created
$creditmemos = ($this->getCreditmemosCollection() === false) ?
true : (count($this->getCreditmemosCollection()) > 0);
$paidAmtIsRefunded = $this->getTotalRefunded() == $totalPaid && $creditmemos;
if (($dueAmountCondition || $paidAmtIsRefunded)
if (($hasDueAmount || $paidAmtIsRefunded)
|| (!$checkAmtTotalPaid && abs($totalRefunded - $this->getAdjustmentNegative()) < .0001)
) {
return false;
Expand Down
2 changes: 2 additions & 0 deletions app/code/Magento/Sales/i18n/en_US.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,3 +796,5 @@ Created,Created
"PDF Creditmemos","PDF Creditmemos"
Refunds,Refunds
"Shipment with requested ID %1 doesn't correspond with Order with requested ID %2.","Shipment with requested ID %1 doesn't correspond with Order with requested ID %2."
"Allow Zero GrandTotal for Creditmemo","Allow Zero GrandTotal for Creditmemo"
"Allow Zero GrandTotal","Allow Zero GrandTotal"