diff --git a/app/Console/Commands/SyncProductPropertiesJson.php b/app/Console/Commands/SyncProductPropertiesJson.php
index 74231e7..0e324bf 100644
--- a/app/Console/Commands/SyncProductPropertiesJson.php
+++ b/app/Console/Commands/SyncProductPropertiesJson.php
@@ -31,7 +31,7 @@ class SyncProductPropertiesJson extends Command
         // Using cursor to be memory efficient
         $products = Product::cursor();
         $count = Product::count();
-        
+
         $bar = $this->output->createProgressBar($count);
         $bar->start();
 
diff --git a/app/Helpers/Ecommerce/Product/Filter/ProductFilterer.php b/app/Helpers/Ecommerce/Product/Filter/ProductFilterer.php
index b634daa..9573ef1 100644
--- a/app/Helpers/Ecommerce/Product/Filter/ProductFilterer.php
+++ b/app/Helpers/Ecommerce/Product/Filter/ProductFilterer.php
@@ -64,7 +64,7 @@ class ProductFilterer
         if ($this->request->filled('properties')) {
             foreach ($this->request->input('properties') as $attributeSlug => $values) {
                 $valuesArray = explode(',', $values);
-                
+
                 $this->queryBuilder->where(function ($query) use ($attributeSlug, $valuesArray) {
                     foreach ($valuesArray as $value) {
                         $query->orWhereJsonContains("properties_json->{$attributeSlug}", $value);
diff --git a/app/Http/Controllers/Api/System/VersionManagement/AppVersionController.php b/app/Http/Controllers/Api/System/VersionManagement/AppVersionController.php
index fca2e94..e194a9e 100644
--- a/app/Http/Controllers/Api/System/VersionManagement/AppVersionController.php
+++ b/app/Http/Controllers/Api/System/VersionManagement/AppVersionController.php
@@ -11,7 +11,7 @@ class AppVersionController extends Controller
 {
     /**
      * Check for app updates
-     * 
+     *
      * This api should be triggered when the app is **launched**, and **current version** and **operating system** should be sent in body. It should check if there is any update available for the app.\
      * **Handle Response**:\
      *     *   **Update Required**: If the update is critical/mandatory, show a **blocking modal**. The user cannot dismiss it and must click a button to go to the App Store or Google Play Store.\
diff --git a/app/Http/Controllers/Api/V1/Auth/Register/AuthRegisterRequest.php b/app/Http/Controllers/Api/V1/Auth/Register/AuthRegisterRequest.php
index ea50539..1ca33d0 100644
--- a/app/Http/Controllers/Api/V1/Auth/Register/AuthRegisterRequest.php
+++ b/app/Http/Controllers/Api/V1/Auth/Register/AuthRegisterRequest.php
@@ -14,17 +14,17 @@ class AuthRegisterRequest extends FormRequest
     public function rules(): array
     {
         return [
-            /** 
+            /**
              * @example 61929248
              */
             'phone_number' => ['required', 'integer', 'between:61000000,71999999', 'unique:users,phone_number'],
-            
-            /** 
+
+            /**
              * @example Nurmuhammet Allanov
              */
             'name' => ['required', 'string', 'max:255'],
 
-            /** 
+            /**
              * @example 75 3rd Ave, New York, NY 10003, USA
              */
             'address' => ['required', 'string', 'max:255'],
diff --git a/app/Http/Controllers/Api/V1/AuthController.php b/app/Http/Controllers/Api/V1/AuthController.php
index 608e085..62dbf08 100644
--- a/app/Http/Controllers/Api/V1/AuthController.php
+++ b/app/Http/Controllers/Api/V1/AuthController.php
@@ -15,7 +15,7 @@ class AuthController extends Controller
 {
     /**
      * Guest token (walk-in-user)
-     * 
+     *
      * Use when user visits website/app for the first time, and save the token in cache.
      */
     public function guestToken(): JsonResponse
@@ -28,8 +28,8 @@ class AuthController extends Controller
 
     /**
      * Register user
-     * 
-     * Register a new user and send a verification code to their phone number. Then make another request to verification route. 
+     *
+     * Register a new user and send a verification code to their phone number. Then make another request to verification route.
      */
     public function register(AuthRegisterRequest $request): JsonResponse
     {
@@ -46,7 +46,7 @@ class AuthController extends Controller
 
     /**
      * Login
-     * 
+     *
      * Send a verification code to the phone number. Then make another request to verify route.
      */
     public function login(AuthLoginRequest $request): JsonResponse
@@ -62,7 +62,7 @@ class AuthController extends Controller
 
     /**
      * Verify the code
-     * 
+     *
      * After verification, bearer token will be returned.
      */
     public function verify(AuthVerifyRequest $request): JsonResponse
diff --git a/app/Http/Controllers/Api/V1/OrderController.php b/app/Http/Controllers/Api/V1/OrderController.php
index 01c641e..fd52c16 100644
--- a/app/Http/Controllers/Api/V1/OrderController.php
+++ b/app/Http/Controllers/Api/V1/OrderController.php
@@ -38,7 +38,7 @@ class OrderController extends Controller
      */
     public function store(CheckoutOrderRequest $request, CreateOrderService $service): JsonResponse
     {
-        $order = $service->execute(auth()->user(), $request->validated());
+        $order = $service->execute(auth()->user(), $request->all());
 
         $url = null;
         if ($request->payment_type_id == 3) {
@@ -81,7 +81,6 @@ class OrderController extends Controller
     /**
      * Remove the specified resource from storage.
      *
-     * @param  Order  $order
      * @return \Illuminate\Http\Response
      */
     public function destroy(Order $order)
diff --git a/app/Http/Controllers/Api/V1/Product/Resources/ProductIndexResource.php b/app/Http/Controllers/Api/V1/Product/Resources/ProductIndexResource.php
index 2c607f2..a21f6ad 100644
--- a/app/Http/Controllers/Api/V1/Product/Resources/ProductIndexResource.php
+++ b/app/Http/Controllers/Api/V1/Product/Resources/ProductIndexResource.php
@@ -4,7 +4,6 @@ namespace App\Http\Controllers\Api\V1\Product\Resources;
 
 use App\Http\Resources\MediaResource;
 use App\Repositories\Ecommerce\Product\Property\PropertyRepository;
-use App\Http\Controllers\Api\V1\Product\Resources\Variant\ProductVariantResource;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class ProductIndexResource extends JsonResource
diff --git a/app/Http/Requests/Api/System/VersionManagement/CheckForUpdateRequest.php b/app/Http/Requests/Api/System/VersionManagement/CheckForUpdateRequest.php
index 4ee95d2..3f0400f 100644
--- a/app/Http/Requests/Api/System/VersionManagement/CheckForUpdateRequest.php
+++ b/app/Http/Requests/Api/System/VersionManagement/CheckForUpdateRequest.php
@@ -10,7 +10,7 @@ class CheckForUpdateRequest extends FormRequest
 {
     /**
      * Get the validation rules that apply to the request.
-     * 
+     *
      * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array|string>
      */
     public function rules(): array
diff --git a/app/Http/Requests/Api/V1/Auth/AuthLoginRequest.php b/app/Http/Requests/Api/V1/Auth/AuthLoginRequest.php
index 9e6518d..25a1e5c 100644
--- a/app/Http/Requests/Api/V1/Auth/AuthLoginRequest.php
+++ b/app/Http/Requests/Api/V1/Auth/AuthLoginRequest.php
@@ -2,7 +2,6 @@
 
 namespace App\Http\Requests\Api\V1\Auth;
 
-use App\Rules\VerificationRule;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
diff --git a/app/Http/Requests/Api/V1/Auth/AuthVerifyRequest.php b/app/Http/Requests/Api/V1/Auth/AuthVerifyRequest.php
index 1e44055..a1c352d 100644
--- a/app/Http/Requests/Api/V1/Auth/AuthVerifyRequest.php
+++ b/app/Http/Requests/Api/V1/Auth/AuthVerifyRequest.php
@@ -15,12 +15,12 @@ class AuthVerifyRequest extends FormRequest
     public function rules(): array
     {
         return [
-            /** 
+            /**
              * @example 61929248
              */
             'phone_number' => ['required', 'integer', 'between:61000000,65999999'],
 
-            /** 
+            /**
              * @example 99934
              */
             'code' => ['required', 'integer', new VerificationRule($this->phone_number)],
diff --git a/app/Models/Ecommerce/Product/Product/Concerns/HasPropertiesJson.php b/app/Models/Ecommerce/Product/Product/Concerns/HasPropertiesJson.php
index e62cb95..4678441 100644
--- a/app/Models/Ecommerce/Product/Product/Concerns/HasPropertiesJson.php
+++ b/app/Models/Ecommerce/Product/Product/Concerns/HasPropertiesJson.php
@@ -23,7 +23,7 @@ trait HasPropertiesJson
 
         foreach ($this->properties as $property) {
             $attributeSlug = $property->attribute->slug;
-            
+
             if (! isset($propertiesJson[$attributeSlug])) {
                 $propertiesJson[$attributeSlug] = [];
             }
@@ -34,12 +34,12 @@ trait HasPropertiesJson
                 if ($value->value) {
                     $propertiesJson[$attributeSlug][] = $value->value->key;
                 }
-                
+
                 if ($value->product_custom_value) {
                     $propertiesJson[$attributeSlug][] = $value->product_custom_value;
                 }
             }
-            
+
             // Unique values just in case
             $propertiesJson[$attributeSlug] = array_values(array_unique($propertiesJson[$attributeSlug]));
         }
diff --git a/app/Models/Ecommerce/Product/Product/Product.php b/app/Models/Ecommerce/Product/Product/Product.php
index c4bc4be..1658eb6 100644
--- a/app/Models/Ecommerce/Product/Product/Product.php
+++ b/app/Models/Ecommerce/Product/Product/Product.php
@@ -27,16 +27,16 @@ class Product extends Model implements HasMedia, Viewable
      */
     use HasFactory;
 
-    /**
-     * Has Schemaless Attributes (spatie/laravel-schemaless-attributes)
-     */
-    use HasSchemalessAttributes;
-
     /**
      * Has Properties Json
      */
     use HasPropertiesJson;
 
+    /**
+     * Has Schemaless Attributes (spatie/laravel-schemaless-attributes)
+     */
+    use HasSchemalessAttributes;
+
     /**
      * Has Slug (spatie/laravel-sluggable)
      */
diff --git a/app/Models/System/VersionManagement/AppVersion.php b/app/Models/System/VersionManagement/AppVersion.php
index 16923a6..da48a0f 100644
--- a/app/Models/System/VersionManagement/AppVersion.php
+++ b/app/Models/System/VersionManagement/AppVersion.php
@@ -9,7 +9,7 @@ use Illuminate\Database\Eloquent\Model;
  * @property int $id
  * @property string $version
  * @property string $os
- * @property bool   $important
+ * @property bool $important
  * @property string $notes
  * @property \Carbon\Carbon|null $created_at
  * @property \Carbon\Carbon|null $updated_at
diff --git a/app/Nova/Resources/System/Warning.php b/app/Nova/Resources/System/Warning.php
index 509ee46..30c4a62 100644
--- a/app/Nova/Resources/System/Warning.php
+++ b/app/Nova/Resources/System/Warning.php
@@ -38,7 +38,6 @@ class Warning extends Resource
     /**
      * Get the fields displayed by the resource.
      *
-     * @param  \Laravel\Nova\Http\Requests\NovaRequest  $request
      * @return array
      */
     public function fields(NovaRequest $request)
@@ -68,7 +67,6 @@ class Warning extends Resource
     /**
      * Get the cards available for the request.
      *
-     * @param  \Laravel\Nova\Http\Requests\NovaRequest  $request
      * @return array
      */
     public function cards(NovaRequest $request)
@@ -79,7 +77,6 @@ class Warning extends Resource
     /**
      * Get the filters available for the resource.
      *
-     * @param  \Laravel\Nova\Http\Requests\NovaRequest  $request
      * @return array
      */
     public function filters(NovaRequest $request)
@@ -90,7 +87,6 @@ class Warning extends Resource
     /**
      * Get the lenses available for the resource.
      *
-     * @param  \Laravel\Nova\Http\Requests\NovaRequest  $request
      * @return array
      */
     public function lenses(NovaRequest $request)
@@ -101,7 +97,6 @@ class Warning extends Resource
     /**
      * Get the actions available for the resource.
      *
-     * @param  \Laravel\Nova\Http\Requests\NovaRequest  $request
      * @return array
      */
     public function actions(NovaRequest $request)
diff --git a/app/Providers/DocumentationServiceProvider.php b/app/Providers/DocumentationServiceProvider.php
index 7404c7d..4f4e34d 100644
--- a/app/Providers/DocumentationServiceProvider.php
+++ b/app/Providers/DocumentationServiceProvider.php
@@ -2,11 +2,11 @@
 
 namespace App\Providers;
 
-use Dedoc\Scramble\Support\Generator\SecurityScheme;
-use Illuminate\Support\ServiceProvider;
 use Dedoc\Scramble\Scramble;
 use Dedoc\Scramble\Support\Generator\OpenApi;
 use Dedoc\Scramble\Support\Generator\SecurityRequirement;
+use Dedoc\Scramble\Support\Generator\SecurityScheme;
+use Illuminate\Support\ServiceProvider;
 
 class DocumentationServiceProvider extends ServiceProvider
 {
@@ -24,14 +24,14 @@ class DocumentationServiceProvider extends ServiceProvider
     public function boot(): void
     {
         Scramble::configure()
-        ->withDocumentTransformers(function (OpenApi $openApi) {
-            $openApi->components->securitySchemes['api-token'] = SecurityScheme::apiKey('header', 'Api-token');
-            $openApi->components->securitySchemes['bearer'] = SecurityScheme::http('bearer');
+            ->withDocumentTransformers(function (OpenApi $openApi) {
+                $openApi->components->securitySchemes['api-token'] = SecurityScheme::apiKey('header', 'Api-token');
+                $openApi->components->securitySchemes['bearer'] = SecurityScheme::http('bearer');
 
-            $openApi->security[] = new SecurityRequirement([
-                'api-token' => [],
-                'bearer' => [],
-            ]);
-        });
+                $openApi->security[] = new SecurityRequirement([
+                    'api-token' => [],
+                    'bearer' => [],
+                ]);
+            });
     }
 }
diff --git a/app/Repositories/Ecommerce/Product/ProductRepository.php b/app/Repositories/Ecommerce/Product/ProductRepository.php
index 8e2c778..ef03f08 100644
--- a/app/Repositories/Ecommerce/Product/ProductRepository.php
+++ b/app/Repositories/Ecommerce/Product/ProductRepository.php
@@ -58,8 +58,8 @@ class ProductRepository
 
     /**
      * Update query builder with resource relationship
-     * 
-     * @param mixed $resource
+     *
+     * @param  mixed  $resource
      */
     public function queryAsFromResource($resource): self
     {
@@ -277,8 +277,8 @@ class ProductRepository
 
     /**
      * Ajax paginate
-     * 
-     * @param mixed $products
+     *
+     * @param  mixed  $products
      */
     public static function ajaxPaginate($products): JsonResponse
     {
diff --git a/app/Services/Order/CreateOrderService.php b/app/Services/Order/CreateOrderService.php
index b264376..6382584 100644
--- a/app/Services/Order/CreateOrderService.php
+++ b/app/Services/Order/CreateOrderService.php
@@ -13,15 +13,12 @@ class CreateOrderService
 {
     /**
      * Create a new order for the user
-     *
-     * @param  User  $user
-     * @param  array  $data
-     * @return Order
      */
     public function execute(User $user, array $data): Order
     {
         return DB::transaction(function () use ($user, $data) {
             // 1. Create the order
+            info(['service' => $data]);
             $order = Order::create($data);
 
             // 2. Process Cart Items
diff --git a/database/migrations/2026_02_04_210430_change_source_app_to_source_on_orders_table.php b/database/migrations/2026_02_04_210430_change_source_app_to_source_on_orders_table.php
index 6c0ad97..2db9801 100644
--- a/database/migrations/2026_02_04_210430_change_source_app_to_source_on_orders_table.php
+++ b/database/migrations/2026_02_04_210430_change_source_app_to_source_on_orders_table.php
@@ -13,6 +13,9 @@ return new class extends Migration
     {
         Schema::table('orders', function (Blueprint $table) {
             $table->dropColumn('source_app');
+        });
+
+        Schema::table('orders', function (Blueprint $table) {
             $table->string('source')->nullable();
         });
     }
@@ -26,6 +29,9 @@ return new class extends Migration
             if (Schema::hasColumn('source')) {
                 $table->dropColumn('source')->nullable();
             }
+        });
+
+        Schema::table('orders', function (Blueprint $table) {
             if (! Schema::hasColumn('source_app')) {
                 $table->string('source_app')->nullable();
             }
diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php
index ce540f0..8870b4b 100644
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -15,29 +15,29 @@ class DatabaseSeeder extends Seeder
     public function run(): void
     {
         // $this->call([
-            // SettingsSeeder::class,
-            // RolesTableSeeder::class,
-            // BannerTableSeeder::class,
-            // CarouselTableSeeder::class,
-            // UserTableSeeder::class,
-            // ChannelTableSeeder::class,
-            // PaymentTypeTableSeeder::class,
-            // ProvinceTableSeeder::class,
-            // BrandTableSeeder::class,
-            // ProductTableSeeder::class,
-            // PostBranchTableSeeder::class,
-            // InventoriesTableSeeder::class,
-            // CategoryTableSeeder::class,
-            // CollectionTableSeeder::class,
-            // AttributeTableSeeder::class,
-            // ContactUsTableSeeder::class,
-            // LegalPageTableSeeder::class,
-            // ReviewTableSeeder::class,
-            // NewsletterTableSeeder::class,
-            // CartItemTableSeeder::class,
-            // FavouriteTableSeeder::class,
-            // MediaTableSeeder::class,
-            // ProductHasRelationsTable::class,
+        // SettingsSeeder::class,
+        // RolesTableSeeder::class,
+        // BannerTableSeeder::class,
+        // CarouselTableSeeder::class,
+        // UserTableSeeder::class,
+        // ChannelTableSeeder::class,
+        // PaymentTypeTableSeeder::class,
+        // ProvinceTableSeeder::class,
+        // BrandTableSeeder::class,
+        // ProductTableSeeder::class,
+        // PostBranchTableSeeder::class,
+        // InventoriesTableSeeder::class,
+        // CategoryTableSeeder::class,
+        // CollectionTableSeeder::class,
+        // AttributeTableSeeder::class,
+        // ContactUsTableSeeder::class,
+        // LegalPageTableSeeder::class,
+        // ReviewTableSeeder::class,
+        // NewsletterTableSeeder::class,
+        // CartItemTableSeeder::class,
+        // FavouriteTableSeeder::class,
+        // MediaTableSeeder::class,
+        // ProductHasRelationsTable::class,
         // ]);
         $this->call([
 
diff --git a/routes/api/v1/v1-api.php b/routes/api/v1/v1-api.php
index 4872f58..4e31011 100644
--- a/routes/api/v1/v1-api.php
+++ b/routes/api/v1/v1-api.php
@@ -26,7 +26,6 @@ use App\Http\Controllers\Api\V1\Profile\ProfileController;
 use App\Http\Controllers\Api\V1\Province\ProvinceController;
 use App\Http\Controllers\Api\V1\ReviewController;
 use App\Modules\GlobalOrder\Controllers\GlobalOrderController;
-use Dedoc\Scramble\Attributes\HeaderParameter;
 use Illuminate\Support\Facades\Route;
 
 // Auth...
diff --git a/tests/Feature/Api/V1/CartTest.php b/tests/Feature/Api/V1/CartTest.php
index ad194a4..3abbc0a 100644
--- a/tests/Feature/Api/V1/CartTest.php
+++ b/tests/Feature/Api/V1/CartTest.php
@@ -1,15 +1,15 @@
 <?php
 
-use App\Models\User;
-use App\Models\Ecommerce\Product\Product\Product;
 use App\Models\Ecommerce\Product\Cart\CartItem;
+use App\Models\Ecommerce\Product\Product\Product;
+use App\Models\User;
 
 beforeEach(function () {
     $this->user = User::factory()->create([
         'password' => 'password',
         'phone_number' => 61929248,
     ]);
-    
+
     // Helper to create product with stock
     $this->createProductWithStock = function ($stock = 10) {
         // Since we don't have factories for Channel/Inventory, and the Controller logic
@@ -17,10 +17,10 @@ beforeEach(function () {
         // (based on CartController::index logic: if ($cartItem->product->stock < ...)),
         // we can just create a product with the stock attribute.
         // If Product factory doesn't exist, we'll create it manually.
-        
+
         return Product::create([
             'name' => 'Test Product',
-            'slug' => 'test-product-' . uniqid(),
+            'slug' => 'test-product-'.uniqid(),
             'stock' => $stock,
             'price_amount' => 100,
             'is_visible' => true,
@@ -50,7 +50,7 @@ test('authenticated user can store item in cart', function () {
         ->withHeaders(['Api-Token' => config('ecommerce.api.token')])
         ->postJson('/api/v1/carts', [
             'product_id' => $product->id,
-            'product_quantity' => 2
+            'product_quantity' => 2,
         ]);
 
     $response->assertStatus(201);
@@ -58,18 +58,18 @@ test('authenticated user can store item in cart', function () {
     $this->assertDatabaseHas('cart_items', [
         'user_id' => $this->user->id,
         'product_id' => $product->id,
-        'product_quantity' => 2
+        'product_quantity' => 2,
     ]);
 });
 
 test('storing item updates quantity if already in cart', function () {
     $product = ($this->createProductWithStock)(10);
-    
+
     // Initial add
     CartItem::create([
         'user_id' => $this->user->id,
         'product_id' => $product->id,
-        'product_quantity' => 1
+        'product_quantity' => 1,
     ]);
 
     // Update quantity
@@ -77,7 +77,7 @@ test('storing item updates quantity if already in cart', function () {
         ->withHeaders(['Api-Token' => config('ecommerce.api.token')])
         ->postJson('/api/v1/carts', [
             'product_id' => $product->id,
-            'product_quantity' => 5
+            'product_quantity' => 5,
         ]);
 
     $response->assertStatus(201);
@@ -85,7 +85,7 @@ test('storing item updates quantity if already in cart', function () {
     $this->assertDatabaseHas('cart_items', [
         'user_id' => $this->user->id,
         'product_id' => $product->id,
-        'product_quantity' => 5 // Should update to new quantity, not add
+        'product_quantity' => 5, // Should update to new quantity, not add
     ]);
 });
 
@@ -94,10 +94,10 @@ test('cart validation fails if product does not exist', function () {
         ->withHeaders(['Api-Token' => config('ecommerce.api.token')])
         ->postJson('/api/v1/carts', [
             'product_id' => 99999,
-            'product_quantity' => 1
+            'product_quantity' => 1,
         ]);
 
-    // Expecting validation error. 
+    // Expecting validation error.
     // Note: The custom rule ProductStockIsAvailable might handle existence check or it might fail before that.
     // The request doesn't use 'exists' rule explicitly but checks stock.
     $response->assertStatus(422)
@@ -111,7 +111,7 @@ test('cart validation fails if quantity is invalid', function () {
         ->withHeaders(['Api-Token' => config('ecommerce.api.token')])
         ->postJson('/api/v1/carts', [
             'product_id' => $product->id,
-            'product_quantity' => 0 // Min is 1
+            'product_quantity' => 0, // Min is 1
         ]);
 
     $response->assertStatus(422)
@@ -125,7 +125,7 @@ test('cart validation fails if stock is insufficient', function () {
         ->withHeaders(['Api-Token' => config('ecommerce.api.token')])
         ->postJson('/api/v1/carts', [
             'product_id' => $product->id,
-            'product_quantity' => 10
+            'product_quantity' => 10,
         ]);
 
     $response->assertStatus(422)
@@ -153,8 +153,8 @@ test('authenticated user can list cart items', function () {
                     'product_id',
                     'product_quantity',
                     'product',
-                ]
-            ]
+                ],
+            ],
         ]);
 });
 
@@ -170,12 +170,12 @@ test('index adjusts quantity if stock decreased', function () {
         ->getJson('/api/v1/carts');
 
     $response->assertStatus(200);
-    
+
     // Check DB
     $this->assertDatabaseHas('cart_items', [
         'user_id' => $this->user->id,
         'product_id' => $product->id,
-        'product_quantity' => 5
+        'product_quantity' => 5,
     ]);
 });
 
@@ -192,7 +192,7 @@ test('index removes item if out of stock', function () {
 
     $response->assertStatus(200)
         ->assertJsonCount(0, 'data');
-    
+
     // Check DB
     $this->assertDatabaseMissing('cart_items', [
         'user_id' => $this->user->id,
@@ -207,14 +207,14 @@ test('authenticated user can remove specific item from cart', function () {
     $response = $this->actingAs($this->user, 'sanctum')
         ->withHeaders(['Api-Token' => config('ecommerce.api.token')])
         ->patchJson('/api/v1/carts', [
-            'product_id' => $product->id
+            'product_id' => $product->id,
         ]);
 
     $response->assertStatus(200);
 
     $this->assertDatabaseMissing('cart_items', [
         'user_id' => $this->user->id,
-        'product_id' => $product->id
+        'product_id' => $product->id,
     ]);
 });
 
diff --git a/tests/Feature/Api/V1/CategoryTest.php b/tests/Feature/Api/V1/CategoryTest.php
index 63a9e24..d24a793 100644
--- a/tests/Feature/Api/V1/CategoryTest.php
+++ b/tests/Feature/Api/V1/CategoryTest.php
@@ -14,11 +14,11 @@ beforeEach(function () {
 
 function createCategory(array $attributes = []): Category
 {
-    $name = $attributes['name'] ?? 'Test Category ' . Str::random(5);
+    $name = $attributes['name'] ?? 'Test Category '.Str::random(5);
     // Handle name translation if it's not an array
     $nameValue = is_array($name) ? $name : ['en' => $name];
     $slug = Str::slug(is_array($name) ? ($name['en'] ?? reset($name)) : $name);
-    
+
     return Category::create(array_merge([
         'name' => $nameValue,
         'slug' => $slug,
@@ -30,7 +30,8 @@ function createCategory(array $attributes = []): Category
 
 function createProduct(array $attributes = []): Product
 {
-    $name = $attributes['name'] ?? 'Test Product ' . Str::random(5);
+    $name = $attributes['name'] ?? 'Test Product '.Str::random(5);
+
     return Product::create(array_merge([
         'name' => $name,
         'slug' => Str::slug($name),
@@ -61,10 +62,10 @@ test('can list categories', function () {
                     'id',
                     'name',
                     'slug',
-                ]
-            ]
+                ],
+            ],
         ]);
-        
+
     $this->assertCount(3, $response->json('data'));
 });
 
@@ -101,7 +102,7 @@ test('can filter categories by type tree', function () {
     // Tree view should return root categories with children nested (or however toTree() works)
     // Assuming toTree() nests children under 'children' key or similar structure
     // CategoryRepository::get() calls $data->toTree() which usually returns roots with children loaded
-    $this->assertCount(1, $response->json('data')); 
+    $this->assertCount(1, $response->json('data'));
     $this->assertEquals($parent->id, $response->json('data.0.id'));
     // Since toTree is used, we expect structure to reflect hierarchy
     // Depending on implementation, checking count of roots is good start.
@@ -152,7 +153,7 @@ test('can show a specific category', function () {
             'data' => [
                 'id' => $category->id,
                 'name' => 'Test Category',
-            ]
+            ],
         ]);
 });
 
@@ -181,8 +182,8 @@ test('returns 404 for invalid category id format', function () {
 test('can list products for a category', function () {
     // Arrange
     $category = createCategory();
-    $products = collect(range(1, 5))->map(fn() => createProduct());
-    
+    $products = collect(range(1, 5))->map(fn () => createProduct());
+
     // Attach products to category
     $category->products()->attach($products->pluck('id'));
 
@@ -199,10 +200,10 @@ test('can list products for a category', function () {
                 '*' => [
                     'id',
                     'name',
-                ]
+                ],
             ],
         ]);
-        
+
     $this->assertCount(5, $response->json('data'));
 });
 
@@ -211,7 +212,7 @@ test('does not list invisible products for a category', function () {
     $category = createCategory();
     $visibleProduct = createProduct(['is_visible' => true]);
     $invisibleProduct = createProduct(['is_visible' => false]);
-    
+
     // Attach products to category
     $category->products()->attach([$visibleProduct->id, $invisibleProduct->id]);
 
diff --git a/tests/Feature/Api/V1/CollectionTest.php b/tests/Feature/Api/V1/CollectionTest.php
index b41766e..e76df0f 100644
--- a/tests/Feature/Api/V1/CollectionTest.php
+++ b/tests/Feature/Api/V1/CollectionTest.php
@@ -14,11 +14,11 @@ beforeEach(function () {
 
 function createCollection(array $attributes = []): Collection
 {
-    $name = $attributes['name'] ?? 'Test Collection ' . Str::random(5);
+    $name = $attributes['name'] ?? 'Test Collection '.Str::random(5);
     // Handle name translation if it's not an array
     $nameValue = is_array($name) ? $name : ['en' => $name];
     $slug = Str::slug(is_array($name) ? ($name['en'] ?? reset($name)) : $name);
-    
+
     return Collection::create(array_merge([
         'name' => $nameValue,
         'slug' => $slug,
@@ -29,7 +29,8 @@ function createCollection(array $attributes = []): Collection
 
 function createProductForCollection(array $attributes = []): Product
 {
-    $name = $attributes['name'] ?? 'Test Product ' . Str::random(5);
+    $name = $attributes['name'] ?? 'Test Product '.Str::random(5);
+
     return Product::create(array_merge([
         'name' => $name,
         'slug' => Str::slug($name),
@@ -60,10 +61,10 @@ test('can list collections', function () {
                     'id',
                     'name',
                     'slug',
-                ]
-            ]
+                ],
+            ],
         ]);
-        
+
     $this->assertCount(3, $response->json('data'));
 });
 
@@ -86,7 +87,7 @@ test('does not list invisible collections', function () {
 
 test('can list paginated collections', function () {
     // Arrange
-    $collections = collect(range(1, 10))->map(fn() => createCollection());
+    $collections = collect(range(1, 10))->map(fn () => createCollection());
 
     // Act
     $response = $this->withHeaders([
@@ -99,7 +100,7 @@ test('can list paginated collections', function () {
         ->assertJsonStructure([
             'data',
         ]);
-        
+
     $this->assertCount(5, $response->json('data'));
 });
 
@@ -119,7 +120,7 @@ test('can show a specific collection', function () {
             'data' => [
                 'id' => $collection->id,
                 'name' => 'Test Collection',
-            ]
+            ],
         ]);
 });
 
@@ -148,8 +149,8 @@ test('returns 404 for invalid collection id format', function () {
 test('can list products for a collection', function () {
     // Arrange
     $collection = createCollection();
-    $products = collect(range(1, 5))->map(fn() => createProductForCollection());
-    
+    $products = collect(range(1, 5))->map(fn () => createProductForCollection());
+
     // Attach products to collection
     $collection->products()->attach($products->pluck('id'));
 
@@ -166,10 +167,10 @@ test('can list products for a collection', function () {
                 '*' => [
                     'id',
                     'name',
-                ]
+                ],
             ],
         ]);
-        
+
     $this->assertCount(5, $response->json('data'));
 });
 
@@ -178,7 +179,7 @@ test('does not list invisible products for a collection', function () {
     $collection = createCollection();
     $visibleProduct = createProductForCollection(['is_visible' => true]);
     $invisibleProduct = createProductForCollection(['is_visible' => false]);
-    
+
     // Attach products to collection
     $collection->products()->attach([$visibleProduct->id, $invisibleProduct->id]);
 
diff --git a/tests/Feature/Api/V1/FavoriteTest.php b/tests/Feature/Api/V1/FavoriteTest.php
index 670d20d..6b5bee7 100644
--- a/tests/Feature/Api/V1/FavoriteTest.php
+++ b/tests/Feature/Api/V1/FavoriteTest.php
@@ -1,20 +1,19 @@
 <?php
 
-use App\Models\User;
 use App\Models\Ecommerce\Product\Product\Product;
-use App\Models\Ecommerce\Product\Favorite\Favorite;
+use App\Models\User;
 
 beforeEach(function () {
     $this->user = User::factory()->create([
         'password' => 'password',
         'phone_number' => 61929248,
     ]);
-    
+
     // Helper to create product
     $this->createProduct = function () {
         return Product::create([
             'name' => 'Test Product',
-            'slug' => 'test-product-' . uniqid(),
+            'slug' => 'test-product-'.uniqid(),
             'stock' => 10,
             'price_amount' => 100,
             'is_visible' => true,
@@ -43,43 +42,43 @@ test('authenticated user can add item to favorites', function () {
     $response = $this->actingAs($this->user, 'sanctum')
         ->withHeaders(['Api-Token' => config('ecommerce.api.token')])
         ->postJson('/api/v1/favorites', [
-            'product_id' => $product->id
+            'product_id' => $product->id,
         ]);
 
     $response->assertStatus(200)
         ->assertJson([
-            'message' => 'Added'
+            'message' => 'Added',
         ]);
 
     $this->assertDatabaseHas('favorites', [
         'user_id' => $this->user->id,
-        'product_id' => $product->id
+        'product_id' => $product->id,
     ]);
 });
 
 test('authenticated user can remove item from favorites (toggle)', function () {
     $product = ($this->createProduct)();
-    
+
     // Add first
     $this->user->favorites()->create([
-        'product_id' => $product->id
+        'product_id' => $product->id,
     ]);
 
     // Request to toggle (remove)
     $response = $this->actingAs($this->user, 'sanctum')
         ->withHeaders(['Api-Token' => config('ecommerce.api.token')])
         ->postJson('/api/v1/favorites', [
-            'product_id' => $product->id
+            'product_id' => $product->id,
         ]);
 
     $response->assertStatus(200)
         ->assertJson([
-            'message' => 'Removed'
+            'message' => 'Removed',
         ]);
 
     $this->assertDatabaseMissing('favorites', [
         'user_id' => $this->user->id,
-        'product_id' => $product->id
+        'product_id' => $product->id,
     ]);
 });
 
@@ -87,7 +86,7 @@ test('favorite toggle validation fails if product does not exist', function () {
     $response = $this->actingAs($this->user, 'sanctum')
         ->withHeaders(['Api-Token' => config('ecommerce.api.token')])
         ->postJson('/api/v1/favorites', [
-            'product_id' => 99999
+            'product_id' => 99999,
         ]);
 
     $response->assertStatus(422)
@@ -116,8 +115,8 @@ test('authenticated user can view favorites list with items', function () {
                         'name',
                         'slug',
                         // Add other product fields as expected by ProductResource
-                    ]
-                ]
-            ]
+                    ],
+                ],
+            ],
         ]);
 });
diff --git a/tests/Feature/Api/V1/FilterTest.php b/tests/Feature/Api/V1/FilterTest.php
index 6484699..0675052 100644
--- a/tests/Feature/Api/V1/FilterTest.php
+++ b/tests/Feature/Api/V1/FilterTest.php
@@ -16,10 +16,10 @@ beforeEach(function () {
 
 function createFilterCategory(array $attributes = []): Category
 {
-    $name = $attributes['name'] ?? 'Test Category ' . Str::random(5);
+    $name = $attributes['name'] ?? 'Test Category '.Str::random(5);
     $nameValue = is_array($name) ? $name : ['en' => $name];
     $slug = Str::slug(is_array($name) ? ($name['en'] ?? reset($name)) : $name);
-    
+
     return Category::create(array_merge([
         'name' => $nameValue,
         'slug' => $slug,
@@ -31,7 +31,8 @@ function createFilterCategory(array $attributes = []): Category
 
 function createFilterBrand(array $attributes = []): Brand
 {
-    $name = $attributes['name'] ?? 'Test Brand ' . Str::random(5);
+    $name = $attributes['name'] ?? 'Test Brand '.Str::random(5);
+
     return Brand::create(array_merge([
         'name' => $name,
         'slug' => Str::slug($name),
@@ -42,10 +43,10 @@ function createFilterBrand(array $attributes = []): Brand
 
 function createFilterCollection(array $attributes = []): Collection
 {
-    $name = $attributes['name'] ?? 'Test Collection ' . Str::random(5);
+    $name = $attributes['name'] ?? 'Test Collection '.Str::random(5);
     $nameValue = is_array($name) ? $name : ['en' => $name];
     $slug = Str::slug(is_array($name) ? ($name['en'] ?? reset($name)) : $name);
-    
+
     return Collection::create(array_merge([
         'name' => $nameValue,
         'slug' => $slug,
@@ -56,7 +57,8 @@ function createFilterCollection(array $attributes = []): Collection
 
 function createFilterProduct(array $attributes = []): Product
 {
-    $name = $attributes['name'] ?? 'Test Product ' . Str::random(5);
+    $name = $attributes['name'] ?? 'Test Product '.Str::random(5);
+
     return Product::create(array_merge([
         'name' => $name,
         'slug' => Str::slug($name),
@@ -84,9 +86,9 @@ test('can get filters', function () {
             'data' => [
                 'categories',
                 'brands',
-            ]
+            ],
         ]);
-        
+
     $this->assertCount(1, $response->json('data.categories'));
     $this->assertCount(1, $response->json('data.brands'));
 });
@@ -96,10 +98,10 @@ test('can get filters filtered by category', function () {
     $parent = createFilterCategory(['name' => 'Parent']);
     $child = createFilterCategory(['name' => 'Child', 'parent_id' => $parent->id]);
     $other = createFilterCategory(['name' => 'Other']);
-    
+
     $brand1 = createFilterBrand(['name' => 'Brand 1']);
     $brand2 = createFilterBrand(['name' => 'Brand 2']);
-    
+
     $product = createFilterProduct(['brand_id' => $brand1->id]);
     $parent->products()->attach($product->id); // Attach to parent
 
@@ -111,12 +113,12 @@ test('can get filters filtered by category', function () {
 
     // Assert
     $response->assertOk();
-    
+
     // Categories should be children of the requested category
     $categories = collect($response->json('data.categories'));
     $this->assertTrue($categories->contains('id', $child->id));
     $this->assertFalse($categories->contains('id', $other->id));
-    
+
     // Brands should be brands of products in this category
     $brands = collect($response->json('data.brands'));
     $this->assertTrue($brands->contains('id', $brand1->id));
@@ -127,10 +129,10 @@ test('can get filters filtered by brand', function () {
     // Arrange
     $brand = createFilterBrand(['name' => 'Brand']);
     $otherBrand = createFilterBrand(['name' => 'Other Brand']);
-    
+
     $category1 = createFilterCategory(['name' => 'Cat 1']);
     $category2 = createFilterCategory(['name' => 'Cat 2']);
-    
+
     $product = createFilterProduct(['brand_id' => $brand->id]);
     $category1->products()->attach($product->id);
 
@@ -142,12 +144,12 @@ test('can get filters filtered by brand', function () {
 
     // Assert
     $response->assertOk();
-    
+
     // Categories should be categories containing products of this brand
     $categories = collect($response->json('data.categories'));
     $this->assertTrue($categories->contains('id', $category1->id));
     $this->assertFalse($categories->contains('id', $category2->id));
-    
+
     // Brands should be the requested brand
     $brands = collect($response->json('data.brands'));
     $this->assertTrue($brands->contains('id', $brand->id));
@@ -157,15 +159,15 @@ test('can get filters filtered by brand', function () {
 test('can get filters filtered by collection', function () {
     // Arrange
     $collection = createFilterCollection(['name' => 'Collection']);
-    
+
     $brand1 = createFilterBrand(['name' => 'Brand 1']);
     $brand2 = createFilterBrand(['name' => 'Brand 2']);
-    
+
     $category1 = createFilterCategory(['name' => 'Cat 1']);
     $category2 = createFilterCategory(['name' => 'Cat 2']);
-    
+
     $product = createFilterProduct(['brand_id' => $brand1->id]);
-    
+
     $collection->products()->attach($product->id);
     $category1->products()->attach($product->id);
 
@@ -177,12 +179,12 @@ test('can get filters filtered by collection', function () {
 
     // Assert
     $response->assertOk();
-    
+
     // Categories should be categories of products in this collection
     $categories = collect($response->json('data.categories'));
     $this->assertTrue($categories->contains('id', $category1->id));
     $this->assertFalse($categories->contains('id', $category2->id));
-    
+
     // Brands should be brands of products in this collection
     $brands = collect($response->json('data.brands'));
     $this->assertTrue($brands->contains('id', $brand1->id));
diff --git a/tests/Feature/Api/V1/FormTest.php b/tests/Feature/Api/V1/FormTest.php
index 90ab656..59b77bc 100644
--- a/tests/Feature/Api/V1/FormTest.php
+++ b/tests/Feature/Api/V1/FormTest.php
@@ -1,7 +1,5 @@
 <?php
 
-use App\Models\CMS\Forms\ContactUS;
-use App\Models\CMS\Marketing\NewsletterUser;
 use App\Models\System\Settings\OS;
 use App\Models\User;
 
diff --git a/tests/Feature/Api/V1/LegalPageTest.php b/tests/Feature/Api/V1/LegalPageTest.php
index 37b5c28..f4588ee 100644
--- a/tests/Feature/Api/V1/LegalPageTest.php
+++ b/tests/Feature/Api/V1/LegalPageTest.php
@@ -38,7 +38,7 @@ test('legal pages list can be retrieved', function () {
         ]);
 
     $this->assertCount(2, $response->json('data'));
-    
+
     $slugs = collect($response->json('data'))->pluck('slug')->toArray();
     $this->assertContains('terms-of-service', $slugs);
     $this->assertContains('privacy-policy', $slugs);
diff --git a/tests/Feature/Api/V1/LocationTest.php b/tests/Feature/Api/V1/LocationTest.php
index 948c9c6..b847a61 100644
--- a/tests/Feature/Api/V1/LocationTest.php
+++ b/tests/Feature/Api/V1/LocationTest.php
@@ -32,24 +32,24 @@ test('can list provinces', function () {
                     'id',
                     'name',
                     'region',
-                ]
-            ]
+                ],
+            ],
         ]);
-        
+
     $this->assertCount(2, $response->json('data'));
 });
 
 test('can list post branches', function () {
     // Arrange
     $province = Province::create(['name' => ['en' => 'Province 1'], 'region' => Region::AG]);
-    
+
     PostBranch::create([
         'province_id' => $province->id,
         'name' => ['en' => 'Branch 1'],
         'address' => ['en' => 'Address 1'],
         'description' => ['en' => 'Desc 1'],
     ]);
-    
+
     PostBranch::create([
         'province_id' => $province->id,
         'name' => ['en' => 'Branch 2'],
@@ -73,9 +73,9 @@ test('can list post branches', function () {
                     'name',
                     'address',
                     'description',
-                ]
-            ]
+                ],
+            ],
         ]);
-        
+
     $this->assertCount(2, $response->json('data'));
 });
diff --git a/tests/Feature/Api/V1/Order/OrderSettingsTest.php b/tests/Feature/Api/V1/Order/OrderSettingsTest.php
index f7476f8..47ff6fb 100644
--- a/tests/Feature/Api/V1/Order/OrderSettingsTest.php
+++ b/tests/Feature/Api/V1/Order/OrderSettingsTest.php
@@ -42,9 +42,9 @@ test('can list order payment types', function () {
                 '*' => [
                     'id',
                     'name',
-                ]
-            ]
+                ],
+            ],
         ]);
-        
+
     $this->assertCount(2, $response->json('data'));
 });
diff --git a/tests/Feature/Api/V1/OrderTest.php b/tests/Feature/Api/V1/OrderTest.php
index 5de3bce..dfc81c0 100644
--- a/tests/Feature/Api/V1/OrderTest.php
+++ b/tests/Feature/Api/V1/OrderTest.php
@@ -18,20 +18,20 @@ uses(RefreshDatabase::class);
 
 beforeEach(function () {
     Config::set('ecommerce.api.token', 'test-token');
-    
+
     $this->user = User::factory()->create([
         'password' => 'password',
         'phone_number' => 61929248,
     ]);
-    
+
     // Create tmpost channel required by OrderRepository
     if (Channel::where('slug', 'tmpost')->doesntExist()) {
         Channel::create(['slug' => 'tmpost', 'name' => 'TM Post']);
     }
-    
+
     // Mock default payment type for OrderPayment::default()
     if (PaymentType::count() === 0) {
-        $paymentType = new PaymentType();
+        $paymentType = new PaymentType;
         $paymentType->forceFill([
             'id' => 1,
             'code' => 'cash',
@@ -44,7 +44,7 @@ beforeEach(function () {
 });
 
 test('authenticated user can list their orders', function () {
-    $order = new Order();
+    $order = new Order;
     $order->forceFill([
         'user_id' => $this->user->id,
         'number' => 'ORD-123',
@@ -71,8 +71,8 @@ test('authenticated user can list their orders', function () {
                     'id',
                     'number',
                     // Add other fields from OrderIndexResource
-                ]
-            ]
+                ],
+            ],
         ]);
 });
 
@@ -186,7 +186,7 @@ test('order validation fails with invalid data', function () {
 });
 
 test('can show specific order', function () {
-    $order = new Order();
+    $order = new Order;
     $order->forceFill([
         'user_id' => $this->user->id,
         'number' => 'ORD-SHOW',
@@ -214,8 +214,8 @@ test('can show specific order', function () {
 test('can delete order (if allowed)', function () {
     // Note: The controller destroy method is basically empty: return response()->rest();
     // But the route exists. Let's test it returns 200 at least.
-    
-    $order = new Order();
+
+    $order = new Order;
     $order->forceFill([
         'user_id' => $this->user->id,
         'number' => 'ORD-DEL',
@@ -236,7 +236,7 @@ test('can delete order (if allowed)', function () {
         ->deleteJson("/api/v1/orders/{$order->id}");
 
     $response->assertOk();
-    
+
     $this->assertSoftDeleted('orders', [
         'id' => $order->id,
     ]);
diff --git a/tests/Feature/Api/V1/Product/FilterTest.php b/tests/Feature/Api/V1/Product/FilterTest.php
index fdad366..6609f91 100644
--- a/tests/Feature/Api/V1/Product/FilterTest.php
+++ b/tests/Feature/Api/V1/Product/FilterTest.php
@@ -15,7 +15,8 @@ beforeEach(function () {
 
 function createProductForFilterTest(array $attributes = []): Product
 {
-    $name = $attributes['name'] ?? 'Test Product ' . Str::random(5);
+    $name = $attributes['name'] ?? 'Test Product '.Str::random(5);
+
     return Product::create(array_merge([
         'name' => $name,
         'slug' => Str::slug($name),
@@ -28,10 +29,10 @@ function createProductForFilterTest(array $attributes = []): Product
 
 function createCategoryForFilterTest(array $attributes = []): Category
 {
-    $name = $attributes['name'] ?? 'Test Category ' . Str::random(5);
+    $name = $attributes['name'] ?? 'Test Category '.Str::random(5);
     $nameValue = is_array($name) ? $name : ['en' => $name];
     $slug = Str::slug(is_array($name) ? ($name['en'] ?? reset($name)) : $name);
-    
+
     return Category::create(array_merge([
         'name' => $nameValue,
         'slug' => $slug,
@@ -43,7 +44,8 @@ function createCategoryForFilterTest(array $attributes = []): Category
 
 function createBrandForFilterTest(array $attributes = []): Brand
 {
-    $name = $attributes['name'] ?? 'Test Brand ' . Str::random(5);
+    $name = $attributes['name'] ?? 'Test Brand '.Str::random(5);
+
     return Brand::create(array_merge([
         'name' => $name,
         'slug' => Str::slug($name),
@@ -125,7 +127,7 @@ test('can filter products by brand ids', function () {
     // Arrange
     $brand1 = createBrandForFilterTest(['name' => 'Brand 1']);
     $brand2 = createBrandForFilterTest(['name' => 'Brand 2']);
-    
+
     createProductForFilterTest(['name' => 'Product 1', 'brand_id' => $brand1->id]);
     createProductForFilterTest(['name' => 'Product 2', 'brand_id' => $brand2->id]);
     createProductForFilterTest(['name' => 'Product 3']); // No brand
@@ -140,13 +142,13 @@ test('can filter products by brand ids', function () {
     $response->assertOk();
     $this->assertCount(1, $response->json('data'));
     $this->assertEquals('Product 1', $response->json('data.0.name'));
-    
+
     // Test multiple brands
     $responseMulti = $this->withHeaders([
         'Api-Token' => 'test-token',
         'Accept' => 'application/json',
     ])->getJson("/api/v1/products?brands={$brand1->id},{$brand2->id}");
-    
+
     $responseMulti->assertOk();
     $this->assertCount(2, $responseMulti->json('data'));
 });
@@ -155,11 +157,11 @@ test('can filter products by category ids', function () {
     // Arrange
     $category1 = createCategoryForFilterTest(['name' => 'Category 1']);
     $category2 = createCategoryForFilterTest(['name' => 'Category 2']);
-    
+
     $product1 = createProductForFilterTest(['name' => 'Product 1']);
     $product2 = createProductForFilterTest(['name' => 'Product 2']);
     $product3 = createProductForFilterTest(['name' => 'Product 3']);
-    
+
     $category1->products()->attach($product1->id);
     $category2->products()->attach($product2->id);
     // Product 3 has no category
@@ -174,13 +176,13 @@ test('can filter products by category ids', function () {
     $response->assertOk();
     $this->assertCount(1, $response->json('data'));
     $this->assertEquals('Product 1', $response->json('data.0.name'));
-    
+
     // Test multiple categories
     $responseMulti = $this->withHeaders([
         'Api-Token' => 'test-token',
         'Accept' => 'application/json',
     ])->getJson("/api/v1/products?categories={$category1->id},{$category2->id}");
-    
+
     $responseMulti->assertOk();
     $this->assertCount(2, $responseMulti->json('data'));
 });
diff --git a/tests/Feature/Api/V1/Product/ReviewTest.php b/tests/Feature/Api/V1/Product/ReviewTest.php
index 1e13ca5..6f8c23d 100644
--- a/tests/Feature/Api/V1/Product/ReviewTest.php
+++ b/tests/Feature/Api/V1/Product/ReviewTest.php
@@ -16,7 +16,8 @@ beforeEach(function () {
 
 function createProductForReview(array $attributes = []): Product
 {
-    $name = $attributes['name'] ?? 'Test Product ' . Str::random(5);
+    $name = $attributes['name'] ?? 'Test Product '.Str::random(5);
+
     return Product::create(array_merge([
         'name' => $name,
         'slug' => Str::slug($name),
@@ -31,7 +32,7 @@ test('can list product reviews', function () {
     // Arrange
     $product = createProductForReview();
     $user = User::factory()->create();
-    
+
     $product->reviews()->create([
         'user_id' => $user->id,
         'rating' => 5,
@@ -39,7 +40,7 @@ test('can list product reviews', function () {
         'is_visible' => true,
         'is_recommended' => true,
     ]);
-    
+
     $product->reviews()->create([
         'user_id' => $user->id,
         'rating' => 4,
@@ -62,10 +63,10 @@ test('can list product reviews', function () {
                     'id',
                     'rating',
                     'content',
-                ]
-            ]
+                ],
+            ],
         ]);
-        
+
     $this->assertCount(2, $response->json('data'));
 });
 
@@ -73,14 +74,14 @@ test('does not list invisible reviews', function () {
     // Arrange
     $product = createProductForReview();
     $user = User::factory()->create();
-    
+
     $product->reviews()->create([
         'user_id' => $user->id,
         'rating' => 5,
         'content' => 'Visible',
         'is_visible' => true,
     ]);
-    
+
     $product->reviews()->create([
         'user_id' => $user->id,
         'rating' => 1,
@@ -104,7 +105,7 @@ test('can store a review', function () {
     // Arrange
     $product = createProductForReview();
     $user = User::factory()->create();
-    
+
     // Act
     $response = $this->actingAs($user)
         ->withHeaders([
@@ -120,7 +121,7 @@ test('can store a review', function () {
 
     // Assert
     $response->assertStatus(201); // Created
-    
+
     $this->assertDatabaseHas('reviews', [
         'product_id' => $product->id,
         'user_id' => $user->id,
@@ -134,7 +135,7 @@ test('can store a review', function () {
 test('guest cannot store a review', function () {
     // Arrange
     $product = createProductForReview();
-    
+
     // Act
     $response = $this->withHeaders([
         'Api-Token' => 'test-token',
@@ -152,7 +153,7 @@ test('validates review input', function () {
     // Arrange
     $product = createProductForReview();
     $user = User::factory()->create();
-    
+
     // Act
     $response = $this->actingAs($user)
         ->withHeaders([
diff --git a/tests/Feature/Api/V1/Product/SearchTest.php b/tests/Feature/Api/V1/Product/SearchTest.php
index 230fef5..bf1cdbf 100644
--- a/tests/Feature/Api/V1/Product/SearchTest.php
+++ b/tests/Feature/Api/V1/Product/SearchTest.php
@@ -13,7 +13,8 @@ beforeEach(function () {
 
 function createProductForSearch(array $attributes = []): Product
 {
-    $name = $attributes['name'] ?? 'Test Product ' . Str::random(5);
+    $name = $attributes['name'] ?? 'Test Product '.Str::random(5);
+
     return Product::create(array_merge([
         'name' => $name,
         'slug' => Str::slug($name),
@@ -28,7 +29,7 @@ test('can search product by barcode', function () {
     // Arrange
     $product = createProductForSearch([
         'name' => 'Barcode Product',
-        'barcode' => '1234567890123'
+        'barcode' => '1234567890123',
     ]);
 
     // Act
@@ -44,7 +45,7 @@ test('can search product by barcode', function () {
                 'id' => $product->id,
                 'name' => 'Barcode Product',
                 'stock' => 10,
-            ]
+            ],
         ]);
 });
 
diff --git a/tests/Feature/Api/V1/Product/SortTest.php b/tests/Feature/Api/V1/Product/SortTest.php
index b7f74fb..d1e0072 100644
--- a/tests/Feature/Api/V1/Product/SortTest.php
+++ b/tests/Feature/Api/V1/Product/SortTest.php
@@ -16,7 +16,7 @@ function createProductForSortTest(array $attributes = []): Product
     $createdAt = $attributes['created_at'] ?? null;
     unset($attributes['created_at']);
 
-    $name = $attributes['name'] ?? 'Test Product ' . Str::random(5);
+    $name = $attributes['name'] ?? 'Test Product '.Str::random(5);
     $product = Product::create(array_merge([
         'name' => $name,
         'slug' => Str::slug($name),
diff --git a/tests/Feature/Api/V1/Product/ViewedProductTest.php b/tests/Feature/Api/V1/Product/ViewedProductTest.php
index bd6a35f..a94664a 100644
--- a/tests/Feature/Api/V1/Product/ViewedProductTest.php
+++ b/tests/Feature/Api/V1/Product/ViewedProductTest.php
@@ -1,8 +1,8 @@
 <?php
 
-use App\Models\User;
 use App\Models\Ecommerce\Product\Product\Product;
 use App\Models\Ecommerce\Product\ProductView\ProductView;
+use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Str;
@@ -11,14 +11,15 @@ uses(RefreshDatabase::class);
 
 beforeEach(function () {
     Config::set('ecommerce.api.token', 'test-token');
-    
+
     $this->user = User::factory()->create([
         'password' => 'password',
         'phone_number' => 61929248,
     ]);
 
     $this->createProduct = function (array $attributes = []) {
-        $name = $attributes['name'] ?? 'Test Product ' . Str::random(5);
+        $name = $attributes['name'] ?? 'Test Product '.Str::random(5);
+
         return Product::create(array_merge([
             'name' => $name,
             'slug' => Str::slug($name),
@@ -63,11 +64,11 @@ test('viewing the same product again updates the timestamp', function () {
     $this->actingAs($this->user, 'sanctum')
         ->withHeaders(['Api-Token' => 'test-token'])
         ->getJson("/api/v1/products/{$product->id}");
-    
+
     $firstView = ProductView::where('user_id', $this->user->id)
         ->where('product_id', $product->id)
         ->first();
-    
+
     // Travel into the future
     $this->travel(1)->hour();
 
@@ -111,10 +112,10 @@ test('authenticated user can list viewed products', function () {
                     'name',
                     'slug',
                     'price_amount',
-                ]
-            ]
+                ],
+            ],
         ]);
-    
+
     $this->assertCount(2, $response->json('data'));
 });
 
@@ -130,7 +131,7 @@ test('viewed products are sorted by most recently viewed', function () {
     $this->actingAs($this->user, 'sanctum')
         ->withHeaders(['Api-Token' => 'test-token'])
         ->getJson("/api/v1/products/{$product1->id}");
-    
+
     $this->travel(1)->minute();
 
     // View 2
@@ -157,7 +158,7 @@ test('viewed products are sorted by most recently viewed', function () {
         ->getJson('/api/v1/products/viewed');
 
     $data = $response->json('data');
-    
+
     expect($data[0]['id'])->toBe($product1->id)
         ->and($data[1]['id'])->toBe($product3->id)
         ->and($data[2]['id'])->toBe($product2->id);
diff --git a/tests/Feature/Api/V1/ProductTest.php b/tests/Feature/Api/V1/ProductTest.php
index 9c22158..acc1abf 100644
--- a/tests/Feature/Api/V1/ProductTest.php
+++ b/tests/Feature/Api/V1/ProductTest.php
@@ -14,7 +14,8 @@ beforeEach(function () {
 
 function createProductForTest(array $attributes = []): Product
 {
-    $name = $attributes['name'] ?? 'Test Product ' . Str::random(5);
+    $name = $attributes['name'] ?? 'Test Product '.Str::random(5);
+
     return Product::create(array_merge([
         'name' => $name,
         'slug' => Str::slug($name),
@@ -27,10 +28,10 @@ function createProductForTest(array $attributes = []): Product
 
 function createCategoryForTest(array $attributes = []): Category
 {
-    $name = $attributes['name'] ?? 'Test Category ' . Str::random(5);
+    $name = $attributes['name'] ?? 'Test Category '.Str::random(5);
     $nameValue = is_array($name) ? $name : ['en' => $name];
     $slug = Str::slug(is_array($name) ? ($name['en'] ?? reset($name)) : $name);
-    
+
     return Category::create(array_merge([
         'name' => $nameValue,
         'slug' => $slug,
@@ -61,16 +62,16 @@ test('can list products', function () {
                     'name',
                     'slug',
                     'price_amount',
-                ]
-            ]
+                ],
+            ],
         ]);
-        
+
     $this->assertCount(3, $response->json('data'));
 });
 
 test('can paginate products', function () {
     // Arrange
-    collect(range(1, 10))->each(fn() => createProductForTest());
+    collect(range(1, 10))->each(fn () => createProductForTest());
 
     // Act
     $response = $this->withHeaders([
@@ -150,7 +151,7 @@ test('can show a specific product', function () {
             'data' => [
                 'id' => $product->id,
                 'name' => 'Test Product',
-            ]
+            ],
         ]);
 });
 
@@ -179,18 +180,18 @@ test('returns 404 for invalid product id format', function () {
 test('can list related products', function () {
     // Arrange
     $category = createCategoryForTest();
-    
+
     $mainProduct = createProductForTest(['name' => 'Main Product']);
     $relatedProduct1 = createProductForTest(['name' => 'Related 1']);
     $relatedProduct2 = createProductForTest(['name' => 'Related 2']);
     $unrelatedProduct = createProductForTest(['name' => 'Unrelated']);
-    
+
     // Attach products to category
     // Note: ProductRelatedController looks for products in the same category
     $category->products()->attach([
-        $mainProduct->id, 
-        $relatedProduct1->id, 
-        $relatedProduct2->id
+        $mainProduct->id,
+        $relatedProduct1->id,
+        $relatedProduct2->id,
     ]);
 
     // Act
@@ -206,10 +207,10 @@ test('can list related products', function () {
                 '*' => [
                     'id',
                     'name',
-                ]
-            ]
+                ],
+            ],
         ]);
-        
+
     // Should contain related products but not the main product itself (usually)
     // The query in ProductRelatedController:
     // where('product_id', '=', $product->id) -> This selects categories WHERE the main product is present
@@ -221,10 +222,10 @@ test('can list related products', function () {
     // However, `unique()` is used.
     // If the main product is returned, count would be 3. If excluded, 2.
     // Let's assert that we get some products back.
-    
+
     $data = $response->json('data');
     $this->assertGreaterThanOrEqual(2, count($data));
-    
+
     // Check if unrelated product is NOT in the list
     $ids = collect($data)->pluck('id');
     $this->assertNotContains($unrelatedProduct->id, $ids);
@@ -235,7 +236,7 @@ test('returns empty related products if no shared categories', function () {
     // Arrange
     $mainProduct = createProductForTest(['name' => 'Main Product']);
     $otherProduct = createProductForTest(['name' => 'Other Product']);
-    
+
     // No categories attached
 
     // Act
diff --git a/tests/Feature/Api/V1/ReviewTest.php b/tests/Feature/Api/V1/ReviewTest.php
index ef3ac60..e5ab97d 100644
--- a/tests/Feature/Api/V1/ReviewTest.php
+++ b/tests/Feature/Api/V1/ReviewTest.php
@@ -2,25 +2,24 @@
 
 use App\Models\Ecommerce\Product\Product\Product;
 use App\Models\Ecommerce\Product\Review\Review;
-use App\Models\User;
 use App\Models\System\Settings\OS;
+use App\Models\User;
 use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Support\Facades\Config;
-use Illuminate\Support\Str;
 
 uses(RefreshDatabase::class);
 
 beforeEach(function () {
     Config::set('ecommerce.api.token', 'test-token');
-    
+
     $this->user = User::factory()->create([
         'password' => 'password',
         'phone_number' => 61929248,
     ]);
-    
+
     $this->product = Product::create([
         'name' => 'Test Product',
-        'slug' => 'test-product-' . uniqid(),
+        'slug' => 'test-product-'.uniqid(),
         'price_amount' => 100,
         'stock' => 10,
         'is_visible' => true,
@@ -53,9 +52,9 @@ test('authenticated user can view their reviews', function () {
                     'product' => [
                         'id',
                         'name',
-                    ]
-                ]
-            ]
+                    ],
+                ],
+            ],
         ]);
 });
 
@@ -169,25 +168,25 @@ test('user cannot update another users review', function () {
             'title' => 'Hacked',
             'content' => 'Hacked content',
         ]);
-        
+
     // If the controller doesn't check ownership, this might pass (200), which would be a security bug.
     // If it's secured, it should return 403 or 404.
     // Since we want to "test everything" for the routes, we should assert what happens.
     // If it fails (returns 200), we should probably fix the controller or note it.
     // For now, let's assume standard Laravel policy/security practices.
-    
+
     // NOTE: The current controller implementation shown earlier:
     // public function update(ProductReviewUpdate $request, Review $review): JsonResponse { $review->update(...); ... }
     // It DOES NOT check ownership. This test is expected to FAIL (i.e. return 200 instead of 403) based on the code read.
     // However, I will write the test expecting 403 to highlight the issue if it exists, or 200 if I am wrong about middleware/policies not shown.
-    
+
     // Actually, looking at the code again, there is no `authorizeResource` in the constructor or `authorize` in methods.
     // So this IS a vulnerability. I will comment this test out or adjust expectation if the goal is just to test "these routes" as they are implementation.
     // But usually "test everything" implies testing security too.
-    
+
     // Let's keeping it simple and assume we test the current behavior for now, OR better, I will fix the vulnerability if I can.
     // But per instructions "make sure to test everything", I'll add the test and see.
-    
+
     // I will checking ownership in the test.
     if ($response->status() === 200) {
         $this->markTestSkipped('Security Vulnerability: User can update other users reviews. Controller needs authorization check.');
diff --git a/tests/Pest.php b/tests/Pest.php
index 4ff43dd..3d4d875 100644
--- a/tests/Pest.php
+++ b/tests/Pest.php
@@ -13,7 +13,7 @@
 
 uses(
     Tests\TestCase::class,
-     Illuminate\Foundation\Testing\RefreshDatabase::class,
+    Illuminate\Foundation\Testing\RefreshDatabase::class,
 )->in('Feature');
 
 /*