Merge pull request #174 from andrewdwallo/development-3.x

Development 3.x

app/Filament/Company/Resources/Purchases/VendorResource.php

@@ -220,9 +220,7 @@ class VendorResource extends Resource
                 ]),
             ])
             ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make(),
-                ]),
+                //
             ]);
     }
 

app/Filament/Company/Resources/Sales/ClientResource.php

@@ -309,9 +309,7 @@ class ClientResource extends Resource
                 ]),
             ])
             ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make(),
-                ]),
+                //
             ]);
     }
 

app/Models/Common/Client.php

@@ -173,18 +173,15 @@ class Client extends Model
 
         if (isset($data['shippingAddress'])) {
             $shippingData = $data['shippingAddress'];
-            $shippingAddress = [
-                'type' => AddressType::Shipping,
-                'recipient' => $shippingData['recipient'] ?? null,
-                'phone' => $shippingData['phone'] ?? null,
-                'notes' => $shippingData['notes'] ?? null,
-            ];
 
             if ($shippingData['same_as_billing'] ?? false) {
                 $billingAddress = $this->billingAddress;
                 if ($billingAddress) {
                     $shippingAddress = [
-                        ...$shippingAddress,
+                        'type' => AddressType::Shipping,
+                        'recipient' => $shippingData['recipient'] ?? null,
+                        'phone' => $shippingData['phone'] ?? null,
+                        'notes' => $shippingData['notes'] ?? null,
                         'parent_address_id' => $billingAddress->id,
                         'address_line_1' => $billingAddress->address_line_1,
                         'address_line_2' => $billingAddress->address_line_2,
@@ -193,10 +190,18 @@ class Client extends Model
                         'city' => $billingAddress->city,
                         'postal_code' => $billingAddress->postal_code,
                     ];
+
+                    $this->shippingAddress()->updateOrCreate(
+                        ['type' => AddressType::Shipping],
+                        $shippingAddress
+                    );
                 }
             } elseif (isset($shippingData['address_line_1'])) {
                 $shippingAddress = [
-                    ...$shippingAddress,
+                    'type' => AddressType::Shipping,
+                    'recipient' => $shippingData['recipient'] ?? null,
+                    'phone' => $shippingData['phone'] ?? null,
+                    'notes' => $shippingData['notes'] ?? null,
                     'parent_address_id' => null,
                     'address_line_1' => $shippingData['address_line_1'],
                     'address_line_2' => $shippingData['address_line_2'] ?? null,
@@ -205,12 +210,12 @@ class Client extends Model
                     'city' => $shippingData['city'] ?? null,
                     'postal_code' => $shippingData['postal_code'] ?? null,
                 ];
-            }
 
-            $this->shippingAddress()->updateOrCreate(
-                ['type' => AddressType::Shipping],
-                $shippingAddress
-            );
+                $this->shippingAddress()->updateOrCreate(
+                    ['type' => AddressType::Shipping],
+                    $shippingAddress
+                );
+            }
         }
 
         return $this;

app/Policies/ClientPolicy.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Policies;
+
+use App\Models\Common\Client;
+use App\Models\User;
+
+class ClientPolicy
+{
+    /**
+     * Determine whether the user can view any models.
+     */
+    public function viewAny(User $user): bool
+    {
+        return true;
+    }
+
+    /**
+     * Determine whether the user can view the model.
+     */
+    public function view(User $user, Client $client): bool
+    {
+        return true;
+    }
+
+    /**
+     * Determine whether the user can create models.
+     */
+    public function create(User $user): bool
+    {
+        return true;
+    }
+
+    /**
+     * Determine whether the user can update the model.
+     */
+    public function update(User $user, Client $client): bool
+    {
+        return true;
+    }
+
+    /**
+     * Determine whether the user can delete the model.
+     */
+    public function delete(User $user, Client $client): bool
+    {
+        return false;
+    }
+
+    /**
+     * Determine whether the user can restore the model.
+     */
+    public function restore(User $user, Client $client): bool
+    {
+        return false;
+    }
+
+    /**
+     * Determine whether the user can permanently delete the model.
+     */
+    public function forceDelete(User $user, Client $client): bool
+    {
+        return false;
+    }
+}

app/Policies/VendorPolicy.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Policies;
+
+use App\Models\Common\Vendor;
+use App\Models\User;
+
+class VendorPolicy
+{
+    /**
+     * Determine whether the user can view any models.
+     */
+    public function viewAny(User $user): bool
+    {
+        return true;
+    }
+
+    /**
+     * Determine whether the user can view the model.
+     */
+    public function view(User $user, Vendor $client): bool
+    {
+        return true;
+    }
+
+    /**
+     * Determine whether the user can create models.
+     */
+    public function create(User $user): bool
+    {
+        return true;
+    }
+
+    /**
+     * Determine whether the user can update the model.
+     */
+    public function update(User $user, Vendor $client): bool
+    {
+        return true;
+    }
+
+    /**
+     * Determine whether the user can delete the model.
+     */
+    public function delete(User $user, Vendor $client): bool
+    {
+        return false;
+    }
+
+    /**
+     * Determine whether the user can restore the model.
+     */
+    public function restore(User $user, Vendor $client): bool
+    {
+        return false;
+    }
+
+    /**
+     * Determine whether the user can permanently delete the model.
+     */
+    public function forceDelete(User $user, Vendor $client): bool
+    {
+        return false;
+    }
+}

app/Services/ReportService.php

@@ -968,6 +968,7 @@ class ReportService
                 ->whereNotIn('status', [InvoiceStatus::Draft, InvoiceStatus::Void])
                 ->whereNotNull('approved_at')
                 ->whereNotNull('paid_at')
+                ->whereHas('client')
                 ->with(['client:id,name'])
                 ->get()
                 ->groupBy('client_id'),
@@ -975,6 +976,7 @@ class ReportService
                 ->whereBetween('date', [$startDate, $endDate])
                 ->whereNotIn('status', [BillStatus::Void])
                 ->whereNotNull('paid_at')
+                ->whereHas('vendor')
                 ->with(['vendor:id,name'])
                 ->get()
                 ->groupBy('vendor_id'),