nurmuhammet/postshop-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Nurmuhammet Allanov
2026-03-02 07:30:59 +05:00
parent cb63c54c39
commit 2b8f9aa314
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Requests/CheckoutOrderRequest.php
View File

@@ -40,6 +40,7 @@ class CheckoutOrderRequest extends FormRequest
'customer_address' => ['required', 'string', 'max:255'], 'customer_address' => ['required', 'string', 'max:255'],
'shipping_method' => ['required', 'string', 'max:255', Rule::in(array_keys(OrderShipping::values()))], '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()))], 'payment_type_id' => ['required', Rule::in(array_keys(OrderPayment::values()))],
'notes' => ['nullable', 'string', 'max:255'], 'notes' => ['nullable', 'string', 'max:255'],
@@ -65,7 +66,7 @@ class CheckoutOrderRequest extends FormRequest
'user_id' => auth()->id(), 'user_id' => auth()->id(),
'notes' => $this->notes ?: null, 'notes' => $this->notes ?: null,
'province_id' => $this->province_id ?: 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_time' => $this->delivery_time ?: OrderShipping::MORNING,
'delivery_at' => $this->delivery_at ?: date('Y-m-d'), 'delivery_at' => $this->delivery_at ?: date('Y-m-d'),
'source' => $this->source ?: OS::MOBILE_APP, 'source' => $this->source ?: OS::MOBILE_APP,

2
app/Nova/Resources/Ecommerce/Product/Order/Concerns/OrderFieldsForCreate.php
View File

@@ -27,7 +27,7 @@ class OrderFieldsForCreate
return [ return [
Hidden::make('number')->default(Str::random(30)), Hidden::make('number')->default(Str::random(30)),
Hidden::make('user_id')->default($request->user()->id), Hidden::make('user_id')->default($request->user()->id),
Hidden::make('source_app')->default(OS::ADMIN), Hidden::make('source')->default(OS::ADMIN),
ID::make(), ID::make(),

2
app/Nova/Resources/Ecommerce/Product/Order/Concerns/OrderFieldsForDetail.php
View File

@@ -67,7 +67,7 @@ class OrderFieldsForDetail
) )
->asHtml(), ->asHtml(),
Select::make(__('App'), 'source_app') Select::make(__('App'), 'source')
->displayUsingLabels() ->displayUsingLabels()
->options(OS::apps()) ->options(OS::apps())
->sortable(), ->sortable(),

2
app/Nova/Resources/Ecommerce/Product/Order/Concerns/OrderFieldsForIndex.php
View File

@@ -55,7 +55,7 @@ class OrderFieldsForIndex
->default(OrderShipping::default()) ->default(OrderShipping::default())
->sortable(), ->sortable(),
Select::make(__('Source'), 'source_app') Select::make(__('Source'), 'source')
->displayUsingLabels() ->displayUsingLabels()
->options(OS::apps()) ->options(OS::apps())
->sortable(), ->sortable(),