Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[4.x] Shipping method performance issue due to order serialization. #3566

Closed
wants to merge 7 commits into from
Closed

[4.x] Shipping method performance issue due to order serialization. #3566

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
90eb6b1
Update Dummy.php expiry date
MatMc May 15, 2024
2249eed
Update Dummy.php
MatMc May 15, 2024
5c150b0
Merge pull request #3499 from MatMc/patch-3
nfourtythree May 22, 2024
1c6c32f
Merge branch '3.x' of github.com:craftcms/commerce into feature/shipp…
lukeholder Jun 26, 2024
8f1fd6c
Initial fix idea
lukeholder Jul 3, 2024
de503ea
Fix unsafe access to static var
lukeholder Jul 3, 2024
d0c643d
Merge branch '4.x' into feature/shipping-method-performance
lukeholder Jul 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 27 additions & 5 deletions src/models/ShippingRule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,13 @@ class ShippingRule extends Model implements ShippingRuleInterface
*/
private ?array $_shippingRuleCategories = null;

/**
* Holds the order serialized as an array used to pass to a twig condition formula.
*
* @var array
*/
private static array $_orderConditionParamsByMethodAndOrderNumber = [];

/**
* @throws InvalidConfigException
*/
Expand Down Expand Up @@ -273,11 +280,7 @@ public function matchOrder(Order $order): bool
$lineItems = $order->getLineItems();

if ($this->orderConditionFormula) {
$fieldsAsArray = $order->getSerializedFieldValues();
$orderAsArray = $order->toArray([], ['lineItems.snapshot', 'shippingAddress', 'billingAddress']);
$orderConditionParams = [
'order' => array_merge($orderAsArray, $fieldsAsArray),
];
$orderConditionParams = $this->_orderConditionParams($order);
if (!Plugin::getInstance()->getFormulas()->evaluateCondition($this->orderConditionFormula, $orderConditionParams, 'Evaluate Shipping Rule Order Condition Formula')) {
return false;
}
Expand Down Expand Up @@ -388,6 +391,25 @@ public function matchOrder(Order $order): bool
return true;
}

private function _orderConditionParams($order): array
{
if (isset(self::$_orderConditionParamsByMethodAndOrderNumber[$this->_getOrderConditionParamsCacheKey($order)])) {
return self::$_orderConditionParamsByMethodAndOrderNumber[$this->_getOrderConditionParamsCacheKey($order)];
}
$fieldsAsArray = $order->getSerializedFieldValues();
$orderAsArray = $order->toArray([], ['lineItems.snapshot', 'shippingAddress', 'billingAddress']);
self::$_orderConditionParamsByMethodAndOrderNumber[$this->_getOrderConditionParamsCacheKey($order)] = [
'order' => array_merge($orderAsArray, $fieldsAsArray),
];

return self::$_orderConditionParamsByMethodAndOrderNumber[$this->_getOrderConditionParamsCacheKey($order)];
}

public function _getOrderConditionParamsCacheKey($order): string
{
return $this->methodId . '-' . $order->number;
}

/**
* @return ShippingRuleCategory[]
* @throws InvalidConfigException
Expand Down
Loading