wip

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,

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(),
 

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(),

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(),