Merge pull request #111 from khalidmaquilang/dev

v2.5.0-

Author: khalidmaquilang

.env.example

@@ -46,6 +46,8 @@ REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
+QUEUE_CONNECTIONS=default,short-running-queue,long-running-queue
+
 MAIL_MAILER=log
 MAIL_HOST=127.0.0.1
 MAIL_PORT=2525

.github/workflows/laravel.yml

@@ -26,6 +26,10 @@ jobs:
       run: php artisan key:generate
     - name: Directory Permissions
       run: chmod -R 777 storage bootstrap/cache
+    - name: Install NPM
+      run: npm install
+    - name: Compile Assets
+      run: npm run build
     - name: Check Code Quality
       run: vendor/bin/pint --test
     - name: Execute tests (Unit and Feature tests) via PHPUnit

app/Console/Commands/CheckExpiredSubscriptions.php

@@ -21,7 +21,7 @@ class CheckExpiredSubscriptions extends Command
      *
      * @var string
      */
-    protected $description = "This command checks for active subscriptions that have expired based on their `end_date`. Expired subscriptions are then marked as 'expired', and you can add additional logic here to handle notifications, access restrictions, or other relevant actions.";
+    protected $description = "This command checks for active subscriptions that have expired based on their `end_date`. Expired subscriptions are then marked as 'expired'.";
 
     /**
      * Execute the console command.

app/Console/Commands/Retrofits/RetrofitPaymentsCompanyId.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Console\Commands\Retrofits;
+
+use App\Models\Payment;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Log;
+
+class RetrofitPaymentsCompanyId extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'retrofit:fill-payments-company-id';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'This command will fill all payments that does not have any company id.';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        $this->line('Searching for payments that does not have company_id');
+        $payments = Payment::with('subscription')->where('company_id', null)->get();
+
+        $this->line($payments->count().' payment/s found.');
+
+        $this->line('Retrofitting...');
+        $bar = $this->output->createProgressBar($payments->count());
+
+        $errorCount = 0;
+        $bar->start();
+
+        foreach ($payments as $payment) {
+            try {
+                $this->addCompanyId($payment);
+
+            } catch (\Exception $exception) {
+                Log::error('There was something wrong while retrofitting payments.', [
+                    'payment_id' => $payment->id,
+                    'exception' => $exception,
+                ]);
+                $errorCount++;
+            }
+
+            $bar->advance();
+        }
+
+        $bar->finish();
+        $this->newLine();
+
+        if ($errorCount) {
+            $this->error($errorCount.' errors found. Please check logs.');
+        }
+
+        $this->line('Retrofit Finished!');
+    }
+
+    /**
+     * @param  Payment  $payment
+     * @return void
+     */
+    protected function addCompanyId(Payment $payment)
+    {
+        $subscription = $payment->subscription;
+
+        $payment->company_id = $subscription->company_id;
+        $payment->save();
+    }
+}

app/Console/Commands/Retrofits/RetrofitSuperAdminPermission.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Console\Commands\Retrofits;
+
+use App\Models\Role;
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Log;
+
+class RetrofitSuperAdminPermission extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'retrofit:add-super-admin-permission {permissions* : permission names}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'This command will add permissions on the super_admin roles.';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        $permissions = $this->argument('permissions');
+
+        $this->line('Getting all Super Admin roles from different companies.');
+        $roles = Role::where('name', config('filament-shield.super_admin.name'))
+            ->where('company_id', '<>', null)
+            ->get();
+
+        $this->line($roles->count().' role/s found.');
+
+        $this->line('Retrofitting...');
+        $bar = $this->output->createProgressBar($roles->count());
+
+        $errorCount = 0;
+        $bar->start();
+
+        foreach ($roles as $role) {
+            try {
+                $role->givePermissionTo($permissions);
+            } catch (\Exception $exception) {
+                Log::error('There was something wrong while retrofitting roles.', [
+                    'payment_id' => $role->id,
+                    'permissions' => $permissions,
+                    'exception' => $exception,
+                ]);
+                $errorCount++;
+            }
+
+            $bar->advance();
+        }
+
+        $bar->finish();
+        $this->newLine();
+
+        if ($errorCount) {
+            $this->error($errorCount.' errors found. Please check logs.');
+        }
+
+        $this->line('Retrofit Finished!');
+    }
+}

app/Console/Commands/SendInvoiceNearExpiredSubscriptions.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Enums\PaymentStatusEnum;
+use App\Jobs\SendInvoiceJob;
+use App\Models\Subscription;
+use Illuminate\Console\Command;
+
+class SendInvoiceNearExpiredSubscriptions extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'app:send-invoice-near-expired-subscriptions';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'This command checks for active subscriptions expiring within a week and generates invoices for them.';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        $expiringSubscriptions = Subscription::where('status', 'active')
+            ->where('total_amount', '>', 0)
+            ->whereDate('end_date', '=', now()->addWeek()->toDateString())
+            ->get();
+
+        foreach ($expiringSubscriptions as $subscription) {
+            $payment = $subscription->createPayment(PaymentStatusEnum::PENDING);
+
+            SendInvoiceJob::dispatch($payment)
+                ->onQueue('short-running-queue');
+        }
+    }
+}

app/Filament/Admin/Resources/CompanyResource/RelationManagers/SubscriptionsRelationManager.php

@@ -53,9 +53,6 @@ public function table(Table $table): Table
                 Tables\Columns\TextColumn::make('total_amount')
                     ->money('PHP'),
             ])
-            ->filters([
-                //
-            ])
             ->headerActions([
                 Tables\Actions\CreateAction::make()
                     ->mutateFormDataUsing(function (array $data) {
@@ -141,12 +138,7 @@ protected function beforeCreate(array $data): array
      */
     protected function afterCreate($record): void
     {
-        $record->payments()->create([
-            'payment_date' => now(),
-            'amount' => $record->total_amount,
-            'payment_method' => 'system',
-            'status' => PaymentStatusEnum::SUCCESS,
-        ]);
+        $record->createPayment(PaymentStatusEnum::SUCCESS, now());
     }
 
     /**

app/Filament/Admin/Resources/SubscriptionResource/RelationManagers/PaymentsRelationManager.php

@@ -2,6 +2,9 @@
 
 namespace App\Filament\Admin\Resources\SubscriptionResource\RelationManagers;
 
+use App\Enums\PaymentStatusEnum;
+use Filament\Forms\Components\Group;
+use Filament\Forms\Components\TextInput;
 use Filament\Resources\RelationManagers\RelationManager;
 use Filament\Tables;
 use Filament\Tables\Table;
@@ -16,6 +19,8 @@ public function table(Table $table): Table
             ->columns([
                 Tables\Columns\TextColumn::make('invoice_number')
                     ->searchable(),
+                Tables\Columns\TextColumn::make('reference_number')
+                    ->searchable(),
                 Tables\Columns\TextColumn::make('payment_date')
                     ->date(),
                 Tables\Columns\TextColumn::make('amount')
@@ -25,7 +30,27 @@ public function table(Table $table): Table
                     ->badge(),
             ])
             ->actions([
+                Tables\Actions\Action::make('Pay Due')
+                    ->label('')
+                    ->tooltip('Pay Due')
+                    ->icon('heroicon-o-banknotes')
+                    ->color('info')
+                    ->form([
+                        Group::make([
+                            TextInput::make('reference_number'),
+                        ]),
+                    ])
+                    ->action(function ($record, array $data) {
+                        $record->reference_number = $data['reference_number'];
+                        $record->status = PaymentStatusEnum::SUCCESS;
+                        $record->save();
+
+                        $record->subscription->updateEndDate();
+                    })
+                    ->visible(fn ($record) => $record->status === PaymentStatusEnum::PENDING),
                 Tables\Actions\Action::make('Download Invoice')
+                    ->label('')
+                    ->tooltip('Download Invoice')
                     ->icon('heroicon-o-document-arrow-down')
                     ->color('success')
                     ->url(fn ($record) => route('admin.sales.generate-invoice', [$record]))

app/Filament/Admin/Resources/UserResource.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Filament\Admin\Resources;
+
+use App\Filament\Admin\Resources\UserResource\Pages;
+use App\Models\User;
+use Filament\Forms\Form;
+use Filament\Resources\Resource;
+use Filament\Tables;
+use Filament\Tables\Table;
+
+class UserResource extends Resource
+{
+    protected static ?string $model = User::class;
+
+    protected static ?string $navigationIcon = 'heroicon-o-user-group';
+
+    protected static bool $shouldSkipAuthorization = true;
+
+    public static function form(Form $form): Form
+    {
+        return $form
+            ->schema(User::getForm());
+    }
+
+    public static function table(Table $table): Table
+    {
+        return $table
+            ->columns([
+                Tables\Columns\TextColumn::make('name')
+                    ->searchable(),
+                Tables\Columns\TextColumn::make('email')
+                    ->searchable(),
+                Tables\Columns\TextColumn::make('email_verified_at')
+                    ->dateTime()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('created_at')
+                    ->dateTime()
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true),
+                Tables\Columns\TextColumn::make('updated_at')
+                    ->dateTime()
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true),
+            ])
+            ->filters([
+                //
+            ])
+            ->actions([
+                Tables\Actions\EditAction::make(),
+            ])
+            ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
+                ]),
+            ]);
+    }
+
+    public static function getRelations(): array
+    {
+        return [
+            //
+        ];
+    }
+
+    public static function getPages(): array
+    {
+        return [
+            'index' => Pages\ListUsers::route('/'),
+            'create' => Pages\CreateUser::route('/create'),
+            'edit' => Pages\EditUser::route('/{record}/edit'),
+        ];
+    }
+}

app/Filament/Admin/Resources/UserResource/Pages/CreateUser.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Filament\Admin\Resources\UserResource\Pages;
+
+use App\Filament\Admin\Resources\UserResource;
+use Filament\Resources\Pages\CreateRecord;
+
+class CreateUser extends CreateRecord
+{
+    protected static string $resource = UserResource::class;
+}