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

[5.4] Reports #3628

Draft
wants to merge 8 commits into
base: 5.x
Choose a base branch
from
Draft

[5.4] Reports #3628

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
655490b
Start WIP release notes
lukeholder Aug 15, 2024
1ad4c42
Add payment gateway order condition rule
lukeholder Oct 25, 2024
01d6a44
Cleanup
lukeholder Oct 25, 2024
c95eb01
Use UID
lukeholder Nov 6, 2024
fe7a7dc
Merge branch '5.x' into 5.3
nfourtythree Nov 6, 2024
1047f16
Fix cs
nfourtythree Nov 6, 2024
643d287
Don’t show “view customer” link on order edit if they don’t have perm…
nfourtythree Nov 6, 2024
a5826f0
Merge branch '5.3' into feature/reports
lukeholder Nov 13, 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
Prev Previous commit
Next Next commit
Use UID
  • Loading branch information
@lukeholder
lukeholder committed Nov 6, 2024
commit c95eb01922381767aae6739af2f0af072036b517
9 changes: 6 additions & 3 deletions src/elements/conditions/orders/PaymentGatewayConditionRule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use craft\commerce\elements\Order;
use craft\commerce\Plugin;
use craft\elements\conditions\ElementConditionRuleInterface;
use craft\helpers\ArrayHelper;
use yii\db\QueryInterface;

/**
Expand Down Expand Up @@ -41,7 +42,7 @@ public function getExclusiveQueryParams(): array
protected function options(): array
{
return Plugin::getInstance()->getGateways()->getAllGateways()->mapWithKeys(function($gateway) {
return [$gateway->id => $gateway->name];
return [$gateway->uid => $gateway->name];
})->all();
}

Expand All @@ -50,8 +51,9 @@ protected function options(): array
*/
public function modifyQuery(QueryInterface $query): void
{
$gateway = Plugin::getInstance()->getGateways()->getAllGateways()->firstWhere('uid', $this->value);
/** @var OrderQuery $query */
$query->gatewayId($this->value);
$query->gatewayId($gateway->id);
}

/**
Expand All @@ -60,6 +62,7 @@ public function modifyQuery(QueryInterface $query): void
public function matchElement(ElementInterface $element): bool
{
/** @var Order $element */
return $this->matchValue($element->gatewayId);
$gatewayUid = $element->getGateway()?->uid;
return $this->matchValue($gatewayUid);
}
}
Loading