Fix: country flag on customer address (#270)

* Update Enum with custom traits to use static methods call * fix: Flag on customer profile * fix code formatting --------- Co-authored-by: mckenziearts <[email protected]>
shopperlabs · Jul 29, 2024 · b90f387 · b90f387
1 parent 0d77d9e
commit b90f387
Show file tree

Hide file tree

Showing 98 changed files with 261 additions and 142 deletions.
diff --git a/packages/admin/package.json b/packages/admin/package.json
@@ -32,7 +32,7 @@
     "resolve-url-loader": "^2.3.1",
     "shiki": "^1.3.0",
     "sortablejs": "^1.15.0",
-    "tailwindcss": "^3.4.1"
+    "tailwindcss": "^3.4.7"
   },
   "dependencies": {
     "treeselectjs": "^0.10.0"

diff --git a/packages/admin/public/shopper.css b/packages/admin/public/shopper.css
diff --git a/packages/admin/resources/views/livewire/components/customers/addresses.blade.php b/packages/admin/resources/views/livewire/components/customers/addresses.blade.php
@@ -15,19 +15,21 @@
                             </span>
                         </div>
                         <h4 class="mt-1 block text-sm font-medium text-gray-900 dark:text-white">
-                            {{ $address->last_name . ' ' . $address->first_name }}
+                            {{ $address->full_name }}
                         </h4>
                         <div class="mt-1 text-sm leading-5">
                             <p class="text-gray-500 dark:text-gray-400">
-                                {{ $address->street_address }}, {{ $address->city }}
+                                {{ $address->street_address }}
                             </p>
-                            <div class="truncate text-sm text-gray-500 dark:text-gray-400">
-                                <span>{{ $address->phone_number }}</span>
-                                <br />
-                                <span>{{ $address->zipcode }}</span>
-                                ,
-                                <span>{{ $address->country->name }}</span>
-                                <span class="inline-flex h-6 w-6 rounded-full">{{ $address->country->svg_flag }}</span>
+                            <div class="flex flex-col space-y-0.5 truncate text-sm text-gray-500 dark:text-gray-400">
+                                <span>{{ $address->postal_code }}, {{ $address->city }}</span>
+                                <span class="inline-flex items-center gap-2 shrink-0">
+                                    <span>{{ $address->country->name }}</span>
+                                    <img src="{{ $address->country->svg_flag }}" class="size-5 rounded-full object-center object-cover" alt="Country flag">
+                                </span>
+                                @if($address->phone_number)
+                                    <span>{{ $address->phone_number }}</span>
+                                @endif
                             </div>
                         </div>
                     </div>

diff --git a/packages/admin/src/Console/UserCommand.php b/packages/admin/src/Console/UserCommand.php
@@ -72,7 +72,7 @@ protected function createUser(): void
         $model = config('auth.providers.users.model', User::class);
 
         try {
-            $user = tap((new $model())->forceFill($userData))->save(); // @phpstan-ignore-line
+            $user = tap((new $model)->forceFill($userData))->save(); // @phpstan-ignore-line
 
             $user->assignRole(config('shopper.core.users.admin_role'));
         } catch (Exception | QueryException $e) {

diff --git a/packages/admin/src/Enum/FeatureState.php b/packages/admin/src/Enum/FeatureState.php
@@ -4,8 +4,16 @@
 
 namespace Shopper\Enum;
 
+use Shopper\Core\Traits\HasEnumStaticMethods;
+
+/**
+ * @method static string Enabled()
+ * @method static string Disabled()
+ */
 enum FeatureState: string
 {
+    use HasEnumStaticMethods;
+
     case Enabled = 'enabled';
 
     case Disabled = 'disabled';

diff --git a/packages/admin/src/Livewire/Components/Account/Devices.php b/packages/admin/src/Livewire/Components/Account/Devices.php
@@ -42,7 +42,7 @@ public function render(): View
 
     protected function createAgent($session): Agent
     {
-        return tap(new Agent(), function ($agent) use ($session): void {
+        return tap(new Agent, function ($agent) use ($session): void {
             $agent->setUserAgent($session->user_agent);
         });
     }

diff --git a/packages/admin/src/Livewire/Components/Products/Form/Variants.php b/packages/admin/src/Livewire/Components/Products/Form/Variants.php
@@ -37,7 +37,7 @@ public function table(Table $table): Table
     {
         return $table
             ->query(
-                (new ProductRepository())
+                (new ProductRepository)
                     ->makeModel()
                     ->where('parent_id', $this->product->id)
                     ->newQuery()

diff --git a/packages/admin/src/Livewire/Components/Settings/Team/UsersRole.php b/packages/admin/src/Livewire/Components/Settings/Team/UsersRole.php
@@ -27,7 +27,7 @@ public function table(Table $table): Table
     {
         return $table
             ->query(
-                (new UserRepository())
+                (new UserRepository)
                     ->with('roles')
                     ->makeModel()
                     ->whereHas('roles', function (Builder $query): void {

diff --git a/packages/admin/src/Livewire/Components/SlideOverPanel.php b/packages/admin/src/Livewire/Components/SlideOverPanel.php
@@ -41,7 +41,7 @@ public function openPanel($component, $arguments = [], $panelAttributes = []): v
         $id = md5($component . serialize($arguments));
 
         $arguments = collect($arguments)
-            ->merge($this->resolveComponentProps($arguments, new $componentClass()))
+            ->merge($this->resolveComponentProps($arguments, new $componentClass))
             ->all();
 
         $this->components[$id] = [
@@ -93,7 +93,7 @@ protected function resolveParameter($attributes, $parameterName, $parameterClass
         $instance = app()->make($parameterClassName);
 
         if (! $model = $instance->resolveRouteBinding($parameterValue)) {
-            throw (new ModelNotFoundException())->setModel(get_class($instance), [$parameterValue]);
+            throw (new ModelNotFoundException)->setModel(get_class($instance), [$parameterValue]);
         }
 
         return $model;

diff --git a/packages/admin/src/Livewire/Modals/CollectionProductsList.php b/packages/admin/src/Livewire/Modals/CollectionProductsList.php
@@ -24,7 +24,7 @@ class CollectionProductsList extends ModalComponent
 
     public function mount(int $collectionId, array $exceptProductIds = []): void
     {
-        $this->collection = (new CollectionRepository())->getById($collectionId);
+        $this->collection = (new CollectionRepository)->getById($collectionId);
         $this->exceptProductIds = $exceptProductIds;
     }
 
@@ -36,7 +36,7 @@ public static function modalMaxWidth(): string
     #[Computed]
     public function products(): Collection
     {
-        return (new ProductRepository())
+        return (new ProductRepository)
             ->where('name', '%' . $this->search . '%', 'like')
             ->whereNull('parent_id')
             ->get(['name', 'price_amount', 'id'])

diff --git a/packages/admin/src/Livewire/Modals/RelatedProductsList.php b/packages/admin/src/Livewire/Modals/RelatedProductsList.php
@@ -21,7 +21,7 @@ class RelatedProductsList extends ModalComponent
 
     public function mount(int $productId, array $ids = []): void
     {
-        $this->product = (new ProductRepository())->getById($productId);
+        $this->product = (new ProductRepository)->getById($productId);
         $this->exceptProductIds = $ids;
     }
 
@@ -32,7 +32,7 @@ public static function modalMaxWidth(): string
 
     public function getProductsProperty()
     {
-        return (new ProductRepository())
+        return (new ProductRepository)
             ->where('name', '%' . $this->search . '%', 'like')
             ->whereNull('parent_id')
             ->get(['name', 'price_amount', 'id'])

diff --git a/packages/admin/src/Livewire/Pages/Brand/Index.php b/packages/admin/src/Livewire/Pages/Brand/Index.php
@@ -30,7 +30,7 @@ public function mount(): void
     public function table(Table $table): Table
     {
         return $table
-            ->query((new BrandRepository())->makeModel()->newQuery())
+            ->query((new BrandRepository)->makeModel()->newQuery())
             ->columns([
                 Tables\Columns\SpatieMediaLibraryImageColumn::make('Logo')
                     ->collection(config('shopper.core.storage.thumbnail_collection'))
@@ -129,7 +129,7 @@ public function table(Table $table): Table
     public function render(): View
     {
         return view('shopper::livewire.pages.brand.index', [
-            'total' => (new BrandRepository())->count(),
+            'total' => (new BrandRepository)->count(),
         ])->title(__('shopper::pages/brands.menu'));
     }
 }
diff --git a/packages/admin/src/Livewire/Pages/Category/Index.php b/packages/admin/src/Livewire/Pages/Category/Index.php
@@ -32,7 +32,7 @@ public function table(Table $table): Table
     {
         return $table
             ->query(
-                (new CategoryRepository())
+                (new CategoryRepository)
                     ->makeModel()
                     ->with('parent:id,name')
                     ->newQuery()

diff --git a/packages/admin/src/Livewire/Pages/Collection/Index.php b/packages/admin/src/Livewire/Pages/Collection/Index.php
@@ -29,7 +29,7 @@ public function table(Table $table): Table
     {
         return $table
             ->query(
-                (new CollectionRepository())
+                (new CollectionRepository)
                     ->makeModel()
                     ->with('rules')
                     ->newQuery()
@@ -88,7 +88,7 @@ public function table(Table $table): Table
     public function render(): View
     {
         return view('shopper::livewire.pages.collections.browse', [
-            'total' => (new CollectionRepository())->count(),
+            'total' => (new CollectionRepository)->count(),
         ])
             ->title(__('shopper::pages/collections.menu'));
     }

diff --git a/packages/admin/src/Livewire/Pages/Customers/Create.php b/packages/admin/src/Livewire/Pages/Customers/Create.php
@@ -140,7 +140,7 @@ public function store(): void
         ]);
 
         /** @var User $customer */
-        $customer = (new UserRepository())->create(array_merge(
+        $customer = (new UserRepository)->create(array_merge(
             $customerData,
             ['email_verified_at' => now()->toDateTimeString()],
         ));

diff --git a/packages/admin/src/Livewire/Pages/Customers/Index.php b/packages/admin/src/Livewire/Pages/Customers/Index.php
@@ -32,7 +32,7 @@ public function table(Table $table): Table
     {
         return $table
             ->query(
-                (new UserRepository())
+                (new UserRepository)
                     ->with(['roles', 'addresses'])
                     ->makeModel()
                     ->scopes('customers')
@@ -99,7 +99,7 @@ public function table(Table $table): Table
     public function render(): View
     {
         return view('shopper::livewire.pages.customers.index', [
-            'total' => (new UserRepository())
+            'total' => (new UserRepository)
                 ->makeModel()
                 ->scopes('customers')
                 ->count(),

diff --git a/packages/admin/src/Livewire/Pages/Customers/Show.php b/packages/admin/src/Livewire/Pages/Customers/Show.php
@@ -45,7 +45,7 @@ public function mount(int $user): void
     {
         $this->authorize('read_customers');
 
-        $this->customer = (new UserRepository())->with(['addresses', 'orders'])->getById($user);
+        $this->customer = (new UserRepository)->with(['addresses', 'orders'])->getById($user);
     }
 
     public function render(): View

diff --git a/packages/admin/src/Livewire/Pages/Product/Create.php b/packages/admin/src/Livewire/Pages/Product/Create.php
@@ -37,7 +37,7 @@ public function mount(): void
 
         $this->form->fill();
 
-        $this->defaultChannel = (new ChannelRepository())
+        $this->defaultChannel = (new ChannelRepository)
             ->where('is_default', true)
             ->first();
     }
@@ -285,7 +285,7 @@ public function store(): void
         $data = $this->form->getState();
 
         /** @var Product $product */
-        $product = (new ProductRepository())->create(
+        $product = (new ProductRepository)->create(
             Arr::except($data, ['quantity', 'categories'])
         );
         $this->form->model($product)->saveRelationships();
@@ -299,7 +299,7 @@ public function store(): void
         $quantity = (int) $data['quantity'];
 
         if ($quantity && $quantity > 0) {
-            (new InitialQuantityInventory())->handle($quantity, $product);
+            (new InitialQuantityInventory)->handle($quantity, $product);
         }
 
         Notification::make()

diff --git a/packages/admin/src/Livewire/Pages/Product/Edit.php b/packages/admin/src/Livewire/Pages/Product/Edit.php
@@ -26,7 +26,7 @@ public function mount(): void
     {
         $this->authorize('edit_products');
 
-        $this->product = (new ProductRepository())->getById((int) $this->product);
+        $this->product = (new ProductRepository)->getById((int) $this->product);
     }
 
     public function deleteAction(): Action

diff --git a/packages/admin/src/Livewire/Pages/Product/Index.php b/packages/admin/src/Livewire/Pages/Product/Index.php
@@ -36,7 +36,7 @@ public function table(Table $table): Table
     {
         return $table
             ->query(
-                (new ProductRepository())
+                (new ProductRepository)
                     ->with(['brand', 'variants'])
                     ->makeModel()
                     ->newQuery()
@@ -137,7 +137,7 @@ public function table(Table $table): Table
     public function render(): View
     {
         return view('shopper::livewire.pages.products.index', [
-            'total' => (new ProductRepository())->count(),
+            'total' => (new ProductRepository)->count(),
         ])
             ->title(__('shopper::pages/products.menu'));
     }

diff --git a/packages/admin/src/Livewire/Pages/Product/Variant.php b/packages/admin/src/Livewire/Pages/Product/Variant.php
@@ -31,8 +31,8 @@ public function mount(int $product, int $variantId): void
     {
         $this->authorize('edit_products');
 
-        $this->product = (new ProductRepository())->getById($product);
-        $this->variant = (new ProductRepository())->getById($variantId);
+        $this->product = (new ProductRepository)->getById($product);
+        $this->variant = (new ProductRepository)->getById($variantId);
 
         $this->form->fill($this->variant->toArray());
     }

diff --git a/packages/admin/src/Livewire/Pages/Settings/Team/Index.php b/packages/admin/src/Livewire/Pages/Settings/Team/Index.php
@@ -27,7 +27,7 @@ public function table(Table $table): Table
     {
         return $table
             ->query(
-                (new UserRepository())
+                (new UserRepository)
                     ->with('roles')
                     ->makeModel()
                     ->scopes('administrators')

diff --git a/packages/admin/src/Livewire/SlideOvers/AddCollectionForm.php b/packages/admin/src/Livewire/SlideOvers/AddCollectionForm.php
@@ -111,7 +111,7 @@ public function form(Form $form): Form
     public function store(): void
     {
         /** @var Collection $collection */
-        $collection = (new CollectionRepository())->create($this->form->getState());
+        $collection = (new CollectionRepository)->create($this->form->getState());
         $this->form->model($collection)->saveRelationships();
 
         Notification::make()

diff --git a/packages/admin/src/Livewire/SlideOvers/AddVariantForm.php b/packages/admin/src/Livewire/SlideOvers/AddVariantForm.php
@@ -175,15 +175,15 @@ public function save(): void
         $data = $this->form->getState();
 
         /** @var Product $product */
-        $product = (new ProductRepository())->create(
+        $product = (new ProductRepository)->create(
             Arr::except($data, ['quantity'])
         );
         $this->form->model($product)->saveRelationships();
 
         $quantity = (int) $data['quantity'];
 
         if ($quantity && $quantity > 0) {
-            (new InitialQuantityInventory())->handle($quantity, $product);
+            (new InitialQuantityInventory)->handle($quantity, $product);
         }
 
         Notification::make()

diff --git a/packages/admin/src/Livewire/SlideOvers/BrandForm.php b/packages/admin/src/Livewire/SlideOvers/BrandForm.php
@@ -29,8 +29,8 @@ class BrandForm extends SlideOverComponent implements HasForms
     public function mount(?int $brandId = null): void
     {
         $this->brand = $brandId
-            ? (new BrandRepository())->getById($brandId)
-            : (new BrandRepository())->makeModel();
+            ? (new BrandRepository)->getById($brandId)
+            : (new BrandRepository)->makeModel();
 
         $this->form->fill($this->brand->toArray());
     }
@@ -102,7 +102,7 @@ public function save(): void
         if ($this->brand->id) {
             $this->brand->update($this->form->getState());
         } else {
-            $brand = (new BrandRepository())->create($this->form->getState());
+            $brand = (new BrandRepository)->create($this->form->getState());
             $this->form->model($brand)->saveRelationships();
         }
 

diff --git a/packages/admin/src/Livewire/SlideOvers/CategoryForm.php b/packages/admin/src/Livewire/SlideOvers/CategoryForm.php
@@ -30,8 +30,8 @@ class CategoryForm extends SlideOverComponent implements HasForms
     public function mount(?int $categoryId = null): void
     {
         $this->category = $categoryId
-            ? (new CategoryRepository())->getById($categoryId)
-            : (new CategoryRepository())->makeModel();
+            ? (new CategoryRepository)->getById($categoryId)
+            : (new CategoryRepository)->makeModel();
 
         $this->form->fill($this->category->toArray());
     }
@@ -109,7 +109,7 @@ public function save(): void
         if ($this->category->id) {
             $this->category->update($this->form->getState());
         } else {
-            $category = (new CategoryRepository())->create($this->form->getState());
+            $category = (new CategoryRepository)->create($this->form->getState());
             $this->form->model($category)->saveRelationships();
         }
 

diff --git a/packages/admin/src/Livewire/SlideOvers/CreateTeamMember.php b/packages/admin/src/Livewire/SlideOvers/CreateTeamMember.php
@@ -94,7 +94,7 @@ public function store(): void
         $data = $this->form->getState();
 
         /** @var User $user */
-        $user = (new UserRepository())->create([
+        $user = (new UserRepository)->create([
             'email' => $data['email'],
             'first_name' => $data['first_name'],
             'last_name' => $data['last_name'],