Skip to content

[5.5] Allow multiple gateways to be selected in gateway rules #4113

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

Open
Parent: 5.5
wants to merge 2 commits into
base: 5.5
Choose a base branch
from
Open

[5.5] Allow multiple gateways to be selected in gateway rules #4113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e361ddc
Fixed #4112
lukeholder Sep 1, 2025
848da68
Merge branch '5.5' into luke/com-466-5x-allow-multi-select-of-payment…
lukeholder Sep 22, 2025
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
2 changes: 2 additions & 0 deletions CHANGELOG-WIP.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

### Administration

- Gateway condition rules now allow multiple gateways to be selected. ([#4112](https://github.com/craftcms/commerce/issues/4112))

### Development

### Extensibility
Expand Down
21 changes: 16 additions & 5 deletions src/elements/conditions/orders/PaymentGatewayConditionRule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace craft\commerce\elements\conditions\orders;

use Craft;
use craft\base\conditions\BaseSelectConditionRule;
use craft\base\conditions\BaseMultiSelectConditionRule;
use craft\base\ElementInterface;
use craft\commerce\elements\db\OrderQuery;
use craft\commerce\elements\Order;
Expand All @@ -17,7 +17,7 @@
* @author Pixel & Tonic, Inc. <[email protected]>
* @since 5.3.0
*/
class PaymentGatewayConditionRule extends BaseSelectConditionRule implements ElementConditionRuleInterface
class PaymentGatewayConditionRule extends BaseMultiSelectConditionRule implements ElementConditionRuleInterface
{
/**
* @inheritdoc
Expand Down Expand Up @@ -48,9 +48,20 @@ protected function options(): array
*/
public function modifyQuery(QueryInterface $query): void
{
$gateway = Plugin::getInstance()->getGateways()->getAllGateways()->firstWhere('uid', $this->value);
/** @var OrderQuery $query */
$query->gatewayId($gateway->id);
$gatewayIds = [];
$gateways = Plugin::getInstance()->getGateways()->getAllGateways();

foreach ($this->getValues() as $uid) {
$gateway = $gateways->firstWhere('uid', $uid);
if ($gateway) {
$gatewayIds[] = $gateway->id;
}
}

if (!empty($gatewayIds)) {
/** @var OrderQuery $query */
$query->gatewayId($this->paramValue(fn($uid) => $gateways->firstWhere('uid', $uid)?->id));
}
}

/**
Expand Down
Loading