jev/opensem
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor datatables admin

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2023-08-29 23:31:15 +02:00
parent b1d16a7871
commit 470560efb6
37 changed files with 64 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Datatables/Shop/CategoriesDataTable.php → app/Datatables/Admin/Shop/CategoriesDataTable.php
View File

@@ -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;

2
app/Datatables/Shop/CustomerAddressesDataTable.php → app/Datatables/Admin/Shop/CustomerAddressesDataTable.php
View File

@@ -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;

2
app/Datatables/Shop/CustomersDataTable.php → app/Datatables/Admin/Shop/CustomersDataTable.php
View File

@@ -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;

2
app/Datatables/Shop/DeliveryPackagesDataTable.php → app/Datatables/Admin/Shop/DeliveryPackagesDataTable.php
View File

@@ -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;

2
app/Datatables/Shop/DeliveryTypeCalculationsDataTable.php → app/Datatables/Admin/Shop/DeliveryTypeCalculationsDataTable.php
View File

@@ -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;

2
app/Datatables/Shop/DeliveryTypesDataTable.php → app/Datatables/Admin/Shop/DeliveryTypesDataTable.php
View File

@@ -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;

2
app/Datatables/Shop/HomepagesDataTable.php → app/Datatables/Admin/Shop/HomepagesDataTable.php
View File

@@ -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;

2
app/Datatables/Shop/MerchandisesDataTable.php → app/Datatables/Admin/Shop/MerchandisesDataTable.php
View File

@@ -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;

2
app/Datatables/Shop/PackagesDataTable.php → app/Datatables/Admin/Shop/PackagesDataTable.php
View File

@@ -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;

2
app/Datatables/Shop/PriceGenericCategoriesDataTable.php → app/Datatables/Admin/Shop/PriceGenericCategoriesDataTable.php
View File

@@ -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;

2
app/Datatables/Shop/PriceListsDataTable.php → app/Datatables/Admin/Shop/PriceListsDataTable.php
View File

@@ -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;

2
app/Datatables/Shop/ProducersDataTable.php → app/Datatables/Admin/Shop/ProducersDataTable.php
View File

@@ -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;

2
app/Datatables/Shop/TagGroupsDataTable.php → app/Datatables/Admin/Shop/TagGroupsDataTable.php
View File

@@ -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;

2
app/Datatables/Shop/TagsDataTable.php → app/Datatables/Admin/Shop/TagsDataTable.php
View File

@@ -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;

25
app/Datatables/Admin/Shop/TariffUnitiesDataTable.php Normal file
View File

@@ -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(),
];
}
}

2
app/Datatables/Shop/TariffsDataTable.php → app/Datatables/Admin/Shop/TariffsDataTable.php
View File

@@ -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;

2
app/Datatables/Shop/UnitiesDataTable.php → app/Datatables/Admin/Shop/UnitiesDataTable.php
View File

@@ -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;

2
app/Datatables/Shop/VariationsDataTable.php → app/Datatables/Admin/Shop/VariationsDataTable.php
View File

@@ -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;

BIN
app/Datatables/Shop/TariffUnitiesDataTable.php
View File

Binary file not shown.

2
app/Http/Controllers/Admin/Shop/CategoryController.php
View File

@@ -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;

4
app/Http/Controllers/Admin/Shop/CustomerController.php
View File

@@ -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;

2
app/Http/Controllers/Admin/Shop/DeliveryPackageController.php
View File

@@ -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;

2
app/Http/Controllers/Admin/Shop/DeliveryTypeCalculationController.php
View File

@@ -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;

2
app/Http/Controllers/Admin/Shop/DeliveryTypeController.php
View File

@@ -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;

2
app/Http/Controllers/Admin/Shop/HomepageController.php
View File

@@ -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;

2
app/Http/Controllers/Admin/Shop/PackageController.php
View File

@@ -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;

2
app/Http/Controllers/Admin/Shop/PriceGenericCategoryController.php
View File

@@ -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;

2
app/Http/Controllers/Admin/Shop/ProducerController.php
View File

@@ -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;

2
app/Http/Controllers/Admin/Shop/TagController.php
View File

@@ -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;

2
app/Http/Controllers/Admin/Shop/TagGroupController.php
View File

@@ -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;

4
app/Http/Controllers/Admin/Shop/TariffController.php
View File

@@ -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;

2
app/Http/Controllers/Admin/Shop/TariffUnityController.php
View File

@@ -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;

2
app/Http/Controllers/Admin/Shop/UnityController.php
View File

@@ -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;

2
app/Http/Controllers/Admin/Shop/VariationController.php
View File

@@ -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;

9
app/Menu/Customers.php
View File

@@ -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);
}
}

1
app/Repositories/Shop/Invoices.php
View File

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

1
app/Repositories/Shop/Orders.php
View File

@@ -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']);