Skip to content

Commit 85285a0

Browse files
committed
[backport-2.2-develop] for PR 19288 - fixed typos
1 parent 2483bd8 commit 85285a0

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

app/code/Magento/Sales/Model/Order.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -663,7 +663,7 @@ public function canCreditmemo()
663663
private function canCreditmemoForZeroTotalRefunded(float $totalRefunded): bool
664664
{
665665
$isRefundZero = abs($totalRefunded) < .0001;
666-
// Case when Adjustment Fee (adjustment_negative) has been used for first credit memo
666+
// Case when Adjustment Fee (adjustment_negative) has been used for first creditmemo
667667
$hasAdjustmentFee = abs($totalRefunded - $this->getAdjustmentNegative()) < .0001;
668668
$hasActionFlag = $this->getActionFlag(self::ACTION_FLAG_EDIT) === false;
669669
if ($isRefundZero || $hasAdjustmentFee || $hasActionFlag) {
@@ -686,10 +686,10 @@ private function canCreditmemoForZeroTotal(float $totalRefunded): bool
686686
$checkAmtTotalPaid = $totalPaid <= $this->getGrandTotal();
687687
//case when amount is due for invoice
688688
$hasDueAmount = $this->canInvoice() && $checkAmtTotalPaid;
689-
//case when paid amount is refunded and order has credit memo created
690-
$creditMemos = ($this->getCreditmemosCollection() === false) ?
689+
//case when paid amount is refunded and order has creditmemo created
690+
$creditmemos = ($this->getCreditmemosCollection() === false) ?
691691
true : (count($this->getCreditmemosCollection()) > 0);
692-
$paidAmtIsRefunded = $this->getTotalRefunded() == $totalPaid && $creditMemos;
692+
$paidAmtIsRefunded = $this->getTotalRefunded() == $totalPaid && $creditmemos;
693693
if (($hasDueAmount || $paidAmtIsRefunded)
694694
|| (!$checkAmtTotalPaid && abs($totalRefunded - $this->getAdjustmentNegative()) < .0001)
695695
) {

app/code/Magento/Sales/etc/adminhtml/system.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
</field>
5050
</group>
5151
<group id="zerograndtotal_creditmemo" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
52-
<label>Allow Zero GrandTotal for Credit Memos</label>
52+
<label>Allow Zero GrandTotal</label>
5353
<field id="allow_zero_grandtotal" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
54-
<label>Allow Zero GrandTotal for Credit Memos</label>
54+
<label>Allow Zero GrandTotal for Creditmemo</label>
5555
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
5656
</field>
5757
</group>

app/code/Magento/Sales/i18n/en_US.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -796,3 +796,5 @@ Created,Created
796796
"PDF Creditmemos","PDF Creditmemos"
797797
Refunds,Refunds
798798
"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."
799+
"Allow Zero GrandTotal for Creditmemo","Allow Zero GrandTotal for Creditmemo"
800+
"Allow Zero GrandTotal","Allow Zero GrandTotal"

0 commit comments

Comments
 (0)