change icons, css, add routing to merchandise, add mail templater, fixes

app/Datatables/Admin/Core/Mail/MailLogsDataTable.php

@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Datatables\Admin\Core\Mail;
+
+use App\Datatables\ParentDataTable as DataTable;
+use App\Models\Core\Mail\MailLog;
+use App\Repositories\Core\Mail\MailParser;
+use Yajra\DataTables\Html\Column;
+
+class MailLogsDataTable extends DataTable
+{
+    public $model_name = 'mail_logs';
+
+    public $sortedColumn = 0;
+
+    public $sortedOrder = 'desc';
+
+    public $stateSave = true;
+
+    public function query(MailLog $model)
+    {
+        return $this->buildQuery($model);
+    }
+
+    public function modifier($datatables)
+    {
+        $datatables
+            ->editColumn('sent_to', function (MailLog $log) {
+                return MailParser::getToEmail($log->event);
+            })
+            ->editColumn('subject', function (MailLog $log) {
+                return MailParser::getSubject($log->event);
+            })
+            ->rawColumns(['action']);
+
+        return parent::modifier($datatables);
+    }
+
+    public function getHtmlButtons()
+    {
+        return self::getButtonShow();
+    }
+
+    protected function getColumns()
+    {
+        return [
+            Column::make('created_at')->title(__('sent')),
+            Column::make('sent_to')->title(__('user')),
+            Column::make('subject')->title(__('subject')),
+            $this->makeColumnButtons()->width('60'),
+        ];
+    }
+}

app/Datatables/Admin/Core/Mail/MailTemplatesDataTable.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Datatables\Admin\Core\Mail;
+
+use App\Datatables\ParentDataTable as DataTable;
+use App\Models\Core\Mail\MailTemplate;
+use App\Repositories\Core\Auth\Users;
+use Yajra\DataTables\Html\Column;
+
+class MailTemplatesDataTable extends DataTable
+{
+    public $model_name = 'mail_templates';
+
+    public $sortedColumn = 0;
+
+    public $sortedOrder = 'desc';
+
+    public $stateSave = true;
+
+    public function query(MailTemplate $model)
+    {
+        return $this->buildQuery($model);
+    }
+
+    public function getHtmlButtons()
+    {
+        $buttons = '';
+        if (Users::hasPermission('mail_templates_view')) {
+            $buttons .= self::getButtonShow();
+        }
+        if (Users::hasPermission('mail_templates_update')) {
+            $buttons .= self::getButtonEdit();
+        }
+        if (Users::hasPermission('mail_templates_delete')) {
+            $buttons .= self::getButtonDel();
+        }
+
+        return $buttons;
+    }
+
+    protected function getColumns()
+    {
+        return [
+            Column::make('subject')->title(__('Core.subject')),
+            Column::make('mailable')->title(__('Mailable')),
+            $this->makeColumnButtons()->width('60'),
+        ];
+    }
+}

app/Datatables/Shop/ArticleNaturesDataTable.php

@@ -5,6 +5,7 @@ namespace App\Datatables\Shop;
 use Yajra\DataTables\Html\Column;
 use App\Datatables\ParentDataTable as DataTable;
 use App\Models\Shop\ArticleNature;
+use App\Repositories\Shop\ArticleNatures;
 
 class ArticleNaturesDataTable extends DataTable
 {
@@ -16,11 +17,22 @@ class ArticleNaturesDataTable extends DataTable
         return $this->buildQuery($model);
     }
 
+    public function modifier($datatables)
+    {
+        $datatables
+        ->editColumn('product_type', function (ArticleNature $nature) {
+            return ArticleNatures::getProductTypeName($nature->product_type);
+        })
+        ->rawColumns(['action']);
+        return parent::modifier($datatables);
+    }
+
     protected function getColumns()
     {
         return [
+            Column::make('product_type')->title('Famille de produit')->width(140),
             Column::make('name')->title('Nom'),
-            Column::make('articles_count')->title('#Art')->addClass('text-right')->searchable(false)->width(60),
+            Column::make('articles_count')->title('Nb Art.')->addClass('text-right')->searchable(false)->width(60),
             $this->makeColumnButtons(),
         ];
     }

app/Datatables/Shop/InvoicesDataTable.php

@@ -36,9 +36,9 @@ class InvoicesDataTable extends DataTable
     protected function getColumns()
     {
         return [
-            
-            Column::make('status'),
-            Column::make('created_at')->title('Date'),
+            Column::make('ref')->title('Ref')->width(80),
+            Column::make('status')->width(60),
+            Column::make('created_at')->title('Date')->width(100),
             Column::make('customer.last_name')->title('Client')->default(''),
             Column::make('total')->addClass('text-right'),
             $this->makeColumnButtons(),

app/Datatables/Shop/OrdersDataTable.php

@@ -44,6 +44,7 @@ class OrdersDataTable extends DataTable
     protected function getColumns()
     {
         return [
+            Column::make('ref')->title('Ref'),
             Column::make('status')->title('Statut'),
             Column::make('created_at')->title('Date'),
             Column::make('customer.last_name')->title('Client'),