Skip to content

[5.x] Order condition rules could show incorrect currency #4369

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

Merged
lukeholder merged 2 commits into from
Sep 16, 2026
Merged

[5.x] Order condition rules could show incorrect currency #4369

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
8dd3edb
#4368 order condition rules could show incorrect currency
nfourtythree Sep 16, 2026
63114b5
phpstan fix
nfourtythree Sep 16, 2026
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Release Notes for Craft Commerce

## Unreleased

- Fixed a bug where currency-based order condition rules could show the incorrect currency. ([#4368](https://github.com/craftcms/commerce/issues/4368))

## 5.7.4 - 2026-09-15

- Fixed a bug where custom order fields with a visibility condition based on order attributes couldn’t be saved. ([#4198](https://github.com/craftcms/commerce/issues/4198))
Expand Down
9 changes: 7 additions & 2 deletions src/elements/conditions/orders/OrderCurrencyValuesAttributeConditionRule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
use craft\elements\conditions\ElementConditionInterface;
use craft\fields\conditions\MoneyFieldConditionRule;
use craft\fields\Money;
use craft\helpers\Cp;
use craft\models\Site;
use Money\Currency;
use yii\db\QueryInterface;
Expand Down Expand Up @@ -71,10 +72,14 @@ public function setCondition(ConditionInterface $condition): void
if ($this->getCondition() instanceof HasStoreInterface) {
$this->currency = $this->getCondition()->getStore()->getCurrency();
} else {
if (Craft::$app->getRequest()->getIsCpRequest()) {
$currentSite = Cp::requestedSite();
} else {
$currentSite = Craft::$app->getSites()->getCurrentSite();
}
/** @var Site|StoreBehavior|null $currentSite */
$currentSite = Craft::$app->getSites()->getCurrentSite();

if ($currentSite->getBehavior(StoreBehavior::class)) {
if ($currentSite->getBehavior('commerce:store')) {
$this->currency = $currentSite?->getStore()->getCurrency();
}
}
Expand Down
Loading