From 125d619935d0198c4157b97c0ff65d3cd17c1b03 Mon Sep 17 00:00:00 2001 From: Nurmuhammet Allanov Date: Wed, 10 Dec 2025 13:01:39 +0500 Subject: [PATCH] wip --- app/Http/Requests/CheckoutOrderRequest.php | 3 +- .../Resources/Ecommerce/Channel/Channel.php | 3 ++ ..._add_shipping_price_for_channels_table.php | 28 +++++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 database/migrations/2025_12_10_125807_add_shipping_price_for_channels_table.php diff --git a/app/Http/Requests/CheckoutOrderRequest.php b/app/Http/Requests/CheckoutOrderRequest.php index 13de78d..17f91c3 100644 --- a/app/Http/Requests/CheckoutOrderRequest.php +++ b/app/Http/Requests/CheckoutOrderRequest.php @@ -40,6 +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'], 'payment_type_id' => ['required', Rule::in(array_keys(OrderPayment::values()))], 'notes' => ['nullable', 'string', 'max:255'], @@ -70,7 +71,7 @@ class CheckoutOrderRequest extends FormRequest 'user_id' => auth()->id(), 'notes' => $this->notes ?: null, 'province_id' => $this->province_id ?: null, - 'shipping_price' => OrderShipping::priceFor($this->shipping_method), + 'shipping_price' => $this->shipping_price ?: OrderShipping::priceFor($this->shipping_method), 'delivery_time' => $this->delivery_time ?: OrderShipping::MORNING, 'delivery_at' => $this->delivery_at ?: date('Y-m-d'), 'source_app' => $this->source ?: OS::MOBILE_APP, diff --git a/app/Nova/Resources/Ecommerce/Channel/Channel.php b/app/Nova/Resources/Ecommerce/Channel/Channel.php index b61a5b0..667ceb3 100644 --- a/app/Nova/Resources/Ecommerce/Channel/Channel.php +++ b/app/Nova/Resources/Ecommerce/Channel/Channel.php @@ -100,6 +100,9 @@ class Channel extends Resource Text::make(__('Description'), 'description') ->rules(['nullable', 'string', 'max:255']), + Text::make('Daswtawka bahasy', 'shipping_price') + ->rules('nullable', 'numeric'), + URL::make('URL'), Hidden::make('is_default')->default(true), Hidden::make('timezone')->default('Asia/Ashgabat'), diff --git a/database/migrations/2025_12_10_125807_add_shipping_price_for_channels_table.php b/database/migrations/2025_12_10_125807_add_shipping_price_for_channels_table.php new file mode 100644 index 0000000..f64488c --- /dev/null +++ b/database/migrations/2025_12_10_125807_add_shipping_price_for_channels_table.php @@ -0,0 +1,28 @@ +string('shipping_price'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('channels', function (Blueprint $table) { + $table->dropColumn('shipping_price'); + }); + } +};