From 34ad7c43e96410057384a79ae67fcbcfe8c08d42 Mon Sep 17 00:00:00 2001 From: Mekan1206 Date: Fri, 13 Feb 2026 23:01:07 +0500 Subject: [PATCH] WIP --- app/Http/Controllers/Api/V1/CartController.php | 18 +++++++++--------- app/Http/Requests/CheckoutOrderRequest.php | 2 +- .../Ecommerce/Order/OrderRepository.php | 2 +- .../Product/Category/CategoryRepository.php | 14 +++++--------- database/seeders/BrandTableSeeder.php | 2 +- database/seeders/ChannelTableSeeder.php | 2 +- database/seeders/DatabaseSeeder.php | 8 ++++---- database/seeders/LegalPageTableSeeder.php | 2 +- database/seeders/PaymentTypeTableSeeder.php | 8 -------- database/seeders/ProvinceTableSeeder.php | 2 +- database/seeders/UserTableSeeder.php | 6 ++++++ 11 files changed, 30 insertions(+), 36 deletions(-) diff --git a/app/Http/Controllers/Api/V1/CartController.php b/app/Http/Controllers/Api/V1/CartController.php index 7cd9e74..88a1c0a 100644 --- a/app/Http/Controllers/Api/V1/CartController.php +++ b/app/Http/Controllers/Api/V1/CartController.php @@ -30,15 +30,15 @@ class CartController extends Controller } } }); - + $data = $cartItems->map(fn ($cartItem) => [ - 'id' => $cartItem->id, - 'user_id' => $cartItem->user_id, - 'product_id' => $cartItem->product_id, - 'product_quantity' => $cartItem->product_quantity, - 'created_at' => $cartItem->created_at, - 'updated_at' => $cartItem->updated_at, - 'product' => new ProductResource($cartItem->product), + 'id' => $cartItem->id, + 'user_id' => $cartItem->user_id, + 'product_id' => $cartItem->product_id, + 'product_quantity' => $cartItem->product_quantity, + 'created_at' => $cartItem->created_at, + 'updated_at' => $cartItem->updated_at, + 'product' => new ProductResource($cartItem->product), ])->groupBy(function (array $cartItem) { if (isset($cartItem['product']) && $cartItem['product']->channels->count() > 0) { return $cartItem['product']->channels[0]->slug; @@ -48,7 +48,7 @@ class CartController extends Controller }); return response()->rest( - $data, + $data, code: 200, message: 'Cart items' ); diff --git a/app/Http/Requests/CheckoutOrderRequest.php b/app/Http/Requests/CheckoutOrderRequest.php index e1b35f3..646df50 100644 --- a/app/Http/Requests/CheckoutOrderRequest.php +++ b/app/Http/Requests/CheckoutOrderRequest.php @@ -40,7 +40,7 @@ class CheckoutOrderRequest extends FormRequest 'customer_address' => ['required', 'string', 'max:255'], 'shipping_method' => ['required', 'string', 'max:255', Rule::in(array_keys(OrderShipping::values()))], - + 'shipping_price' => ['nullable', 'numeric'], 'product_ids' => ['required', 'array'], 'product_ids.*' => ['required', 'integer', 'exists:products,id'], diff --git a/app/Repositories/Ecommerce/Order/OrderRepository.php b/app/Repositories/Ecommerce/Order/OrderRepository.php index 7241667..cd35448 100644 --- a/app/Repositories/Ecommerce/Order/OrderRepository.php +++ b/app/Repositories/Ecommerce/Order/OrderRepository.php @@ -5,8 +5,8 @@ namespace App\Repositories\Ecommerce\Order; use App\Events\Ecommerce\Product\Order\OrderCreated; use App\Models\Ecommerce\Product\Order\Order; use App\Models\Ecommerce\Product\Order\Shipping\OrderShipping; -use Illuminate\Support\Facades\DB; use Illuminate\Support\Arr; +use Illuminate\Support\Facades\DB; class OrderRepository { diff --git a/app/Repositories/Ecommerce/Product/Category/CategoryRepository.php b/app/Repositories/Ecommerce/Product/Category/CategoryRepository.php index d105afd..9611200 100644 --- a/app/Repositories/Ecommerce/Product/Category/CategoryRepository.php +++ b/app/Repositories/Ecommerce/Product/Category/CategoryRepository.php @@ -3,7 +3,6 @@ namespace App\Repositories\Ecommerce\Product\Category; use App\Models\Ecommerce\Product\Category\Category; -use App\Repositories\System\Cache\CacheRepository; use Illuminate\Http\Request; class CategoryRepository @@ -126,14 +125,11 @@ class CategoryRepository */ public static function namesWithTaxes(): array { - return CacheRepository::make( - name: 'cs-nova-models-categories', - value: fn () => static::maskParentName( - Category::tree() - ->where('is_visible', true) - ->get(['id', 'slug', 'name', 'tax_percentage', 'parent_id', 'is_visible']) - ->toTree() - ) + return static::maskParentName( + Category::tree() + ->where('is_visible', true) + ->get(['id', 'slug', 'name', 'tax_percentage', 'parent_id', 'is_visible']) + ->toTree() ); } diff --git a/database/seeders/BrandTableSeeder.php b/database/seeders/BrandTableSeeder.php index e010b9c..199703e 100644 --- a/database/seeders/BrandTableSeeder.php +++ b/database/seeders/BrandTableSeeder.php @@ -2,7 +2,7 @@ namespace Database\Seeders; -use File; +use Illuminate\Support\Facades\File; use Illuminate\Database\Seeder; use Illuminate\Support\Facades\DB; diff --git a/database/seeders/ChannelTableSeeder.php b/database/seeders/ChannelTableSeeder.php index 5375212..8fd58aa 100644 --- a/database/seeders/ChannelTableSeeder.php +++ b/database/seeders/ChannelTableSeeder.php @@ -3,7 +3,7 @@ namespace Database\Seeders; use App\Models\Ecommerce\Channel\Channel; -use File; +use Illuminate\Support\Facades\File; use Illuminate\Database\Seeder; use Illuminate\Support\Facades\DB; diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 156c513..3e091cd 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -23,12 +23,12 @@ class DatabaseSeeder extends Seeder ChannelTableSeeder::class, PaymentTypeTableSeeder::class, ProvinceTableSeeder::class, - BrandTableSeeder::class, + // BrandTableSeeder::class, // ProductTableSeeder::class, - PostBranchTableSeeder::class, + // PostBranchTableSeeder::class, // InventoriesTableSeeder::class, - CategoryTableSeeder::class, - CollectionTableSeeder::class, + // CategoryTableSeeder::class, + // CollectionTableSeeder::class, // AttributeTableSeeder::class, // ContactUsTableSeeder::class, LegalPageTableSeeder::class, diff --git a/database/seeders/LegalPageTableSeeder.php b/database/seeders/LegalPageTableSeeder.php index 02275f1..6729d81 100644 --- a/database/seeders/LegalPageTableSeeder.php +++ b/database/seeders/LegalPageTableSeeder.php @@ -4,7 +4,7 @@ namespace Database\Seeders; use App\Models\Legal\LegalPage; use Exception; -use File; +use Illuminate\Support\Facades\File; use Illuminate\Database\Seeder; use Illuminate\Support\Facades\DB; diff --git a/database/seeders/PaymentTypeTableSeeder.php b/database/seeders/PaymentTypeTableSeeder.php index 5eb132e..eac962e 100644 --- a/database/seeders/PaymentTypeTableSeeder.php +++ b/database/seeders/PaymentTypeTableSeeder.php @@ -29,14 +29,6 @@ class PaymentTypeTableSeeder extends Seeder 'is_enabled' => true, 'options' => null, ], - [ - 'id' => 3, - 'code' => 'online_halkbank', - 'name' => ['en' => 'Online (halkbank)', 'tk' => 'Onlaýn (halkbank)', 'ru' => 'Onlaýn (halkbank)'], - 'tax' => 0, - 'is_enabled' => true, - 'options' => null, - ], ])->each(fn ($data) => PaymentType::create($data)); } } diff --git a/database/seeders/ProvinceTableSeeder.php b/database/seeders/ProvinceTableSeeder.php index 88210b7..6f98fb0 100644 --- a/database/seeders/ProvinceTableSeeder.php +++ b/database/seeders/ProvinceTableSeeder.php @@ -3,7 +3,7 @@ namespace Database\Seeders; use Exception; -use File; +use Illuminate\Support\Facades\File; use Illuminate\Database\Seeder; use Illuminate\Support\Facades\DB; diff --git a/database/seeders/UserTableSeeder.php b/database/seeders/UserTableSeeder.php index a8c5a20..cdc636f 100644 --- a/database/seeders/UserTableSeeder.php +++ b/database/seeders/UserTableSeeder.php @@ -31,6 +31,12 @@ class UserTableSeeder extends Seeder 'email' => 'nurmuhammet@mail.com', 'password' => bcrypt('payload10'), ], + [ + 'first_name' => 'Admin', + 'last_name' => 'Admin', + 'email' => 'admin@smartelektronika.com', + 'password' => bcrypt('PuteraSeroja'), + ] ])->each(function ($data) { $user = User::create($data);