Revert "Performance improvement order condition on shipping"

This reverts commit 9fc1878.
craftcms · Sep 4, 2024 · b92e1be · b92e1be
1 parent 9fc1878
commit b92e1be
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 31 deletions.
diff --git a/src/models/ShippingRule.php b/src/models/ShippingRule.php
@@ -229,9 +229,8 @@ function($attribute) {
                         if (!$order) {
                             $order = new Order();
                         }
-                        $orderAsArray = Plugin::getInstance()->getShippingMethods()->getSerializedOrderForMatchingRules($order);
                         $orderConditionParams = [
-                            'order' => $orderAsArray,
+                            'order' => $order->toArray([], ['lineItems.snapshot', 'shippingAddress', 'billingAddress']),
                         ];
                         if (!Plugin::getInstance()->getFormulas()->validateConditionSyntax($this->{$attribute}, $orderConditionParams)) {
                             $this->addError($attribute, Craft::t('commerce', 'Invalid order condition syntax.'));
@@ -274,9 +273,10 @@ public function matchOrder(Order $order): bool
         $lineItems = $order->getLineItems();
 
         if ($this->orderConditionFormula) {
-            $orderAsArray = Plugin::getInstance()->getShippingMethods()->getSerializedOrderForMatchingRules($order);
+            $fieldsAsArray = $order->getSerializedFieldValues();
+            $orderAsArray = $order->toArray([], ['lineItems.snapshot', 'shippingAddress', 'billingAddress']);
             $orderConditionParams = [
-                'order' => $orderAsArray,
+                'order' => array_merge($orderAsArray, $fieldsAsArray),
             ];
             if (!Plugin::getInstance()->getFormulas()->evaluateCondition($this->orderConditionFormula, $orderConditionParams, 'Evaluate Shipping Rule Order Condition Formula')) {
                 return false;

diff --git a/src/services/ShippingMethods.php b/src/services/ShippingMethods.php
@@ -59,11 +59,6 @@ class ShippingMethods extends Component
      */
     private ?array $_allShippingMethods = null;
 
-    /**
-     * @var array
-     */
-    private array $_serializedOrdersByNumber = [];
-
     /**
      * Returns the Commerce managed shipping methods stored in the database.
      *
@@ -146,31 +141,9 @@ public function getMatchingShippingMethods(Order $order): array
             $shippingMethods[$method->getHandle()] = $method; // Keep the key being the handle of the method for front-end use.
         }
 
-        // Clear the memoized data so next time we watch to match rules, we get fresh data.
-        $this->_serializedOrdersByNumber = [];
-
         return $shippingMethods;
     }
 
-    /**
-     * Creates an order as an array for matching rules.
-     * We do this centrally here so that we can clear the memoized data centrally.
-     *
-     * @param Order $order
-     * @return array
-     */
-    public function getSerializedOrderForMatchingRules(Order $order): array
-    {
-        if (isset($this->_serializedOrdersByNumber[$order->number])) {
-            return $this->_serializedOrdersByNumber[$order->number];
-        }
-
-        $fieldsAsArray = $order->getSerializedFieldValues();
-        $orderAsArray = $order->toArray([], ['lineItems.snapshot', 'shippingAddress', 'billingAddress']);
-        $this->_serializedOrdersByNumber[$order->number] = array_merge($orderAsArray, $fieldsAsArray);
-        return $this->_serializedOrdersByNumber[$order->number];
-    }
-
     /**
      * Get a matching shipping rule for Order and shipping method.
      *