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

Fixes after reading excel files and discuss with eric

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2021-03-26 15:40:53 +01:00
parent 37ffaa938b
commit 22fa3d3246
22 changed files with 456 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
app/Http/Controllers/Shop/Admin/PackageController.php Normal file
View File

@@ -0,0 +1,64 @@
<?php
namespace App\Http\Controllers\Shop\Admin;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Repositories\Shop\ArticleFamilies;
use App\Repositories\Shop\Packages;
use App\DataTables\Shop\PackagesDataTable;
class PackageController extends Controller
{
public function index(PackagesDataTable $dataTable)
{
$data['families'] = ArticleFamilies::getOptions();
return $dataTable->render('Shop.Admin.Packages.list', $data);
}
public function getDatatable(Request $request)
{
return Packages::getTables($request->all());
}
public function getOptionsByFamily(Request $request)
{
$id = $request->input('family_id');
return response()->json(Packages::getSelectByFamily($id));
}
public function create()
{
return view('Shop.Admin.Packages.create');
}
public function store(Request $request)
{
$ret = Packages::store($request->all());
return redirect()->route('Shop.Admin.Packages.index');
}
public function show($id)
{
$data = Packages::get($id);
return view('Shop.Admin.Packages.view', $data);
}
public function edit($id)
{
$data = Packages::get($id);
return view('Shop.Admin.Packages.edit', $data);
}
public function update(Request $request)
{
//
}
public function destroy($id)
{
return Packages::destroy($id);
}
}

6
app/Http/Controllers/Shop/Admin/PriceGenericController.php
View File

@@ -9,6 +9,7 @@ use App\Models\Shop\PriceGeneric;
use App\Repositories\Shop\PriceGenerics;
use App\Repositories\Shop\PriceGenericCategories;
use App\Repositories\Shop\Taxes;
use App\Repositories\Shop\Packages;
use App\Repositories\Shop\Unities;
use App\DataTables\Shop\PriceGenericsDataTable;
@@ -34,8 +35,9 @@ class PriceGenericController extends Controller
public function edit($id)
{
$data['generic'] = PriceGenerics::get($id)->toArray();
$data['unities'] = Unities::getOptions();
$data['generic'] = PriceGenerics::getFull($id)->toArray();
$data['packages'] = Packages::getSelectByFamily($data['generic']['category']['article_family_id']);
$data['unities'] = ($data['packages']['id'] ?? false) ? Unities::getSelectByPackage($data['packages']['id']) : [];
$data['taxes'] = Taxes::getOptions();
$data['categories'] = PriceGenericCategories::getOptions();
return view('Shop.Admin.PriceGenerics.edit', $data);

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

@@ -9,7 +9,7 @@ use App\Repositories\Shop\ArticleFamilies;
use App\Repositories\Shop\Unities;
use App\DataTables\Shop\UnitiesDataTable;
class UnityValueController extends Controller
class UnityController extends Controller
{
public function index(UnitiesDataTable $dataTable)
{
@@ -22,10 +22,10 @@ class UnityValueController extends Controller
return Unities::getTables($request->all());
}
public function getOptionsByFamily(Request $request)
public function getOptionsByPackage(Request $request)
{
$id = $request->input('family_id');
return response()->json(Unities::getSelectByFamily($id));
$id = $request->input('package_id');
return response()->json(Unities::getSelectByPackage($id));
}
public function create()
@@ -51,14 +51,13 @@ class UnityValueController extends Controller
return view('Shop.Admin.Unities.edit', $data);
}
public function update(Request $request)
{
//
}
public function destroy($id)
{
return Unities::destroy($id);
}
public function update($id) {
}
}