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

enhance invoice display

Browse Source
This commit is contained in:
ludo
2023-12-03 02:20:41 +01:00
parent ec509df665
commit b5da5fc881
12 changed files with 152 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Datatables/Admin/Shop/InvoicesDataTable.php
View File

@@ -9,7 +9,7 @@ use Yajra\DataTables\Html\Column;
class InvoicesDataTable extends DataTable
{
public $model_name = 'Invoices';
public $model_name = 'invoices';
public function query(Invoice $model)
{
@@ -28,7 +28,7 @@ class InvoicesDataTable extends DataTable
return $invoice->created_at->toDateTimeString();
})
->editColumn('customer.last_name', function (Invoice $invoice) {
return ($invoice->customer ?? false) ? $invoice->customer->last_name.' '.$invoice->customer->first_name : '';
return ($invoice->customer ?? false) ? $invoice->customer->name : '';
})
->rawColumns(['action']);

2
app/Datatables/Admin/Shop/OrdersDataTable.php
View File

@@ -12,7 +12,7 @@ class OrdersDataTable extends DataTable
{
public $model_name = 'orders';
public $sortedColumn = 1;
public $sortedColumn = 0;
public $sortedOrder = 'desc';

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

@@ -45,7 +45,6 @@ class OrderController extends Controller
'customer' => $customer ? $customer->toArray() : false,
'basket' => Baskets::getBasketTotal(),
'deliveries' => Deliveries::getAllWithSaleChannel()->toArray(),
'sale_channel' => SaleChannels::getDefault()->toArray(),
'delivery_types' => DeliveryTypes::getWithPrice(Baskets::getWeight()),
];

2
app/Models/Shop/Order.php
View File

@@ -25,7 +25,7 @@ class Order extends Model
public function delivery_address()
{
return $this->belongsTo(CustomerAddress::class, 'customer_delivery_id');
return $this->belongsTo(CustomerAddress::class, 'delivery_address_id');
}
public function delivery()

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

@@ -62,6 +62,7 @@ class Invoices
{
InvoiceStats::increase($data['total_taxed']);
$data['uuid'] = Str::uuid()->toString();
$data['ref'] = self::getNewRef();
return Invoice::create($data);
}
@@ -77,7 +78,7 @@ class Invoices
public static function getNewRef()
{
$ref = date('ymd').'00000';
$lastRef = Invoice::orderBy('id', 'desc')->first();
$lastRef = Invoice::where($ref, '>', $ref)->orderBy('id', 'desc')->first();
return $lastRef ? $lastRef->ref + 1 : $ref + 1;
}

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

@@ -34,7 +34,6 @@ class Orders
public static function saveOrder($data)
{
$data += $data['basket'];
$basket = $data['basket'];
unset($data['basket']);
$order = self::store($data);
@@ -42,10 +41,8 @@ class Orders
$data['ref'] = $order->ref;
unset($data['comment']);
unset($data['agree']);
unset($data['customer_id']);
unset($data['delivery_id']);
unset($data['delivery_address_id']);
unset($data['detail']);
unset($data['payment_type']);
unset($data['sale_channel_id']);
return ($order && $detail) ? Invoices::saveInvoice($order->id, $data) : false;
@@ -54,7 +51,14 @@ class Orders
public static function edit($id)
{
return [
'order' => self::get($id, ['customer', 'invoice.address', 'delivery', 'delivery_address', 'detail'])->toArray(),
'order' => self::get($id, [
'customer',
'invoice.address',
'delivery',
'delivery_address',
'detail',
'sale_channel',
])->toArray(),
'statuses' => self::statuses(),
'delivery_types' => DeliveryTypes::getOptions(),
'payment_types' => self::paymentTypes(),
@@ -107,7 +111,7 @@ class Orders
public static function getNewRef()
{
$ref = date('ymd').'00000';
$lastRef = Order::orderBy('id', 'desc')->first();
$lastRef = Order::where($ref, '>', $ref)->orderBy('id', 'desc')->first();
return $lastRef ? $lastRef->ref + 1 : $ref + 1;
}