Merge branch '1.x' into feat/variant-editing

lunarphp · Jan 29, 2024 · 2087140 · 2087140
2 parents 9621c6f + 8a92100
commit 2087140
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 10 deletions.
diff --git a/packages/admin/src/Filament/Resources/ChannelResource/Pages/ListChannels.php b/packages/admin/src/Filament/Resources/ChannelResource/Pages/ListChannels.php
@@ -10,7 +10,7 @@ class ListChannels extends BaseListRecords
 {
     protected static string $resource = ChannelResource::class;
 
-    protected function getHeaderActions(): array
+    protected function getDefaultHeaderActions(): array
     {
         return [
             Actions\CreateAction::make(),

diff --git a/packages/admin/src/Filament/Resources/CollectionGroupResource/Pages/ListCollectionGroups.php b/packages/admin/src/Filament/Resources/CollectionGroupResource/Pages/ListCollectionGroups.php
@@ -10,7 +10,7 @@ class ListCollectionGroups extends ListRecords
 {
     protected static string $resource = CollectionGroupResource::class;
 
-    protected function getHeaderActions(): array
+    protected function getDefaultHeaderActions(): array
     {
         return [
             Actions\CreateAction::make(),

diff --git a/packages/admin/src/Filament/Resources/CollectionResource/Pages/ListCollections.php b/packages/admin/src/Filament/Resources/CollectionResource/Pages/ListCollections.php
@@ -14,7 +14,7 @@ public function mount(): void
         abort(404);
     }
 
-    protected function getHeaderActions(): array
+    protected function getDefaultHeaderActions(): array
     {
         return [];
     }

diff --git a/packages/admin/src/Filament/Resources/CurrencyResource/Pages/ListCurrencies.php b/packages/admin/src/Filament/Resources/CurrencyResource/Pages/ListCurrencies.php
@@ -10,7 +10,7 @@ class ListCurrencies extends BaseListRecords
 {
     protected static string $resource = CurrencyResource::class;
 
-    protected function getHeaderActions(): array
+    protected function getDefaultHeaderActions(): array
     {
         return [
             Actions\CreateAction::make(),

diff --git a/packages/admin/src/Filament/Resources/CustomerGroupResource/Pages/ListCustomerGroups.php b/packages/admin/src/Filament/Resources/CustomerGroupResource/Pages/ListCustomerGroups.php
@@ -10,7 +10,7 @@ class ListCustomerGroups extends BaseListRecords
 {
     protected static string $resource = CustomerGroupResource::class;
 
-    protected function getHeaderActions(): array
+    protected function getDefaultHeaderActions(): array
     {
         return [
             Actions\CreateAction::make(),

diff --git a/packages/admin/src/Filament/Resources/OrderResource/Pages/ListOrders.php b/packages/admin/src/Filament/Resources/OrderResource/Pages/ListOrders.php
@@ -13,7 +13,7 @@ class ListOrders extends BaseListRecords
 {
     protected static string $resource = OrderResource::class;
 
-    protected function getHeaderActions(): array
+    protected function getDefaultHeaderActions(): array
     {
         return [
             // Actions\CreateAction::make(),

diff --git a/packages/admin/src/Filament/Resources/ProductResource/Pages/ListProducts.php b/packages/admin/src/Filament/Resources/ProductResource/Pages/ListProducts.php
@@ -79,6 +79,7 @@ public static function createRecord(array $data, string $model): Model
         ]);
         $variant->prices()->create([
             'tier' => 1,
+            'currency_id' => $currency->id,
             'price' => (int) bcmul($data['base_price'], $currency->factor),
         ]);
         DB::commit();

diff --git a/packages/admin/src/Filament/Resources/StaffResource/Pages/ListStaff.php b/packages/admin/src/Filament/Resources/StaffResource/Pages/ListStaff.php
@@ -11,7 +11,7 @@ class ListStaff extends BaseListRecords
 {
     protected static string $resource = StaffResource::class;
 
-    protected function getHeaderActions(): array
+    protected function getDefaultHeaderActions(): array
     {
         return [
             Actions\Action::make('access-control')

diff --git a/packages/admin/src/Filament/Resources/TaxClassResource/Pages/ListTaxClasses.php b/packages/admin/src/Filament/Resources/TaxClassResource/Pages/ListTaxClasses.php
@@ -10,7 +10,7 @@ class ListTaxClasses extends BaseListRecords
 {
     protected static string $resource = TaxClassResource::class;
 
-    protected function getHeaderActions(): array
+    protected function getDefaultHeaderActions(): array
     {
         return [
             Actions\CreateAction::make(),

diff --git a/packages/admin/src/Support/FieldTypes/Number.php b/packages/admin/src/Support/FieldTypes/Number.php
@@ -19,11 +19,11 @@ public static function getFilamentComponent(Attribute $attribute): Component
         $input = TextField::getFilamentComponent($attribute)->numeric();
 
         if ($min) {
-            $input->min($min);
+            $input->minValue($min);
         }
 
         if ($max) {
-            $input->max($max);
+            $input->maxValue($max);
         }
 
         return $input;

diff --git a/...s/core/database/migrations/2024_01_29_100000_update_nullable_currency_on_prices_table.php b/...s/core/database/migrations/2024_01_29_100000_update_nullable_currency_on_prices_table.php
@@ -0,0 +1,22 @@
+-<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Lunar\Base\Migration;
+
+class UpdateNullableCurrencyOnPricesTable extends Migration
+{
+    public function up()
+    {
+        Schema::table($this->prefix.'prices', function (Blueprint $table) {
+            $table->foreignId('currency_id')->nullable(false)->change();
+        });
+    }
+
+    public function down()
+    {
+        Schema::table($this->prefix.'prices', function (Blueprint $table) {
+            $table->foreignId('currency_id')->nullable(true)->change();
+        });
+    }
+}