ACPT-10: [Checkout] Sales Rules limitation improvement

magento · Jun 19, 2023 · fe84b95 · fe84b95
1 parent cfaeeae
commit fe84b95
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 6 deletions.
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php b/app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php
@@ -7,6 +7,7 @@
 namespace Magento\SalesRule\Model\ResourceModel\Rule;
 
 use Magento\Framework\DB\Select;
+use Magento\Framework\Model\AbstractExtensibleModel;
 use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Quote\Model\Quote\Address;
 use Magento\SalesRule\Api\Data\CouponInterface;
@@ -83,6 +84,7 @@ public function __construct(
         $this->_date = $date;
         $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()->get(Json::class);
         $this->_associatedEntitiesMap = $this->getAssociatedEntitiesMap();
+        $this->_setIdFieldName('row_id');
     }
 
     /**
@@ -123,10 +125,19 @@ protected function mapAssociatedEntities($entityType, $objectField)
         );
 
         $associatedEntities = $this->getConnection()->fetchAll($select);
-
+        $ruleIdFieldName = $this->getIdFieldName();
+        if (empty($this->getIdFieldName()) && $this->getNewEmptyItem() instanceof AbstractExtensibleModel)
+        {
+            /** @var AbstractExtensibleModel $item */
+            $ruleIdFieldName = $this->getNewEmptyItem()->getIdFieldName();
+        }
         array_map(
-            function ($associatedEntity) use ($entityInfo, $ruleIdField, $objectField) {
-                $item = $this->getItemByColumnValue($ruleIdField, $associatedEntity[$ruleIdField]);
+            function ($associatedEntity) use ($entityInfo, $ruleIdField, $objectField, $ruleIdFieldName) {
+                if ($ruleIdField === $ruleIdFieldName) {
+                    $item = $this->getItemById($associatedEntity[$ruleIdField]);
+                } else {
+                    $item = $this->getItemByColumnValue($ruleIdField, $associatedEntity[$ruleIdField]);
+                }
                 $itemAssociatedValue = $item->getData($objectField) ?? [];
                 $itemAssociatedValue[] = $associatedEntity[$entityInfo['entity_id_field']];
                 $item->setData($objectField, $itemAssociatedValue);

diff --git a/app/code/Magento/SalesRule/Model/Rule.php b/app/code/Magento/SalesRule/Model/Rule.php
@@ -38,7 +38,6 @@
  * @method \Magento\SalesRule\Model\Rule setProductIds(string $value)
  * @method int getSortOrder()
  * @method \Magento\SalesRule\Model\Rule setSortOrder(int $value)
- * @method string getSimpleAction()
  * @method \Magento\SalesRule\Model\Rule setSimpleAction(string $value)
  * @method float getDiscountAmount()
  * @method \Magento\SalesRule\Model\Rule setDiscountAmount(float $value)
@@ -547,6 +546,17 @@ public function getFromDate()
         return $this->getData('from_date');
     }
 
+    /**
+     * Get from date.
+     *
+     * @return string
+     * @since 100.1.0
+     */
+    public function getSimpleAction()
+    {
+        return $this->_getData('simple_action');
+    }
+
     /**
      * Get to date.
      *

diff --git a/setup/src/Magento/Setup/Fixtures/CartPriceRulesFixture.php b/setup/src/Magento/Setup/Fixtures/CartPriceRulesFixture.php
@@ -123,6 +123,7 @@ public function execute()
      */
     public function generateCondition($ruleId, $categoriesArray)
     {
+        //$value = $this->cartPriceRulesProductsFloor + $ruleId % 3;
         return [
             'conditions' => [
                 1 => [
@@ -136,6 +137,7 @@ public function generateCondition($ruleId, $categoriesArray)
                     'attribute' => 'total_qty',
                     'operator' => '>=',
                     'value' => $this->cartPriceRulesProductsFloor + $ruleId,
+//                    'value' => $value,
                 ],
                 '1--2' => [
                     'type' => \Magento\SalesRule\Model\Rule\Condition\Product\Found::class,
@@ -147,7 +149,8 @@ public function generateCondition($ruleId, $categoriesArray)
                     'type' => \Magento\SalesRule\Model\Rule\Condition\Product::class,
                     'attribute' => 'category_ids',
                     'operator' => '==',
-                    'value' => $categoriesArray[$ruleId % count($categoriesArray)][0],
+//                    'value' => $categoriesArray[$ruleId % count($categoriesArray)][0],
+                    'value' => 2,
                 ],
             ],
             'actions' => [
@@ -199,7 +202,7 @@ public function generateRules($ruleFactory, $categoriesArray)
                 'discount_step'             => '',
                 'apply_to_shipping'         => '0',
                 'simple_free_shipping'      => '0',
-                'stop_rules_processing'     => '1',
+                'stop_rules_processing'     => '0',
                 'reward_points_delta'       => '',
                 'store_labels'              => [
                     0 => '',