coding style

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
 {

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);
     }

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

app/Http/Controllers/Admin/Core/Controller.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace App\Http\Controllers\Admin\Core;
 
 use App\Http\Controllers\Controller as ParentController;

app/Http/Controllers/Admin/HomeController.php

@@ -19,6 +19,7 @@ class HomeController extends Controller
         $start = $request->input('start');
         $end = $request->input('end');
         $data = Dashboards::getStats($start, $end);
+
         // dump($data);
         return view('Admin.Shop.Dashboard.index', $data);
     }

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

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

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

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);

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;

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,6 +26,7 @@ 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);
     }
 
@@ -35,6 +36,7 @@ class BasketController extends Controller
             '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']);
     }
 

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 Illuminate\Http\Request;
-use App\Datatables\Shop\CategoriesDataTable;
-use App\Repositories\Shop\ArticleNatures;
 
 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);

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

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\Shop\TagGroups;
-use App\Repositories\Config;
+use Illuminate\Http\Request;
-use App\Repositories\Core\Arrays;
 
 class HomeController extends Controller
 {
@@ -23,6 +19,7 @@ class HomeController extends Controller
             'tags' => TagGroups::getWithTagsAndCountOffers(),
             'no_filter' => true,
         ];
+
         return view('Shop.home', $data);
     }
 }

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);
     }
 
@@ -28,6 +26,7 @@ class InvoiceController extends Controller
         $data['invoice'] = Invoices::getByUUID($uuid);
         $filename = 'invoice-'.$uuid.'.pdf';
         $html = view('Shop.Invoices.pdf', $data)->toHtml();
+
         // $html = '<h1>Hello world!</h1>';
         // return PDF::convertHTML($html);
         // return view('Shop.Invoices.pdf', $data);

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

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');
     }
 }

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
 {
 }

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');
     }
 }

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);

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;

app/Menu/Botanic.php

@@ -3,7 +3,6 @@
 namespace App\Menu;
 
 use Sebastienheyd\Boilerplate\Menu\Builder;
-use App\Repositories\Users;
 
 class Botanic
 {

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

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

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 Wildside\Userstamps\Userstamps;
-use App\Traits\Model\Imageable;
-use App\Models\Shop\Tag;
-use App\Models\Shop\Article;
 
 class Specie extends Model implements HasMedia
 {
     use Imageable, SoftDeletes, Taggable, UserStamps;
 
     protected $guarded = ['id'];
+
     protected $table = 'botanic_species';
 
     public function tags()

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

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'];

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();
     }
-
 }

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

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

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

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

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
 {

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];

app/Repositories/Core/Geolocation.php

@@ -20,6 +20,7 @@ class Geolocation
         // dump($res);
         $longitude = $res[0];
         $latitude = $res[1];
+
         // dump($latitude);
         // dump($longitude);
         // exit;

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;
             }

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;
     }

app/Repositories/Shop/ArticleNatures.php

@@ -62,6 +62,7 @@ class ArticleNatures
                 $productType = 'botanic';
                 break;
         }
+
         return $productType;
     }
 

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();
+    }
 }

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
 {

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.

resources/views/Shop/Invoices/mail.blade.php

@@ -28,9 +28,10 @@
                                         <strong>Livr&eacute; &agrave;:</strong>
                                     </p>
                                     <span style="text-transform: capitalize; letter-spacing: 0px; color: #666666;">
-                                        {{ $order['address']['name'] }}<br />
+                                        {{ $order['delivery_address']['name'] }}<br />
-                                        {{ $order['address']['address'] }}<br />
+                                        {{ $order['delivery_address']['address'] }}<br />
-                                        {{ $order['address']['zipcode'] }} {{ $order['address']['city'] }}<br />
+                                        {{ $order['delivery_address']['zipcode'] }}
+                                        {{ $order['delivery_address']['city'] }}<br />
                                         FR
                                     </span>
                                 </div>