refactoring of admin datatables

app/Datatables/Admin/Shop/ArticleNaturesDataTable.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Datatables\Shop;
+namespace App\Datatables\Admin\Shop;
 
 use App\Datatables\ParentDataTable as DataTable;
 use App\Models\Shop\ArticleNature;

app/Datatables/Admin/Shop/ArticlesDataTable.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Datatables\Shop;
+namespace App\Datatables\Admin\Shop;
 
 use App\Datatables\ParentDataTable as DataTable;
 use App\Models\Shop\Article;

app/Datatables/Admin/Shop/DeliveriesDataTable.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Datatables\Shop;
+namespace App\Datatables\Admin\Shop;
 
 use App\Datatables\ParentDataTable as DataTable;
 use App\Models\Shop\Delivery;
@@ -29,10 +29,16 @@ class DeliveriesDataTable extends DataTable
                     'size' => 'sm',
                 ]);
             })
+            ->editColumn('is_public', function (Delivery $delivery) {
+                return $delivery->is_public ? "<i class='fa fa-check secondary'></i>" : '';
+            })
+            ->editColumn('at_house', function (Delivery $delivery) {
+                return $delivery->at_house ? "<i class='fa fa-check secondary'></i>" : '';
+            })
             ->editColumn('address', function (Delivery $delivery) {
                 return $delivery->address.' '.$delivery->zipcode.' '.$delivery->city;
             })
-            ->rawColumns(['active', 'address', 'action']);
+            ->rawColumns(['active', 'is_public', 'at_house', 'address', 'action']);
 
         return parent::modifier($datatables);
     }
@@ -41,6 +47,8 @@ class DeliveriesDataTable extends DataTable
     {
         return [
             Column::make('active')->title(__('active'))->width(60)->class('text-center'),
+            Column::make('is_public')->title(__('Public'))->width(60)->class('text-center'),
+            Column::make('at_house')->title(__('Défaut'))->width(60)->class('text-center'),
             Column::make('name')->title('Nom'),
             Column::make('sale_channel.name')->title(__('shop.sale_channels.name')),
             Column::make('address')->title('Adresse')->searchable(false),

app/Datatables/Admin/Shop/InvoicesDataTable.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Datatables\Admin\Shop;
+
+use App\Datatables\ParentDataTable as DataTable;
+use App\Models\Shop\Invoice;
+use App\Repositories\Shop\Invoices;
+use Yajra\DataTables\Html\Column;
+
+class InvoicesDataTable extends DataTable
+{
+    public $model_name = 'Invoices';
+
+    public function query(Invoice $model)
+    {
+        $model = $model->with('customer');
+
+        return $this->buildQuery($model);
+    }
+
+    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->toDateTimeString();
+            })
+            ->editColumn('customer.last_name', function (Invoice $invoice) {
+                return ($invoice->customer ?? false) ? $invoice->customer->last_name.' '.$invoice->customer->first_name : '';
+            })
+            ->rawColumns(['action']);
+
+        return parent::modifier($datatables);
+    }
+
+    protected function getColumns()
+    {
+        return [
+            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/Admin/Shop/OffersDataTable.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Datatables\Shop;
+namespace App\Datatables\Admin\Shop;
 
 use App\Datatables\ParentDataTable as DataTable;
 use App\Models\Shop\Offer;

app/Datatables/Admin/Shop/OrdersDataTable.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Datatables\Admin\Shop;
+
+use App\Datatables\ParentDataTable as DataTable;
+use App\Models\Shop\Order;
+use App\Repositories\Shop\InvoicePayments;
+use App\Repositories\Shop\Orders;
+use Yajra\DataTables\Html\Column;
+
+class OrdersDataTable extends DataTable
+{
+    public $model_name = 'orders';
+
+    public $sortedColumn = 1;
+
+    public $sortedOrder = 'desc';
+
+    public $stateSave = true;
+
+    public function query(Order $model)
+    {
+        $model = $model->with(['customer', 'delivery']);
+
+        return $this->buildQuery($model);
+    }
+
+    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->toDateTimeString();
+            })
+            ->editColumn('customer.last_name', function (Order $order) {
+                return $order->customer->last_name.' '.$order->customer->first_name;
+            })
+            ->editColumn('payment_type', function (Order $order) {
+                return InvoicePayments::getPaymentType($order->payment_type);
+            })
+            ->rawColumns(['action']);
+
+        return parent::modifier($datatables);
+    }
+
+    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'),
+            Column::make('delivery.name')->title('Point de distribution'),
+            Column::make('payment_type')->title('Règlement'),
+            Column::make('total_shipped')->title('Montant')->class('text-right'),
+            $this->makeColumnButtons(),
+        ];
+    }
+}

app/Datatables/Admin/Shop/SaleChannelsDataTable.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Datatables\Shop;
+namespace App\Datatables\Admin\Shop;
 
 use App\Datatables\ParentDataTable as DataTable;
 use App\Models\Shop\SaleChannel;

app/Datatables/Shop/OrdersDataTable.php

@@ -45,6 +45,11 @@ class OrdersDataTable extends DataTable
         return parent::modifier($datatables);
     }
 
+    public function getHtmlButtons()
+    {
+        return self::getButtonShow();
+    }
+
     protected function getColumns()
     {
         return [

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

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Admin\Shop;
 
-use App\Datatables\Shop\ArticlesDataTable;
+use App\Datatables\Admin\Shop\ArticlesDataTable;
 use App\Repositories\Shop\ArticleNatures;
 use App\Repositories\Shop\Articles;
 use App\Repositories\Shop\Categories;

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

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Admin\Shop;
 
-use App\Datatables\Shop\ArticleNaturesDataTable;
+use App\Datatables\Admin\Shop\ArticleNaturesDataTable;
 use App\Repositories\Shop\ArticleNatures;
 use Illuminate\Http\Request;
 

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

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Admin\Shop;
 
-use App\Datatables\Shop\DeliveriesDataTable;
+use App\Datatables\Admin\Shop\DeliveriesDataTable;
 use App\Repositories\Shop\Deliveries;
 use App\Repositories\Shop\SaleChannels;
 use Illuminate\Http\Request;
@@ -11,14 +11,14 @@ class DeliveryController extends Controller
 {
     public function index(DeliveriesDataTable $dataTable)
     {
-        $data = [];
+        return $dataTable->render('Admin.Shop.Deliveries.list');
-
-        return $dataTable->render('Admin.Shop.Deliveries.list', $data);
     }
 
     public function create()
     {
-        $data['sale_channels'] = SaleChannels::getOptions();
+        $data = [
+            'sale_channels' => SaleChannels::getOptions(),
+        ];
 
         return view('Admin.Shop.Deliveries.create', $data);
     }
@@ -32,15 +32,19 @@ class DeliveryController extends Controller
 
     public function show($id)
     {
-        $data['delivery'] = Deliveries::get($id);
+        $data = [
+            'delivery' => Deliveries::get($id),
+        ];
 
         return view('Admin.Shop.Deliveries.view', $data);
     }
 
     public function edit($id)
     {
-        $data['delivery'] = Deliveries::get($id)->toArray();
+        $data = [
-        $data['sale_channels'] = SaleChannels::getOptions();
+            'delivery' => Deliveries::get($id)->toArray(),
+            'sale_channels' => SaleChannels::getOptions(),
+        ];
 
         return view('Admin.Shop.Deliveries.edit', $data);
     }

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

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Admin\Shop;
 
-use App\Datatables\Shop\InvoicesDataTable;
+use App\Datatables\Admin\Shop\InvoicesDataTable;
 use App\Http\Controllers\Controller;
 use App\Repositories\Shop\Invoices;
 use Illuminate\Http\Request;

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

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Admin\Shop;
 
-use App\Datatables\Shop\OffersDataTable;
+use App\Datatables\Admin\Shop\OffersDataTable;
 use App\Http\Controllers\Controller;
 use App\Repositories\Shop\ArticleNatures;
 use App\Repositories\Shop\Articles;

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

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Admin\Shop;
 
-use App\Datatables\Shop\OrdersDataTable;
+use App\Datatables\Admin\Shop\OrdersDataTable;
 use App\Http\Controllers\Controller;
 use App\Repositories\Shop\Orders;
 use App\Repositories\Shop\OrderMails;

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

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Admin\Shop;
 
-use App\Datatables\Shop\SaleChannelsDataTable;
+use App\Datatables\Admin\Shop\SaleChannelsDataTable;
 use App\Http\Controllers\Controller;
 use App\Repositories\Shop\SaleChannels;
 use Illuminate\Http\Request;