Merge pull request #7 from magento/2.3-develop

ravi-chandra3197 · web-flow · commit a06ae361ca5e · 2018-12-10T15:23:42.000+05:30
update branch 2.3 develop
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php b/app/code/Magento/Catalog/Model/Product/Attribute/OptionManagement.php
@@ -8,6 +8,9 @@
 
 use Magento\Framework\Exception\InputException;
 
+/**
+ * Option management model for product attribute.
+ */
 class OptionManagement implements \Magento\Catalog\Api\ProductAttributeOptionManagementInterface
 {
     /**
@@ -25,7 +28,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getItems($attributeCode)
     {
@@ -36,7 +39,7 @@ public function getItems($attributeCode)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function add($attributeCode, $option)
     {
@@ -47,7 +50,7 @@ public function add($attributeCode, $option)
                 /** @var \Magento\Eav\Api\Data\AttributeOptionInterface $attributeOption */
                     $attributeOption = $attributeOption->getLabel();
             });
-            if (in_array($option->getLabel(), $currentOptions)) {
+            if (in_array($option->getLabel(), $currentOptions, true)) {
                 return false;
             }
         }
@@ -59,7 +62,7 @@ public function add($attributeCode, $option)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function delete($attributeCode, $optionId)
     {
diff --git a/app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php b/app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php
@@ -298,7 +298,7 @@ protected function _runJob($scheduledTime, $currentTime, $jobConfig, $schedule,
 
         if (!isset($jobConfig['instance'], $jobConfig['method'])) {
             $schedule->setStatus(Schedule::STATUS_ERROR);
-            throw new \Exception('No callbacks found');
+            throw new \Exception(sprintf('No callbacks found for cron job %s', $jobCode));
         }
         $model = $this->_objectManager->create($jobConfig['instance']);
         $callback = [$model, $jobConfig['method']];
diff --git a/app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php b/app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php
@@ -354,7 +354,8 @@ public function testDispatchExceptionTooLate()
      */
     public function testDispatchExceptionNoCallback()
     {
-        $exceptionMessage = 'No callbacks found';
+        $jobName = 'test_job1';
+        $exceptionMessage = 'No callbacks found for cron job ' . $jobName;
         $exception = new \Exception(__($exceptionMessage));
 
         $dateScheduledAt = date('Y-m-d H:i:s', $this->time - 86400);
@@ -383,7 +384,7 @@ public function testDispatchExceptionNoCallback()
 
         $this->loggerMock->expects($this->once())->method('critical')->with($exception);
 
-        $jobConfig = ['test_group' => ['test_job1' => ['instance' => 'Some_Class']]];
+        $jobConfig = ['test_group' => [$jobName => ['instance' => 'Some_Class']]];
 
         $this->_config->expects($this->exactly(2))->method('getJobs')->will($this->returnValue($jobConfig));
 
diff --git a/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml b/app/code/Magento/Customer/view/frontend/templates/address/edit.phtml
@@ -104,7 +104,7 @@
             <div class="control">
                 <select id="region_id" name="region_id"
                         title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>"
-                        class="validate-select" <?= /* @noEscape */ !$block->getConfig('general/region/display_all') ? ' disabled="disabled"' : '' ?>>
+                        class="validate-select region_id" <?= /* @noEscape */ !$block->getConfig('general/region/display_all') ? ' disabled="disabled"' : '' ?>>
                     <option value=""><?= $block->escapeHtml(__('Please select a region, state or province.')) ?></option>
                 </select>
                 <input type="text"
diff --git a/app/code/Magento/Customer/view/frontend/templates/form/register.phtml b/app/code/Magento/Customer/view/frontend/templates/form/register.phtml
@@ -94,7 +94,7 @@
             <div class="field region required">
                 <label for="region_id" class="label"><span><?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?></span></label>
                 <div class="control">
-                    <select id="region_id" name="region_id" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>" class="validate-select" style="display:none;">
+                    <select id="region_id" name="region_id" title="<?= /* @noEscape */ $block->getAttributeData()->getFrontendLabel('region') ?>" class="validate-select region_id" style="display:none;">
                         <option value=""><?= $block->escapeHtml(__('Please select a region, state or province.')) ?></option>
                     </select>
                     <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;">
diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
@@ -660,8 +660,8 @@ private function canCreditmemoForZeroTotalRefunded($totalRefunded)
         $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;
         }
 
@@ -680,13 +680,12 @@ public function canCreditmemoForZeroTotal($totalRefunded)
         //check if total paid is less than grandtotal
         $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;
diff --git a/app/code/Magento/Sales/i18n/en_US.csv b/app/code/Magento/Sales/i18n/en_US.csv
@@ -795,3 +795,5 @@ Created,Created
 "PDF Shipments","PDF Shipments"
 "PDF Creditmemos","PDF Creditmemos"
 Refunds,Refunds
+"Allow Zero GrandTotal for Creditmemo","Allow Zero GrandTotal for Creditmemo"
+"Allow Zero GrandTotal","Allow Zero GrandTotal"
diff --git a/app/code/Magento/ThemeGraphQl/README.md b/app/code/Magento/ThemeGraphQl/README.md
@@ -1,4 +1,4 @@
-# ThemeGraphQlhQl
+# ThemeGraphQl
 
-**ThemeGraphQlhQl** provides type information for the GraphQl module
+**ThemeGraphQl** provides type information for the GraphQl module
 to generate theme fields information endpoints.
diff --git a/app/code/Magento/Wishlist/etc/adminhtml/system.xml b/app/code/Magento/Wishlist/etc/adminhtml/system.xml
@@ -39,6 +39,10 @@
                     <label>Enabled</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
+                <field id="show_in_sidebar" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Show in Sidebar</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
             </group>
             <group id="wishlist_link" translate="label" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="0">
                 <label>My Wish List Link</label>
diff --git a/app/code/Magento/Wishlist/etc/config.xml b/app/code/Magento/Wishlist/etc/config.xml
@@ -10,6 +10,7 @@
         <wishlist>
             <general>
                 <active>1</active>
+                <show_in_sidebar>1</show_in_sidebar>
             </general>
             <email>
                 <email_identity>general</email_identity>
diff --git a/app/code/Magento/Wishlist/i18n/en_US.csv b/app/code/Magento/Wishlist/i18n/en_US.csv
@@ -118,4 +118,5 @@ Action,Action
 Configure,Configure
 Delete,Delete
 "Product Details and Comment","Product Details and Comment"
-"You must login or register to add items to your wishlist.","You must login or register to add items to your wishlist."
+"You must login or register to add items to your wishlist.","You must login or register to add items to your wishlist."
+"Show in Sidebar","Show in Sidebar"
diff --git a/app/code/Magento/Wishlist/view/frontend/layout/default.xml b/app/code/Magento/Wishlist/view/frontend/layout/default.xml
@@ -18,7 +18,7 @@
             </block>
         </referenceBlock>
         <referenceContainer name="sidebar.additional">
-            <block class="Magento\Wishlist\Block\Customer\Sidebar" name="wishlist_sidebar" as="wishlist" template="Magento_Wishlist::sidebar.phtml"/>
+            <block class="Magento\Wishlist\Block\Customer\Sidebar" name="wishlist_sidebar" as="wishlist" template="Magento_Wishlist::sidebar.phtml" ifconfig="wishlist/general/show_in_sidebar"/>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
@@ -162,6 +162,11 @@
     &.collapsible-block-wrapper-last {
         border-bottom: 0;
     }
+    .admin__dynamic-rows.admin__control-collapsible {   
+        .admin__collapsible-block-wrapper {
+            border-bottom: none;
+        }
+    }
 }
 
 .admin__collapsible-content {
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
@@ -147,6 +147,14 @@
                 }
             }
         }
+
+        &.field-currently_used_for {
+            > .admin__field-control {
+                .admin__field {
+                    margin-top: 8px;
+                }
+            } 
+        }
     }
 }
 
@@ -288,6 +296,12 @@
     .admin__fieldset > & {
         margin-bottom: 3rem;
         position: relative;
+        
+        &.field-import_file {
+            .input-file {
+                margin-top: 6px;
+            }
+        }
     }
 
     //  Hide group legend and show first field label instead
diff --git a/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less
@@ -65,7 +65,7 @@
     }
 
     .form-address-edit {
-        #region_id {
+        .region_id {
             display: none;
         }
 
@@ -368,7 +368,7 @@
 
     .account {
         .page.messages {
-            margin-bottom: @indent__xl;
+            margin-bottom: @indent__base;
         }
 
         .toolbar {
diff --git a/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Customer/web/css/source/_module.less
@@ -70,7 +70,7 @@
     }
 
     .form-address-edit {
-        #region_id {
+        .region_id {
             display: none;
         }
 
@@ -551,7 +551,7 @@
 
     .account {
         .page.messages {
-            margin-bottom: @indent__xl;
+            margin-bottom: @indent__base;
         }
 
         .column.main {
diff --git a/lib/internal/Magento/Framework/Option/ArrayInterface.php b/lib/internal/Magento/Framework/Option/ArrayInterface.php
@@ -6,7 +6,10 @@
 namespace Magento\Framework\Option;
 
 /**
- * @todo Remove in favor of the ancestor interface
+ * Array marker interface
+ *
+ * @deprecated please use \Magento\Framework\Data\OptionSourceInterface instead.
+ * @see \Magento\Framework\Data\OptionSourceInterface
  */
 interface ArrayInterface extends \Magento\Framework\Data\OptionSourceInterface
 {

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,9 @@`
`8`	`8`
`9`	`9`	`use Magento\Framework\Exception\InputException;`
`10`	`10`
	`11`	`+/**`
	`12`	`+ * Option management model for product attribute.`
	`13`	`+ */`
`11`	`14`	`class OptionManagement implements \Magento\Catalog\Api\ProductAttributeOptionManagementInterface`
`12`	`15`	`{`
`13`	`16`	`/**`
`@@ -25,7 +28,7 @@ public function __construct(`
`25`	`28`	`}`
`26`	`29`
`27`	`30`	`/**`
`28`		`- * {@inheritdoc}`
	`31`	`+ * @inheritdoc`
`29`	`32`	`*/`
`30`	`33`	`public function getItems($attributeCode)`
`31`	`34`	`{`
`@@ -36,7 +39,7 @@ public function getItems($attributeCode)`
`36`	`39`	`}`
`37`	`40`
`38`	`41`	`/**`
`39`		`- * {@inheritdoc}`
	`42`	`+ * @inheritdoc`
`40`	`43`	`*/`
`41`	`44`	`public function add($attributeCode, $option)`
`42`	`45`	`{`
`@@ -47,7 +50,7 @@ public function add($attributeCode, $option)`
`47`	`50`	`/** @var \Magento\Eav\Api\Data\AttributeOptionInterface $attributeOption */`
`48`	`51`	`$attributeOption = $attributeOption->getLabel();`
`49`	`52`	`});`
`50`		`- if (in_array($option->getLabel(), $currentOptions)) {`
	`53`	`+ if (in_array($option->getLabel(), $currentOptions, true)) {`
`51`	`54`	`return false;`
`52`	`55`	`}`
`53`	`56`	`}`
`@@ -59,7 +62,7 @@ public function add($attributeCode, $option)`
`59`	`62`	`}`
`60`	`63`
`61`	`64`	`/**`
`62`		`- * {@inheritdoc}`
	`65`	`+ * @inheritdoc`
`63`	`66`	`*/`
`64`	`67`	`public function delete($attributeCode, $optionId)`
`65`	`68`	`{`
Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ protected function _runJob($scheduledTime, $currentTime, $jobConfig, $schedule,`
`298`	`298`
`299`	`299`	`if (!isset($jobConfig['instance'], $jobConfig['method'])) {`
`300`	`300`	`$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));`
`302`	`302`	`}`
`303`	`303`	`$model = $this->_objectManager->create($jobConfig['instance']);`
`304`	`304`	`$callback = [$model, $jobConfig['method']];`