refactor datatables admin

app/Datatables/Admin/Shop/CategoriesDataTable.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\Category;

app/Datatables/Admin/Shop/CustomerAddressesDataTable.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\CustomerAddress;

app/Datatables/Admin/Shop/CustomersDataTable.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\Customer;

app/Datatables/Admin/Shop/DeliveryPackagesDataTable.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\DeliveryPackage;

app/Datatables/Admin/Shop/DeliveryTypeCalculationsDataTable.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\DeliveryTypeCalculation;

app/Datatables/Admin/Shop/DeliveryTypesDataTable.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\DeliveryType;

app/Datatables/Admin/Shop/HomepagesDataTable.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\Homepage;

app/Datatables/Admin/Shop/MerchandisesDataTable.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\Merchandise;

app/Datatables/Admin/Shop/PackagesDataTable.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\Package;

app/Datatables/Admin/Shop/PriceGenericCategoriesDataTable.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\PriceGenericCategory;

app/Datatables/Admin/Shop/PriceListsDataTable.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\PriceList;

app/Datatables/Admin/Shop/ProducersDataTable.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\Producer;

app/Datatables/Admin/Shop/TagGroupsDataTable.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\TagGroup;

app/Datatables/Admin/Shop/TagsDataTable.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\Tag;

app/Datatables/Admin/Shop/TariffUnitiesDataTable.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Datatables\Admin\Shop;
+
+use Yajra\DataTables\Html\Column;
+use App\Datatables\ParentDataTable as DataTable;
+use App\Models\Shop\TariffUnity;
+
+class TariffUnitiesDataTable extends DataTable
+{
+    public $model_name = 'tariff_unities';
+
+    public function query(TariffUnity $model)
+    {
+        return $this->buildQuery($model);
+    }
+
+    protected function getColumns()
+    {
+        return [
+            Column::make('value')->title('Valeur'),
+            $this->makeColumnButtons(),
+        ];
+    }
+}

app/Datatables/Admin/Shop/TariffsDataTable.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\Tariff;

app/Datatables/Admin/Shop/UnitiesDataTable.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\Unity;

app/Datatables/Admin/Shop/VariationsDataTable.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\Variation;

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

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Admin\Shop;
 
-use App\Datatables\Shop\CategoriesDataTable;
+use App\Datatables\Admin\Shop\CategoriesDataTable;
 use App\Repositories\Shop\Categories;
 use App\Repositories\Shop\TagGroups;
 use Illuminate\Http\Request;

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

@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\Admin\Shop;
 
-use App\Datatables\Shop\CustomerAddressesDataTable;
+use App\Datatables\Admin\Shop\CustomerAddressesDataTable;
-use App\Datatables\Shop\CustomersDataTable;
+use App\Datatables\Admin\Shop\CustomersDataTable;
 use App\Repositories\Shop\Customers;
 use App\Repositories\Shop\Deliveries;
 use Illuminate\Http\Request;

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

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

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

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Admin\Shop;
 
-use App\Datatables\Shop\DeliveryTypeCalculationsDataTable;
+use App\Datatables\Admin\Shop\DeliveryTypeCalculationsDataTable;
 use App\Repositories\Shop\DeliveryTypeCalculations;
 use App\Repositories\Shop\DeliveryTypes;
 use Illuminate\Http\Request;

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

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

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

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

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

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

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

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

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

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Admin\Shop;
 
-use App\Datatables\Shop\ProducersDataTable;
+use App\Datatables\Admin\Shop\ProducersDataTable;
 use App\Repositories\Shop\Producers;
 use App\Repositories\Shop\TagGroups;
 use Illuminate\Http\Request;

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

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Admin\Shop;
 
-use App\Datatables\Shop\TagsDataTable;
+use App\Datatables\Admin\Shop\TagsDataTable;
 use App\Http\Controllers\Controller;
 use App\Repositories\Shop\TagGroups;
 use App\Repositories\Shop\Tags;

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

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

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

@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers\Admin\Shop;
 
-use App\Datatables\Shop\PriceListsDataTable;
+use App\Datatables\Admin\Shop\PriceListsDataTable;
-use App\Datatables\Shop\TariffsDataTable;
+use App\Datatables\Admin\Shop\TariffsDataTable;
 use App\Repositories\Shop\SaleChannels;
 use App\Repositories\Shop\Tariffs;
 use App\Repositories\Shop\TariffUnities;

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

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

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

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

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

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Admin\Shop;
 
-use App\Datatables\Shop\VariationsDataTable;
+use App\Datatables\Admin\Shop\VariationsDataTable;
 use App\Repositories\Shop\Packages;
 use App\Repositories\Shop\Unities;
 use App\Repositories\Shop\Variations;

app/Menu/Customers.php

@@ -13,10 +13,9 @@ class Customers
             ->activeIfRoute('customers')
             ->order(3);
 
-        $menu->addTo('customers', 'Clients', [ 'route' => 'Admin.Shop.Customers.index', 'permission' => 'backend_access' ])
+        $menu->addTo('customers', 'Clients', [
-            ->activeIfRoute(['Admin.Shop.Customers.*'])->order(1);
+            'route' => 'Admin.Shop.Customers.index',
-
+            'permission' => 'backend_access',
-        $menu->addTo('customers', 'Canaux de vente', [ 'route' => 'Admin.Shop.SaleChannels.index', 'permission' => 'backend_access' ])
+        ])->activeIfRoute(['Admin.Shop.Customers.*'])->order(1);
-            ->activeIfRoute(['Admin.Shop.SaleChannels.*'])->order(1);
     }
 }

app/Repositories/Shop/Invoices.php

@@ -49,7 +49,6 @@ class Invoices
     {
         InvoiceStats::increase($data['total_taxed']);
         $data['uuid'] = Str::uuid()->toString();
-        $data['ref'] = self::getNewRef();
 
         return Invoice::create($data);
     }

app/Repositories/Shop/Orders.php

@@ -23,6 +23,7 @@ class Orders
         unset($data['basket']);
         $order = self::store($data);
         $detail = OrderDetails::saveBasket($order->id, $basket['detail']);
+        $data['ref'] = $order->ref;
         unset($data['comment']);
         unset($data['agree']);
         unset($data['customer_id']);