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

fix parameters for invoices

Browse Source
This commit is contained in:
ludo
2023-12-21 16:57:40 +01:00
parent ee64ae0be7
commit 643c26d549
7 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,12 +40,13 @@ class OrderController extends Controller
{ {
if (ShopCart::count()) { if (ShopCart::count()) {
$customer = Customers::getWithAddresses(); $customer = Customers::getWithAddresses();
$deliveries = Deliveries::getByCustomer();
$data = [ $data = [
'customer' => $customer ? $customer->toArray() : false, 'customer' => $customer ? $customer->toArray() : false,
'basket' => Baskets::getBasketTotal(), 'basket' => Baskets::getBasketTotal(),
// 'deliveries' => Deliveries::getAllWithSaleChannel()->toArray(), // 'deliveries' => Deliveries::getAllWithSaleChannel()->toArray(),
'deliveries' => Deliveries::getByCustomer()->toArray(), 'deliveries' => $deliveries ? $deliveries->toArray() : [],
'delivery_types' => DeliveryTypes::getWithPrice(Baskets::getWeight()), 'delivery_types' => DeliveryTypes::getWithPrice(Baskets::getWeight()),
]; ];

1
app/Repositories/Shop/Invoices.php
View File

@@ -47,6 +47,7 @@ class Invoices
public static function saveInvoice($orderId, $data) public static function saveInvoice($orderId, $data)
{ {
$data['order_id'] = $orderId; $data['order_id'] = $orderId;
$data['date_invoice'] = date('Y-m-d');
return self::store($data); return self::store($data);
} }

27
app/Repositories/Shop/Orders.php
View File

@@ -36,17 +36,26 @@ class Orders
public static function saveOrder($data) public static function saveOrder($data)
{ {
$basket = $data['basket']; $basket = $data['basket'];
unset($data['basket']); $invoice = $data['invoice'];
unset($data['basket'], $data['invoice']);
$data += self::getSummaryOfBasket($basket);
$order = self::store($data); $order = self::store($data);
$detail = OrderDetails::saveBasket($order->id, $basket['detail']); $detail = $order ? OrderDetails::saveBasket($order->id, $basket['detail']) : false;
$data['ref'] = $order->ref; unset($data['comment'], $data['agree'], $data['delivery_address_id'], $data['sale_channel_id']);
unset($data['comment']); $invoice = $detail ? Invoices::saveInvoice($order->id, $data + $invoice) : false;
unset($data['agree']);
unset($data['delivery_address_id']);
unset($data['detail']);
unset($data['sale_channel_id']);
return ($order && $detail) ? Invoices::saveInvoice($order->id, $data) : false; return $invoice ? $order : false;
}
public static function getSummaryOfBasket($basket)
{
return [
'total' => $basket['total'],
'taxes' => $basket['taxes'],
'total_taxed' => $basket['total_taxed'],
'shipping' => $basket['shipping'],
'total_shipped' => $basket['total_shipped'],
];
} }
public static function edit($id) public static function edit($id)

6
app/Repositories/Shop/Paybox.php
View File

@@ -3,9 +3,9 @@
namespace App\Repositories\Shop; namespace App\Repositories\Shop;
use App; use App;
use Devpark\PayboxGateway\Requests\AuthorizationWithCapture; use Bnb\PayboxGateway\Requests\AuthorizationWithCapture;
use Devpark\PayboxGateway\Requests\Capture; use Bnb\PayboxGateway\Requests\Capture;
use Devpark\PayboxGateway\Responses\Verify; use Bnb\PayboxGateway\Responses\Verify;
class Paybox class Paybox
{ {

2
resources/views/Shop/Orders/partials/addresses.blade.php
View File

@@ -3,7 +3,7 @@
<div class="row mb-3"> <div class="row mb-3">
<div class="col-1"> <div class="col-1">
@include('components.form.radios.icheck', [ @include('components.form.radios.icheck', [
'name' => $prefix . '_address_id', 'name' => $name,
'val' => $address['id'], 'val' => $address['id'],
'id' => $prefix . '_address_' . $address['id'], 'id' => $prefix . '_address_' . $address['id'],
'value' => $address['priority'] || count($addresses) === 1 ? $address['id'] : false, 'value' => $address['priority'] || count($addresses) === 1 ? $address['id'] : false,

2
resources/views/Shop/Orders/partials/deliveries.blade.php
View File

@@ -19,7 +19,7 @@ Si vous voulez laisser un message à propos de votre commande, merci de bien vou
ci-contre ci-contre
@include('components.form.textarea', [ @include('components.form.textarea', [
'name' => 'content', 'name' => 'comment',
]) ])
@push('js') @push('js')

2
resources/views/Shop/Orders/partials/registered.blade.php
View File

@@ -3,6 +3,7 @@
@include('Shop.Orders.partials.addresses', [ @include('Shop.Orders.partials.addresses', [
'addresses' => $customer['invoice_addresses'] ?? false, 'addresses' => $customer['invoice_addresses'] ?? false,
'prefix' => 'invoice', 'prefix' => 'invoice',
'name' => 'invoice[invoice_address_id]',
]) ])
</x-layout.collapse> </x-layout.collapse>
@@ -15,6 +16,7 @@
@include('Shop.Orders.partials.addresses', [ @include('Shop.Orders.partials.addresses', [
'addresses' => $customer['delivery_addresses'] ?? false, 'addresses' => $customer['delivery_addresses'] ?? false,
'prefix' => 'delivery', 'prefix' => 'delivery',
'name' => 'delivery_address_id',
]) ])
@include('Shop.Orders.partials.shipping') @include('Shop.Orders.partials.shipping')
</x-layout.collapse> </x-layout.collapse>