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

[WIP] Working on orders & invoices

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2022-08-19 22:04:44 +02:00
parent 1880b25407
commit dae8156164
32 changed files with 440 additions and 323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,11 +34,13 @@ class OrderController extends Controller
public function edit($id)
{
$data['customer'] = Orders::get($id)->toArray();
$data['order'] = Orders::get($id, ['customer', 'detail'])->toArray();
dump($data['order']);
exit;
return view('Admin.Shop.Orders.edit', $data);
}
public function destroy($id)
public function delete($id)
{
return Orders::destroy($id);
}

86
app/Http/Controllers/Admin/Shop/OrderPaymentController.php
View File

@@ -1,86 +0,0 @@
<?php
namespace App\Http\Controllers\Admin\Shop;
use App\OrderPayment;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
class OrderPaymentController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
{
//
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
//
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
//
}
/**
* Display the specified resource.
*
* @param \App\OrderPayment $orderPayment
* @return \Illuminate\Http\Response
*/
public function show(OrderPayment $orderPayment)
{
//
}
/**
* Show the form for editing the specified resource.
*
* @param \App\OrderPayment $orderPayment
* @return \Illuminate\Http\Response
*/
public function edit(OrderPayment $orderPayment)
{
//
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param \App\OrderPayment $orderPayment
* @return \Illuminate\Http\Response
*/
public function update(Request $request, OrderPayment $orderPayment)
{
//
}
/**
* Remove the specified resource from storage.
*
* @param \App\OrderPayment $orderPayment
* @return \Illuminate\Http\Response
*/
public function destroy(OrderPayment $orderPayment)
{
//
}
}

9
app/Http/Controllers/Shop/BasketController.php
View File

@@ -3,10 +3,11 @@
namespace App\Http\Controllers\Shop;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Http\Controllers\Controller;
use App\Repositories\Core\User\ShopCart;
use App\Repositories\Shop\Offers;
use App\Repositories\Shop\Baskets;
use App\Repositories\Shop\Orders;
use App\Repositories\Users;
@@ -25,19 +26,19 @@ class BasketController extends Controller
$offer_id = $request->input('offer_id');
$quantity = $request->input('quantity') ?? 1;
$update = $request->input('update') ?? false;
return Offers::addBasket($offer_id, $quantity, $update);
return Baskets::addBasket($offer_id, $quantity, $update);
}
public function modalBasket($offer_id, $quantity)
{
$data['offer'] = Offers::getFull($offer_id)->toArray();
$data['basket'] = Offers::addBasket($offer_id, $quantity);
$data['basket'] = Baskets::addBasket($offer_id, $quantity);
return view('Shop.Baskets.partials.modalBasket', $data);
}
public function basket()
{
$data['basket'] = Offers::getBasket();
$data['basket'] = Baskets::getBasket();
return view('Shop.Baskets.basket', $data);
}

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

@@ -9,28 +9,8 @@ use App\Repositories\Shop\Customers;
class CustomerController extends Controller
{
public function show($id)
{
//
}
public function edit(C$id)
{
//
}
public function update(Request $request)
{
//
}
public function destroy($id)
{
//
}
public function profile($id = false)
{
return view('Shop.Profile.profile');
return view('Shop.Customers.profile');
}
}

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

@@ -9,17 +9,20 @@ use App\Repositories\Core\User\ShopCart;
use App\Repositories\Shop\Customers;
use App\Repositories\Shop\Deliveries;
use App\Repositories\Shop\Orders;
use App\Repositories\Shop\Offers;
use App\Repositories\Shop\Baskets;
use App\Repositories\Shop\SaleChannels;
class OrderController extends Controller
{
public function order()
{
$data['customer'] = Customers::getWithAddresses()->toArray();
$data['basket'] = ShopCart::getSummary();
$data['deliveries'] = Deliveries::getAllWithSaleChannel()->toArray();
$data['sale_channel'] = SaleChannels::getDefault()->toArray();
$customer = Customers::getWithAddresses();
$data = [
'customer' => $customer ? $customer->toArray() : false,
'basket' => ShopCart::getSummary(),
'deliveries' => Deliveries::getAllWithSaleChannel()->toArray(),
'sale_channel' => SaleChannels::getDefault()->toArray(),
];
return view('Shop.Orders.order', $data);
}
@@ -27,18 +30,23 @@ class OrderController extends Controller
{
$data = $request->all();
$data['customer_id'] = Customers::getId();
$data['basket'] = ShopCart::getSummary();
$data['basket'] = Baskets::getBasketSummary();
dump($data);
exit;
$order = Orders::saveOrder($data);
if ($order) {
if (intval($data['payment']) === 1) {
return redirect('Shop.Payments.online');
if ($data['payment'] == '1') {
return redirect()->route('Shop.Payments.online');
} else {
return redirect('Shop.Orders.confirmed');
return redirect()->route('Shop.Orders.confirmed');
}
} else {
return view('Shop.Orders.order');
return view('Shop.Orders.order');
}
}
public function confirmed()
{
return view('Shop.Orders.confirmed');
}
}