From 419a4c2b9a81f47a591966098da2e582e6147b57 Mon Sep 17 00:00:00 2001
From: Ludovic CANDELLIER <ludovic.candellier@fundglobam.com>
Date: Tue, 29 Aug 2023 23:31:15 +0200
Subject: [PATCH] refactor datatables admin

---
 .../{ => Admin}/Shop/CategoriesDataTable.php  |   2 +-
 .../Shop/CustomerAddressesDataTable.php       |   2 +-
 .../{ => Admin}/Shop/CustomersDataTable.php   |   2 +-
 .../Shop/DeliveryPackagesDataTable.php        |   2 +-
 .../DeliveryTypeCalculationsDataTable.php     |   2 +-
 .../Shop/DeliveryTypesDataTable.php           |   2 +-
 .../{ => Admin}/Shop/HomepagesDataTable.php   |   2 +-
 .../Shop/MerchandisesDataTable.php            |   2 +-
 .../{ => Admin}/Shop/PackagesDataTable.php    |   2 +-
 .../Shop/PriceGenericCategoriesDataTable.php  |   2 +-
 .../{ => Admin}/Shop/PriceListsDataTable.php  |   2 +-
 .../{ => Admin}/Shop/ProducersDataTable.php   |   2 +-
 .../{ => Admin}/Shop/TagGroupsDataTable.php   |   2 +-
 .../{ => Admin}/Shop/TagsDataTable.php        |   2 +-
 .../Admin/Shop/TariffUnitiesDataTable.php     |  25 ++++++++++++++++++
 .../{ => Admin}/Shop/TariffsDataTable.php     |   2 +-
 .../{ => Admin}/Shop/UnitiesDataTable.php     |   2 +-
 .../{ => Admin}/Shop/VariationsDataTable.php  |   2 +-
 .../Shop/TariffUnitiesDataTable.php           | Bin 520 -> 0 bytes
 .../Admin/Shop/CategoryController.php         |   2 +-
 .../Admin/Shop/CustomerController.php         |   4 +--
 .../Admin/Shop/DeliveryPackageController.php  |   2 +-
 .../DeliveryTypeCalculationController.php     |   2 +-
 .../Admin/Shop/DeliveryTypeController.php     |   2 +-
 .../Admin/Shop/HomepageController.php         |   2 +-
 .../Admin/Shop/PackageController.php          |   2 +-
 .../Shop/PriceGenericCategoryController.php   |   2 +-
 .../Admin/Shop/ProducerController.php         |   2 +-
 .../Controllers/Admin/Shop/TagController.php  |   2 +-
 .../Admin/Shop/TagGroupController.php         |   2 +-
 .../Admin/Shop/TariffController.php           |   4 +--
 .../Admin/Shop/TariffUnityController.php      |   2 +-
 .../Admin/Shop/UnityController.php            |   2 +-
 .../Admin/Shop/VariationController.php        |   2 +-
 app/Menu/Customers.php                        |   9 +++----
 app/Repositories/Shop/Invoices.php            |   1 -
 app/Repositories/Shop/Orders.php              |   1 +
 37 files changed, 64 insertions(+), 40 deletions(-)
 rename app/Datatables/{ => Admin}/Shop/CategoriesDataTable.php (98%)
 rename app/Datatables/{ => Admin}/Shop/CustomerAddressesDataTable.php (95%)
 rename app/Datatables/{ => Admin}/Shop/CustomersDataTable.php (96%)
 rename app/Datatables/{ => Admin}/Shop/DeliveryPackagesDataTable.php (94%)
 rename app/Datatables/{ => Admin}/Shop/DeliveryTypeCalculationsDataTable.php (95%)
 rename app/Datatables/{ => Admin}/Shop/DeliveryTypesDataTable.php (92%)
 rename app/Datatables/{ => Admin}/Shop/HomepagesDataTable.php (94%)
 rename app/Datatables/{ => Admin}/Shop/MerchandisesDataTable.php (97%)
 rename app/Datatables/{ => Admin}/Shop/PackagesDataTable.php (95%)
 rename app/Datatables/{ => Admin}/Shop/PriceGenericCategoriesDataTable.php (94%)
 rename app/Datatables/{ => Admin}/Shop/PriceListsDataTable.php (97%)
 rename app/Datatables/{ => Admin}/Shop/ProducersDataTable.php (97%)
 rename app/Datatables/{ => Admin}/Shop/TagGroupsDataTable.php (97%)
 rename app/Datatables/{ => Admin}/Shop/TagsDataTable.php (97%)
 create mode 100644 app/Datatables/Admin/Shop/TariffUnitiesDataTable.php
 rename app/Datatables/{ => Admin}/Shop/TariffsDataTable.php (97%)
 rename app/Datatables/{ => Admin}/Shop/UnitiesDataTable.php (92%)
 rename app/Datatables/{ => Admin}/Shop/VariationsDataTable.php (97%)
 delete mode 100644 app/Datatables/Shop/TariffUnitiesDataTable.php

diff --git a/app/Datatables/Shop/CategoriesDataTable.php b/app/Datatables/Admin/Shop/CategoriesDataTable.php
similarity index 98%
rename from app/Datatables/Shop/CategoriesDataTable.php
rename to app/Datatables/Admin/Shop/CategoriesDataTable.php
index 8e78a910..cb653d59 100644
--- a/app/Datatables/Shop/CategoriesDataTable.php
+++ b/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;
diff --git a/app/Datatables/Shop/CustomerAddressesDataTable.php b/app/Datatables/Admin/Shop/CustomerAddressesDataTable.php
similarity index 95%
rename from app/Datatables/Shop/CustomerAddressesDataTable.php
rename to app/Datatables/Admin/Shop/CustomerAddressesDataTable.php
index 07ce0904..21527d37 100644
--- a/app/Datatables/Shop/CustomerAddressesDataTable.php
+++ b/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;
diff --git a/app/Datatables/Shop/CustomersDataTable.php b/app/Datatables/Admin/Shop/CustomersDataTable.php
similarity index 96%
rename from app/Datatables/Shop/CustomersDataTable.php
rename to app/Datatables/Admin/Shop/CustomersDataTable.php
index ae8563c3..e5b3d7a1 100644
--- a/app/Datatables/Shop/CustomersDataTable.php
+++ b/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;
diff --git a/app/Datatables/Shop/DeliveryPackagesDataTable.php b/app/Datatables/Admin/Shop/DeliveryPackagesDataTable.php
similarity index 94%
rename from app/Datatables/Shop/DeliveryPackagesDataTable.php
rename to app/Datatables/Admin/Shop/DeliveryPackagesDataTable.php
index f0b6d537..5da81d96 100644
--- a/app/Datatables/Shop/DeliveryPackagesDataTable.php
+++ b/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;
diff --git a/app/Datatables/Shop/DeliveryTypeCalculationsDataTable.php b/app/Datatables/Admin/Shop/DeliveryTypeCalculationsDataTable.php
similarity index 95%
rename from app/Datatables/Shop/DeliveryTypeCalculationsDataTable.php
rename to app/Datatables/Admin/Shop/DeliveryTypeCalculationsDataTable.php
index cefb0593..e6941b4b 100644
--- a/app/Datatables/Shop/DeliveryTypeCalculationsDataTable.php
+++ b/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;
diff --git a/app/Datatables/Shop/DeliveryTypesDataTable.php b/app/Datatables/Admin/Shop/DeliveryTypesDataTable.php
similarity index 92%
rename from app/Datatables/Shop/DeliveryTypesDataTable.php
rename to app/Datatables/Admin/Shop/DeliveryTypesDataTable.php
index 32cf0c85..55c77d09 100644
--- a/app/Datatables/Shop/DeliveryTypesDataTable.php
+++ b/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;
diff --git a/app/Datatables/Shop/HomepagesDataTable.php b/app/Datatables/Admin/Shop/HomepagesDataTable.php
similarity index 94%
rename from app/Datatables/Shop/HomepagesDataTable.php
rename to app/Datatables/Admin/Shop/HomepagesDataTable.php
index 1168fb35..144e00fa 100644
--- a/app/Datatables/Shop/HomepagesDataTable.php
+++ b/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;
diff --git a/app/Datatables/Shop/MerchandisesDataTable.php b/app/Datatables/Admin/Shop/MerchandisesDataTable.php
similarity index 97%
rename from app/Datatables/Shop/MerchandisesDataTable.php
rename to app/Datatables/Admin/Shop/MerchandisesDataTable.php
index 3377aa11..d4742209 100644
--- a/app/Datatables/Shop/MerchandisesDataTable.php
+++ b/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;
diff --git a/app/Datatables/Shop/PackagesDataTable.php b/app/Datatables/Admin/Shop/PackagesDataTable.php
similarity index 95%
rename from app/Datatables/Shop/PackagesDataTable.php
rename to app/Datatables/Admin/Shop/PackagesDataTable.php
index 2e7c4bd9..a698ab48 100644
--- a/app/Datatables/Shop/PackagesDataTable.php
+++ b/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;
diff --git a/app/Datatables/Shop/PriceGenericCategoriesDataTable.php b/app/Datatables/Admin/Shop/PriceGenericCategoriesDataTable.php
similarity index 94%
rename from app/Datatables/Shop/PriceGenericCategoriesDataTable.php
rename to app/Datatables/Admin/Shop/PriceGenericCategoriesDataTable.php
index 40ddd5df..1cd5eefc 100644
--- a/app/Datatables/Shop/PriceGenericCategoriesDataTable.php
+++ b/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;
diff --git a/app/Datatables/Shop/PriceListsDataTable.php b/app/Datatables/Admin/Shop/PriceListsDataTable.php
similarity index 97%
rename from app/Datatables/Shop/PriceListsDataTable.php
rename to app/Datatables/Admin/Shop/PriceListsDataTable.php
index efe43624..f56be18a 100644
--- a/app/Datatables/Shop/PriceListsDataTable.php
+++ b/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;
diff --git a/app/Datatables/Shop/ProducersDataTable.php b/app/Datatables/Admin/Shop/ProducersDataTable.php
similarity index 97%
rename from app/Datatables/Shop/ProducersDataTable.php
rename to app/Datatables/Admin/Shop/ProducersDataTable.php
index c4bd941d..8843eb29 100644
--- a/app/Datatables/Shop/ProducersDataTable.php
+++ b/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;
diff --git a/app/Datatables/Shop/TagGroupsDataTable.php b/app/Datatables/Admin/Shop/TagGroupsDataTable.php
similarity index 97%
rename from app/Datatables/Shop/TagGroupsDataTable.php
rename to app/Datatables/Admin/Shop/TagGroupsDataTable.php
index 87866166..b37cfc48 100644
--- a/app/Datatables/Shop/TagGroupsDataTable.php
+++ b/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;
diff --git a/app/Datatables/Shop/TagsDataTable.php b/app/Datatables/Admin/Shop/TagsDataTable.php
similarity index 97%
rename from app/Datatables/Shop/TagsDataTable.php
rename to app/Datatables/Admin/Shop/TagsDataTable.php
index 17b6b63d..9add0022 100644
--- a/app/Datatables/Shop/TagsDataTable.php
+++ b/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;
diff --git a/app/Datatables/Admin/Shop/TariffUnitiesDataTable.php b/app/Datatables/Admin/Shop/TariffUnitiesDataTable.php
new file mode 100644
index 00000000..f508e46d
--- /dev/null
+++ b/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(),
+        ];
+    }
+}
diff --git a/app/Datatables/Shop/TariffsDataTable.php b/app/Datatables/Admin/Shop/TariffsDataTable.php
similarity index 97%
rename from app/Datatables/Shop/TariffsDataTable.php
rename to app/Datatables/Admin/Shop/TariffsDataTable.php
index a080f5f1..070ef26e 100644
--- a/app/Datatables/Shop/TariffsDataTable.php
+++ b/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;
diff --git a/app/Datatables/Shop/UnitiesDataTable.php b/app/Datatables/Admin/Shop/UnitiesDataTable.php
similarity index 92%
rename from app/Datatables/Shop/UnitiesDataTable.php
rename to app/Datatables/Admin/Shop/UnitiesDataTable.php
index ddb734cb..aad7da1e 100644
--- a/app/Datatables/Shop/UnitiesDataTable.php
+++ b/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;
diff --git a/app/Datatables/Shop/VariationsDataTable.php b/app/Datatables/Admin/Shop/VariationsDataTable.php
similarity index 97%
rename from app/Datatables/Shop/VariationsDataTable.php
rename to app/Datatables/Admin/Shop/VariationsDataTable.php
index b712f32a..f56b2c8b 100644
--- a/app/Datatables/Shop/VariationsDataTable.php
+++ b/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;
diff --git a/app/Datatables/Shop/TariffUnitiesDataTable.php b/app/Datatables/Shop/TariffUnitiesDataTable.php
deleted file mode 100644
index dd2963f777fd6cd8f02755443d146962ab6fd7bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 520
PcmZQz7zLvtz`y_i0tf&B

diff --git a/app/Http/Controllers/Admin/Shop/CategoryController.php b/app/Http/Controllers/Admin/Shop/CategoryController.php
index 7449a044..7f7f9032 100644
--- a/app/Http/Controllers/Admin/Shop/CategoryController.php
+++ b/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;
diff --git a/app/Http/Controllers/Admin/Shop/CustomerController.php b/app/Http/Controllers/Admin/Shop/CustomerController.php
index 91bc41c6..fb1ecb7e 100644
--- a/app/Http/Controllers/Admin/Shop/CustomerController.php
+++ b/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\Shop\CustomersDataTable;
+use App\Datatables\Admin\Shop\CustomerAddressesDataTable;
+use App\Datatables\Admin\Shop\CustomersDataTable;
 use App\Repositories\Shop\Customers;
 use App\Repositories\Shop\Deliveries;
 use Illuminate\Http\Request;
diff --git a/app/Http/Controllers/Admin/Shop/DeliveryPackageController.php b/app/Http/Controllers/Admin/Shop/DeliveryPackageController.php
index aa7e0eb6..ee00ad2a 100644
--- a/app/Http/Controllers/Admin/Shop/DeliveryPackageController.php
+++ b/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;
diff --git a/app/Http/Controllers/Admin/Shop/DeliveryTypeCalculationController.php b/app/Http/Controllers/Admin/Shop/DeliveryTypeCalculationController.php
index 09722a24..80dcff22 100644
--- a/app/Http/Controllers/Admin/Shop/DeliveryTypeCalculationController.php
+++ b/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;
diff --git a/app/Http/Controllers/Admin/Shop/DeliveryTypeController.php b/app/Http/Controllers/Admin/Shop/DeliveryTypeController.php
index cdb16b67..3191e650 100644
--- a/app/Http/Controllers/Admin/Shop/DeliveryTypeController.php
+++ b/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;
diff --git a/app/Http/Controllers/Admin/Shop/HomepageController.php b/app/Http/Controllers/Admin/Shop/HomepageController.php
index 88469d5d..e7a6df3e 100644
--- a/app/Http/Controllers/Admin/Shop/HomepageController.php
+++ b/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;
 
diff --git a/app/Http/Controllers/Admin/Shop/PackageController.php b/app/Http/Controllers/Admin/Shop/PackageController.php
index 78c13612..1b15b316 100644
--- a/app/Http/Controllers/Admin/Shop/PackageController.php
+++ b/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;
diff --git a/app/Http/Controllers/Admin/Shop/PriceGenericCategoryController.php b/app/Http/Controllers/Admin/Shop/PriceGenericCategoryController.php
index f4fc6542..862bce95 100644
--- a/app/Http/Controllers/Admin/Shop/PriceGenericCategoryController.php
+++ b/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;
diff --git a/app/Http/Controllers/Admin/Shop/ProducerController.php b/app/Http/Controllers/Admin/Shop/ProducerController.php
index a0761cb9..f04c5457 100644
--- a/app/Http/Controllers/Admin/Shop/ProducerController.php
+++ b/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;
diff --git a/app/Http/Controllers/Admin/Shop/TagController.php b/app/Http/Controllers/Admin/Shop/TagController.php
index 0917e984..f9b0cc05 100644
--- a/app/Http/Controllers/Admin/Shop/TagController.php
+++ b/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;
diff --git a/app/Http/Controllers/Admin/Shop/TagGroupController.php b/app/Http/Controllers/Admin/Shop/TagGroupController.php
index 86e9f2c1..4b3adf97 100644
--- a/app/Http/Controllers/Admin/Shop/TagGroupController.php
+++ b/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;
diff --git a/app/Http/Controllers/Admin/Shop/TariffController.php b/app/Http/Controllers/Admin/Shop/TariffController.php
index ce089bd0..fb855d85 100644
--- a/app/Http/Controllers/Admin/Shop/TariffController.php
+++ b/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\Shop\TariffsDataTable;
+use App\Datatables\Admin\Shop\PriceListsDataTable;
+use App\Datatables\Admin\Shop\TariffsDataTable;
 use App\Repositories\Shop\SaleChannels;
 use App\Repositories\Shop\Tariffs;
 use App\Repositories\Shop\TariffUnities;
diff --git a/app/Http/Controllers/Admin/Shop/TariffUnityController.php b/app/Http/Controllers/Admin/Shop/TariffUnityController.php
index 7a22b63d..1819c4fb 100644
--- a/app/Http/Controllers/Admin/Shop/TariffUnityController.php
+++ b/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;
diff --git a/app/Http/Controllers/Admin/Shop/UnityController.php b/app/Http/Controllers/Admin/Shop/UnityController.php
index 310f305d..363cc070 100644
--- a/app/Http/Controllers/Admin/Shop/UnityController.php
+++ b/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;
diff --git a/app/Http/Controllers/Admin/Shop/VariationController.php b/app/Http/Controllers/Admin/Shop/VariationController.php
index 3f9a4d52..83b00ea7 100644
--- a/app/Http/Controllers/Admin/Shop/VariationController.php
+++ b/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;
diff --git a/app/Menu/Customers.php b/app/Menu/Customers.php
index c1c83231..d16af17e 100644
--- a/app/Menu/Customers.php
+++ b/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' ])
-            ->activeIfRoute(['Admin.Shop.Customers.*'])->order(1);
-
-        $menu->addTo('customers', 'Canaux de vente', [ 'route' => 'Admin.Shop.SaleChannels.index', 'permission' => 'backend_access' ])
-            ->activeIfRoute(['Admin.Shop.SaleChannels.*'])->order(1);
+        $menu->addTo('customers', 'Clients', [
+            'route' => 'Admin.Shop.Customers.index',
+            'permission' => 'backend_access',
+        ])->activeIfRoute(['Admin.Shop.Customers.*'])->order(1);
     }
 }
diff --git a/app/Repositories/Shop/Invoices.php b/app/Repositories/Shop/Invoices.php
index 572c257d..655defa5 100644
--- a/app/Repositories/Shop/Invoices.php
+++ b/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);
     }
diff --git a/app/Repositories/Shop/Orders.php b/app/Repositories/Shop/Orders.php
index 8d630c38..00a71581 100644
--- a/app/Repositories/Shop/Orders.php
+++ b/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']);