Merge branch '5.0' of https://github.com/craftcms/commerce into 5.0

craftcms · Feb 29, 2024 · e5019d7 · e5019d7
2 parents 51273c0 + 7495b53
commit e5019d7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/controllers/StoresController.php b/src/controllers/StoresController.php
@@ -9,6 +9,7 @@
 
 use Craft;
 use craft\commerce\db\Table;
+use craft\commerce\elements\Order;
 use craft\commerce\models\Store;
 use craft\commerce\Plugin;
 use craft\db\Query;
@@ -44,6 +45,7 @@ public function actionEditStore(?int $storeId = null, ?Store $storeModel = null)
         $storesService = Plugin::getInstance()->getStores();
 
         $brandNewStore = false;
+        $allowCurrencyChange = false;
 
         if ($storeId !== null) {
             if ($storeModel === null) {
@@ -59,6 +61,7 @@ public function actionEditStore(?int $storeId = null, ?Store $storeModel = null)
             if ($storeModel === null) {
                 $storeModel = new Store();
                 $brandNewStore = true;
+                $allowCurrencyChange = true;
             }
 
             $title = Craft::t('app', 'Create a new Store');
@@ -76,6 +79,11 @@ public function actionEditStore(?int $storeId = null, ?Store $storeModel = null)
             ],
         ];
 
+        $storeHasOrders = $storeModel->id && (new Query())->from(Table::ORDERS)->where(['storeId' => $storeModel->id])->exists();
+        if (!$storeHasOrders) {
+            $allowCurrencyChange = true;
+        }
+
         // map sites into select box options array
         $availableSiteOptions = collect(Craft::$app->getSites()->getAllSites())->map(function($site) {
             $availableForAssignmentToNewStores = Plugin::getInstance()->getStores()->getSiteIdsAvailableForAssignmentToNewStores();
@@ -90,6 +98,7 @@ public function actionEditStore(?int $storeId = null, ?Store $storeModel = null)
 
         return $this->renderTemplate('commerce/settings/stores/_edit', [
             'brandNewStore' => $brandNewStore,
+            'allowCurrencyChange' => $allowCurrencyChange,
             'title' => $title,
             'crumbs' => $crumbs,
             'store' => $storeModel,

diff --git a/src/templates/settings/stores/_edit.twig b/src/templates/settings/stores/_edit.twig
@@ -48,7 +48,9 @@
                 value: null,
                 options: availableSiteOptions,
             }) }}
+        {% endif %}
 
+        {% if allowCurrencyChange %}
             {{ forms.selectField({
                 label: "Currency"|t('commerce'),
                 id: 'currency',