From 15c8ffe1dbf5bacffecbae9fd56f2d5d8df33cbc Mon Sep 17 00:00:00 2001 From: soufiane Date: Tue, 20 Jun 2023 11:23:44 +0200 Subject: [PATCH] wip #5788 @0:30 --- .../Admin/SelectionCrudController.php | 4 +-- app/Http/Controllers/AjaxController.php | 30 +++++++++---------- .../Controllers/Client/ClientController.php | 22 ++++++++++++++ app/Models/{Panier.php => Cart.php} | 10 +++---- ...ndPanierSchema.php => ECommerceCommon.php} | 2 +- app/Models/Order.php | 2 +- app/Templates/PaniersEnregistres.php | 4 +-- .../views/partials/nav-account.blade.php | 2 +- .../vendor/notifications/email.blade.php | 4 +-- 9 files changed, 51 insertions(+), 29 deletions(-) create mode 100644 app/Http/Controllers/Client/ClientController.php rename app/Models/{Panier.php => Cart.php} (88%) rename app/Models/{CommandPanierSchema.php => ECommerceCommon.php} (98%) diff --git a/app/Http/Controllers/Admin/SelectionCrudController.php b/app/Http/Controllers/Admin/SelectionCrudController.php index 12b23ca..6ba5621 100644 --- a/app/Http/Controllers/Admin/SelectionCrudController.php +++ b/app/Http/Controllers/Admin/SelectionCrudController.php @@ -4,9 +4,9 @@ namespace App\Http\Controllers\Admin; class SelectionCrudController extends \Cubist\Backpack\app\Magic\Controllers\CubistMagicController { - protected $_modelNamespace = 'App\Models\Panier'; + protected $_modelNamespace = 'App\Models\Cart'; protected $_routeURL = 'selection'; - protected $_singular = 'Panier'; + protected $_singular = 'Cart'; protected $_plural = 'PaniersEnregistres'; protected $_clonable = true; protected $_bulk = true; diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php index 510aa02..4bcc69f 100644 --- a/app/Http/Controllers/AjaxController.php +++ b/app/Http/Controllers/AjaxController.php @@ -3,7 +3,7 @@ namespace App\Http\Controllers; use App\Models\Order; -use App\Models\Panier; +use App\Models\Cart; use Cubist\Backpack\Facades\App; use App\Models\Page; use App\Models\Product; @@ -598,31 +598,31 @@ class AjaxController extends CubistFrontController $lastCartId = $request->session()->get('last_selection'); // - $lastCartRefs = $lastCartId ? Panier::find($lastCartId)->getReferences() : []; - $currentCartRef = Panier::getRefs($data['products']); + $lastCartRefs = $lastCartId ? Cart::find($lastCartId)->getReferences() : []; + $currentCartRef = Cart::getRefs($data['products']); $intersect = $lastCartRefs ? array_intersect($currentCartRef,$lastCartRefs) : []; $data['products'] = json_encode($data['products']); $ids = Product::getProductIds($data); $productsInfosBase = Product::getProductsByIds($ids); - $currentCartRef = Panier::getRefs(json_decode($data['products'],true)); + $currentCartRef = Cart::getRefs(json_decode($data['products'],true)); $data['products'] = json_decode($data['products'], true); /** * */ - $data = Panier::fillData($currentCartRef, $data, $productsInfosBase,false); + $data = Cart::fillData($currentCartRef, $data, $productsInfosBase,false); if(sizeof($lastCartRefs) !== sizeof($intersect) || (sizeof($lastCartRefs) === sizeof($intersect) && sizeof($currentCartRef) != sizeof($lastCartRefs)) ) { - $panier = Panier::firstOrCreate($data); + $panier = Cart::firstOrCreate($data); $panier->save(); // Save back to the session with the latest cart id $id = $panier->getOriginal('id'); $request->session()->put('last_selection', $id); } else { - Panier::where('id', $lastCartId)->update($data); + Cart::where('id', $lastCartId)->update($data); } return __('Le panier a été enregistré avec succès !'); @@ -634,7 +634,7 @@ class AjaxController extends CubistFrontController ]); $id = $request->input('id'); - $cart = Panier::find($id); + $cart = Cart::find($id); $cart->delete(); } @@ -647,7 +647,7 @@ class AjaxController extends CubistFrontController $id = $request->input('id'); $newName = $request->input('text'); - $cart = Panier::find($id); + $cart = Cart::find($id); $cart->name = $newName; $cart->save(); } @@ -659,16 +659,16 @@ class AjaxController extends CubistFrontController $cartId = $request->input('id'); - $cart = Panier::find($cartId)->toArray(); + $cart = Cart::find($cartId)->toArray(); $ids = Product::getProductIds($cart); $productsInfosBase = Product::getProductsByIds($ids); $clientIdInRequest = intval($cart['user_id']); $clientId = Client::getClientConnected()->id; - $currentCartRef = Panier::getRefs(json_decode($cart['products'],true)); + $currentCartRef = Cart::getRefs(json_decode($cart['products'],true)); $cart['products'] = json_decode($cart['products'], true); - $data = Panier::updateCartData($currentCartRef,$cart,$productsInfosBase); + $data = Cart::updateCartData($currentCartRef,$cart,$productsInfosBase); if($clientIdInRequest === $clientId) { $cartData = $data['products']; @@ -698,7 +698,7 @@ class AjaxController extends CubistFrontController $data['products'] = json_decode($data['products'], true); $productsInfosBase = Product::getProductsByIds($ids); - $currentCartRef = Panier::getRefs($data['products']); + $currentCartRef = Cart::getRefs($data['products']); $data = Order::fillData($currentCartRef,$data,$productsInfosBase); @@ -721,9 +721,9 @@ class AjaxController extends CubistFrontController $data['products'] = json_encode($cart); $ids = Product::getProductIds($data); $productsInfosBase = Product::getProductsByIds($ids); - $currentCartRef = Panier::getRefs(json_decode($data['products'],true)); + $currentCartRef = Cart::getRefs(json_decode($data['products'],true)); $data['products'] = json_decode($data['products'], true); - $data = Panier::fillData($currentCartRef, $data, $productsInfosBase,false); + $data = Cart::fillData($currentCartRef, $data, $productsInfosBase,false); $update = json_decode($data['products'],true); $request->session()->forget('cart_items'); diff --git a/app/Http/Controllers/Client/ClientController.php b/app/Http/Controllers/Client/ClientController.php new file mode 100644 index 0000000..905be08 --- /dev/null +++ b/app/Http/Controllers/Client/ClientController.php @@ -0,0 +1,22 @@ +logout(); + $request->session()->invalidate(); + $request->session()->regenerateToken(); + return redirect('/se-connecter'); + } +} diff --git a/app/Models/Panier.php b/app/Models/Cart.php similarity index 88% rename from app/Models/Panier.php rename to app/Models/Cart.php index abe060e..0e5fc37 100644 --- a/app/Models/Panier.php +++ b/app/Models/Cart.php @@ -2,13 +2,13 @@ namespace App\Models; -class Panier extends CommandPanierSchema +class Cart extends ECommerceCommon { - protected $table = 'selection'; + protected $table = 'cart'; - protected $_options = ['name' => 'selection', - 'singular' => 'Panier', - 'plural' => 'PaniersEnregistres']; + protected $_options = ['name' => 'cart', + 'singular' => 'Cart', + 'plural' => 'Carts']; public function setFields() { diff --git a/app/Models/CommandPanierSchema.php b/app/Models/ECommerceCommon.php similarity index 98% rename from app/Models/CommandPanierSchema.php rename to app/Models/ECommerceCommon.php index e9455a4..a3c5fb8 100644 --- a/app/Models/CommandPanierSchema.php +++ b/app/Models/ECommerceCommon.php @@ -4,7 +4,7 @@ namespace App\Models; use Cubist\Backpack\app\Magic\Models\CubistMagicAbstractModel; -class CommandPanierSchema extends CubistMagicAbstractModel +class ECommerceCommon extends CubistMagicAbstractModel { protected $fields = [ [ diff --git a/app/Models/Order.php b/app/Models/Order.php index 7f9afb2..e13d09f 100644 --- a/app/Models/Order.php +++ b/app/Models/Order.php @@ -1,7 +1,7 @@
  • - {{ __('Panier enregistrés') }} + {{ __('Paniers enregistrés') }}
  • diff --git a/resources/views/vendor/notifications/email.blade.php b/resources/views/vendor/notifications/email.blade.php index 05be6cd..01671da 100644 --- a/resources/views/vendor/notifications/email.blade.php +++ b/resources/views/vendor/notifications/email.blade.php @@ -53,8 +53,8 @@ @slot('subcopy') @lang( - ":text1 \":actionText\" :text2". - ':text3 [:actionURL](:actionURL)', + ":text1 \":actionText\" :text2 ". + ":text3 [:actionURL](:actionURL)", [ 'text1' => trans('mail.footer_part1'), 'text2' => trans('mail.footer_part2'), -- 2.39.5