From 5f215cef816a7c9aa666968a5bd01ac1392dac79 Mon Sep 17 00:00:00 2001 From: Ludovic CANDELLIER Date: Wed, 13 Sep 2023 22:53:37 +0200 Subject: [PATCH] coding style --- .../Admin/Shop/TariffUnitiesDataTable.php | 2 +- app/Datatables/ParentDataTable.php | 4 +-- .../Shop/CustomerOrdersDataTable.php | 1 - .../Controllers/Admin/Core/Controller.php | 1 + app/Http/Controllers/Admin/HomeController.php | 1 + .../Admin/Shop/DeliveryPackageController.php | 1 - .../DeliveryTypeCalculationController.php | 2 +- .../Admin/Shop/DeliveryTypeController.php | 1 - .../Admin/Shop/OrderController.php | 2 +- .../Controllers/Shop/ArticleController.php | 1 + .../Shop/Auth/RegisterController.php | 1 - .../Controllers/Shop/BasketController.php | 14 +++++++--- .../Controllers/Shop/CategoryController.php | 9 +++---- .../Controllers/Shop/CustomerController.php | 3 +-- app/Http/Controllers/Shop/HomeController.php | 9 +++---- .../Controllers/Shop/InvoiceController.php | 9 +++---- app/Http/Controllers/Shop/OfferController.php | 2 -- app/Http/Controllers/Shop/OrderController.php | 12 +++++---- .../Shop/OrderPaymentController.php | 9 ------- .../Controllers/Shop/PayboxController.php | 4 +-- .../Controllers/Shop/SearchController.php | 4 +-- app/Mail/Acheminement.php | 2 ++ app/Menu/Botanic.php | 11 ++++---- app/Menu/Contents.php | 2 +- app/Menu/Customers.php | 2 +- app/Menu/Deliveries.php | 4 +-- app/Menu/Merchandises.php | 2 +- app/Menu/Orders.php | 26 +++++++++---------- app/Menu/Settings.php | 4 +-- app/Menu/Shop.php | 20 +++++++------- app/Models/Botanic/Family.php | 4 +-- app/Models/Botanic/Genre.php | 2 +- app/Models/Botanic/Specie.php | 13 +++++----- app/Models/Botanic/Variety.php | 18 ++++++------- app/Models/Shop/Article.php | 4 +-- app/Models/Shop/ArticleNature.php | 3 +-- app/Models/Shop/Delivery.php | 2 +- app/Models/Shop/DeliveryPackage.php | 2 +- app/Models/Shop/DeliveryType.php | 2 +- app/Models/Shop/DeliveryTypeCalculation.php | 2 +- app/Models/Shop/Merchandise.php | 2 +- app/Repositories/Cities.php | 1 + app/Repositories/Core/Geolocation.php | 1 + app/Repositories/Core/Menu/Item.php | 1 + app/Repositories/Core/Stat.php | 2 ++ app/Repositories/Shop/ArticleNatures.php | 1 + app/Repositories/Shop/DeliveryPackages.php | 2 +- .../Shop/DeliveryTypeCalculations.php | 2 +- app/Repositories/Shop/Invoices.php | 7 ++++- app/Repositories/Shop/OrderMails.php | 4 --- app/User.php | 4 +-- resources/views/Shop/Invoices/mail.blade.php | 7 ++--- 52 files changed, 122 insertions(+), 129 deletions(-) diff --git a/app/Datatables/Admin/Shop/TariffUnitiesDataTable.php b/app/Datatables/Admin/Shop/TariffUnitiesDataTable.php index f508e46d..4bae6c7e 100644 --- a/app/Datatables/Admin/Shop/TariffUnitiesDataTable.php +++ b/app/Datatables/Admin/Shop/TariffUnitiesDataTable.php @@ -2,9 +2,9 @@ namespace App\Datatables\Admin\Shop; -use Yajra\DataTables\Html\Column; use App\Datatables\ParentDataTable as DataTable; use App\Models\Shop\TariffUnity; +use Yajra\DataTables\Html\Column; class TariffUnitiesDataTable extends DataTable { diff --git a/app/Datatables/ParentDataTable.php b/app/Datatables/ParentDataTable.php index fb5a07c2..9d6452c8 100644 --- a/app/Datatables/ParentDataTable.php +++ b/app/Datatables/ParentDataTable.php @@ -215,10 +215,8 @@ class ParentDataTable extends DataTable /** * Get filename for export. - * - * @return string */ - protected function filename() + protected function filename(): string { return self::buildFilename($this->model_name); } diff --git a/app/Datatables/Shop/CustomerOrdersDataTable.php b/app/Datatables/Shop/CustomerOrdersDataTable.php index 43c8ec17..b51c713e 100644 --- a/app/Datatables/Shop/CustomerOrdersDataTable.php +++ b/app/Datatables/Shop/CustomerOrdersDataTable.php @@ -23,7 +23,6 @@ class CustomerOrdersDataTable extends DataTable $this->url = route('Shop.Orders.index'); } - public function query(Order $model) { $customerId = Auth::id(); diff --git a/app/Http/Controllers/Admin/Core/Controller.php b/app/Http/Controllers/Admin/Core/Controller.php index 42ff91c3..07263731 100644 --- a/app/Http/Controllers/Admin/Core/Controller.php +++ b/app/Http/Controllers/Admin/Core/Controller.php @@ -1,4 +1,5 @@ input('start'); $end = $request->input('end'); $data = Dashboards::getStats($start, $end); + // dump($data); return view('Admin.Shop.Dashboard.index', $data); } diff --git a/app/Http/Controllers/Admin/Shop/DeliveryPackageController.php b/app/Http/Controllers/Admin/Shop/DeliveryPackageController.php index ee00ad2a..23384b9d 100644 --- a/app/Http/Controllers/Admin/Shop/DeliveryPackageController.php +++ b/app/Http/Controllers/Admin/Shop/DeliveryPackageController.php @@ -4,7 +4,6 @@ namespace App\Http\Controllers\Admin\Shop; use App\Datatables\Admin\Shop\DeliveryPackagesDataTable; use App\Repositories\Shop\DeliveryPackages; -use App\Repositories\Shop\SaleChannels; use Illuminate\Http\Request; class DeliveryPackageController extends Controller diff --git a/app/Http/Controllers/Admin/Shop/DeliveryTypeCalculationController.php b/app/Http/Controllers/Admin/Shop/DeliveryTypeCalculationController.php index 80dcff22..1e301d4e 100644 --- a/app/Http/Controllers/Admin/Shop/DeliveryTypeCalculationController.php +++ b/app/Http/Controllers/Admin/Shop/DeliveryTypeCalculationController.php @@ -36,7 +36,7 @@ class DeliveryTypeCalculationController extends Controller 'calcul' => DeliveryTypeCalculations::get($id)->toArray(), 'delivery_types' => DeliveryTypes::getOptions(), ]; - + return view('Admin.Shop.DeliveryTypeCalculations.edit', $data); } diff --git a/app/Http/Controllers/Admin/Shop/DeliveryTypeController.php b/app/Http/Controllers/Admin/Shop/DeliveryTypeController.php index 3191e650..8cbc5f57 100644 --- a/app/Http/Controllers/Admin/Shop/DeliveryTypeController.php +++ b/app/Http/Controllers/Admin/Shop/DeliveryTypeController.php @@ -4,7 +4,6 @@ namespace App\Http\Controllers\Admin\Shop; use App\Datatables\Admin\Shop\DeliveryTypesDataTable; use App\Repositories\Shop\DeliveryTypes; -use App\Repositories\Shop\SaleChannels; use Illuminate\Http\Request; class DeliveryTypeController extends Controller diff --git a/app/Http/Controllers/Admin/Shop/OrderController.php b/app/Http/Controllers/Admin/Shop/OrderController.php index de169f97..f47892ad 100644 --- a/app/Http/Controllers/Admin/Shop/OrderController.php +++ b/app/Http/Controllers/Admin/Shop/OrderController.php @@ -4,8 +4,8 @@ namespace App\Http\Controllers\Admin\Shop; use App\Datatables\Admin\Shop\OrdersDataTable; use App\Http\Controllers\Controller; -use App\Repositories\Shop\Orders; use App\Repositories\Shop\OrderMails; +use App\Repositories\Shop\Orders; use Illuminate\Http\Request; class OrderController extends Controller diff --git a/app/Http/Controllers/Shop/ArticleController.php b/app/Http/Controllers/Shop/ArticleController.php index b8c790dd..2991c47c 100644 --- a/app/Http/Controllers/Shop/ArticleController.php +++ b/app/Http/Controllers/Shop/ArticleController.php @@ -13,6 +13,7 @@ class ArticleController extends Controller $data['article'] = Articles::getArticleToSell($id); // $data['breadcrumb'] = Categories::getAncestorsByCategory($category_id); $data['offers2'] = Articles::getSiblings($id)->toArray(); + // dump($data); // exit; return view('Shop.Articles.show', $data); diff --git a/app/Http/Controllers/Shop/Auth/RegisterController.php b/app/Http/Controllers/Shop/Auth/RegisterController.php index eda0c55c..99fc4046 100644 --- a/app/Http/Controllers/Shop/Auth/RegisterController.php +++ b/app/Http/Controllers/Shop/Auth/RegisterController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers\Shop\Auth; use App\Http\Controllers\Controller; -use App\Http\Requests\Shop\RegisterCustomer; use App\Repositories\Shop\CustomerAddresses; use App\Repositories\Shop\Customers; use Illuminate\Auth\Events\Registered; diff --git a/app/Http/Controllers/Shop/BasketController.php b/app/Http/Controllers/Shop/BasketController.php index 67231433..800036e2 100644 --- a/app/Http/Controllers/Shop/BasketController.php +++ b/app/Http/Controllers/Shop/BasketController.php @@ -2,14 +2,13 @@ namespace App\Http\Controllers\Shop; -use Illuminate\Http\Request; - use App\Http\Controllers\Controller; use App\Repositories\Core\User\ShopCart; -use App\Repositories\Shop\Offers; use App\Repositories\Shop\Baskets; +use App\Repositories\Shop\Offers; use App\Repositories\Shop\Orders; use App\Repositories\Users; +use Illuminate\Http\Request; class BasketController extends Controller { @@ -18,6 +17,7 @@ class BasketController extends Controller $offerId = $request->input('offer_id'); $quantity = $request->input('quantity') ?? 1; $price = Offers::getPrice($offerId, $quantity)->price_taxed; + return number_format($quantity * $price, 2); } @@ -26,15 +26,17 @@ class BasketController extends Controller $offerId = $request->input('offer_id'); $quantity = $request->input('quantity') ?? 1; $update = $request->input('update') ?? false; + return Baskets::addBasket($offerId, $quantity, $update); } - + public function modalBasket($offerId, $quantity) { $data = [ 'offer' => Offers::getFull($offerId)->toArray(), 'basket' => Baskets::addBasket($offerId, $quantity), ]; + return view('Shop.Baskets.partials.modalBasket', $data); } @@ -43,12 +45,14 @@ class BasketController extends Controller $data = [ 'basket' => Baskets::getBasket(), ]; + return view('Shop.Baskets.basket', $data); } public function getBasket() { $data = ShopCart::getContent(); + return response()->json(['data' => $data, 'code' => '200']); } @@ -60,6 +64,7 @@ class BasketController extends Controller public function getSummary() { $data = ShopCart::getSummary(); + return response()->json(['data' => $data, 'code' => '200']); } @@ -70,6 +75,7 @@ class BasketController extends Controller unset($data['_token']); $data['user_id'] = Users::getId(); Orders::saveOrder($data); + return response()->json(['code' => '200']); } diff --git a/app/Http/Controllers/Shop/CategoryController.php b/app/Http/Controllers/Shop/CategoryController.php index 8cbbf487..020eb2ee 100644 --- a/app/Http/Controllers/Shop/CategoryController.php +++ b/app/Http/Controllers/Shop/CategoryController.php @@ -2,15 +2,13 @@ namespace App\Http\Controllers\Shop; -use Illuminate\Http\Request; +use App\Datatables\Shop\CategoriesDataTable; use App\Http\Controllers\Controller; - +use App\Repositories\Shop\ArticleNatures; use App\Repositories\Shop\Articles; use App\Repositories\Shop\Categories; use App\Repositories\Shop\TagGroups; - -use App\Datatables\Shop\CategoriesDataTable; -use App\Repositories\Shop\ArticleNatures; +use Illuminate\Http\Request; class CategoryController extends Controller { @@ -62,6 +60,7 @@ class CategoryController extends Controller ]), 'tags' => TagGroups::getWithTagsAndCountOffers($categoryId), ]; + // dump($data); // exit; return view('Shop.Shelves.shelve', $data); diff --git a/app/Http/Controllers/Shop/CustomerController.php b/app/Http/Controllers/Shop/CustomerController.php index 7f12dae2..d16e9b87 100644 --- a/app/Http/Controllers/Shop/CustomerController.php +++ b/app/Http/Controllers/Shop/CustomerController.php @@ -2,10 +2,9 @@ namespace App\Http\Controllers\Shop; -use Illuminate\Http\Request; use App\Http\Controllers\Controller; - use App\Repositories\Shop\Customers; +use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; class CustomerController extends Controller diff --git a/app/Http/Controllers/Shop/HomeController.php b/app/Http/Controllers/Shop/HomeController.php index 99dc2d9e..33cde3fd 100644 --- a/app/Http/Controllers/Shop/HomeController.php +++ b/app/Http/Controllers/Shop/HomeController.php @@ -2,15 +2,11 @@ namespace App\Http\Controllers\Shop; -use Illuminate\Http\Request; use App\Http\Controllers\Controller; - use App\Repositories\Shop\Articles; -use App\Repositories\Shop\TagGroups; use App\Repositories\Shop\Homepages; - -use App\Repositories\Config; -use App\Repositories\Core\Arrays; +use App\Repositories\Shop\TagGroups; +use Illuminate\Http\Request; class HomeController extends Controller { @@ -23,6 +19,7 @@ class HomeController extends Controller 'tags' => TagGroups::getWithTagsAndCountOffers(), 'no_filter' => true, ]; + return view('Shop.home', $data); } } diff --git a/app/Http/Controllers/Shop/InvoiceController.php b/app/Http/Controllers/Shop/InvoiceController.php index ad5d2542..05ed873e 100644 --- a/app/Http/Controllers/Shop/InvoiceController.php +++ b/app/Http/Controllers/Shop/InvoiceController.php @@ -2,12 +2,9 @@ namespace App\Http\Controllers\Shop; -use App\Models\Shop\Invoice; -use Illuminate\Http\Request; use App\Http\Controllers\Controller; - -use App\Repositories\Shop\Invoices; use App\Repositories\Core\PDF; +use App\Repositories\Shop\Invoices; class InvoiceController extends Controller { @@ -19,6 +16,7 @@ class InvoiceController extends Controller public function show($uuid) { $data = Invoices::getByUUID($uuid); + return view('Shop.Invoices.show', $data); } @@ -26,8 +24,9 @@ class InvoiceController extends Controller { \Debugbar::disable(); $data['invoice'] = Invoices::getByUUID($uuid); - $filename = 'invoice-' . $uuid . '.pdf'; + $filename = 'invoice-'.$uuid.'.pdf'; $html = view('Shop.Invoices.pdf', $data)->toHtml(); + // $html = '

Hello world!

'; // return PDF::convertHTML($html); // return view('Shop.Invoices.pdf', $data); diff --git a/app/Http/Controllers/Shop/OfferController.php b/app/Http/Controllers/Shop/OfferController.php index 489f8442..216e5e07 100644 --- a/app/Http/Controllers/Shop/OfferController.php +++ b/app/Http/Controllers/Shop/OfferController.php @@ -2,9 +2,7 @@ namespace App\Http\Controllers\Shop; -use Illuminate\Http\Request; use App\Http\Controllers\Controller; - use App\Repositories\Shop\Offers; class OfferController extends Controller diff --git a/app/Http/Controllers/Shop/OrderController.php b/app/Http/Controllers/Shop/OrderController.php index d60ee651..da3ab0f2 100644 --- a/app/Http/Controllers/Shop/OrderController.php +++ b/app/Http/Controllers/Shop/OrderController.php @@ -2,18 +2,17 @@ namespace App\Http\Controllers\Shop; -use Illuminate\Http\Request; +use App\Datatables\Shop\OrdersDataTable; use App\Http\Controllers\Controller; - use App\Repositories\Core\User\ShopCart; +use App\Repositories\Shop\Baskets; use App\Repositories\Shop\Customers; use App\Repositories\Shop\Deliveries; -use App\Repositories\Shop\Orders; use App\Repositories\Shop\OrderMails; +use App\Repositories\Shop\Orders; use App\Repositories\Shop\Paybox; -use App\Repositories\Shop\Baskets; use App\Repositories\Shop\SaleChannels; -use App\Datatables\Shop\OrdersDataTable; +use Illuminate\Http\Request; class OrderController extends Controller { @@ -30,6 +29,7 @@ class OrderController extends Controller public function pdf($uuid) { $data = Orders::getByUUID($uuid); + return view('Shop.Orders.pdf', $data); } @@ -43,6 +43,7 @@ class OrderController extends Controller 'deliveries' => Deliveries::getAllWithSaleChannel()->toArray(), 'sale_channel' => SaleChannels::getDefault()->toArray(), ]; + return view('Shop.Orders.order', $data); } else { return redirect()->route('home'); @@ -72,6 +73,7 @@ class OrderController extends Controller public function confirmed() { ShopCart::clear(); + return view('Shop.Orders.confirmed'); } } diff --git a/app/Http/Controllers/Shop/OrderPaymentController.php b/app/Http/Controllers/Shop/OrderPaymentController.php index 440232ba..ed93e16a 100644 --- a/app/Http/Controllers/Shop/OrderPaymentController.php +++ b/app/Http/Controllers/Shop/OrderPaymentController.php @@ -2,17 +2,8 @@ namespace App\Http\Controllers\Shop; -use Illuminate\Http\Request; use App\Http\Controllers\Controller; -use App\Repositories\Core\User\ShopCart; -use App\Repositories\Shop\Customers; -use App\Repositories\Shop\Deliveries; -use App\Repositories\Shop\Orders; -use App\Repositories\Shop\Paybox; -use App\Repositories\Shop\Baskets; -use App\Repositories\Shop\SaleChannels; - class OrderPaymentController extends Controller { } diff --git a/app/Http/Controllers/Shop/PayboxController.php b/app/Http/Controllers/Shop/PayboxController.php index f2596efa..5aee88f7 100644 --- a/app/Http/Controllers/Shop/PayboxController.php +++ b/app/Http/Controllers/Shop/PayboxController.php @@ -2,9 +2,8 @@ namespace App\Http\Controllers\Shop; -use Illuminate\Http\Request; use App\Http\Controllers\Controller; - +use Illuminate\Http\Request; class PayboxController extends Controller { @@ -32,6 +31,7 @@ class PayboxController extends Controller { dump($request); exit; + return view('paybox.send'); } } diff --git a/app/Http/Controllers/Shop/SearchController.php b/app/Http/Controllers/Shop/SearchController.php index 80e082d7..bef8f4c5 100644 --- a/app/Http/Controllers/Shop/SearchController.php +++ b/app/Http/Controllers/Shop/SearchController.php @@ -2,10 +2,9 @@ namespace App\Http\Controllers\Shop; -use Illuminate\Http\Request; use App\Http\Controllers\Controller; - use App\Repositories\Shop\Searches; +use Illuminate\Http\Request; class SearchController extends Controller { @@ -20,6 +19,7 @@ class SearchController extends Controller 'search' => $data, 'product_type' => $data['product_type'], ]; + // dump($data); // exit; return view('Shop.Search.results', $data); diff --git a/app/Mail/Acheminement.php b/app/Mail/Acheminement.php index 0d4e8ea2..cf811210 100644 --- a/app/Mail/Acheminement.php +++ b/app/Mail/Acheminement.php @@ -41,6 +41,8 @@ class Acheminement extends TemplateMailable public $facture; + public $mode_livraison; + public function __construct($order) { $this->prenom = $order->customer->first_name; diff --git a/app/Menu/Botanic.php b/app/Menu/Botanic.php index c183e8ac..aba27627 100644 --- a/app/Menu/Botanic.php +++ b/app/Menu/Botanic.php @@ -3,24 +3,23 @@ namespace App\Menu; use Sebastienheyd\Boilerplate\Menu\Builder; -use App\Repositories\Users; class Botanic { public function make(Builder $menu) { - $menu->add('Botanique', [ 'permission' => 'backend_access', 'icon' => 'leaf' ]) + $menu->add('Botanique', ['permission' => 'backend_access', 'icon' => 'leaf']) ->id('botanic') ->activeIfRoute('botanic') ->order(4); - $menu->addTo('botanic', 'Familles', [ 'route' => 'Admin.Botanic.Families.index', 'permission' => 'backend_access' ]) + $menu->addTo('botanic', 'Familles', ['route' => 'Admin.Botanic.Families.index', 'permission' => 'backend_access']) ->activeIfRoute(['Admin.Botanic.Families.*'])->order(1); - $menu->addTo('botanic', 'Genres', [ 'route' => 'Admin.Botanic.Genres.index', 'permission' => 'backend_access' ]) + $menu->addTo('botanic', 'Genres', ['route' => 'Admin.Botanic.Genres.index', 'permission' => 'backend_access']) ->activeIfRoute(['Admin.Botanic.Genres.*'])->order(2); - $menu->addTo('botanic', 'Espèces', [ 'route' => 'Admin.Botanic.Species.index', 'permission' => 'backend_access' ]) + $menu->addTo('botanic', 'Espèces', ['route' => 'Admin.Botanic.Species.index', 'permission' => 'backend_access']) ->activeIfRoute(['Admin.Botanic.Species.*'])->order(3); - $menu->addTo('botanic', 'Variétés', [ 'route' => 'Admin.Botanic.Varieties.index', 'permission' => 'backend_access' ]) + $menu->addTo('botanic', 'Variétés', ['route' => 'Admin.Botanic.Varieties.index', 'permission' => 'backend_access']) ->activeIfRoute(['Admin.Botanic.Varieties.*'])->order(4); } } diff --git a/app/Menu/Contents.php b/app/Menu/Contents.php index b328a0ff..a4d51ac8 100644 --- a/app/Menu/Contents.php +++ b/app/Menu/Contents.php @@ -8,7 +8,7 @@ class Contents { public function make(Builder $menu) { - $menu->add('Contenus', ['icon' => 'newspaper' ]) + $menu->add('Contenus', ['icon' => 'newspaper']) ->id('contents') ->order(6); diff --git a/app/Menu/Customers.php b/app/Menu/Customers.php index d16af17e..49a085ff 100644 --- a/app/Menu/Customers.php +++ b/app/Menu/Customers.php @@ -8,7 +8,7 @@ class Customers { public function make(Builder $menu) { - $menu->add('Clients', [ 'permission' => 'backend_access', 'icon' => 'address-card' ]) + $menu->add('Clients', ['permission' => 'backend_access', 'icon' => 'address-card']) ->id('customers') ->activeIfRoute('customers') ->order(3); diff --git a/app/Menu/Deliveries.php b/app/Menu/Deliveries.php index ab3c723e..cff906e7 100644 --- a/app/Menu/Deliveries.php +++ b/app/Menu/Deliveries.php @@ -14,10 +14,10 @@ class Deliveries $menu->addTo('sales_mode', __('shop.sale_channels.name'), [ 'route' => 'Admin.Shop.SaleChannels.index', - ])->activeIfRoute(['Admin.Shop.SaleChannels.*'])->order(1); + ])->activeIfRoute(['Admin.Shop.SaleChannels.*'])->order(1); $menu->addTo('sales_mode', __('shop.deliveries.title'), [ 'route' => 'Admin.Shop.Deliveries.index', - ])->activeIfRoute(['Admin.Shop.Deliveries.*'])->order(1); + ])->activeIfRoute(['Admin.Shop.Deliveries.*'])->order(1); } } diff --git a/app/Menu/Merchandises.php b/app/Menu/Merchandises.php index 8edd1ae9..11dc59c3 100644 --- a/app/Menu/Merchandises.php +++ b/app/Menu/Merchandises.php @@ -8,7 +8,7 @@ class Merchandises { public function make(Builder $menu) { - $menu->add('Marchandises', ['icon' => 'shopping-bag' ]) + $menu->add('Marchandises', ['icon' => 'shopping-bag']) ->id('merchandises') ->order(5); diff --git a/app/Menu/Orders.php b/app/Menu/Orders.php index da331aec..f0d9eb1a 100644 --- a/app/Menu/Orders.php +++ b/app/Menu/Orders.php @@ -8,11 +8,11 @@ class Orders { public function make(Builder $menu) { - $menu->add('Commandes', [ 'permission' => 'backend_access', 'icon' => 'shopping-basket' ]) + $menu->add('Commandes', ['permission' => 'backend_access', 'icon' => 'shopping-basket']) ->id('orders') ->activeIfRoute('orders') ->order(1); - + $menu->addTo('orders', 'Commandes', [ 'route' => 'Admin.Shop.Orders.index', 'permission' => 'backend_access', @@ -22,16 +22,16 @@ class Orders 'route' => 'Admin.Shop.Invoices.index', 'permission' => 'backend_access', ])->activeIfRoute(['Admin.Shop.Invoices.*'])->order(2); -/* - $menu->addTo('orders', 'Avoirs', [ - 'route' => 'Admin.Shop.Invoices.index', - 'permission' => 'backend_access', - ])->activeIfRoute(['Admin.Shop.Invoices.*'])->order(3); - - $menu->addTo('orders', 'Bons de livraison', [ - 'route' => 'Admin.Shop.Invoices.index', - 'permission' => 'backend_access', - ])->activeIfRoute(['Admin.Shop.Invoices.*'])->order(4); -*/ + /* + $menu->addTo('orders', 'Avoirs', [ + 'route' => 'Admin.Shop.Invoices.index', + 'permission' => 'backend_access', + ])->activeIfRoute(['Admin.Shop.Invoices.*'])->order(3); + + $menu->addTo('orders', 'Bons de livraison', [ + 'route' => 'Admin.Shop.Invoices.index', + 'permission' => 'backend_access', + ])->activeIfRoute(['Admin.Shop.Invoices.*'])->order(4); + */ } } diff --git a/app/Menu/Settings.php b/app/Menu/Settings.php index d5e5cf96..e32d4d2a 100644 --- a/app/Menu/Settings.php +++ b/app/Menu/Settings.php @@ -8,11 +8,11 @@ class Settings { public function make(Builder $menu) { - $menu->add('Paramètres', [ 'permission' => 'backend_access', 'icon' => 'cogs' ]) + $menu->add('Paramètres', ['permission' => 'backend_access', 'icon' => 'cogs']) ->id('settings') ->activeIfRoute('settings') ->order(7); - + $menu->addTo('settings', __('shop.delivery_types.title'), [ 'route' => 'Admin.Shop.DeliveryTypes.index', 'permission' => 'backend_access', diff --git a/app/Menu/Shop.php b/app/Menu/Shop.php index a641cbfb..867ab2e8 100644 --- a/app/Menu/Shop.php +++ b/app/Menu/Shop.php @@ -8,33 +8,33 @@ class Shop { public function make(Builder $menu) { - $menu->add('Catalogue', [ 'permission' => 'backend_access', 'icon' => 'store' ]) + $menu->add('Catalogue', ['permission' => 'backend_access', 'icon' => 'store']) ->id('shop') ->activeIfRoute('shop') ->order(2); - $menu->addTo('shop', 'Articles', [ 'route' => 'Admin.Shop.Articles.index', 'permission' => 'backend_access' ]) + $menu->addTo('shop', 'Articles', ['route' => 'Admin.Shop.Articles.index', 'permission' => 'backend_access']) ->activeIfRoute(['Admin.Shop.Articles.*'])->order(1); - $menu->addTo('shop', 'Déclinaisons', [ 'route' => 'Admin.Shop.Variations.index', 'permission' => 'backend_access' ]) + $menu->addTo('shop', 'Déclinaisons', ['route' => 'Admin.Shop.Variations.index', 'permission' => 'backend_access']) ->activeIfRoute(['Admin.Shop.Variations.*'])->order(2); - $menu->addTo('shop', 'Tarifs', [ 'route' => 'Admin.Shop.Tariffs.index', 'permission' => 'backend_access' ]) + $menu->addTo('shop', 'Tarifs', ['route' => 'Admin.Shop.Tariffs.index', 'permission' => 'backend_access']) ->activeIfRoute(['Admin.Shop.Tariffs.*'])->order(3); - $menu->addTo('shop', 'Offres', [ 'route' => 'Admin.Shop.Offers.index', 'permission' => 'backend_access' ]) + $menu->addTo('shop', 'Offres', ['route' => 'Admin.Shop.Offers.index', 'permission' => 'backend_access']) ->activeIfRoute(['Admin.Shop.Offers.*'])->order(4); - $menu->addTo('shop', 'Rayons', [ 'route' => 'Admin.Shop.Categories.index', 'permission' => 'backend_access' ]) + $menu->addTo('shop', 'Rayons', ['route' => 'Admin.Shop.Categories.index', 'permission' => 'backend_access']) ->activeIfRoute(['Admin.Shop.Categories.*'])->order(6); - $menu->addTo('shop', 'Tags', [ 'route' => 'Admin.Shop.Tags.index', 'permission' => 'backend_access' ]) + $menu->addTo('shop', 'Tags', ['route' => 'Admin.Shop.Tags.index', 'permission' => 'backend_access']) ->activeIfRoute(['Admin.Shop.Tags.*'])->order(8); - $menu->addTo('shop', 'Natures d\'articles', [ 'route' => 'Admin.Shop.ArticleNatures.index', 'permission' => 'backend_access' ]) + $menu->addTo('shop', 'Natures d\'articles', ['route' => 'Admin.Shop.ArticleNatures.index', 'permission' => 'backend_access']) ->activeIfRoute(['Admin.Shop.ArticleNatures.*'])->order(9); - $menu->addTo('shop', 'Packages', [ 'route' => 'Admin.Shop.Packages.index', 'permission' => 'backend_access' ]) + $menu->addTo('shop', 'Packages', ['route' => 'Admin.Shop.Packages.index', 'permission' => 'backend_access']) ->activeIfRoute(['Admin.Shop.Packages.*'])->order(12); - $menu->addTo('shop', 'Unités', [ 'route' => 'Admin.Shop.Unities.index', 'permission' => 'backend_access' ]) + $menu->addTo('shop', 'Unités', ['route' => 'Admin.Shop.Unities.index', 'permission' => 'backend_access']) ->activeIfRoute(['Admin.Shop.Unities.*'])->order(14); } } diff --git a/app/Models/Botanic/Family.php b/app/Models/Botanic/Family.php index ee8068c5..b603d2dc 100644 --- a/app/Models/Botanic/Family.php +++ b/app/Models/Botanic/Family.php @@ -4,15 +4,15 @@ namespace App\Models\Botanic; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; - -use Wildside\Userstamps\Userstamps; use Staudenmeir\EloquentHasManyDeep\HasRelationships; +use Wildside\Userstamps\Userstamps; class Family extends Model { use HasRelationships, SoftDeletes, Userstamps; protected $guarded = ['id']; + protected $table = 'botanic_families'; public function genres() diff --git a/app/Models/Botanic/Genre.php b/app/Models/Botanic/Genre.php index ba90f054..26c1b21c 100644 --- a/app/Models/Botanic/Genre.php +++ b/app/Models/Botanic/Genre.php @@ -4,7 +4,6 @@ namespace App\Models\Botanic; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; - use Wildside\Userstamps\Userstamps; class Genre extends Model @@ -12,6 +11,7 @@ class Genre extends Model use SoftDeletes, Userstamps; protected $guarded = ['id']; + protected $table = 'botanic_genres'; public function family() diff --git a/app/Models/Botanic/Specie.php b/app/Models/Botanic/Specie.php index c437e384..c4cdcb90 100644 --- a/app/Models/Botanic/Specie.php +++ b/app/Models/Botanic/Specie.php @@ -2,22 +2,21 @@ namespace App\Models\Botanic; +use App\Models\Shop\Article; +use App\Models\Shop\Tag; +use App\Traits\Model\Imageable; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; - -use Wildside\Userstamps\Userstamps; use Rinvex\Tags\Traits\Taggable; use Spatie\MediaLibrary\HasMedia; - -use App\Traits\Model\Imageable; -use App\Models\Shop\Tag; -use App\Models\Shop\Article; +use Wildside\Userstamps\Userstamps; class Specie extends Model implements HasMedia { use Imageable, SoftDeletes, Taggable, UserStamps; protected $guarded = ['id']; + protected $table = 'botanic_species'; public function tags() @@ -42,6 +41,6 @@ class Specie extends Model implements HasMedia public function scopeByName($query, $name) { - return $query->where($this->table . '.name', $name); + return $query->where($this->table.'.name', $name); } } diff --git a/app/Models/Botanic/Variety.php b/app/Models/Botanic/Variety.php index beb337b0..781628f5 100644 --- a/app/Models/Botanic/Variety.php +++ b/app/Models/Botanic/Variety.php @@ -2,24 +2,22 @@ namespace App\Models\Botanic; -use Illuminate\Database\Eloquent\Model; -use Illuminate\Database\Eloquent\SoftDeletes; - -use Spatie\MediaLibrary\HasMedia; -use Rinvex\Tags\Traits\Taggable; -use Kirschbaum\PowerJoins\PowerJoins; -use Wildside\Userstamps\Userstamps; - -use App\Traits\Model\Imageable; - use App\Models\Shop\Article; use App\Models\Shop\Tag; +use App\Traits\Model\Imageable; +use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\SoftDeletes; +use Kirschbaum\PowerJoins\PowerJoins; +use Rinvex\Tags\Traits\Taggable; +use Spatie\MediaLibrary\HasMedia; +use Wildside\Userstamps\Userstamps; class Variety extends Model implements HasMedia { use Imageable, PowerJoins, SoftDeletes, Taggable, UserStamps; protected $guarded = ['id']; + protected $table = 'botanic_varieties'; public function Specie() diff --git a/app/Models/Shop/Article.php b/app/Models/Shop/Article.php index 4b467330..302bde3b 100644 --- a/app/Models/Shop/Article.php +++ b/app/Models/Shop/Article.php @@ -20,7 +20,7 @@ use Rinvex\Tags\Traits\Taggable; use Spatie\MediaLibrary\HasMedia; use Staudenmeir\EloquentHasManyDeep\HasManyDeep; use Staudenmeir\EloquentHasManyDeep\HasRelationships; -use \Venturecraft\Revisionable\RevisionableTrait; +use Venturecraft\Revisionable\RevisionableTrait; use Wildside\Userstamps\Userstamps; class Article extends Model implements HasMedia @@ -32,8 +32,8 @@ class Article extends Model implements HasMedia use Imageable; use Powerjoins; use RevisionableTrait; - use Taggable; use SoftDeletes; + use Taggable; use UserStamps; protected $guarded = ['id']; diff --git a/app/Models/Shop/ArticleNature.php b/app/Models/Shop/ArticleNature.php index a7a3baae..d3479088 100644 --- a/app/Models/Shop/ArticleNature.php +++ b/app/Models/Shop/ArticleNature.php @@ -15,7 +15,7 @@ use Wildside\Userstamps\Userstamps; class ArticleNature extends Model implements HasMedia { - use HasRelationships, InteractsWithMedia, SoftDeletes, RevisionableTrait, UserStamps; + use HasRelationships, InteractsWithMedia, RevisionableTrait, SoftDeletes, UserStamps; protected $guarded = ['id']; @@ -60,5 +60,4 @@ class ArticleNature extends Model implements HasMedia $this->addMediaConversion('thumb')->fit(Manipulations::FIT_MAX, 60, 32)->keepOriginalImageFormat()->nonQueued(); $this->addMediaConversion('normal')->fit(Manipulations::FIT_MAX, 360, 192)->keepOriginalImageFormat()->nonQueued(); } - } diff --git a/app/Models/Shop/Delivery.php b/app/Models/Shop/Delivery.php index a9b368f2..914cbad6 100644 --- a/app/Models/Shop/Delivery.php +++ b/app/Models/Shop/Delivery.php @@ -4,7 +4,7 @@ namespace App\Models\Shop; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; -use \Venturecraft\Revisionable\RevisionableTrait; +use Venturecraft\Revisionable\RevisionableTrait; use Wildside\Userstamps\Userstamps; class Delivery extends Model diff --git a/app/Models/Shop/DeliveryPackage.php b/app/Models/Shop/DeliveryPackage.php index 0d416458..b31454ed 100644 --- a/app/Models/Shop/DeliveryPackage.php +++ b/app/Models/Shop/DeliveryPackage.php @@ -4,7 +4,7 @@ namespace App\Models\Shop; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; -use \Venturecraft\Revisionable\RevisionableTrait; +use Venturecraft\Revisionable\RevisionableTrait; use Wildside\Userstamps\Userstamps; class DeliveryPackage extends Model diff --git a/app/Models/Shop/DeliveryType.php b/app/Models/Shop/DeliveryType.php index 34c9632d..ee889317 100644 --- a/app/Models/Shop/DeliveryType.php +++ b/app/Models/Shop/DeliveryType.php @@ -4,7 +4,7 @@ namespace App\Models\Shop; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; -use \Venturecraft\Revisionable\RevisionableTrait; +use Venturecraft\Revisionable\RevisionableTrait; use Wildside\Userstamps\Userstamps; class DeliveryType extends Model diff --git a/app/Models/Shop/DeliveryTypeCalculation.php b/app/Models/Shop/DeliveryTypeCalculation.php index dc933a55..0c097b78 100644 --- a/app/Models/Shop/DeliveryTypeCalculation.php +++ b/app/Models/Shop/DeliveryTypeCalculation.php @@ -4,7 +4,7 @@ namespace App\Models\Shop; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; -use \Venturecraft\Revisionable\RevisionableTrait; +use Venturecraft\Revisionable\RevisionableTrait; use Wildside\Userstamps\Userstamps; class DeliveryTypeCalculation extends Model diff --git a/app/Models/Shop/Merchandise.php b/app/Models/Shop/Merchandise.php index af193953..e13b88ad 100644 --- a/app/Models/Shop/Merchandise.php +++ b/app/Models/Shop/Merchandise.php @@ -8,8 +8,8 @@ use Illuminate\Database\Eloquent\SoftDeletes; use Kirschbaum\PowerJoins\PowerJoins; use Rinvex\Tags\Traits\Taggable; use Spatie\MediaLibrary\HasMedia; -use Wildside\Userstamps\Userstamps; use Venturecraft\Revisionable\RevisionableTrait; +use Wildside\Userstamps\Userstamps; class Merchandise extends Model implements HasMedia { diff --git a/app/Repositories/Cities.php b/app/Repositories/Cities.php index 7c5b8e55..f679adea 100644 --- a/app/Repositories/Cities.php +++ b/app/Repositories/Cities.php @@ -52,6 +52,7 @@ class Cities // dump($res); $latitude = $res[0]; $longitude = $res[1]; + // dump($latitude); // dump($longitude); return ['latitude' => $latitude, 'longitude' => $longitude]; diff --git a/app/Repositories/Core/Geolocation.php b/app/Repositories/Core/Geolocation.php index 624b4366..14cc6a41 100644 --- a/app/Repositories/Core/Geolocation.php +++ b/app/Repositories/Core/Geolocation.php @@ -20,6 +20,7 @@ class Geolocation // dump($res); $longitude = $res[0]; $latitude = $res[1]; + // dump($latitude); // dump($longitude); // exit; diff --git a/app/Repositories/Core/Menu/Item.php b/app/Repositories/Core/Menu/Item.php index e550c20c..1836c4d4 100644 --- a/app/Repositories/Core/Menu/Item.php +++ b/app/Repositories/Core/Menu/Item.php @@ -55,6 +55,7 @@ class Item extends LavaryMenuItem if (strstr($this->title, 'circle-o')) { $this->title = str_replace('fa-circle-o', 'fa-dot-circle-o', $this->title); } + // dump($this); return $this; } diff --git a/app/Repositories/Core/Stat.php b/app/Repositories/Core/Stat.php index e7fcdca6..d3916183 100644 --- a/app/Repositories/Core/Stat.php +++ b/app/Repositories/Core/Stat.php @@ -66,6 +66,7 @@ class Stat ->select($db::raw("count(id) as y, $var as name")) ->groupBy($var) ->get(); + // var_Debug::message($data); return $data; } @@ -82,6 +83,7 @@ class Stat $y = (int) $nb[$key]; $data[] = ['y' => $y, 'name' => $value]; } + // var_Debug::message($data); return $data; } diff --git a/app/Repositories/Shop/ArticleNatures.php b/app/Repositories/Shop/ArticleNatures.php index b3d60065..0f908a32 100644 --- a/app/Repositories/Shop/ArticleNatures.php +++ b/app/Repositories/Shop/ArticleNatures.php @@ -62,6 +62,7 @@ class ArticleNatures $productType = 'botanic'; break; } + return $productType; } diff --git a/app/Repositories/Shop/DeliveryPackages.php b/app/Repositories/Shop/DeliveryPackages.php index 30863487..8dab15d6 100644 --- a/app/Repositories/Shop/DeliveryPackages.php +++ b/app/Repositories/Shop/DeliveryPackages.php @@ -8,7 +8,7 @@ use App\Traits\Model\Basic; class DeliveryPackages { use Basic; - + public static function getModel() { return DeliveryPackage::query(); diff --git a/app/Repositories/Shop/DeliveryTypeCalculations.php b/app/Repositories/Shop/DeliveryTypeCalculations.php index 4cc092eb..875a0fa0 100644 --- a/app/Repositories/Shop/DeliveryTypeCalculations.php +++ b/app/Repositories/Shop/DeliveryTypeCalculations.php @@ -8,7 +8,7 @@ use App\Traits\Model\Basic; class DeliveryTypeCalculations { use Basic; - + public static function getModel() { return DeliveryTypeCalculation::query(); diff --git a/app/Repositories/Shop/Invoices.php b/app/Repositories/Shop/Invoices.php index 655defa5..d7a09eef 100644 --- a/app/Repositories/Shop/Invoices.php +++ b/app/Repositories/Shop/Invoices.php @@ -13,7 +13,7 @@ class Invoices public static function getInvoiceHtml($id) { - $invoice = self::get($id, ['order.customer', 'order.address', 'order.detail']); + $invoice = self::get($id, ['order.customer', 'order.delivery_address', 'order.detail']); $order = $invoice->order; $customer = $order->customer; unset($invoice->order, $order->customer); @@ -78,4 +78,9 @@ class Invoices { return ['En attente', 'Paiement partiel', 'Soldée', 'Paiement rejeté']; } + + public static function getModel() + { + return Invoice::query(); + } } diff --git a/app/Repositories/Shop/OrderMails.php b/app/Repositories/Shop/OrderMails.php index 23b4ca74..71f498c7 100644 --- a/app/Repositories/Shop/OrderMails.php +++ b/app/Repositories/Shop/OrderMails.php @@ -5,11 +5,7 @@ namespace App\Repositories\Shop; use App\Mail\Acheminement; use App\Mail\ConfirmationCommande; use App\Mail\Preparation; -use App\Models\Shop\Order; -use App\Repositories\Core\DateStats; -use Carbon\Carbon; use Illuminate\Support\Facades\Mail; -use Illuminate\Support\Str; class OrderMails { diff --git a/app/User.php b/app/User.php index 6922b568..8d52a9fe 100644 --- a/app/User.php +++ b/app/User.php @@ -50,11 +50,11 @@ use Yadahan\AuthenticationLog\AuthenticationLogable; */ class User extends Authenticatable { - use Notifiable; + use AuthenticationLogable; use LaratrustUserTrait; + use Notifiable; use SoftDeletes; use UserHasTeams; - use AuthenticationLogable; /** * The attributes that are mass assignable. diff --git a/resources/views/Shop/Invoices/mail.blade.php b/resources/views/Shop/Invoices/mail.blade.php index 5b5b2437..7df79e35 100644 --- a/resources/views/Shop/Invoices/mail.blade.php +++ b/resources/views/Shop/Invoices/mail.blade.php @@ -28,9 +28,10 @@ Livré à:

- {{ $order['address']['name'] }}
- {{ $order['address']['address'] }}
- {{ $order['address']['zipcode'] }} {{ $order['address']['city'] }}
+ {{ $order['delivery_address']['name'] }}
+ {{ $order['delivery_address']['address'] }}
+ {{ $order['delivery_address']['zipcode'] }} + {{ $order['delivery_address']['city'] }}
FR