From 2b8f9aa31479a6a63dd0a14b0b1efc1146b288e0 Mon Sep 17 00:00:00 2001 From: Nurmuhammet Allanov Date: Mon, 2 Mar 2026 07:30:59 +0500 Subject: [PATCH] wip --- app/Http/Requests/CheckoutOrderRequest.php | 3 ++- .../Ecommerce/Product/Order/Concerns/OrderFieldsForCreate.php | 2 +- .../Ecommerce/Product/Order/Concerns/OrderFieldsForDetail.php | 2 +- .../Ecommerce/Product/Order/Concerns/OrderFieldsForIndex.php | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Http/Requests/CheckoutOrderRequest.php b/app/Http/Requests/CheckoutOrderRequest.php index f2c5ff3..514e646 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'], @@ -65,7 +66,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' => $this->source ?: OS::MOBILE_APP, diff --git a/app/Nova/Resources/Ecommerce/Product/Order/Concerns/OrderFieldsForCreate.php b/app/Nova/Resources/Ecommerce/Product/Order/Concerns/OrderFieldsForCreate.php index c88ea5e..13ba8f8 100644 --- a/app/Nova/Resources/Ecommerce/Product/Order/Concerns/OrderFieldsForCreate.php +++ b/app/Nova/Resources/Ecommerce/Product/Order/Concerns/OrderFieldsForCreate.php @@ -27,7 +27,7 @@ class OrderFieldsForCreate return [ Hidden::make('number')->default(Str::random(30)), Hidden::make('user_id')->default($request->user()->id), - Hidden::make('source_app')->default(OS::ADMIN), + Hidden::make('source')->default(OS::ADMIN), ID::make(), diff --git a/app/Nova/Resources/Ecommerce/Product/Order/Concerns/OrderFieldsForDetail.php b/app/Nova/Resources/Ecommerce/Product/Order/Concerns/OrderFieldsForDetail.php index 5878f04..47d9cc0 100644 --- a/app/Nova/Resources/Ecommerce/Product/Order/Concerns/OrderFieldsForDetail.php +++ b/app/Nova/Resources/Ecommerce/Product/Order/Concerns/OrderFieldsForDetail.php @@ -67,7 +67,7 @@ class OrderFieldsForDetail ) ->asHtml(), - Select::make(__('App'), 'source_app') + Select::make(__('App'), 'source') ->displayUsingLabels() ->options(OS::apps()) ->sortable(), diff --git a/app/Nova/Resources/Ecommerce/Product/Order/Concerns/OrderFieldsForIndex.php b/app/Nova/Resources/Ecommerce/Product/Order/Concerns/OrderFieldsForIndex.php index 8dc578e..7e10d8a 100644 --- a/app/Nova/Resources/Ecommerce/Product/Order/Concerns/OrderFieldsForIndex.php +++ b/app/Nova/Resources/Ecommerce/Product/Order/Concerns/OrderFieldsForIndex.php @@ -55,7 +55,7 @@ class OrderFieldsForIndex ->default(OrderShipping::default()) ->sortable(), - Select::make(__('Source'), 'source_app') + Select::make(__('Source'), 'source') ->displayUsingLabels() ->options(OS::apps()) ->sortable(),