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

good

Browse Source
This commit is contained in:
Mekan1206
2026-04-29 22:40:09 +05:00
parent dd633ef7da
commit bc2770c24d
7 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Api/V1/Entrepreneur/resources/Order/OrderIndexResource.php
View File

@@ -19,7 +19,7 @@ class OrderIndexResource extends JsonResource
return [ return [
'id' => $this->id, 'id' => $this->id,
'status' => OrderStatus::formattedStatusFor($this->status), 'status' => OrderStatus::formattedStatusFor($this->status),
'shipping_method' => OrderShipping::formattedShippingMethod($this->shipping_method), 'shipping_method' => $this->formattedShippingMethod(),
'notes' => $this->notes, 'notes' => $this->notes,
'delivery_time' => $this->delivery_time, 'delivery_time' => $this->delivery_time,
'delivery_at' => $this->delivery_at, 'delivery_at' => $this->delivery_at,

2
app/Http/Controllers/Api/V1/Entrepreneur/resources/Order/OrderShowResource.php
View File

@@ -19,7 +19,7 @@ class OrderShowResource extends JsonResource
return [ return [
'id' => $this->id, 'id' => $this->id,
'status' => OrderStatus::formattedStatusFor($this->status), 'status' => OrderStatus::formattedStatusFor($this->status),
'shipping_method' => OrderShipping::formattedShippingMethod($this->shipping_method), 'shipping_method' => $this->formattedShippingMethod(),
'notes' => $this->notes, 'notes' => $this->notes,
'delivery_time' => $this->delivery_time, 'delivery_time' => $this->delivery_time,
'delivery_at' => $this->delivery_at, 'delivery_at' => $this->delivery_at,

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

@@ -9,10 +9,26 @@ use App\Models\System\Settings\Location\Region;
use App\Models\System\Settings\OS; use App\Models\System\Settings\OS;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Str; use Illuminate\Support\Str;
use App\Models\Ecommerce\Product\Order\Shipping\OrderShippingMethod;
use Illuminate\Validation\Rule; use Illuminate\Validation\Rule;
class CheckoutOrderRequest extends FormRequest class CheckoutOrderRequest extends FormRequest
{ {
/**
* Prepare the data for validation.
*/
protected function prepareForValidation(): void
{
if (! $this->has('shipping_method_id') && $this->has('shipping_method')) {
$method = OrderShippingMethod::query()->where('slug', $this->shipping_method)->first();
if ($method) {
$this->merge([
'shipping_method_id' => $method->id,
]);
}
}
}
/** /**
* Configure the validator instance. * Configure the validator instance.
* *
@@ -39,7 +55,8 @@ class CheckoutOrderRequest extends FormRequest
'customer_phone' => ['required', 'integer', 'between:61000000,71999999'], 'customer_phone' => ['required', 'integer', 'between:61000000,71999999'],
'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_id' => ['required', 'integer', 'exists:order_shipping_methods,id'],
'shipping_method' => ['nullable', 'string', 'max:255', Rule::in(array_keys(OrderShipping::values()))],
'shipping_price' => ['nullable', 'numeric'], 'shipping_price' => ['nullable', 'numeric'],
'product_ids' => ['required', 'array'], 'product_ids' => ['required', 'array'],
@@ -67,13 +84,16 @@ class CheckoutOrderRequest extends FormRequest
*/ */
protected function passedValidation(): void protected function passedValidation(): void
{ {
$shippingMethod = OrderShippingMethod::query()->find($this->shipping_method_id);
$this->merge([ $this->merge([
'number' => Str::random(30), 'number' => Str::random(30),
'status' => OrderStatus::default(), 'status' => OrderStatus::default(),
'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' => $this->shipping_price ?: OrderShipping::priceFor($this->shipping_method), 'shipping_method' => $this->shipping_method ?: $shippingMethod?->slug,
'shipping_price' => $this->shipping_price ?: ($shippingMethod?->price ?? 0),
'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_app' => $this->source ?: OS::MOBILE_APP, 'source_app' => $this->source ?: OS::MOBILE_APP,
@@ -88,9 +108,7 @@ class CheckoutOrderRequest extends FormRequest
public function messages(): array public function messages(): array
{ {
return [ return [
'shipping_method.in' => sprintf('Valid sources: %s', implode(', ', array_keys( 'shipping_method_id.exists' => 'The selected shipping method is invalid.',
OrderShipping::values()
))),
'payment_type_id.in' => sprintf('Valid sources: %s', implode(', ', array_keys( 'payment_type_id.in' => sprintf('Valid sources: %s', implode(', ', array_keys(
OrderPayment::values() OrderPayment::values()
))), ))),

2
app/Http/Resources/Api/V1/Order/OrderIndexResource.php
View File

@@ -19,7 +19,7 @@ class OrderIndexResource extends JsonResource
return [ return [
'id' => $this->id, 'id' => $this->id,
'status' => OrderStatus::formattedStatusFor($this->status), 'status' => OrderStatus::formattedStatusFor($this->status),
'shipping_method' => OrderShipping::formattedShippingMethod($this->shipping_method), 'shipping_method' => $this->formattedShippingMethod(),
'notes' => $this->notes, 'notes' => $this->notes,
'customer_name' => $this->customer_name, 'customer_name' => $this->customer_name,
'customer_phone' => $this->customer_phone, 'customer_phone' => $this->customer_phone,

2
app/Http/Resources/Api/V1/Vendor/Order/VendorOrderIndexResource.php vendored
View File

@@ -19,7 +19,7 @@ class VendorOrderIndexResource extends JsonResource
return [ return [
'id' => $this->id, 'id' => $this->id,
'status' => OrderStatus::formattedStatusFor($this->status), 'status' => OrderStatus::formattedStatusFor($this->status),
'shipping_method' => OrderShipping::formattedShippingMethod($this->shipping_method), 'shipping_method' => $this->formattedShippingMethod(),
'notes' => $this->notes, 'notes' => $this->notes,
'delivery_time' => $this->delivery_time, 'delivery_time' => $this->delivery_time,
'delivery_at' => $this->delivery_at?->format('d.m.Y'), 'delivery_at' => $this->delivery_at?->format('d.m.Y'),

2
app/Http/Resources/Api/V1/Vendor/Order/VendorOrderShowResource.php vendored
View File

@@ -19,7 +19,7 @@ class VendorOrderShowResource extends JsonResource
return [ return [
'id' => $this->id, 'id' => $this->id,
'status' => OrderStatus::formattedStatusFor($this->status), 'status' => OrderStatus::formattedStatusFor($this->status),
'shipping_method' => OrderShipping::formattedShippingMethod($this->shipping_method), 'shipping_method' => $this->formattedShippingMethod(),
'notes' => $this->notes, 'notes' => $this->notes,
'delivery_time' => $this->delivery_time, 'delivery_time' => $this->delivery_time,
'delivery_at' => $this->delivery_at, 'delivery_at' => $this->delivery_at,

4
app/Nova/Resources/Ecommerce/Product/Order/Concerns/OrderFieldsForUpdate.php
View File

@@ -62,6 +62,10 @@ class OrderFieldsForUpdate
Text::make(__('Shipping price'), 'shipping_price') Text::make(__('Shipping price'), 'shipping_price')
->rules('required', 'numeric') ->rules('required', 'numeric')
->dependsOn('shippingMethod', function ($field, $request, $formData) { ->dependsOn('shippingMethod', function ($field, $request, $formData) {
if ($formData->shipping_price) {
return;
}
if ($formData->shippingMethod) { if ($formData->shippingMethod) {
$method = OrderShippingMethodModel::query()->find($formData->shippingMethod); $method = OrderShippingMethodModel::query()->find($formData->shippingMethod);
if ($method) { if ($method) {