family_name is now category_name

Author: nielsdrost7

Modules/Payments/Database/Factories/PaymentFactory.php

@@ -23,17 +23,17 @@ public function definition(): array
 
         $payableType = $this->faker->randomElement(PayableType::cases());
         $payableId   = match ($payableType) {
+            PayableType::EXPENSE => Expense::inRandomOrder()->first()?->id,
             PayableType::INVOICE => Invoice::inRandomOrder()->first()?->id,
             PayableType::QUOTE   => Quote::inRandomOrder()->first()?->id,
-            PayableType::EXPENSE => Expense::inRandomOrder()->first()?->id,
         };
 
         return [
             'company_id'        => $company->id,
             'payable_type'      => $payableType->value,
             'payable_id'        => $payableId,
             'payment_method_id' => $paymentMethod->id,
-            'status'            => $this->faker->randomElement(PaymentStatus::cases())->value,
+            'payment_status'    => $this->faker->randomElement(PaymentStatus::cases())->value,
             'paid_at'           => $this->faker->optional()->dateTimeBetween('-3 years', 'now'),
             'payment_amount'    => $this->faker->randomFloat(2, 10, 500),
         ];

Modules/Payments/Database/Migrations/2010_01_01_000004_create_payments_table.php

@@ -12,7 +12,7 @@ public function up(): void
             $table->unsignedBigInteger('company_id');
             $table->morphs('payable');
             $table->unsignedBigInteger('payment_method_id')->index('payments_payment_method_id_foreign');
-            $table->string('payment_status');
+            $table->string('status');
             $table->date('paid_at')->nullable()->default(null);
             $table->decimal('payment_amount', 20);
 

Modules/Payments/Models/Payment.php

@@ -25,21 +25,14 @@ class Payment extends Model
 
     public $timestamps = false;
 
-    protected $fillable = ['payable_id', 'payable_type', 'payment_method_id', 'payment_status', 'paid_at', 'payment_amount'];
+    protected $fillable = ['payable_id', 'payable_type', 'payment_method_id', 'status', 'paid_at', 'payment_amount'];
 
     protected $casts = [
         'payment_status' => PaymentStatus::class,
         'paid_at'        => 'date',
         'amount'         => 'decimal:2',
     ];
 
-    protected $dates = ['paid_at'];
-
-    public function invoice(): BelongsTo
-    {
-        return $this->belongsTo(Invoice::class, 'payable_id');	// Polymorphic
-    }
-
     public function payable(): MorphTo
     {
         return $this->morphTo();

Modules/Products/Filament/Company/Resources/ProductCategoryResource.php

@@ -48,7 +48,7 @@ public static function form(Form $form): Form
         return $form
             ->schema([
                 Group::make()->schema([
-                    TextInput::make('family_name')
+                    TextInput::make('category_name')
                         ->inlineLabel()
                         ->label(trans('ip.family'))
                         ->required()
@@ -69,7 +69,7 @@ public static function table(Table $table): Table
     {
         return $table
             ->columns([
-                TextColumn::make('family_name')->label(trans('ip.family')),
+                TextColumn::make('category_name')->label(trans('ip.family')),
             ])
             ->filters([])
             ->actions([
@@ -82,7 +82,7 @@ public static function table(Table $table): Table
                     Tables\Actions\DeleteBulkAction::make(),
                 ]),
             ])
-            ->defaultSort('family_name', 'asc');
+            ->defaultSort('category_name', 'asc');
     }
 
     /**

Modules/Products/Http/Requests/API/ProductFamilyAPIRequest.php

@@ -23,7 +23,7 @@ public function validationData(): array
     public function rules(): array
     {
         return [
-            'family_name' => ['required'],
+            'category_name' => ['required'],
         ];
     }
 

Modules/Products/Http/Requests/ProductFamilyRequest.php

@@ -14,7 +14,7 @@ public function authorize(): bool
     public function rules(): array
     {
         return [
-            'family_name' => ['required'],
+            'category_name' => ['required'],
         ];
     }
 }

Modules/Products/Models/ProductFamily.php

@@ -15,22 +15,22 @@ class ProductFamily extends Model
     public $timestamps = false;
 
     public $filterable = [
-        'family_name',
+        'category_name',
     ];
 
     public $orderable = [
-        'family_name',
+        'category_name',
     ];
 
     protected $primaryKey = 'family_id';
 
     protected $fillable = [
-        'family_name',
+        'category_name',
     ];
 
     protected $casts = [
-        'family_id'   => 'integer',
-        'family_name' => 'string',
+        'family_id'     => 'integer',
+        'category_name' => 'string',
     ];
 
     public function products(): HasMany

database/seeders/DatabaseSeeder.php

@@ -3,8 +3,23 @@
 namespace Database\Seeders;
 
 use Illuminate\Database\Seeder;
+use Modules\Clients\Database\Seeders\CustomersSeeder;
+use Modules\Core\Database\Seeders\AdminUserSeeder;
+use Modules\Core\Database\Seeders\CompaniesSeeder;
+use Modules\Core\Database\Seeders\DocumentGroupsSeeder;
+use Modules\Core\Database\Seeders\EmailTemplatesSeeder;
+use Modules\Core\Database\Seeders\TaxRatesSeeder;
+use Modules\Core\Database\Seeders\UsersSeeder;
+use Modules\Expenses\Database\Seeders\ExpenseCategoriesSeeder;
+use Modules\Expenses\Database\Seeders\ExpensesSeeder;
+use Modules\Invoices\Database\Seeders\InvoicesSeeder;
+use Modules\Payments\Database\Seeders\PaymentMethodsSeeder;
 use Modules\Payments\Database\Seeders\PaymentsSeeder;
 use Modules\Products\Database\Seeders\ItemCategoriesSeeder;
+use Modules\Products\Database\Seeders\ItemsSeeder;
+use Modules\Projects\Database\Seeders\ProjectsSeeder;
+use Modules\Projects\Database\Seeders\TasksSeeder;
+use Modules\Quotes\Database\Seeders\QuotesSeeder;
 
 // use Illuminate\Database\Console\Seeds\WithoutModelEvents;
 
@@ -13,31 +28,31 @@ class DatabaseSeeder extends Seeder
     public function run(): void
     {
         $this->call([
-            //CompaniesSeeder::class,
-            ////AdminUserSeeder::class,
-            //TaxRatesSeeder::class,
-            //ExpenseCategoriesSeeder::class,
+            CompaniesSeeder::class,
+            AdminUserSeeder::class,
+            TaxRatesSeeder::class,
+            ExpenseCategoriesSeeder::class,
             ItemCategoriesSeeder::class,
-            //PaymentMethodsSeeder::class,
-            //DocumentGroupsSeeder::class,
-            //EmailTemplatesSeeder::class,
+            PaymentMethodsSeeder::class,
+            DocumentGroupsSeeder::class,
+            EmailTemplatesSeeder::class,
         ]);
 
         $this->call([
-            //UsersSeeder::class,
-            //CustomersSeeder::class,
+            UsersSeeder::class,
+            CustomersSeeder::class,
         ]);
 
         $this->call([
-            //ItemsSeeder::class,
-            //ProjectsSeeder::class,
+            ItemsSeeder::class,
+            ProjectsSeeder::class,
         ]);
 
         $this->call([
-            //TasksSeeder::class,
-            //InvoicesSeeder::class,
-            //ExpensesSeeder::class,
-            //QuotesSeeder::class,
+            TasksSeeder::class,
+            InvoicesSeeder::class,
+            ExpensesSeeder::class,
+            QuotesSeeder::class,
             PaymentsSeeder::class,
         ]);
     }

resources/lang/en/ip.php

@@ -215,7 +215,7 @@
     'families'                                     => 'Families',
     'family'                                       => 'Family',
     'family_already_exists'                        => 'Family already exists!',
-    'family_name'                                  => 'Family name',
+    'category_name'                                => 'Family name',
     'fax'                                          => 'Fax',
     'fax_abbr'                                     => 'F',
     'fax_number'                                   => 'Fax Number',