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

fix devops error

Browse Source
This commit is contained in:
ludo
2024-01-05 01:30:46 +01:00
parent d33dd6e755
commit 25b8fc40c5
128 changed files with 410 additions and 2580 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,9 @@ class OrderController extends Controller
public function pdf($uuid)
{
$data['order'] = Orders::getByUUID($uuid);
$data = [
'order' => Orders::getByUUID($uuid),
];
return view('Shop.Orders.pdf', $data);
}
@@ -45,15 +47,14 @@ class OrderController extends Controller
$data = [
'customer' => $customer ? $customer->toArray() : false,
'basket' => Baskets::getBasketTotal(),
// 'deliveries' => Deliveries::getAllWithSaleChannel()->toArray(),
'deliveries' => $deliveries ? $deliveries->toArray() : [],
'delivery_types' => DeliveryTypes::getWithPrice(Baskets::getWeight()),
];
return view('Shop.Orders.order', $data);
} else {
return redirect()->route('home');
}
return redirect()->route('home');
}
public function store(Request $request)
@@ -64,17 +65,13 @@ class OrderController extends Controller
$data['basket'] = Baskets::getBasketSummary($data['sale_channel_id'], $data['delivery_type_id'] ?? false);
$order = Orders::saveOrder($data);
if ($order) {
if ($data['payment_type'] == '1') {
if ($data['payment_type'] === '1') {
return Paybox::makeAuthorizationRequest($order);
} else {
return redirect()->route('Shop.Orders.confirmed');
}
if ($ret) {
OrderMails::sendOrderConfirmed($order->id);
}
} else {
return view('Shop.Orders.order');
OrderMails::sendOrderConfirmed($order->id);
return redirect()->route('Shop.Orders.confirmed');
}
return view('Shop.Orders.order');
}
public function confirmed()