Merge remote-tracking branch 'magento-l3/ACP2E-1923' into L3-PR-2023-09-06

Author: mirceaRosmeteniuc

app/code/Magento/SalesRule/Model/Rule/DataProvider.php

@@ -11,7 +11,7 @@
 use Magento\SalesRule\Model\Rule;
 
 /**
- * Class DataProvider
+ * Data Provider for sales rule form
  */
 class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
 {
@@ -26,8 +26,6 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
     protected $loadedData;
 
     /**
-     * Core registry
-     *
      * @var \Magento\Framework\Registry
      */
     protected $coreRegistry;
@@ -103,6 +101,8 @@ public function getData()
             $rule->setDiscountQty($rule->getDiscountQty() * 1);
 
             $this->loadedData[$rule->getId()] = $rule->getData();
+            $labels = $rule->getStoreLabels();
+            $this->loadedData[$rule->getId()]['store_labels'] = $labels;
         }
         $data = $this->dataPersistor->get('sale_rule');
         if (!empty($data)) {

app/code/Magento/SalesRule/Test/Unit/Model/Rule/DataProviderTest.php

@@ -89,11 +89,11 @@ protected function setUp(): void
     public function testGetData()
     {
         $ruleId = 42;
-        $ruleData = ['name' => 'Sales Price Rule'];
+        $ruleData = ['name' => 'Sales Price Rule', 'store_labels' => ['1' => 'Store Label']];
 
         $ruleMock = $this->getMockBuilder(Rule::class)
-            ->addMethods(['getDiscountAmount', 'setDiscountAmount', 'getDiscountQty', 'setDiscountQty'])
-            ->onlyMethods(['load', 'getId', 'getData'])
+            ->addMethods(['getDiscountAmount', 'setDiscountAmount', 'getDiscountQty', 'setDiscountQty',])
+            ->onlyMethods(['load', 'getId', 'getData', 'getStoreLabels'])
             ->disableOriginalConstructor()
             ->getMock();
         $this->collectionMock->expects($this->once())->method('getItems')->willReturn([$ruleMock]);
@@ -105,6 +105,7 @@ public function testGetData()
         $ruleMock->expects($this->once())->method('setDiscountAmount')->with(50)->willReturn($ruleMock);
         $ruleMock->expects($this->once())->method('getDiscountQty')->willReturn(20.010);
         $ruleMock->expects($this->once())->method('setDiscountQty')->with(20.01)->willReturn($ruleMock);
+        $ruleMock->expects($this->once())->method('getStoreLabels')->willReturn(["1" => "Store Label"]);
 
         $this->assertEquals([$ruleId => $ruleData], $this->model->getData());
         // Load from object-cache the second time