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

[WIP] Finish the order process

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2022-08-18 18:20:44 +02:00
parent d423fce4f5
commit c22b10dd10
28 changed files with 375 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,9 +37,9 @@ class CustomerController extends Controller
public function edit($id)
{
$data['customer'] = Customers::edit($id);
dump($data['customer']);
exit;
$data['deliveries'] = Deliveries::getOptions();
// dump($data);
// exit;
return view('Admin.Shop.Customers.edit', $data);
}

2
app/Http/Controllers/Shop/Auth/LoginController.php
View File

@@ -37,7 +37,7 @@ class LoginController extends Controller
if ($this->guard()->attempt($credentials, $request->get('remember'))) {
$request->session()->regenerate();
return (back()->getTargetUrl() == route('Shop.login')) ? redirect()->intended(route('home')) : back();
return (back()->getTargetUrl() == route('Shop.login')) ? redirect()->intended(route('home')) : back();
}
return back()->withInput($request->only('email', 'remember'));
}

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

@@ -29,8 +29,8 @@ class CustomerController extends Controller
//
}
public function profile($id)
public function profile($id = false)
{
//
return view('Shop.Profile.profile');
}
}

16
app/Http/Controllers/Shop/OrderController.php
View File

@@ -16,17 +16,29 @@ class OrderController extends Controller
{
public function order()
{
$data['customer'] = Customers::getWithAddresses();
$data['customer'] = Customers::getWithAddresses()->toArray();
$data['basket'] = ShopCart::getSummary();
$data['deliveries'] = Deliveries::getAllWithSaleChannel()->toArray();
$data['sale_channel'] = SaleChannels::getDefault();
$data['sale_channel'] = SaleChannels::getDefault()->toArray();
return view('Shop.Orders.order', $data);
}
public function store(Request $request)
{
$data = $request->all();
$data['customer_id'] = Customers::getId();
$data['basket'] = ShopCart::getSummary();
dump($data);
exit;
$order = Orders::saveOrder($data);
if ($order) {
if (intval($data['payment']) === 1) {
return redirect('Shop.Payments.online');
} else {
return redirect('Shop.Orders.confirmed');
}
} else {
return view('Shop.Orders.order');
}
}
}