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

Fixes for deliveries vs sale_channels

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2021-11-23 23:37:47 +01:00
parent 323330b1a1
commit 5b84ff74e3
36 changed files with 279 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,10 +17,11 @@ class CategoryController extends Controller
public function create()
{
$data = [];
$data['category_id'] = 0;
$data['categories'] = Categories::getOptions();
$data['tags_list'] = TagGroups::getTreeTags();
$data = [
'category_id' => 0,
'categories' => Categories::getOptions(),
'tags_list' => TagGroups::getTreeTags(),
];
return view('Admin.Shop.Categories.create', $data);
}
@@ -38,17 +39,12 @@ class CategoryController extends Controller
public function edit($id)
{
$data['category'] = Categories::get($id)->toArray();
$data['category'] = Categories::getFull($id);
$data['categories'] = Categories::getOptions();
$data['tags_list'] = TagGroups::getTreeTags();
return view('Admin.Shop.Categories.edit', $data);
}
public function update(Request $request)
{
//
}
public function destroy($id)
{
return Categories::destroy($id);
@@ -75,4 +71,11 @@ class CategoryController extends Controller
$type = $request->input('type');
return Categories::moveTree($node_id, $target_id, $type);
}
public function toggleVisible(Request $request)
{
$data = Categories::toggle_visible($request->input('id'), ($request->input('visible') == 'true') ? 1 : 0);
return response()->json(['error' => 0]);
}
}

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

@@ -5,7 +5,7 @@ namespace App\Http\Controllers\Admin\Shop;
use Illuminate\Http\Request;
use App\Repositories\Shop\Customers;
use App\Repositories\Shop\SaleChannels;
use App\Repositories\Shop\Deliveries;
use App\Datatables\Shop\CustomersDataTable;
class CustomerController extends Controller
@@ -18,7 +18,7 @@ class CustomerController extends Controller
public function create()
{
$data['sale_channels'] = SaleChannels::getOptions();
$data['deliveries'] = Deliveries::getOptions();
return view('Admin.Shop.Customers.create', $data);
}
@@ -37,7 +37,7 @@ class CustomerController extends Controller
public function edit($id)
{
$data['customer'] = Customers::get($id)->toArray();
$data['sale_channels'] = SaleChannels::getOptions();
$data['deliveries'] = Deliveries::getOptions();
return view('Admin.Shop.Customers.edit', $data);
}