🔃 [Magento Community Engineering] Community Contributions - 2.3-develop latest changes

Accepted Community Pull Requests:
 - #24193: Use appropriate label for store switch (by @scottsb)
 - #23085: Minimize complexity for customer address import model (by @sankalpshekhar)
 - #20765: [Widgets] Mass-action delete for Widgets (by @vasilii-b)
 - #24187: #24186: CLI: cron:install. Break tasks to default and non-optional. (by @atwixfirster)
 - #24294: Resolve No validate number when create Website, Store View issue24293 (by @edenduong)
 - #23818: Standardize the array structure for the getAttributes result (by @thomas-kl1)
 - #24237: Resolved File type custom option value not showing properly in minicart (by @rani-webkul)
 - #24213: Resolve Virtual Quote shouldn't display "Shipping & Handling" total when Create New Order  (by @edenduong)
 - #22810: Allow sending email to BCC address when not notifying user. (by @Hailong)


Fixed GitHub Issues:
 - #20764: [Widgets] Bulk delete is not available (reported by @vasilii-b) has been fixed in #20765 by @vasilii-b in 2.3-develop branch
   Related commits:
     1. 073121a
     2. 4376b91
     3. 7d92ade
     4. 0de0857
     5. 2fd6ef1
     6. 8225526
     7. 8746079
     8. b56c3c4

 - #10040: [2.2.0-RC1.1] cron:install issues (reported by @hostep) has been fixed in #24187 by @atwixfirster in 2.3-develop branch
   Related commits:
     1. 6e16a8f
     2. 64d4b37

 - #24186: bin/magento cron:install adds extra cron job (reported by @atwixfirster) has been fixed in #24187 by @atwixfirster in 2.3-develop branch
   Related commits:
     1. 6e16a8f
     2. 64d4b37

 - #24293: No validate number when create Website, Store View (reported by @edenduong) has been fixed in #24294 by @edenduong in 2.3-develop branch
   Related commits:
     1. cd1a93c

 - #24236: File type custom option value not showing properly in minicart (reported by @rani-webkul) has been fixed in #24237 by @rani-webkul in 2.3-develop branch
   Related commits:
     1. ed1df5f

 - #24212: Virtual Quote shouldn't display "Shipping & Handling" total when Create New Order  (reported by @edenduong) has been fixed in #24213 by @edenduong in 2.3-develop branch
   Related commits:
     1. d794928

Author: magento-engcom-team

app/code/Magento/Backend/Block/System/Store/Edit/Form/Store.php

@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Backend\Block\System\Store\Edit\Form;
 
 /**
@@ -129,6 +132,7 @@ protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form)
                 'label' => __('Sort Order'),
                 'value' => $storeModel->getSortOrder(),
                 'required' => false,
+                'class' => 'validate-number validate-zero-or-greater',
                 'disabled' => $storeModel->isReadOnly()
             ]
         );

app/code/Magento/Backend/Block/System/Store/Edit/Form/Website.php

@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Backend\Block\System\Store\Edit\Form;
 
 /**
@@ -85,6 +88,7 @@ protected function _prepareStoreFieldset(\Magento\Framework\Data\Form $form)
                 'label' => __('Sort Order'),
                 'value' => $websiteModel->getSortOrder(),
                 'required' => false,
+                'class' => 'validate-number validate-zero-or-greater',
                 'disabled' => $websiteModel->isReadOnly()
             ]
         );

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

@@ -258,7 +258,7 @@ Minute,Minute
 "To use this website you must first enable JavaScript in your browser.","To use this website you must first enable JavaScript in your browser."
 "This is only a demo store. You can browse and place orders, but nothing will be processed.","This is only a demo store. You can browse and place orders, but nothing will be processed."
 "Report an Issue","Report an Issue"
-"Store View:","Store View:"
+"Scope:","Scope:"
 "Stores Configuration","Stores Configuration"
 "Please confirm scope switching. All data that hasn't been saved will be lost.","Please confirm scope switching. All data that hasn't been saved will be lost."
 "Additional Cache Management","Additional Cache Management"

app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml

@@ -9,7 +9,7 @@
 <?php if ($websites = $block->getWebsites()) : ?>
 
 <div class="store-switcher store-view">
-    <span class="store-switcher-label"><?= $block->escapeHtml(__('Store View:')) ?></span>
+    <span class="store-switcher-label"><?= $block->escapeHtml(__('Scope:')) ?></span>
     <div class="actions dropdown closable">
         <input type="hidden" name="store_switcher" id="store_switcher"
                data-role="store-view-id" data-param="<?= $block->escapeHtmlAttr($block->getStoreVarName()) ?>"

app/code/Magento/Checkout/view/frontend/web/template/minicart/item/default.html

@@ -44,7 +44,10 @@
                             <!-- ko if: Array.isArray(option.value) -->
                                 <span data-bind="html: option.value.join('<br>')"></span>
                             <!-- /ko -->
-                            <!-- ko ifnot: Array.isArray(option.value) -->
+                            <!-- ko if: (!Array.isArray(option.value) && option.option_type == 'file') -->
+                                <span data-bind="html: option.value"></span>
+                            <!-- /ko -->
+                            <!-- ko if: (!Array.isArray(option.value) && option.option_type != 'file') -->
                                 <span data-bind="text: option.value"></span>
                             <!-- /ko -->
                         </dd>

app/code/Magento/Cron/Console/Command/CronInstallCommand.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Cron\Console\Command;
 
 use Magento\Framework\Crontab\CrontabManagerInterface;
@@ -19,6 +21,9 @@
  */
 class CronInstallCommand extends Command
 {
+    private const COMMAND_OPTION_FORCE = 'force';
+    private const COMMAND_OPTION_NON_OPTIONAL = 'non-optional';
+
     /**
      * @var CrontabManagerInterface
      */
@@ -44,19 +49,27 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function configure()
     {
         $this->setName('cron:install')
             ->setDescription('Generates and installs crontab for current user')
-            ->addOption('force', 'f', InputOption::VALUE_NONE, 'Force install tasks');
+            ->addOption(self::COMMAND_OPTION_FORCE, 'f', InputOption::VALUE_NONE, 'Force install tasks')
+            // @codingStandardsIgnoreStart
+            ->addOption(self::COMMAND_OPTION_NON_OPTIONAL, 'd', InputOption::VALUE_NONE, 'Install only the non-optional (default) tasks');
+            // @codingStandardsIgnoreEnd
 
         parent::configure();
     }
 
     /**
-     * {@inheritdoc}
+     * Executes "cron:install" command.
+     *
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     * @return int|null
+     * @throws LocalizedException
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
@@ -65,8 +78,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
             return Cli::RETURN_FAILURE;
         }
 
+        $tasks = $this->tasksProvider->getTasks();
+        if ($input->getOption(self::COMMAND_OPTION_NON_OPTIONAL)) {
+            $tasks = $this->extractNonOptionalTasks($tasks);
+        }
+
         try {
-            $this->crontabManager->saveTasks($this->tasksProvider->getTasks());
+            $this->crontabManager->saveTasks($tasks);
         } catch (LocalizedException $e) {
             $output->writeln('<error>' . $e->getMessage() . '</error>');
             return Cli::RETURN_FAILURE;
@@ -76,4 +94,23 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         return Cli::RETURN_SUCCESS;
     }
+
+    /**
+     * Returns an array of non-optional tasks
+     *
+     * @param array $tasks
+     * @return array
+     */
+    private function extractNonOptionalTasks(array $tasks = []): array
+    {
+        $defaultTasks = [];
+
+        foreach ($tasks as $taskCode => $taskParams) {
+            if (!$taskParams['optional']) {
+                $defaultTasks[$taskCode] = $taskParams;
+            }
+        }
+
+        return $defaultTasks;
+    }
 }

app/code/Magento/Cron/etc/di.xml

@@ -66,12 +66,15 @@
             <argument name="tasks" xsi:type="array">
                 <item name="cronMagento" xsi:type="array">
                     <item name="command" xsi:type="string">{magentoRoot}bin/magento cron:run | grep -v "Ran jobs by schedule" >> {magentoLog}magento.cron.log</item>
+                    <item name="optional" xsi:type="boolean">false</item>
                 </item>
                 <item name="cronUpdate" xsi:type="array">
                     <item name="command" xsi:type="string">{magentoRoot}update/cron.php >> {magentoLog}update.cron.log</item>
+                    <item name="optional" xsi:type="boolean">true</item>
                 </item>
                 <item name="cronSetup" xsi:type="array">
                     <item name="command" xsi:type="string">{magentoRoot}bin/magento setup:cron:run >> {magentoLog}setup.cron.log</item>
+                    <item name="optional" xsi:type="boolean">true</item>
                 </item>
             </argument>
         </arguments>