feat: Update product media layout and add new PaymentMethod seeder class

shopperlabs · Jul 19, 2024 · aefa1ea · aefa1ea
1 parent 321a46c
commit aefa1ea
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 7 deletions.
diff --git a/packages/admin/src/Livewire/Components/Products/Form/Media.php b/packages/admin/src/Livewire/Components/Products/Form/Media.php
@@ -36,6 +36,7 @@ public function form(Form $form): Form
                     ->label(__('shopper::words.images'))
                     ->helperText(__('shopper::pages/products.images_helpText'))
                     ->multiple()
+                    ->panelLayout('grid')
                     ->columnSpan(['lg' => 2]),
 
                 Forms\Components\SpatieMediaLibraryFileUpload::make('thumbnail')

diff --git a/packages/admin/src/Livewire/Pages/Product/Create.php b/packages/admin/src/Livewire/Pages/Product/Create.php
@@ -128,6 +128,7 @@ public function form(Form $form): Form
                                 ->label(__('shopper::words.images'))
                                 ->helperText(__('shopper::pages/products.images_helpText'))
                                 ->multiple()
+                                ->panelLayout('grid')
                                 ->columnSpan(['lg' => 3]),
 
                             Forms\Components\SpatieMediaLibraryFileUpload::make('thumbnail')
@@ -152,7 +153,7 @@ public function form(Form $form): Form
 
                             Forms\Components\Select::make('collections')
                                 ->label(__('shopper::pages/collections.menu'))
-                                ->relationship('collections', 'name', fn (Builder $query) => $query->where('is_enabled', true))
+                                ->relationship('collections', 'name')
                                 ->searchable()
                                 ->multiple()
                                 ->visible(Feature::enabled('collection')),
@@ -291,7 +292,7 @@ public function store(): void
 
         $product->channels()->sync([$this->defaultChannel->id]);
 
-        if (Feature::enabled('category') && array_key_exists('categories', $data) && count($data['categories']) > 0) {
+        if (Feature::enabled('category') && array_key_exists('categories', $data) && is_array($data['categories'])) {
             $product->categories()->sync($data['categories']);
         }
 
@@ -302,7 +303,7 @@ public function store(): void
         }
 
         Notification::make()
-            ->title(__('shopper::pages/products.notifications.create'))
+            ->title(__('shopper::notifications.create', ['item' => $product->name]))
             ->success()
             ->send();
 

diff --git a/packages/admin/src/Livewire/Pages/Product/Index.php b/packages/admin/src/Livewire/Pages/Product/Index.php
@@ -46,7 +46,7 @@ public function table(Table $table): Table
             ->columns([
                 Tables\Columns\SpatieMediaLibraryImageColumn::make('thumbnail')
                     ->label(__('shopper::forms.label.thumbnail'))
-                    ->square()
+                    ->circular()
                     ->collection(config('shopper.core.storage.thumbnail_collection'))
                     ->defaultImageUrl(shopper_fallback_url()),
 

diff --git a/packages/core/database/seeders/PaymentMethodSeeder.php b/packages/core/database/seeders/PaymentMethodSeeder.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Shopper\Core\Database\Seeders;
+
+use Illuminate\Database\Seeder;
+use Shopper\Core\Models\PaymentMethod;
+
+final class PaymentMethodSeeder extends Seeder
+{
+    public function run(): void
+    {
+        PaymentMethod::query()->create([
+            'title' => 'Cash',
+            'slug' => 'cash',
+            'is_enabled' => true,
+        ]);
+    }
+}
diff --git a/packages/core/database/seeders/ShopperSeeder.php b/packages/core/database/seeders/ShopperSeeder.php
@@ -19,6 +19,7 @@ public function run(): void
         $this->call(LegalsPageTableSeeder::class);
         $this->call(ChannelSeeder::class);
         $this->call(CarrierSeeder::class);
+        $this->call(PaymentMethodSeeder::class);
 
         Model::reguard();
     }

diff --git a/packages/core/src/helpers.php b/packages/core/src/helpers.php
@@ -50,13 +50,13 @@ function shopper_asset(string $file): string
 if (! function_exists('shopper_currency')) {
     function shopper_currency(): string
     {
-        $settingCurrency = shopper_setting('default_currency_id');
+        $currencyId = shopper_setting('default_currency_id');
 
-        if ($settingCurrency) {
+        if ($currencyId) {
             $currency = Cache::remember(
                 'shopper-currency',
                 now()->addHour(),
-                fn () => Currency::query()->find($settingCurrency)
+                fn () => Currency::query()->find($currencyId)
             );
 
             return $currency ? $currency->code : 'USD'; // @phpstan-ignore-line