ACP2E-209: "Table rate" shipping method displays as "Not yet calculated" on checkout

Author: bubasuma

app/code/Magento/SalesRule/Test/Fixture/Conditions.php

@@ -19,8 +19,8 @@ class Conditions implements DataFixtureInterface
         'attribute' => null,
         'operator' => null,
         'value' => true,
-        'is_value_processed' => null,
         'aggregator' => 'all',
+        'is_value_processed' => null,
         'conditions' => [
 
         ],
@@ -34,15 +34,14 @@ class Conditions implements DataFixtureInterface
     /**
      * @param DataObjectFactory $dataObjectFactory
      */
-    public function __construct(
-        DataObjectFactory  $dataObjectFactory
-    ) {
+    public function __construct(DataObjectFactory  $dataObjectFactory)
+    {
         $this->dataObjectFactory = $dataObjectFactory;
     }
 
     /**
      * {@inheritdoc}
-     * @param array $data Parameters. Same format as ProductConditions::DEFAULT_DATA.
+     * @param array $data Parameters. Same format as Conditions::DEFAULT_DATA.
      * - $data['conditions']: An array of any:
      *      - Conditions
      *      - ProductFoundInCartConditions
@@ -53,29 +52,16 @@ public function apply(array $data = []): ?DataObject
         return $this->dataObjectFactory->create(['data' => $this->prepareData($data)]);
     }
 
-    /**
-     * Prepare combine data
-     *
-     * @param array $data
-     * @return array
-     */
-    private function prepareData(array $data): array
-    {
-        $data = array_merge(self::DEFAULT_DATA, $data);
-        $data['conditions'] = $this->prepareConditionsData($data);
-
-        return $data;
-    }
-
     /**
      * Prepare conditions data
      *
      * @param array $data
      * @return array
      */
-    private function prepareConditionsData(array $data): array
+    private function prepareData(array $data): array
     {
         $conditions = [];
+        $data = array_merge(self::DEFAULT_DATA, $data);
 
         foreach ($data['conditions'] as $condition) {
             $conditionData = $condition instanceof DataObject ? $condition->toArray() : $condition;
@@ -84,7 +70,7 @@ private function prepareConditionsData(array $data): array
             }
             $conditions[] = $conditionData;
         }
-
-        return $conditions;
+        $data['conditions'] = $conditions;
+        return $data;
     }
 }

app/code/Magento/SalesRule/Test/Fixture/ProductConditions.php

@@ -53,27 +53,14 @@ public function apply(array $data = []): ?DataObject
     }
 
     /**
-     * Prepare combine data
+     * Prepare product conditions data
      *
      * @param array $data
      * @return array
      */
     private function prepareData(array $data): array
     {
         $data = array_merge(self::DEFAULT_DATA, $data);
-        $data['conditions'] = $this->prepareConditionsData($data);
-
-        return $data;
-    }
-
-    /**
-     * Prepare conditions data
-     *
-     * @param array $data
-     * @return array
-     */
-    private function prepareConditionsData(array $data): array
-    {
         $conditions = [];
 
         foreach ($data['conditions'] as $condition) {
@@ -83,7 +70,8 @@ private function prepareConditionsData(array $data): array
             }
             $conditions[] = $conditionData;
         }
+        $data['conditions'] = $conditions;
 
-        return $conditions;
+        return $data;
     }
 }

app/code/Magento/SalesRule/Test/Fixture/Rule.php

@@ -114,9 +114,8 @@ public function apply(array $data = []): ?DataObject
         unset($data['conditions'], $data['actions']);
         $model->setData($this->prepareData($data));
 
-        $model->setConditionsSerialized($this->serializer->serialize($conditions));
         $model->setActionsSerialized($this->serializer->serialize($actions));
-
+        $model->setConditionsSerialized($this->serializer->serialize($conditions));
         $this->resourceModel->save($model);
 
         return $model;
@@ -136,7 +135,7 @@ public function revert(DataObject $data): void
     }
 
     /**
-     * Prepare rule data
+     * Prepare salesrule data
      *
      * @param array $data
      * @return array