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

fix shipping

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2023-07-16 17:54:44 +02:00
parent c619f540f8
commit ddb4520621
36 changed files with 640 additions and 897 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,16 +11,12 @@ class DeliveryPackageController extends Controller
{
public function index(DeliveryPackagesDataTable $dataTable)
{
$data = [];
return $dataTable->render('Admin.Shop.DeliveryPackages.list', $data);
return $dataTable->render('Admin.Shop.DeliveryPackages.list');
}
public function create()
{
$data['sale_channels'] = SaleChannels::getOptions();
return view('Admin.Shop.DeliveryPackages.create', $data);
return view('Admin.Shop.DeliveryPackages.create');
}
public function store(Request $request)
@@ -30,17 +26,9 @@ class DeliveryPackageController extends Controller
return redirect()->route('Admin.Shop.DeliveryPackages.index');
}
public function show($id)
{
$data['delivery'] = DeliveryPackages::get($id);
return view('Admin.Shop.DeliveryPackages.view', $data);
}
public function edit($id)
{
$data['delivery'] = DeliveryPackages::get($id)->toArray();
$data['sale_channels'] = SaleChannels::getOptions();
$data['package'] = DeliveryPackages::get($id)->toArray();
return view('Admin.Shop.DeliveryPackages.edit', $data);
}
@@ -49,11 +37,4 @@ class DeliveryPackageController extends Controller
{
return DeliveryPackages::destroy($id);
}
public function toggleActive(Request $request)
{
$data = DeliveryPackages::toggle_active($request->input('id'), ($request->input('active') == 'true') ? 1 : 0);
return response()->json(['error' => 0]);
}
}

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

@@ -4,21 +4,21 @@ namespace App\Http\Controllers\Admin\Shop;
use App\Datatables\Shop\DeliveryTypeCalculationsDataTable;
use App\Repositories\Shop\DeliveryTypeCalculations;
use App\Repositories\Shop\SaleChannels;
use App\Repositories\Shop\DeliveryTypes;
use Illuminate\Http\Request;
class DeliveryTypeCalculationController extends Controller
{
public function index(DeliveryTypeCalculationsDataTable $dataTable)
{
$data = [];
return $dataTable->render('Admin.Shop.DeliveryTypeCalculations.list', $data);
return $dataTable->render('Admin.Shop.DeliveryTypeCalculations.list');
}
public function create()
{
$data = [];
$data = [
'delivery_types' => DeliveryTypes::getOptions(),
];
return view('Admin.Shop.DeliveryTypeCalculations.create', $data);
}
@@ -30,18 +30,13 @@ class DeliveryTypeCalculationController extends Controller
return redirect()->route('Admin.Shop.DeliveryTypeCalculations.index');
}
public function show($id)
{
$data['delivery'] = DeliveryTypeCalculations::get($id);
return view('Admin.Shop.DeliveryTypeCalculations.view', $data);
}
public function edit($id)
{
$data['delivery'] = DeliveryTypeCalculations::get($id)->toArray();
$data['sale_channels'] = SaleChannels::getOptions();
$data = [
'calcul' => DeliveryTypeCalculations::get($id)->toArray(),
'delivery_types' => DeliveryTypes::getOptions(),
];
return view('Admin.Shop.DeliveryTypeCalculations.edit', $data);
}
@@ -49,11 +44,4 @@ class DeliveryTypeCalculationController extends Controller
{
return DeliveryTypeCalculations::destroy($id);
}
public function toggleActive(Request $request)
{
$data = DeliveryTypeCalculations::toggle_active($request->input('id'), ($request->input('active') == 'true') ? 1 : 0);
return response()->json(['error' => 0]);
}
}

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

@@ -30,13 +30,6 @@ class DeliveryTypeController extends Controller
return redirect()->route('Admin.Shop.DeliveryTypes.index');
}
public function show($id)
{
$data['delivery'] = DeliveryTypes::get($id);
return view('Admin.Shop.DeliveryTypes.view', $data);
}
public function edit($id)
{
$data['delivery'] = DeliveryTypes::get($id)->toArray();
@@ -49,11 +42,4 @@ class DeliveryTypeController extends Controller
{
return DeliveryTypes::destroy($id);
}
public function toggleActive(Request $request)
{
$data = DeliveryTypes::toggle_active($request->input('id'), ($request->input('active') == 'true') ? 1 : 0);
return response()->json(['error' => 0]);
}
}