From d7dfd4ab65ddee718b8902373590db75f83566ef Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 4 Aug 2024 16:55:18 +1000
Subject: [PATCH] Fixes for translations in client portal

---
 app/Livewire/Profile/Settings/PersonalAddress.php          | 6 +-----
 app/Livewire/Profile/Settings/ShippingAddress.php          | 6 +-----
 app/Models/Currency.php                                    | 5 +++++
 app/Utils/TranslationHelper.php                            | 7 +++++--
 .../v3/authentication/register-form.blade.php              | 4 ++--
 resources/views/portal/ninja2020/auth/register.blade.php   | 2 +-
 .../components/livewire/required-client-info.blade.php     | 2 +-
 .../ninja2020/gateways/forte/ach/authorize.blade.php       | 4 ++--
 .../ninja2020/gateways/stripe/ach/authorize.blade.php      | 6 +++---
 .../ninja2020/gateways/stripe/becs/authorize.blade.php     | 4 ++--
 .../gateways/stripe/przelewy24/authorize.blade.php         | 4 ++--
 resources/views/portal/ninja2020/plan/trial.blade.php      | 2 +-
 resources/views/portal/ninja2020/profile/index.blade.php   | 4 ++--
 .../ninja2020/profile/settings/personal-address.blade.php  | 2 +-
 .../ninja2020/profile/settings/shipping-address.blade.php  | 2 +-
 .../views/portal/ninja2020/vendor_profile/edit.blade.php   | 2 +-
 16 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/app/Livewire/Profile/Settings/PersonalAddress.php b/app/Livewire/Profile/Settings/PersonalAddress.php
index f067d8177ba5..f0ab4bcc004e 100644
--- a/app/Livewire/Profile/Settings/PersonalAddress.php
+++ b/app/Livewire/Profile/Settings/PersonalAddress.php
@@ -20,8 +20,6 @@ class PersonalAddress extends Component
 
     public $country_id;
 
-    public $countries;
-
     public $saved;
 
     protected $rules = [
@@ -33,7 +31,7 @@ class PersonalAddress extends Component
         'country_id' => ['sometimes'],
     ];
 
-    public function mount($countries)
+    public function mount()
     {
         $this->fill([
             'profile' => auth()->guard('contact')->user()->client,
@@ -43,8 +41,6 @@ class PersonalAddress extends Component
             'state' => auth()->guard('contact')->user()->client->state,
             'postal_code' => auth()->guard('contact')->user()->client->postal_code,
             'country_id' => auth()->guard('contact')->user()->client->country_id,
-
-            'countries' => $countries,
             'saved' => ctrans('texts.save'),
         ]);
     }
diff --git a/app/Livewire/Profile/Settings/ShippingAddress.php b/app/Livewire/Profile/Settings/ShippingAddress.php
index fe23a24fa9cd..41393bc40b48 100644
--- a/app/Livewire/Profile/Settings/ShippingAddress.php
+++ b/app/Livewire/Profile/Settings/ShippingAddress.php
@@ -20,8 +20,6 @@ class ShippingAddress extends Component
 
     public $shipping_country_id;
 
-    public $countries;
-
     public $saved;
 
     protected $rules = [
@@ -33,7 +31,7 @@ class ShippingAddress extends Component
         'shipping_country_id' => ['sometimes'],
     ];
 
-    public function mount($countries)
+    public function mount()
     {
         $this->fill([
             'profile' => auth()->guard('contact')->user()->client,
@@ -43,8 +41,6 @@ class ShippingAddress extends Component
             'shipping_state' => auth()->guard('contact')->user()->client->shipping_state,
             'shipping_postal_code' => auth()->guard('contact')->user()->client->shipping_postal_code,
             'shipping_country_id' => auth()->guard('contact')->user()->client->shipping_country_id,
-
-            'countries' => $countries,
             'saved' => ctrans('texts.save'),
         ]);
     }
diff --git a/app/Models/Currency.php b/app/Models/Currency.php
index 33c3bf27d495..918977effffe 100644
--- a/app/Models/Currency.php
+++ b/app/Models/Currency.php
@@ -53,4 +53,9 @@ class Currency extends StaticModel
         'deleted_at' => 'timestamp',
         'precision' => 'integer',
     ];
+
+    public function getName(): string
+    {
+        return trans('texts.currency_'.$this->name);
+    }
 }
diff --git a/app/Utils/TranslationHelper.php b/app/Utils/TranslationHelper.php
index 6a7f80300180..c80cdbeb19d2 100644
--- a/app/Utils/TranslationHelper.php
+++ b/app/Utils/TranslationHelper.php
@@ -34,8 +34,10 @@ class TranslationHelper
     {
         
         /** @var \Illuminate\Support\Collection<\App\Models\Country> */
-        // $countries = app('countries');
+        $countries = app('countries');
 
+        return $countries;
+        
         return \App\Models\Country::all()->each(function ($country) {
             $country->name = ctrans('texts.country_'.$country->name);
         })->sortBy(function ($country) {
@@ -73,7 +75,8 @@ class TranslationHelper
     {
         
         /** @var \Illuminate\Support\Collection<\App\Models\Currency> */
-        // $currencies = app('currencies');
+        $currencies = app('currencies');
+        return $currencies;
 
         return \App\Models\Currency::all()->each(function ($currency) {
             $currency->name = ctrans('texts.currency_'.Str::slug($currency->name, '_'));
diff --git a/resources/views/billing-portal/v3/authentication/register-form.blade.php b/resources/views/billing-portal/v3/authentication/register-form.blade.php
index 5ebb0a7de21c..83230c043bd8 100644
--- a/resources/views/billing-portal/v3/authentication/register-form.blade.php
+++ b/resources/views/billing-portal/v3/authentication/register-form.blade.php
@@ -61,7 +61,7 @@
                                     <option
                                         {{ $country == isset(auth()->user()->client->shipping_country->id) ? 'selected' : null }} value="{{ $country->id }}">
                                         {{ $country->iso_3166_2 }}
-                                        ({{ $country->name }})
+                                        ({{ $country->getName() }})
                                     </option>
                                 @endforeach
                             </select>
@@ -75,7 +75,7 @@
                                     <option
                                         {{ $country == isset(auth()->user()->client->shipping_country->id) ? 'selected' : null }} value="{{ $country->id }}">
                                         {{ $country->iso_3166_2 }}
-                                        ({{ $country->name }})
+                                        ({{ $country->getName() }})
                                     </option>
                                 @endforeach
                             </select>
diff --git a/resources/views/portal/ninja2020/auth/register.blade.php b/resources/views/portal/ninja2020/auth/register.blade.php
index 0dc41c225a32..d0f9d4093b1e 100644
--- a/resources/views/portal/ninja2020/auth/register.blade.php
+++ b/resources/views/portal/ninja2020/auth/register.blade.php
@@ -83,7 +83,7 @@
                                         @foreach(App\Utils\TranslationHelper::getCountries() as $country)
                                             <option value="{{ $country->id }}">
                                                 {{ $country->iso_3166_2 }}
-                                                ({{ $country->name }})
+                                                ({{ $country->getName() }})
                                             </option>
                                         @endforeach
                                     </select>
diff --git a/resources/views/portal/ninja2020/components/livewire/required-client-info.blade.php b/resources/views/portal/ninja2020/components/livewire/required-client-info.blade.php
index 80070339824d..bbf1165f8056 100644
--- a/resources/views/portal/ninja2020/components/livewire/required-client-info.blade.php
+++ b/resources/views/portal/ninja2020/components/livewire/required-client-info.blade.php
@@ -22,7 +22,7 @@
 
                                 @foreach($countries as $country)
                                     <option value="{{ $country->id }}">
-                                        {{ $country->iso_3166_2 }} ({{ $country->name }})
+                                        {{ $country->iso_3166_2 }} ({{ $country->getName() }})
                                     </option>
                                 @endforeach
                             </select>
diff --git a/resources/views/portal/ninja2020/gateways/forte/ach/authorize.blade.php b/resources/views/portal/ninja2020/gateways/forte/ach/authorize.blade.php
index 1eba7a6aa349..f621f353e53d 100644
--- a/resources/views/portal/ninja2020/gateways/forte/ach/authorize.blade.php
+++ b/resources/views/portal/ninja2020/gateways/forte/ach/authorize.blade.php
@@ -57,7 +57,7 @@
         @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.country')])
             <select name="countries" id="country" name="country" class="form-select input w-full bg-white" required>
                 @foreach($countries as $country)
-                    <option value="{{ $country->iso_3166_2 }}" {{$country->iso_3166_2 == 'US' ? "selected" : ""}}>{{ $country->iso_3166_2 }} ({{ $country->name }})</option>
+                    <option value="{{ $country->iso_3166_2 }}" {{$country->iso_3166_2 == 'US' ? "selected" : ""}}>{{ $country->iso_3166_2 }} ({{ $country->getName() }})</option>
                 @endforeach
             </select>
         @endcomponent
@@ -65,7 +65,7 @@
         @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.currency')])
             <select name="currencies" id="currency" name="currency" class="form-select input w-full">
                 @foreach($currencies as $currency)
-                    <option value="{{ $currency->code }}" {{$currency->code == 'USD' ? "selected" : ""}}>{{ $currency->code }} ({{ $currency->name }})</option>
+                    <option value="{{ $currency->code }}" {{$currency->code == 'USD' ? "selected" : ""}}>{{ $currency->code }} ({{ $currency->getName() }})</option>
                 @endforeach
             </select>
         @endcomponent
diff --git a/resources/views/portal/ninja2020/gateways/stripe/ach/authorize.blade.php b/resources/views/portal/ninja2020/gateways/stripe/ach/authorize.blade.php
index 80b447dfe273..7a9b3c93dc28 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/ach/authorize.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/ach/authorize.blade.php
@@ -51,9 +51,9 @@
             <option disabled selected></option>
             @foreach($countries as $country)
                 @if($country->iso_3166_2 == 'US')
-                <option value="{{ $country->iso_3166_2 }}" selected>{{ $country->iso_3166_2 }} ({{ $country->name }})</option>
+                <option value="{{ $country->iso_3166_2 }}" selected>{{ $country->iso_3166_2 }} ({{ $country->getName() }})</option>
                 @else
-                <option value="{{ $country->iso_3166_2 }}">{{ $country->iso_3166_2 }} ({{ $country->name }})</option>
+                <option value="{{ $country->iso_3166_2 }}">{{ $country->iso_3166_2 }} ({{ $country->getName() }})</option>
                 @endif
             @endforeach
         </select>
@@ -64,7 +64,7 @@
             <option disabled selected></option>
             @foreach($currencies as $currency)
                 @if($currency->code == 'USD')
-                    <option value="{{ $currency->code }}" selected>{{ $currency->code }} ({{ $currency->name }})</option>
+                    <option value="{{ $currency->code }}" selected>{{ $currency->code }} ({{ $currency->getName() }})</option>
                 @else
                     <option value="{{ $currency->code }}">{{ $currency->code }} ({{ $currency->name }})</option>
                 @endif
diff --git a/resources/views/portal/ninja2020/gateways/stripe/becs/authorize.blade.php b/resources/views/portal/ninja2020/gateways/stripe/becs/authorize.blade.php
index 24af2696f215..6d99320aa665 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/becs/authorize.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/becs/authorize.blade.php
@@ -47,7 +47,7 @@
     @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.country')])
         <select name="countries" id="country" class="form-select input w-full bg-white" required>
             @foreach($countries as $country)
-                <option value="{{ $country->iso_3166_2 }}">{{ $country->iso_3166_2 }} ({{ $country->name }})</option>
+                <option value="{{ $country->iso_3166_2 }}">{{ $country->iso_3166_2 }} ({{ $country->getName() }})</option>
             @endforeach
         </select>
     @endcomponent
@@ -55,7 +55,7 @@
     @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.currency')])
         <select name="currencies" id="currency" class="form-select input w-full">
             @foreach($currencies as $currency)
-                <option value="{{ $currency->code }}">{{ $currency->code }} ({{ $currency->name }})</option>
+                <option value="{{ $currency->code }}">{{ $currency->code }} ({{ $currency->getName() }})</option>
             @endforeach
         </select>
     @endcomponent
diff --git a/resources/views/portal/ninja2020/gateways/stripe/przelewy24/authorize.blade.php b/resources/views/portal/ninja2020/gateways/stripe/przelewy24/authorize.blade.php
index 24af2696f215..6d99320aa665 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/przelewy24/authorize.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/przelewy24/authorize.blade.php
@@ -47,7 +47,7 @@
     @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.country')])
         <select name="countries" id="country" class="form-select input w-full bg-white" required>
             @foreach($countries as $country)
-                <option value="{{ $country->iso_3166_2 }}">{{ $country->iso_3166_2 }} ({{ $country->name }})</option>
+                <option value="{{ $country->iso_3166_2 }}">{{ $country->iso_3166_2 }} ({{ $country->getName() }})</option>
             @endforeach
         </select>
     @endcomponent
@@ -55,7 +55,7 @@
     @component('portal.ninja2020.components.general.card-element', ['title' => ctrans('texts.currency')])
         <select name="currencies" id="currency" class="form-select input w-full">
             @foreach($currencies as $currency)
-                <option value="{{ $currency->code }}">{{ $currency->code }} ({{ $currency->name }})</option>
+                <option value="{{ $currency->code }}">{{ $currency->code }} ({{ $currency->getName() }})</option>
             @endforeach
         </select>
     @endcomponent
diff --git a/resources/views/portal/ninja2020/plan/trial.blade.php b/resources/views/portal/ninja2020/plan/trial.blade.php
index 8db0c4d6ac39..4be765d1bc3a 100644
--- a/resources/views/portal/ninja2020/plan/trial.blade.php
+++ b/resources/views/portal/ninja2020/plan/trial.blade.php
@@ -1526,7 +1526,7 @@ Ensure the default browser behavior of the `hidden` attribute.
                 <select name="country" id="country" class="form-select w-full py-[9.5px] px-[12px] border border-light-grey rounded transition ease-in-out m-0 focus:border-primary-blue focus:outline-none bg-white">
                     <option value="{{ $client->country->id}}" selected>{{ $client->country->iso_3166_2 }} ({{ $client->country->name }})</option>
                     @foreach($countries as $country)
-                        <option value="{{ $country->id }}">{{ $country->iso_3166_2 }} ({{ $country->name }})></option>
+                        <option value="{{ $country->id }}">{{ $country->iso_3166_2 }} ({{ $country->getName() }})></option>
                     @endforeach
                 </select>
               </div>
diff --git a/resources/views/portal/ninja2020/profile/index.blade.php b/resources/views/portal/ninja2020/profile/index.blade.php
index d44b9aeff603..2e2cfd9220ee 100644
--- a/resources/views/portal/ninja2020/profile/index.blade.php
+++ b/resources/views/portal/ninja2020/profile/index.blade.php
@@ -28,8 +28,8 @@
     @livewire('profile.settings.general')
 
     <!-- Client personal address -->
-    @livewire('profile.settings.personal-address', ['countries' => $countries])
+    @livewire('profile.settings.personal-address')
 
     <!-- Client shipping address -->
-    @livewire('profile.settings.shipping-address', ['countries' => $countries])
+    @livewire('profile.settings.shipping-address')
 @endsection
diff --git a/resources/views/portal/ninja2020/profile/settings/personal-address.blade.php b/resources/views/portal/ninja2020/profile/settings/personal-address.blade.php
index 47a7f09f8198..8e152de46fac 100644
--- a/resources/views/portal/ninja2020/profile/settings/personal-address.blade.php
+++ b/resources/views/portal/ninja2020/profile/settings/personal-address.blade.php
@@ -61,7 +61,7 @@
                                 <option value="none"></option>
                                 @foreach($countries as $country)
                                     <option value="{{ $country->id }}">
-                                        {{ $country->iso_3166_2 }} ({{ $country->name }})
+                                        {{ $country->iso_3166_2 }} ({{ $country->getName() }})
                                     </option>
                                 @endforeach
                             </select>
diff --git a/resources/views/portal/ninja2020/profile/settings/shipping-address.blade.php b/resources/views/portal/ninja2020/profile/settings/shipping-address.blade.php
index 2742f376f81d..6ce59c890877 100644
--- a/resources/views/portal/ninja2020/profile/settings/shipping-address.blade.php
+++ b/resources/views/portal/ninja2020/profile/settings/shipping-address.blade.php
@@ -62,7 +62,7 @@
                                     <option value="none"></option>
                                     @foreach($countries as $country)
                                     <option value="{{ $country->id }}">
-                                        {{ $country->iso_3166_2 }} ({{ $country->name }})
+                                        {{ $country->iso_3166_2 }} ({{ $country->getName() }})
                                     </option>
                                     @endforeach
                                 </select>
diff --git a/resources/views/portal/ninja2020/vendor_profile/edit.blade.php b/resources/views/portal/ninja2020/vendor_profile/edit.blade.php
index c7cb866f0031..6dccb1298b3b 100644
--- a/resources/views/portal/ninja2020/vendor_profile/edit.blade.php
+++ b/resources/views/portal/ninja2020/vendor_profile/edit.blade.php
@@ -152,7 +152,7 @@
                                 <option value="none"></option>
                                 @foreach($countries as $country)
                                     <option value="{{ $country->id }}" @if($vendor->country_id == $country->id) selected @endif>
-                                        {{ $country->iso_3166_2 }} ({{ $country->name }})
+                                        {{ $country->iso_3166_2 }} ({{ $country->getName() }})
                                     </option>
                                 @endforeach
                             </select>