fix: Timezone.php

app/Filament/Company/Pages/Setting/Localization.php

@@ -6,6 +6,7 @@ use App\Enums\DateFormat;
 use App\Enums\NumberFormat;
 use App\Enums\TimeFormat;
 use App\Enums\WeekStart;
+use App\Models\Setting\CompanyProfile as CompanyProfileModel;
 use App\Models\Setting\Localization as LocalizationModel;
 use App\Utilities\Localization\Timezone;
 use Filament\Actions\Action;
@@ -133,7 +134,7 @@ class Localization extends Page
                     ->searchable(),
                 Select::make('timezone')
                     ->localizeLabel()
-                    ->options(Timezone::getTimezoneOptions(\App\Models\Setting\CompanyProfile::find(auth()->user()->currentCompany->id)->country))
+                    ->options(Timezone::getTimezoneOptions(CompanyProfileModel::first()->country))
                     ->searchable()
                     ->nullable(),
             ])->columns();

app/Providers/AppServiceProvider.php

@@ -29,7 +29,7 @@ class AppServiceProvider extends ServiceProvider
         $this->configurePanelSwitch();
 
         FilamentAsset::register([
-            Js::make('top-navigation-script', __DIR__ . '/../../resources/js/top-navigation.js'),
+            Js::make('top-navigation', __DIR__ . '/../../resources/js/top-navigation.js'),
         ]);
     }
 

app/Utilities/Localization/Timezone.php

@@ -4,31 +4,34 @@ namespace App\Utilities\Localization;
 
 use App\Enums\TimeFormat;
 use App\Models\Setting\Localization;
+use DateTimeZone;
 use Symfony\Component\Intl\Timezones;
 
 class Timezone
 {
-    public static function getTimezoneOptions(?string $countryCode = null): array
+    public static function getTimezoneOptions(#[\SensitiveParameter] ?string $countryCode = null): array
     {
         if (empty($countryCode)) {
             return [];
         }
 
-        $timezones = Timezones::forCountryCode($countryCode);
+        $countryTimezones = DateTimeZone::listIdentifiers(DateTimeZone::PER_COUNTRY, strtoupper($countryCode));
 
-        if (empty($timezones)) {
+        if (empty($countryTimezones)) {
             return [];
         }
 
+        $localizedTimezoneNames = Timezones::getNames();
+
         $results = [];
 
-        foreach ($timezones as $timezone) {
-            $translatedName = Timezones::getName($timezone);
+        foreach ($countryTimezones as $timezoneIdentifier) {
+            $translatedName = $localizedTimezoneNames[$timezoneIdentifier] ?? $timezoneIdentifier;
             $cityName = self::extractCityName($translatedName);
-            $localTime = self::getLocalTime($timezone);
-            $timezoneAbbreviation = now($timezone)->format('T');
+            $localTime = self::getLocalTime($timezoneIdentifier);
+            $timezoneAbbreviation = now($timezoneIdentifier)->format('T');
 
-            $results[$timezone] = "{$cityName} ({$timezoneAbbreviation}) {$localTime}";
+            $results[$timezoneIdentifier] = "{$cityName} ({$timezoneAbbreviation}) {$localTime}";
         }
 
         return $results;

composer.lock

@@ -347,16 +347,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.293.5",
+            "version": "3.293.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "f2002e52b382b45231da3f9552033f769acfebd8"
+                "reference": "1e01734856f8ec2b6d525d1c99c5a34029217598"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/f2002e52b382b45231da3f9552033f769acfebd8",
-                "reference": "f2002e52b382b45231da3f9552033f769acfebd8",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/1e01734856f8ec2b6d525d1c99c5a34029217598",
+                "reference": "1e01734856f8ec2b6d525d1c99c5a34029217598",
                 "shasum": ""
             },
             "require": {
@@ -436,9 +436,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.293.5"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.293.6"
             },
-            "time": "2023-12-06T19:09:15+00:00"
+            "time": "2023-12-07T19:29:50+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",

resources/views/filament/company/components/invoice-layouts/classic.blade.php

@@ -2,7 +2,7 @@
     $data = $this->form->getRawState();
     $viewModel = new \App\View\Models\InvoiceViewModel($this->record, $data);
     $viewSpecial = $viewModel->buildViewData();
-    extract($viewSpecial);
+    extract($viewSpecial,\EXTR_SKIP);
 @endphp
 
 {!! $font_html !!}
@@ -29,7 +29,7 @@
 
         <div class="w-1/3 flex justify-end mr-6">
             @if($logo && $show_logo)
-                <x-company.invoice.logo :src="$logo" />
+                <x-company.invoice.logo :src="$logo"/>
             @endif
         </div>
     </x-company.invoice.header>
@@ -38,13 +38,14 @@
         <div class="items-center flex">
             <hr class="grow-[2] py-0.5 border-double border-y-2" style="border-color: {{ $accent_color }};">
             <div class="items-center flex mx-5">
-                <x-icons.decor-border-left color="{{ $accent_color }}" />
+                <x-icons.decor-border-left color="{{ $accent_color }}"/>
                 <div class="px-2.5 border-double border-y-2 py-1 -mx-3" style="border-color: {{ $accent_color }};">
                     <div class="px-2.5 border-double border-y-2 py-3" style="border-color: {{ $accent_color }};">
-                        <div class="inline text-2xl font-semibold" style="color: {{ $accent_color }};">{{ $header }}</div>
+                        <div class="inline text-2xl font-semibold"
+                             style="color: {{ $accent_color }};">{{ $header }}</div>
                     </div>
                 </div>
-                <x-icons.decor-border-right color="{{ $accent_color }}" />
+                <x-icons.decor-border-right color="{{ $accent_color }}"/>
             </div>
             <hr class="grow-[2] py-0.5 border-double border-y-2" style="border-color: {{ $accent_color }};">
         </div>
@@ -126,26 +127,26 @@
             <div class="w-1/2 mt-2">
                 <table class="w-full table-fixed">
                     <tbody class="text-xs leading-loose">
-                        <tr>
-                            <td class="text-right font-semibold">Subtotal:</td>
-                            <td class="text-right">$1080.00</td>
-                        </tr>
-                        <tr class="text-success-800 dark:text-success-600">
-                            <td class="text-right">Discount (5%):</td>
-                            <td class="text-right">($54.00)</td>
-                        </tr>
-                        <tr>
-                            <td class="text-right">Sales Tax (10%):</td>
-                            <td class="text-right">$102.60</td>
-                        </tr>
-                        <tr>
-                            <td class="text-right font-semibold">Total:</td>
-                            <td class="text-right">$1128.60</td>
-                        </tr>
-                        <tr>
-                            <td class="text-right font-semibold">Amount Due (USD):</td>
-                            <td class="text-right">$1128.60</td>
-                        </tr>
+                    <tr>
+                        <td class="text-right font-semibold">Subtotal:</td>
+                        <td class="text-right">$1080.00</td>
+                    </tr>
+                    <tr class="text-success-800 dark:text-success-600">
+                        <td class="text-right">Discount (5%):</td>
+                        <td class="text-right">($54.00)</td>
+                    </tr>
+                    <tr>
+                        <td class="text-right">Sales Tax (10%):</td>
+                        <td class="text-right">$102.60</td>
+                    </tr>
+                    <tr>
+                        <td class="text-right font-semibold">Total:</td>
+                        <td class="text-right">$1128.60</td>
+                    </tr>
+                    <tr>
+                        <td class="text-right font-semibold">Amount Due (USD):</td>
+                        <td class="text-right">$1128.60</td>
+                    </tr>
                     </tbody>
                 </table>
             </div>

resources/views/filament/company/components/invoice-layouts/default.blade.php

@@ -2,7 +2,7 @@
     $data = $this->form->getRawState();
     $viewModel = new \App\View\Models\InvoiceViewModel($this->record, $data);
     $viewSpecial = $viewModel->buildViewData();
-    extract($viewSpecial);
+    extract($viewSpecial,\EXTR_SKIP);
 @endphp
 
 {!! $font_html !!}
@@ -18,7 +18,7 @@
     <x-company.invoice.header class="default-template-header border-b-2 p-6 pb-4">
         <div class="w-2/3">
             @if($logo && $show_logo)
-                <x-company.invoice.logo :src="$logo" />
+                <x-company.invoice.logo :src="$logo"/>
             @endif
         </div>
 
@@ -77,12 +77,12 @@
     <x-company.invoice.line-items class="default-template-line-items">
         <table class="w-full text-left table-fixed">
             <thead class="text-sm leading-8" style="background: {{ $accent_color }}">
-                <tr class="text-white">
-                    <th class="text-left pl-6">{{ $item_name }}</th>
-                    <th class="text-center">{{ $unit_name }}</th>
-                    <th class="text-right">{{ $price_name }}</th>
-                    <th class="text-right pr-6">{{ $amount_name }}</th>
-                </tr>
+            <tr class="text-white">
+                <th class="text-left pl-6">{{ $item_name }}</th>
+                <th class="text-center">{{ $unit_name }}</th>
+                <th class="text-right">{{ $price_name }}</th>
+                <th class="text-right pr-6">{{ $amount_name }}</th>
+            </tr>
             </thead>
             <tbody class="text-xs border-b-2 border-gray-300 leading-8">
             <tr>
@@ -105,31 +105,31 @@
             </tr>
             </tbody>
             <tfoot class="text-xs leading-loose">
-                <tr>
-                    <td class="pl-6" colspan="2"></td>
-                    <td class="text-right font-semibold">Subtotal:</td>
-                    <td class="text-right pr-6">$1080.00</td>
-                </tr>
-                <tr class="text-success-800 dark:text-success-600">
-                    <td class="pl-6" colspan="2"></td>
-                    <td class="text-right">Discount (5%):</td>
-                    <td class="text-right pr-6">($54.00)</td>
-                </tr>
-                <tr>
-                    <td class="pl-6" colspan="2"></td>
-                    <td class="text-right">Sales Tax (10%):</td>
-                    <td class="text-right pr-6">$102.60</td>
-                </tr>
-                <tr>
-                    <td class="pl-6" colspan="2"></td>
-                    <td class="text-right font-semibold border-t">Total:</td>
-                    <td class="text-right border-t pr-6">$1128.60</td>
-                </tr>
-                <tr>
-                    <td class="pl-6" colspan="2"></td>
-                    <td class="text-right font-semibold border-t-4 border-double">Amount Due (USD):</td>
-                    <td class="text-right border-t-4 border-double pr-6">$1128.60</td>
-                </tr>
+            <tr>
+                <td class="pl-6" colspan="2"></td>
+                <td class="text-right font-semibold">Subtotal:</td>
+                <td class="text-right pr-6">$1080.00</td>
+            </tr>
+            <tr class="text-success-800 dark:text-success-600">
+                <td class="pl-6" colspan="2"></td>
+                <td class="text-right">Discount (5%):</td>
+                <td class="text-right pr-6">($54.00)</td>
+            </tr>
+            <tr>
+                <td class="pl-6" colspan="2"></td>
+                <td class="text-right">Sales Tax (10%):</td>
+                <td class="text-right pr-6">$102.60</td>
+            </tr>
+            <tr>
+                <td class="pl-6" colspan="2"></td>
+                <td class="text-right font-semibold border-t">Total:</td>
+                <td class="text-right border-t pr-6">$1128.60</td>
+            </tr>
+            <tr>
+                <td class="pl-6" colspan="2"></td>
+                <td class="text-right font-semibold border-t-4 border-double">Amount Due (USD):</td>
+                <td class="text-right border-t-4 border-double pr-6">$1128.60</td>
+            </tr>
             </tfoot>
         </table>
     </x-company.invoice.line-items>

resources/views/filament/company/components/invoice-layouts/modern.blade.php

@@ -2,7 +2,7 @@
     $data = $this->form->getRawState();
     $viewModel = new \App\View\Models\InvoiceViewModel($this->record, $data);
     $viewSpecial = $viewModel->buildViewData();
-    extract($viewSpecial);
+    extract($viewSpecial,\EXTR_SKIP);
 @endphp
 
 {!! $font_html !!}
@@ -20,12 +20,13 @@
         <!-- Logo -->
         <div class="w-2/3">
             @if($logo && $show_logo)
-                <x-company.invoice.logo class="ml-6" :src="$logo" />
+                <x-company.invoice.logo class="ml-6" :src="$logo"/>
             @endif
         </div>
 
         <!-- Ribbon Container -->
-        <div class="w-1/3 absolute right-0 top-0 p-2 h-28 flex flex-col justify-end rounded-bl-sm" style="background: {{ $accent_color }};">
+        <div class="w-1/3 absolute right-0 top-0 p-2 h-28 flex flex-col justify-end rounded-bl-sm"
+             style="background: {{ $accent_color }};">
             @if($header)
                 <h1 class="text-3xl font-bold text-white text-center uppercase">{{ $header }}</h1>
             @endif
@@ -106,31 +107,31 @@
             </tr>
             </tbody>
             <tfoot class="text-xs leading-loose">
-                <tr>
-                    <td class="pl-6" colspan="2"></td>
-                    <td class="text-right font-semibold">Subtotal:</td>
-                    <td class="text-right pr-6">$1080.00</td>
-                </tr>
-                <tr class="text-success-800 dark:text-success-600">
-                    <td class="pl-6" colspan="2"></td>
-                    <td class="text-right">Discount (5%):</td>
-                    <td class="text-right pr-6">($54.00)</td>
-                </tr>
-                <tr>
-                    <td class="pl-6" colspan="2"></td>
-                    <td class="text-right">Sales Tax (10%):</td>
-                    <td class="text-right pr-6">$102.60</td>
-                </tr>
-                <tr>
-                    <td class="pl-6" colspan="2"></td>
-                    <td class="text-right font-semibold border-t">Total:</td>
-                    <td class="text-right border-t pr-6">$1128.60</td>
-                </tr>
-                <tr>
-                    <td class="pl-6" colspan="2"></td>
-                    <td class="text-right font-semibold border-t-4 border-double">Amount Due (USD):</td>
-                    <td class="text-right border-t-4 border-double pr-6">$1128.60</td>
-                </tr>
+            <tr>
+                <td class="pl-6" colspan="2"></td>
+                <td class="text-right font-semibold">Subtotal:</td>
+                <td class="text-right pr-6">$1080.00</td>
+            </tr>
+            <tr class="text-success-800 dark:text-success-600">
+                <td class="pl-6" colspan="2"></td>
+                <td class="text-right">Discount (5%):</td>
+                <td class="text-right pr-6">($54.00)</td>
+            </tr>
+            <tr>
+                <td class="pl-6" colspan="2"></td>
+                <td class="text-right">Sales Tax (10%):</td>
+                <td class="text-right pr-6">$102.60</td>
+            </tr>
+            <tr>
+                <td class="pl-6" colspan="2"></td>
+                <td class="text-right font-semibold border-t">Total:</td>
+                <td class="text-right border-t pr-6">$1128.60</td>
+            </tr>
+            <tr>
+                <td class="pl-6" colspan="2"></td>
+                <td class="text-right font-semibold border-t-4 border-double">Amount Due (USD):</td>
+                <td class="text-right border-t-4 border-double pr-6">$1128.60</td>
+            </tr>
             </tfoot>
         </table>
     </x-company.invoice.line-items>