Skip to content

Commit e4736ad

Browse files
adifucanadifucan
committed
Merge remote-tracking branch 'mainline/2.3-develop' into MAGETWO-94346
2 parents 2393dcb + 6478d2b commit e4736ad

File tree

44 files changed

+967
-35
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+967
-35
lines changed

‎app/code/Magento/Backup/Test/Mftf/Test/AdminCreateAndDeleteBackupsTest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
<testCaseId value="MAGETWO-94176"/>
1919
<group value="backup"/>
2020
<skip>
21-
<issueId value="MQE-1187"/>
22-
<issueId value="DEVOPS-3512"/>
21+
<issueId value="MC-5807"/>
2322
</skip>
2423
</annotations>
2524

‎app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88

99
use Magento\Framework\Exception\InputException;
1010

11+
/**
12+
* Option management model for product attribute.
13+
*/
1114
class OptionManagement implements \Magento\Catalog\Api\ProductAttributeOptionManagementInterface
1215
{
1316
/**
@@ -25,7 +28,7 @@ public function __construct(
2528
}
2629

2730
/**
28-
* {@inheritdoc}
31+
* @inheritdoc
2932
*/
3033
public function getItems($attributeCode)
3134
{
@@ -36,7 +39,7 @@ public function getItems($attributeCode)
3639
}
3740

3841
/**
39-
* {@inheritdoc}
42+
* @inheritdoc
4043
*/
4144
public function add($attributeCode, $option)
4245
{
@@ -47,7 +50,7 @@ public function add($attributeCode, $option)
4750
/** @var \Magento\Eav\Api\Data\AttributeOptionInterface $attributeOption */
4851
$attributeOption = $attributeOption->getLabel();
4952
});
50-
if (in_array($option->getLabel(), $currentOptions)) {
53+
if (in_array($option->getLabel(), $currentOptions, true)) {
5154
return false;
5255
}
5356
}
@@ -59,7 +62,7 @@ public function add($attributeCode, $option)
5962
}
6063

6164
/**
62-
* {@inheritdoc}
65+
* @inheritdoc
6366
*/
6467
public function delete($attributeCode, $optionId)
6568
{

‎app/code/Magento/Cms/Test/Mftf/Test/AdminAddImageToWYSIWYGBlockTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
<description value="Admin should be able to add image to WYSIWYG content of Block"/>
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-84376"/>
19-
<skip>
20-
<issueId value="MQE-1187" />
21-
</skip>
2219
</annotations>
2320
<before>
2421
<createData entity="_defaultCmsPage" stepKey="createCMSPage" />

‎app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-69988"/>
1919
<group value="сonfigurable_product"/>
20-
<skip>
21-
<issueId value="MAGETWO-96658"/>
22-
</skip>
2320
</annotations>
2421
<before>
2522
<createData entity="ApiCategory" stepKey="createCategory"/>

‎app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ protected function _runJob($scheduledTime, $currentTime, $jobConfig, $schedule,
298298

299299
if (!isset($jobConfig['instance'], $jobConfig['method'])) {
300300
$schedule->setStatus(Schedule::STATUS_ERROR);
301-
throw new \Exception('No callbacks found');
301+
throw new \Exception(sprintf('No callbacks found for cron job %s', $jobCode));
302302
}
303303
$model = $this->_objectManager->create($jobConfig['instance']);
304304
$callback = [$model, $jobConfig['method']];

‎app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,8 @@ public function testDispatchExceptionTooLate()
354354
*/
355355
public function testDispatchExceptionNoCallback()
356356
{
357-
$exceptionMessage = 'No callbacks found';
357+
$jobName = 'test_job1';
358+
$exceptionMessage = 'No callbacks found for cron job ' . $jobName;
358359
$exception = new \Exception(__($exceptionMessage));
359360

360361
$dateScheduledAt = date('Y-m-d H:i:s', $this->time - 86400);
@@ -383,7 +384,7 @@ public function testDispatchExceptionNoCallback()
383384

384385
$this->loggerMock->expects($this->once())->method('critical')->with($exception);
385386

386-
$jobConfig = ['test_group' => ['test_job1' => ['instance' => 'Some_Class']]];
387+
$jobConfig = ['test_group' => [$jobName => ['instance' => 'Some_Class']]];
387388

388389
$this->_config->expects($this->exactly(2))->method('getJobs')->will($this->returnValue($jobConfig));
389390

‎app/code/Magento/Customer/view/frontend/templates/address/edit.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
<div class="control">
105105
<select id="region_id" name="region_id"
106106
title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>"
107-
class="validate-select" <?= /* @noEscape */ !$block->getConfig('general/region/display_all') ? ' disabled="disabled"' : '' ?>>
107+
class="validate-select region_id" <?= /* @noEscape */ !$block->getConfig('general/region/display_all') ? ' disabled="disabled"' : '' ?>>
108108
<option value=""><?= $block->escapeHtml(__('Please select a region, state or province.')) ?></option>
109109
</select>
110110
<input type="text"

‎app/code/Magento/Customer/view/frontend/templates/form/register.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@
9494
<div class="field region required">
9595
<label for="region_id" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?></span></label>
9696
<div class="control">
97-
<select id="region_id" name="region_id" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>" class="validate-select" style="display:none;">
97+
<select id="region_id" name="region_id" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>" class="validate-select region_id" style="display:none;">
9898
<option value=""><?= $block->escapeHtml(__('Please select a region, state or province.')) ?></option>
9999
</select>
100100
<input type="text" id="region" name="region" value="<?= $block->escapeHtml($block->getRegion()) ?>" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>" class="input-text <?= $block->escapeHtmlAttr($this->helper('Magento\Customer\Helper\Address')->getAttributeValidationClass('region')) ?>" style="display:none;">

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -660,8 +660,8 @@ private function canCreditmemoForZeroTotalRefunded($totalRefunded)
660660
$isRefundZero = abs($totalRefunded) < .0001;
661661
// Case when Adjustment Fee (adjustment_negative) has been used for first creditmemo
662662
$hasAdjustmentFee = abs($totalRefunded - $this->getAdjustmentNegative()) < .0001;
663-
$hasActinFlag = $this->getActionFlag(self::ACTION_FLAG_EDIT) === false;
664-
if ($isRefundZero || $hasAdjustmentFee || $hasActinFlag) {
663+
$hasActionFlag = $this->getActionFlag(self::ACTION_FLAG_EDIT) === false;
664+
if ($isRefundZero || $hasAdjustmentFee || $hasActionFlag) {
665665
return false;
666666
}
667667

@@ -680,13 +680,12 @@ public function canCreditmemoForZeroTotal($totalRefunded)
680680
//check if total paid is less than grandtotal
681681
$checkAmtTotalPaid = $totalPaid <= $this->getGrandTotal();
682682
//case when amount is due for invoice
683-
$dueAmountCondition = $this->canInvoice() && ($checkAmtTotalPaid);
683+
$hasDueAmount = $this->canInvoice() && ($checkAmtTotalPaid);
684684
//case when paid amount is refunded and order has creditmemo created
685-
686685
$creditmemos = ($this->getCreditmemosCollection() === false) ?
687686
true : (count($this->getCreditmemosCollection()) > 0);
688687
$paidAmtIsRefunded = $this->getTotalRefunded() == $totalPaid && $creditmemos;
689-
if (($dueAmountCondition || $paidAmtIsRefunded) ||
688+
if (($hasDueAmount || $paidAmtIsRefunded) ||
690689
(!$checkAmtTotalPaid &&
691690
abs($totalRefunded - $this->getAdjustmentNegative()) < .0001)) {
692691
return false;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -795,3 +795,5 @@ Created,Created
795795
"PDF Shipments","PDF Shipments"
796796
"PDF Creditmemos","PDF Creditmemos"
797797
Refunds,Refunds
798+
"Allow Zero GrandTotal for Creditmemo","Allow Zero GrandTotal for Creditmemo"
799+
"Allow Zero GrandTotal","Allow Zero GrandTotal"

0 commit comments

Comments
 (0)