diff --git a/app/Http/Controllers/Club/ShopController.php b/app/Http/Controllers/Club/ShopController.php index 642c0636..b7f392ab 100644 --- a/app/Http/Controllers/Club/ShopController.php +++ b/app/Http/Controllers/Club/ShopController.php @@ -67,7 +67,6 @@ class ShopController extends Controller try { $order = new Order(); $order->ref = str_replace('-', '', $request->ref); - $order->civility = ContactFormCivility::make(intval($request->coords['civility'])); $order->payementType = OrderType::make(intval($request->payementMethod)); $order->status = OrderStatus::waiting; $order->customer_id = $customerModel->getKey(); diff --git a/app/Http/Requests/Club/Shop/ShopBuyRequest.php b/app/Http/Requests/Club/Shop/ShopBuyRequest.php index 2b7b2f21..6432bd2c 100644 --- a/app/Http/Requests/Club/Shop/ShopBuyRequest.php +++ b/app/Http/Requests/Club/Shop/ShopBuyRequest.php @@ -29,7 +29,6 @@ class ShopBuyRequest extends FormRequest return [ 'ref' => 'required|string|uuid|unique:orders,ref', 'coords' => 'required|array', - 'coords.civility' => ['required', new Enum(ContactFormCivility::class)], 'coords.firstname' => 'required|string|between:3,255', 'coords.lastname' => 'required|string|between:3,255', 'coords.address' => 'required|string|between:3,255', @@ -38,7 +37,6 @@ class ShopBuyRequest extends FormRequest 'coords.phone' => 'nullable|phone:FR|max:255', 'coords.email' => 'required|email:rfc,strict,dns,spoof,filter', 'shipping' => 'sometimes|array', - 'shipping.civility' => ['required_with:shipping', new Enum(ContactFormCivility::class)], 'shipping.firstname' => 'required_with:shipping|string|between:3,255', 'shipping.lastname' => 'required_with:shipping|string|between:3,255', 'shipping.address' => 'required_with:shipping|string|between:3,255', @@ -62,7 +60,6 @@ class ShopBuyRequest extends FormRequest { return [ 'coords' => trans('vos coordonnées'), - 'coords.civility' => trans('civilité dans vos coordonnées'), 'coords.firstname' => trans('prénom dans vos coordonnées'), 'coords.lastname' => trans('nom dans vos coordonnées'), 'coords.address' => trans('adresse dans vos coordonnées'), @@ -71,7 +68,6 @@ class ShopBuyRequest extends FormRequest 'coords.city' => trans('ville dans vos coordonnées'), 'coords.email' => trans('e-mail dans vos coordonnées'), 'shipping' => trans('votre adresse de livraison'), - 'shipping.civility' => trans('civilité dans votre adresse de livraison'), 'shipping.firstname' => trans('prénom dans votre adresse de livraison'), 'shipping.lastname' => trans('nom dans votre adresse de livraison'), 'shipping.address' => trans('adresse dans votre adresse de livraison'), diff --git a/app/Models/Order.php b/app/Models/Order.php index 35be826c..765a7179 100644 --- a/app/Models/Order.php +++ b/app/Models/Order.php @@ -67,7 +67,6 @@ class Order extends Model { return [ 'ref' => $this->ref, - 'civility' => $this->civility->value(), 'lastname' => $this->lastname, 'firstname' => $this->firstname, 'address' => $this->address, diff --git a/resources/ts/club/components/club/shop/RecapComponent.vue b/resources/ts/club/components/club/shop/RecapComponent.vue index 43e6ec0e..8acaeb8c 100644 --- a/resources/ts/club/components/club/shop/RecapComponent.vue +++ b/resources/ts/club/components/club/shop/RecapComponent.vue @@ -12,63 +12,35 @@