Changeset 3746418 for fluent-cart/trunk/app/Models/Subscription.php

Timestamp:

10/14/2026 01:03:30 PM (6 days ago)

Author:

adreastrian

Message:

releasing v2.0.0

File:

• fluent-cart/trunk/app/Models/Subscription.php (modified) (4 diffs)

fluent-cart/trunk/app/Models/Subscription.php

@@ -3 +3 @@
 namespace FluentCart\App\Models;
 
-use FluentCart\Api\CurrencySettings;
+use FluentCart\App\Modules\MultiCurrency\Services\BaseCurrency;
+use FluentCart\App\Modules\MultiCurrency\Services\CurrencySnapshot;
 use FluentCart\Api\StoreSettings;
 use FluentCart\App\App;
@@ -51 +52 @@
         'product_id',
         'item_name',
+        'currency',
         'variation_id',
         'billing_interval',
@@ -84 +86 @@
                 $model->uuid = md5(time() . wp_generate_uuid4());
             }
+
+            // Currency column + the parent order's snapshot, which renewals carry.
+            CurrencySnapshot::applyToNewSubscription($model);
         });
     }
@@ -418 +423 @@
     public function getCurrencyAttribute(): string
     {
-        $currency = '';
-
-        if (empty($this->config)) {
-            // get from store settings
-            $currency = CurrencySettings::get('currency');
-            return strtoupper($currency);
-        }
-
-        $definedCurrency = Arr::get($this->config, 'currency', '');
-
-        if(empty($definedCurrency)) {
-            $currency = CurrencySettings::get('currency');
-            return strtoupper($currency);
-        }
-
-        return strtoupper($definedCurrency);
+        $column = (string) Arr::get($this->attributes, 'currency', '');
+        if ($column !== '') {
+            return strtoupper($column);
+        }
+
+        $definedCurrency = Arr::get((array) $this->config, 'currency', '');
+        if ($definedCurrency) {
+            return strtoupper($definedCurrency);
+        }
+
+        // Not CurrencySettings::get(): on storefront requests that is the visitor's currency
+        $parentCurrency = $this->parent_order_id
+            ? Order::query()->where('id', $this->parent_order_id)->value('currency')
+            : '';
+        if ($parentCurrency) {
+            return strtoupper($parentCurrency);
+        }
+
+        return BaseCurrency::get();
     }