fixes

app/Datatables/Admin/Core/CommentsDataTable.php

@@ -17,7 +17,7 @@ class CommentsDataTable extends DataTable
 
     public function query(Comment $model)
     {
-        $model = $model::with(['user'])->select('*');
+        $model = $model::with(['commentator'])->select('*');
 
         return $this->buildQuery($model);
     }
@@ -26,7 +26,7 @@ class CommentsDataTable extends DataTable
     {
         return [
             Column::make('updated_at')->title(__('date'))->width('80')->class('text-center')->searchable(false),
-            Column::make('user.name')->title(__('name'))->searchable(false),
+            Column::make('commentator.name')->title(__('name'))->searchable(false),
             Column::make('comment')->title(__('comments'))->searchable(false),
             $this->makeColumnButtons(),
         ];

app/Datatables/Admin/Shop/CustomerAddressesDataTable.php

@@ -4,6 +4,7 @@ namespace App\Datatables\Admin\Shop;
 
 use App\Datatables\ParentDataTable as DataTable;
 use App\Models\Shop\CustomerAddress;
+use App\Repositories\Shop\CustomerAddresses;
 use Yajra\DataTables\Html\Column;
 
 class CustomerAddressesDataTable extends DataTable
@@ -29,10 +30,20 @@ class CustomerAddressesDataTable extends DataTable
         return $customerId ? $model->byCustomer($customerId) : $model;
     }
 
+    public function modifier($datatables)
+    {
+        $datatables->editColumn('type', function (CustomerAddress $address) {
+            return CustomerAddresses::getIconByType($address->type);
+        })->rawColumns(['type', 'action']);
+
+        return parent::modifier($datatables);
+    }
+
 
     protected function getColumns()
     {
         return [
+            Column::make('type')->title('')->width(30),
             Column::make('address')->title('Adresse'),
             Column::make('zipcode')->title('Code postal'),
             Column::make('city')->title('Ville'),

app/Datatables/Admin/Shop/CustomerInvoicesDataTable.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace App\Datatables\Admin\Shop;
+
+use App\Datatables\ParentDataTable as DataTable;
+use App\Models\Shop\Invoice;
+use App\Repositories\Shop\Customers;
+use App\Repositories\Shop\InvoicePayments;
+use App\Repositories\Shop\Invoices;
+use Yajra\DataTables\Html\Column;
+
+class CustomerInvoicesDataTable extends DataTable
+{
+    public $model_name = 'invoices';
+
+    public $sortedColumn = 1;
+
+    public $sortedOrder = 'desc';
+
+    public $stateSave = true;
+
+    public $url = null;
+
+    public function __construct()
+    {
+        $this->url = route('Shop.Invoices.index');
+    }
+
+    public function query(Invoice $model)
+    {
+        $customerId = Customers::getId();
+        $model = $model->byCustomer($customerId)->with(['address']);
+
+        return $this->buildQuery($model);
+    }
+
+    public function getHtmlButtons()
+    {
+        $buttons = view('components.form.button', [
+            'dataId' => '{{$uuid}}',
+            'class' => 'btn-sm btn-secondary btn-invoice mr-2',
+            'icon' => 'fa-file-pdf',
+            'title' => 'Télécharger la facture',
+            'url' => route('Shop.Invoices.pdf').'/{{$uuid}}',
+        ]);
+
+        $buttons .= self::getButtonShow('uuid', 'Voir la facture');
+
+        return $buttons;
+    }
+
+    public function modifier($datatables)
+    {
+        $datatables
+            ->editColumn('status', function (Invoice $invoice) {
+                return Invoices::getStatus($invoice->status);
+            })
+            ->editColumn('created_at', function (Invoice $invoice) {
+                return $invoice->created_at->isoFormat('DD/MM/YY HH:mm');
+            })
+            ->editColumn('payment_type', function (Invoice $invoice) {
+                return InvoicePayments::getPaymentType($invoice->payment_type);
+            })
+            ->rawColumns(['action']);
+
+        return parent::modifier($datatables);
+    }
+
+    protected function getColumns()
+    {
+        return [
+            Column::make('created_at')->title('Date'),
+            Column::make('ref')->title('Ref'),
+            Column::make('payment_type')->title('Règlement'),
+            Column::make('total_shipped')->title('Montant')->class('text-right'),
+            Column::make('status')->title('Statut'),
+            $this->makeColumnButtons(),
+        ];
+    }
+}

app/Datatables/Admin/Shop/CustomerOrdersDataTable.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Datatables\Admin\Shop;
+
+use App\Datatables\ParentDataTable as DataTable;
+use App\Models\Shop\Order;
+use App\Repositories\Shop\Customers;
+use App\Repositories\Shop\Orders;
+use Yajra\DataTables\Html\Column;
+
+class CustomerOrdersDataTable extends DataTable
+{
+    public $model_name = 'orders';
+
+    public $sortedColumn = 1;
+
+    public $sortedOrder = 'desc';
+
+    public $stateSave = true;
+
+    public $url = null;
+
+    public function __construct()
+    {
+        $this->url = route('Shop.Orders.index');
+    }
+
+    public function query(Order $model)
+    {
+        $customerId = Customers::getId();
+        $model = $model->byCustomer($customerId);
+
+        return $this->buildQuery($model);
+    }
+
+    public function getHtmlButtons()
+    {
+        $buttons = '';
+
+        $buttons .= self::getButtonShow('uuid', 'Voir la facture');
+
+        return $buttons;
+    }
+
+    public function modifier($datatables)
+    {
+        $datatables
+            ->editColumn('status', function (Order $order) {
+                return Orders::getStatus($order->status);
+            })
+            ->editColumn('created_at', function (Order $order) {
+                return $order->created_at->isoFormat('DD/MM/YY HH:mm');
+            })
+            ->rawColumns(['action']);
+
+        return parent::modifier($datatables);
+    }
+
+    protected function getColumns()
+    {
+        return [
+            Column::make('created_at')->title('Date'),
+            Column::make('ref')->title('Ref'),
+            Column::make('total_shipped')->title('Montant')->class('text-right'),
+            Column::make('status')->title('Statut'),
+            $this->makeColumnButtons(),
+        ];
+    }
+}

app/Datatables/Admin/Shop/PriceListValuesDataTable.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Datatables\Admin\Shop;
+
+use App\Datatables\ParentDataTable as DataTable;
+use App\Models\Shop\PriceListValue;
+use Yajra\DataTables\Html\Column;
+
+class PriceListValuesDataTable extends DataTable
+{
+    public $model_name = 'price_list_values';
+
+    public function __construct()
+    {
+        $this->url = route('Admin.Shop.PriceListValues.index');
+    }
+
+    public function query(PriceListValue $model)
+    {
+        $model = $model->with(['price_list']);
+
+        return $this->buildQuery($model);
+    }
+
+    protected function getColumns()
+    {
+        return [
+            Column::make('price_list.name')->data('price_list')->title('etat'),
+            Column::make('code')->title('Code'),
+            Column::make('quantity')->title('Quantité'),
+            Column::make('price')->title('Prix HT'),
+            Column::make('price_taxed')->title('Prix TTC'),
+            $this->makeColumnButtons(),
+        ];
+    }
+}

app/Http/Controllers/Admin/Shop/CustomerAddressController.php

@@ -31,14 +31,18 @@ class CustomerAddressController extends Controller
 
     public function show($id)
     {
-        $data['customer'] = CustomerAddresses::get($id);
+        $data = [
+            'customer' => CustomerAddresses::get($id),
+        ];
 
         return view('Admin.Shop.CustomerAddresses.view', $data);
     }
 
     public function edit($id)
     {
-        $data['customer'] = CustomerAddresses::edit($id);
+        $data = [
+            'customer' => CustomerAddresses::edit($id),
+        ];
 
         return view('Admin.Shop.CustomerAddresses.edit', $data);
     }

app/Http/Controllers/Admin/Shop/CustomerController.php

@@ -3,6 +3,8 @@
 namespace App\Http\Controllers\Admin\Shop;
 
 use App\Datatables\Admin\Shop\CustomerAddressesDataTable;
+use App\Datatables\Admin\Shop\CustomerInvoicesDataTable;
+use App\Datatables\Admin\Shop\CustomerOrdersDataTable;
 use App\Datatables\Admin\Shop\CustomersDataTable;
 use App\Repositories\Shop\Customers;
 use Illuminate\Http\Request;
@@ -32,17 +34,21 @@ class CustomerController extends Controller
 
     public function show($id)
     {
-        $data['customer'] = Customers::get($id);
+        $data = [
+            'customer' => Customers::get($id),
+        ];
 
         return view('Admin.Shop.Customers.view', $data);
     }
 
     public function edit($id)
     {
-        $data = Customers::init();
-        $data['customer'] = Customers::edit($id);
-        $model = new CustomerAddressesDataTable();
-        $data['customer_addresses'] = $model->html();
+        $data = Customers::init() + [
+            'customer' => Customers::edit($id),
+            'customer_addresses' => (new CustomerAddressesDataTable())->html(),
+            'customer_invoices' => (new CustomerInvoicesDataTable())->html(),
+            'customer_orders' => (new CustomerOrdersDataTable())->html(),
+        ];
 
         return view('Admin.Shop.Customers.edit', $data);
     }

app/Http/Controllers/Admin/Shop/CustomerInvoiceController.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Controllers\Admin\Shop;
+
+use App\Datatables\Admin\Shop\CustomerInvoicesDataTable;
+use App\Repositories\Shop\Invoices;
+
+class CustomerInvoiceController extends Controller
+{
+    public function index(CustomerInvoicesDataTable $dataTable)
+    {
+        return $dataTable->render('Admin.Shop.CustomerInvoices.list');
+    }
+
+    public function show($id)
+    {
+        $data = [
+            'invoice' => Invoices::get($id),
+        ];
+
+        return view('Admin.Shop.CustomerInvoices.view', $data);
+    }
+
+    public function destroy($id)
+    {
+        return Invoices::destroy($id);
+    }
+}

app/Http/Controllers/Admin/Shop/CustomerOrderController.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Controllers\Admin\Shop;
+
+use App\Datatables\Admin\Shop\CustomerOrdersDataTable;
+use App\Repositories\Shop\Orders;
+
+class CustomerOrderController extends Controller
+{
+    public function index(CustomerOrdersDataTable $dataTable)
+    {
+        return $dataTable->render('Admin.Shop.CustomerOrders.list');
+    }
+
+    public function show($id)
+    {
+        $data = [
+            'order' => Orders::get($id),
+        ];
+
+        return view('Admin.Shop.CustomerOrders.view', $data);
+    }
+
+    public function destroy($id)
+    {
+        return Orders::destroy($id);
+    }
+}

app/Http/Controllers/Admin/Shop/PriceListValueController.php

@@ -2,10 +2,9 @@
 
 namespace App\Http\Controllers\Admin\Shop;
 
-use App\Datatables\Shop\PriceListValuesDataTable;
+use App\Datatables\Admin\Shop\PriceListValuesDataTable;
 use App\Http\Controllers\Controller;
 use App\Repositories\Shop\Packages;
-use App\Repositories\Shop\PriceListValueCategories;
 use App\Repositories\Shop\PriceListValues;
 use App\Repositories\Shop\Taxes;
 use App\Repositories\Shop\Unities;
@@ -15,27 +14,31 @@ class PriceListValueController extends Controller
 {
     public function index(PriceListValuesDataTable $dataTable)
     {
-        $data['categories'] = PriceListValueCategories::getOptions();
-
         return $dataTable->render('Admin.Shop.PriceListValues.list', $data);
     }
 
     public function create()
     {
-        $data['unities'] = Unities::getOptions();
-        $data['taxes_options'] = Taxes::getOptions();
-        $data['categories'] = PriceListValueCategories::getOptions();
+        $data = [
+            'unities' => Unities::getOptions(),
+            'taxes_options' => Taxes::getOptions(),
+        ];
 
         return view('Admin.Shop.PriceListValues.create', $data);
     }
 
     public function edit($id)
     {
-        $data['generic'] = PriceListValues::getFull($id)->toArray();
-        $data['packages'] = Packages::getSelectByFamily($data['generic']['category']['article_family_id']);
-        $data['unities'] = ($data['packages']['id'] ?? false) ? Unities::getSelectByPackage($data['packages']['id']) : [];
-        $data['taxes_options'] = Taxes::getOptions();
-        $data['categories'] = PriceListValueCategories::getOptions();
+        $priceListValue = PriceListValues::getFull($id)->toArray();
+        $familyId = $priceListValue['category']['article_family_id'];
+        // $packages = Packages::getSelectByFamily($familyId);
+        $data = [
+            'generic' => $priceListValue,
+            'packages' => $packages,
+            'unities' => $packages['id'] ?? false ? Unities::getSelectByPackage($packages['id']) : [],
+            'taxes_options' => Taxes::getOptions(),
+            'categories' => PriceListValueCategories::getOptions(),
+        ];
 
         return view('Admin.Shop.PriceListValues.edit', $data);
     }

app/Http/Controllers/Shop/Auth/RegisterController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Shop\Auth;
 
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Shop\RegisterCustomer;
+use App\Repositories\Shop\CustomerSaleChannels;
 use App\Repositories\Shop\CustomerAddresses;
 use App\Repositories\Shop\Customers;
 use Illuminate\Foundation\Auth\EmailVerificationRequest;
@@ -63,10 +64,11 @@ class RegisterController extends Controller
 
     protected function create(array $data)
     {
-        $user = Customers::create($data);
-        CustomerAddresses::add($user->id, $data);
+        $customer = Customers::create($data);
+        CustomerAddresses::createByCustomer($customer->id, $data);
+        CustomerSaleChannels::createByCustomer($customer->id);
 
-        return $user;
+        return $customer;
     }
 
     protected function guard()

app/Mail/ConfirmationCommande.php

@@ -42,8 +42,8 @@ class ConfirmationCommande extends TemplateMailable
 
     public function __construct($order)
     {
-        $facturation_address = $order->invoice->address ? $order->invoice->address : $customer; 
-        $delivery_address = $order->delivery_address ? $order->delivery_address : $customer;
+        $facturation_address = $order->invoice->address; 
+        $delivery_address = $order->delivery_address;
         $this->prenom = $order->customer->first_name;
         $this->nom = $order->customer->last_name;
         $this->facturation_adresse = $facturation_address->address;

app/Models/Shop/Unity.php

@@ -3,7 +3,10 @@
 namespace App\Models\Shop;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Znck\Eloquent\Relations\BelongsToThrough as RelationsBelongsToThrough;
 use Znck\Eloquent\Traits\BelongsToThrough;
 
 class Unity extends Model
@@ -14,19 +17,33 @@ class Unity extends Model
 
     protected $table = 'shop_unities';
 
-    public function package()
+    public function package(): BelongsTo
     {
         return $this->belongsTo(Package::class);
     }
 
-    public function article_family()
+    public function variations(): HasMany
     {
-        return $this->belongsToThrough(ArticleNature::class, Package::class, null, '', ['App\Models\Shop\ArticleNature' => 'article_family_id', 'App\Models\Shop\Package' => 'package_id']);
+        return $this->hasMany(Variation::class);
+    }
+
+    public function article_family(): RelationsBelongsToThrough
+    {
+        return $this->belongsToThrough(
+            ArticleNature::class,
+            Package::class,
+            null,
+            '',
+            [
+                'App\Models\Shop\ArticleNature' => 'article_family_id',
+                'App\Models\Shop\Package' => 'package_id'
+            ]
+        );
     }
 
     public function scopeByPackage($query, $id)
     {
-        return $query->where($this->table.'.package_id', $id);
+        return $query->where($this->table . '.package_id', $id);
     }
 
     public function scopeByArticleNature($query, $id)

app/Models/Shop/Variation.php

@@ -30,8 +30,13 @@ class Variation extends Model
         return $this->hasMany(Offer::class);
     }
 
-    public function scopeByPackage($query, $package_id)
+    public function scopeByPackage($query, $packageId)
     {
-        return $query->where($this->table.'.package_id', $package_id);
+        return $query->where($this->table . '.package_id', $packageId);
+    }
+
+    public function scopeByUnity($query, $unityId)
+    {
+        return $query->where($this->table . '.unity_id', $unityId);
     }
 }

app/Repositories/Core/Auth/Passwords.php

@@ -2,22 +2,20 @@
 
 namespace App\Repositories\Core\Auth;
 
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rules\Password;
+
 class Passwords
 {
-    public static function validator()
+    public static function validator($request)
     {
-        $validator = new \Password\Validator(new \Password\StringHelper());
-        $validator->setMinLength(5);
-        $validator->setMinLowerCaseLetters(2);
-        $validator->setMinUpperCaseLetters(1);
-        $validator->setMinNumbers(1);
-        $validator->setMinSymbols(3);
+        return Validator::make($request->all(), [
+            'password' => ['required', 'confirmed', self::rules()],
+        ]);
+    }
 
-        if ($validator->isValid($password)) {
-            printf('password %s is valid'.PHP_EOL, $password);
-        } else {
-            printf('password %s is invalid'.PHP_EOL, $password);
-            var_dump($validator->getErrors());
-        }
+    public static function rules()
+    {
+        return Password::min(10)->mixedCase()->numbers()->symbols()->uncompromised();
     }
 }

app/Repositories/Core/Auth/Teams.php

@@ -41,8 +41,6 @@ class Teams
 
     public static function delete($id)
     {
-        Users::destroyByUniqueTeam($id);
-
         return Team::destroy($id);
     }
 

app/Repositories/Core/Comments.php

@@ -3,28 +3,22 @@
 namespace App\Repositories\Core;
 
 use App\Datatables\Admin\Core\CommentsDataTable;
-use App\Models\Core\Comment as rawComment;
+use App\Models\Core\Comment;
 use App\Repositories\Core\Auth\Users;
+use App\Traits\Model\Basic;
 
 class Comments
 {
-    public static function get($id)
-    {
-        return rawComment::find($id);
-    }
+    use Basic;
 
     public static function getDatatable()
     {
-        $model = new CommentsDataTable();
-
-        return $model->html();
+        return (new CommentsDataTable())->html();
     }
 
     public static function getCommentsByModel($model, $model_id)
     {
-        $class = self::getClass($model);
-
-        return self::getCommentsByClass($class, $model_id);
+        return self::getCommentsByClass(self::getClass($model), $model_id);
     }
 
     public static function getCommentsByClass($class, $id)
@@ -32,14 +26,14 @@ class Comments
         return self::getByModel(self::getModel($class, $id));
     }
 
-    public static function getModel($class, $id)
+    public static function getItem($class, $id)
     {
         return $class::find($id);
     }
 
     public static function getClass($model)
     {
-        return 'App\Models\\'.str_replace('.', '\\', $model);
+        return 'App\Models\\' . str_replace('.', '\\', $model);
     }
 
     public static function getByModel($model)
@@ -75,25 +69,11 @@ class Comments
         $data['is_approved'] = true;
         $data['user_id'] = Users::getId();
 
-        return rawComment::create($data);
+        return Comment::create($data);
     }
 
-    public static function update($data, $id = false)
+    public static function getModel()
     {
-        $id = $id ? $id : $data['id'];
-        $model = self::get($id);
-        $model->update($data);
-
-        return $model;
-    }
-
-    public static function deleteComments($model)
-    {
-        return true;
-    }
-
-    public static function deleteComment($model, $index)
-    {
-        return true;
+        return Comment::query();
     }
 }

app/Repositories/Shop/ArticleImages.php

@@ -4,23 +4,22 @@ namespace App\Repositories\Shop;
 
 use App\Repositories\Botanic\Species;
 use App\Repositories\Botanic\Varieties;
-use App\Traits\Model\Basic;
 use App\Traits\Repository\Imageable;
 
 class ArticleImages
 {
-    use Basic, Imageable;
+    use Imageable;
 
     public static function getFullImagesByArticleId($id)
     {
-        $article = self::get($id);
+        $article = Articles::get($id);
 
         return $article ? self::getFullImagesByArticle($article) : false;
     }
 
     public static function countFullImagesByArticleId($id)
     {
-        $article = self::get($id);
+        $article = Articles::get($id);
 
         return $article ? self::countFullImagesByArticle($article) : 0;
     }

app/Repositories/Shop/CustomerAddresses.php

@@ -9,67 +9,6 @@ class CustomerAddresses
 {
     use Basic;
 
-    public static function add($userId, $data)
-    {
-        self::addDeliveryAddress($userId, $data);
-        self::addInvoiceAddress($userId, $data);
-    }
-
-    public static function addDeliveryAddress($userId, $data)
-    {
-        $name = $data['company'] ? $data['company'] : $data['first_name'].' '.$data['last_name'];
-        $delivery = $data['use_for_delivery'] ?? false;
-        
-        $data = [
-            'customer_id' => $userId,
-            'type' => 2,
-            'name' => $name,
-            'address' => $delivery ? $data['delivery_address'] : $data['address'],
-            'address2' => $delivery ? $data['delivery_address2'] : $data['address2'],
-            'zipcode' => $delivery ? $data['delivery_zipcode'] : $data['zipcode'],
-            'city' => $delivery ? $data['delivery_city'] : $data['city'],
-        ];
-
-        return self::store($data);
-    }
-
-    public static function addInvoiceAddress($userId, $data)
-    {
-        $name = $data['company'] ? $data['company'] : $data['first_name'].' '.$data['last_name'];
-        
-        $data = [
-            'customer_id' => $userId,
-            'type' => 1,
-            'name' => $name,
-            'address' => $data['address'],
-            'address2' => $data['address2'],
-            'zipcode' => $data['zipcode'],
-            'city' => $data['city'],
-        ];
-
-        return self::store($data);
-    }
-
-    public static function getInvoiceAddress($customerId)
-    {
-        $addresses = CustomerAddress::byCustomer($customerId)->byInvoicing()->get();
-        if (count($addresses)) {
-            $address = $addresses->first();
-        }
-
-        return $address;
-    }
-
-    public static function getDeliveryAddress($customerId)
-    {
-        $addresses = CustomerAddress::byCustomer($customerId)->byDelivery()->get();
-        if (count($addresses)) {
-            $address = $addresses->first();
-        }
-
-        return $address;
-    }
-
     public static function storeByCustomer($customer, $data)
     {
         $deliveries = $data['deliveries'] ?? false;
@@ -87,6 +26,72 @@ class CustomerAddresses
         }
     }
 
+    public static function createByCustomer($customerId, $data)
+    {
+        self::addDeliveryAddress($customerId, $data);
+        self::addInvoiceAddress($customerId, $data);
+    }
+
+    public static function addDeliveryAddress($customerId, $data)
+    {
+        $delivery = $data['use_for_delivery'] ?? false;
+        $data = array_merge($data, [
+            'address' => $delivery ? $data['delivery_address'] : $data['address'],
+            'address2' => $delivery ? $data['delivery_address2'] : $data['address2'],
+            'zipcode' => $delivery ? $data['delivery_zipcode'] : $data['zipcode'],
+            'city' => $delivery ? $data['delivery_city'] : $data['city'],
+        ]);
+
+        return self::addAddress($customerId, $data, 2);
+    }
+
+    public static function addInvoiceAddress($customerId, $data)
+    {
+        return self::addAddress($customerId, $data, 1);
+
+    }
+
+    public static function addAddress($customerId, $data, $type)
+    {
+        $name = $data['company'] ? $data['company'] : $data['first_name'] . ' ' . $data['last_name'];
+
+        $data = [
+            'customer_id' => $customerId,
+            'type' => $type,
+            'name' => $name,
+            'address' => $data['address'],
+            'address2' => $data['address2'],
+            'zipcode' => $data['zipcode'],
+            'city' => $data['city'],
+        ];
+
+        return self::store($data);
+    }
+
+    public static function getInvoiceAddress($customerId)
+    {
+        $addresses = CustomerAddress::byCustomer($customerId)->byInvoicing()->get();
+        return count($addresses) ? $addresses->first() : self::getByCustomer($customerId);
+    }
+
+    public static function getDeliveryAddress($customerId)
+    {
+        $addresses = CustomerAddress::byCustomer($customerId)->byDelivery()->get();
+        return count($addresses) ? $addresses->first() : self::getByCustomer($customerId);
+    }
+
+    public static function getByCustomer($customerId = false)
+    {
+        $customer = Customers::get($customerId);
+
+        return $customer ? $customer->only(['address', 'adress2', 'zipcode', 'city']) : false;
+    }
+
+    public static function getIconByType($type)
+    {
+        return ((int) $type === 1) ? '<i class="fa fa-fw fa-truck"></i>' : '<i class="fa fa-fw fa-file-invoice"></i>';
+    }
+
     public static function toggleActive($id, $active)
     {
         return self::update(['active' => $active], $id);

app/Repositories/Shop/CustomerAvatars.php

@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Repositories\Shop;
+
+use App\Repositories\Core\File;
+use Laravolt\Avatar\Avatar;
+
+class CustomerAvatars
+{
+    public static function getImg($id = false)
+    {
+        $avatar = self::getAvatar($id);
+        $name = Customers::getName($id);
+
+        return "<img src='{$avatar}' class='img-fluid' title='{$name}'>";
+    }
+
+    public static function getAvatar($id = false)
+    {
+        $customer = $id ? Customers::get($id) : Customers::getAuth();
+        $file = self::makeAvatarFilename($customer);
+        if (!File::checkFile($file)) {
+            self::createAvatar($customer);
+        }
+
+        return self::getPublic(self::getAvatarFilename($customer));
+    }
+
+    public static function createAvatar($customer)
+    {
+        $filename = self::makeAvatarFilename($customer);
+        $name = $customer->first_name . ' ' . $customer->last_name;
+        $avatar = new Avatar();
+
+        return $avatar->create($name)
+            ->setBackground('#F2B90F')
+            ->setForeground('#335012')
+            ->setBorder(1, '#28a745')
+            ->setFontFamily('Roboto Condensed')
+            ->setDimension(36)
+            ->setFontSize(16)
+            ->save($filename);
+    }
+
+    public static function makeAvatarFilename($customer)
+    {
+        $path = storage_path(self::getStorage());
+        if (File::checkDirOrCreate($path)) {
+            $filename = $path . self::getAvatarFilename($customer);
+        }
+
+        return $filename ?? false;
+    }
+
+    public static function getAvatarFilename($customer)
+    {
+        return 'user-' . $customer->uuid . '.png';
+    }
+
+    public static function getStorage($filename = false)
+    {
+        $path = '/app/public/Customers/';
+
+        return $filename ? $path . $filename : $path;
+    }
+
+    public static function getPublic($filename = false)
+    {
+        $path = '/storage/Customers/';
+
+        return $filename ? $path . $filename : $path;
+    }
+}

app/Repositories/Shop/CustomerSaleChannels.php

@@ -9,6 +9,13 @@ class CustomerSaleChannels
 {
     use Basic;
 
+    public static function createByCustomer($customerId)
+    {
+        $customer = Customers::get($customerId);
+
+        return $customer->sale_channels()->sync(SaleChannels::getDefault());
+    }
+
     public static function destroyByCustomerAndSaleChannel($customerId, $saleChannelId)
     {
         return CustomerSaleChannel::byCustomer($customerId)->bySaleChannel($saleChannelId)->delete();

app/Repositories/Shop/Customers.php

@@ -5,11 +5,9 @@ namespace App\Repositories\Shop;
 use App\Datatables\Shop\CustomerInvoicesDataTable;
 use App\Datatables\Shop\CustomerOrdersDataTable;
 use App\Models\Shop\Customer;
-use App\Repositories\Core\File;
 use App\Traits\Model\Basic;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Str;
-use Laravolt\Avatar\Avatar;
 
 class Customers
 {
@@ -32,20 +30,24 @@ class Customers
     public static function getSaleChannels($customerId = false)
     {
         $customer = $customerId ? self::get($customerId) : self::getAuth();
+        $saleChannels = $customer ? $customer->sale_channels : false;
 
-        return $customer ? $customer->sale_channels : SaleChannels::getDefault();
+        return $saleChannels ? $saleChannels : SaleChannels::getDefault();
     }
 
-    public static function getSaleChannel()
+    public static function getSaleChannel($customerId = false)
     {
-        return SaleChannels::getDefault();
+        $saleChannels = self::getSaleChannels($customerId);
+
+        return $saleChannels->first();
     }
 
     public static function getDeliveries()
     {
         $customer = self::getAuth();
+        $deliveries = $customer ? $customer->deliveries : false;
 
-        return $customer ? $customer->deliveries : Deliveries::getDefault();
+        return $deliveries ? $deliveries : [Deliveries::getDefault()];
     }
 
     public static function getOptions()
@@ -63,48 +65,6 @@ class Customers
         ] : abort('403');
     }
 
-    public static function getAvatar($id = false)
-    {
-        $customer = $id ? self::get($id) : self::getAuth();
-        $file = self::makeAvatarFilename($customer);
-        if (!File::checkFile($file)) {
-            self::createAvatar($customer);
-        }
-
-        return self::getPublic(self::getAvatarFilename($customer));
-    }
-
-    public static function createAvatar($customer)
-    {
-        $filename = self::makeAvatarFilename($customer);
-        $name = $customer->first_name . ' ' . $customer->last_name;
-        $avatar = new Avatar();
-
-        return $avatar->create($name)
-            ->setBackground('#F2B90F')
-            ->setForeground('#335012')
-            ->setBorder(1, '#28a745')
-            ->setFontFamily('Roboto Condensed')
-            ->setDimension(36)
-            ->setFontSize(16)
-            ->save($filename);
-    }
-
-    public static function makeAvatarFilename($customer)
-    {
-        $path = storage_path(self::getStorage());
-        if (File::checkDirOrCreate($path)) {
-            $filename = $path . self::getAvatarFilename($customer);
-        }
-
-        return $filename ?? false;
-    }
-
-    public static function getAvatarFilename($customer)
-    {
-        return 'user-' . $customer->uuid . '.png';
-    }
-
     public static function getAddresses($id = false)
     {
         $customer = self::getWithAddresses($id);
@@ -126,26 +86,6 @@ class Customers
         return $user ? $user->name : '';
     }
 
-    public static function getAuth()
-    {
-        return self::guard()->user();
-    }
-
-    public static function getId()
-    {
-        return self::guard()->id();
-    }
-
-    public static function isNotConnected()
-    {
-        return !self::isConnected();
-    }
-
-    public static function isConnected()
-    {
-        return self::guard()->check();
-    }
-
     public static function edit($id)
     {
         if (!$id) {
@@ -178,14 +118,9 @@ class Customers
         return $customer->id;
     }
 
-    public static function storeDeliveries($customer, $deliveries)
+    public static function storeDeliveries($customerId, $deliveries)
     {
-        if (!$deliveries) {
-            return false;
-        }
-        $deliveries = collect($deliveries)->transform(function ($item) {
-            return (int) $item;
-        })->toArray();
+        $customer = self::get($customerId);
 
         return $customer->deliveries()->sync($deliveries);
     }
@@ -200,18 +135,9 @@ class Customers
 
     public static function storeSaleChannels($customerId, $saleChannels)
     {
-        $oldSaleChannels = self::getSaleChannelIds($customerId);
-        $deleteSaleChannels = array_diff($oldSaleChannels, $saleChannels);
-        $newSaleChannels = array_diff($saleChannels, $oldSaleChannels);
+        $customer = self::get($customerId);
 
-        $data = ['customer_id' => $customerId];
-        foreach ($newSaleChannels as $saleChannelId) {
-            $data['sale_channel_id'] = $saleChannelId;
-            CustomerSaleChannels::store($data);
-        }
-        foreach ($deleteSaleChannels as $saleChannelId) {
-            CustomerSaleChannels::destroyByCustomerAndSaleChannel($customerId, $saleChannelId);
-        }
+        return $customer->sale_channels()->sync($saleChannels);
     }
 
     public static function create($data)
@@ -223,18 +149,24 @@ class Customers
         return Customer::create($data);
     }
 
-    public static function getStorage($filename = false)
+    public static function getAuth()
     {
-        $path = '/app/public/Customers/';
-
-        return $filename ? $path . $filename : $path;
+        return self::guard()->user();
     }
 
-    public static function getPublic($filename = false)
+    public static function getId()
     {
-        $path = '/storage/Customers/';
+        return self::guard()->id();
+    }
 
-        return $filename ? $path . $filename : $path;
+    public static function isNotConnected()
+    {
+        return !self::isConnected();
+    }
+
+    public static function isConnected()
+    {
+        return self::guard()->check();
     }
 
     public static function guard()

app/Repositories/Shop/Deliveries.php

@@ -19,7 +19,7 @@ class Deliveries
     public static function getByCustomer($customerId = false)
     {
         $customer = $customerId ? Customers::get($customerId) : Customers::getAuth();
-        $saleChannels = $customer ? $customer->sale_channels->pluck('id')->toArray() : false;
+        $saleChannels = $customer ? $customer->sale_channels->pluck('id')->toArray() : [SaleChannels::getDefaultID()];
 
         return $saleChannels ? self::getBySaleChannels($saleChannels) : false;
     }