Merge branch 2.3-develop into ENGCOM-5412-magento-magento2-23576

Author: magento-engcom-team

app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml

@@ -53,6 +53,9 @@ if ($isField) {
 
     <?php if (!$element->getNoContainer()) : ?>
         <fieldset class="<?=  $block->escapeHtmlAttr($cssClass) ?>" id="<?=  $block->escapeHtmlAttr($id) ?>">
+        <?php if (strlen($element->getBeforeElementHtml())) : ?>
+            <?= $element->getBeforeElementHtml() ?>
+        <?php endif ?>
         <?php if ($element->getLegend() && !$isWrapped) : ?>
             <legend class="<?= /* @noEscape */ $isField ? 'label admin__field-label' : 'admin__legend legend' ?>">
                 <span><?= $block->escapeHtml($element->getLegend()) ?></span>

app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection.xml

@@ -79,6 +79,7 @@
         <element name="sectionHeader" type="button" selector="div[data-index='websites']" timeout="30"/>
         <element name="sectionHeaderOpened" type="button" selector="[data-index='websites']._show" timeout="30"/>
         <element name="website" type="checkbox" selector="//label[contains(text(), '{{var1}}')]/parent::div//input[@type='checkbox']" parameterized="true"/>
+        <element name="websiteChecked" type="checkbox" selector="//label[contains(text(), '{{var1}}')]/parent::div//input[@type='checkbox'][@value='1']" parameterized="true"/>
     </section>
     <section name="ProductDesignSection">
         <element name="DesignTab" type="button" selector="//strong[@class='admin__collapsible-title']//span[text()='Design']"/>

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Websites.php

@@ -175,11 +175,9 @@ protected function getFieldsForFieldset()
         $label = __('Websites');
 
         $defaultWebsiteId = $this->websiteRepository->getDefault()->getId();
-        $isOnlyOneWebsiteAvailable = count($websitesList) === 1;
         foreach ($websitesList as $website) {
             $isChecked = in_array($website['id'], $websiteIds)
-                || ($defaultWebsiteId == $website['id'] && $isNewProduct)
-                || $isOnlyOneWebsiteAvailable;
+                || ($defaultWebsiteId == $website['id'] && $isNewProduct);
             $children[$website['id']] = [
                 'arguments' => [
                     'data' => [

app/code/Magento/Downloadable/Observer/SaveDownloadableOrderItemObserver.php

@@ -131,6 +131,14 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                         ScopeInterface::SCOPE_STORE
                     );
                 $linkPurchased->setLinkSectionTitle($linkSectionTitle)->save();
+                
+                $linkStatus = \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_PENDING;
+                if ($orderStatusToEnableItem == \Magento\Sales\Model\Order\Item::STATUS_PENDING
+                    || $orderItem->getOrder()->getState() == \Magento\Sales\Model\Order::STATE_COMPLETE
+                ) {
+                    $linkStatus = \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_AVAILABLE;
+                }
+                
                 foreach ($linkIds as $linkId) {
                     if (isset($links[$linkId])) {
                         $linkPurchasedItem = $this->_createPurchasedItemModel()->setPurchasedId(
@@ -158,9 +166,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                         )->setNumberOfDownloadsBought(
                             $numberOfDownloads
                         )->setStatus(
-                            \Magento\Sales\Model\Order\Item::STATUS_PENDING == $orderStatusToEnableItem ?
-                            \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_AVAILABLE :
-                            \Magento\Downloadable\Model\Link\Purchased\Item::LINK_STATUS_PENDING
+                            $linkStatus
                         )->setCreatedAt(
                             $orderItem->getCreatedAt()
                         )->setUpdatedAt(
@@ -170,7 +176,6 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                 }
             }
         }
-
         return $this;
     }
 

app/code/Magento/Widget/Block/Adminhtml/Widget/Form.php

@@ -11,6 +11,9 @@
  */
 namespace Magento\Widget\Block\Adminhtml\Widget;
 
+/**
+ * Widget Form Block class
+ */
 class Form extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
@@ -47,8 +50,13 @@ protected function _prepareForm()
         $form = $this->_formFactory->create();
 
         // Add messages container to fieldset
-        $fieldset = $form->addFieldset('base_fieldset', ['legend' => '<div data-role="messages"></div>',
-            'comment' => __('Inserting a widget does not create a widget instance.')]);
+        $fieldset = $form->addFieldset(
+            'base_fieldset',
+            [
+                'before_element_html' => '<div data-role="messages"></div>',
+                'comment' => __('Inserting a widget does not create a widget instance.'),
+            ]
+        );
 
         $fieldset->addField(
             'select_widget_type',