diff --git a/app/Http/Controllers/Admin/SalesController.php b/app/Http/Controllers/Admin/SalesController.php index 6e13561..1e11f8e 100644 --- a/app/Http/Controllers/Admin/SalesController.php +++ b/app/Http/Controllers/Admin/SalesController.php @@ -833,7 +833,7 @@ class SalesController extends Controller $row = [ $log->machine->name ?? 'Unknown', $log->machine->serial_no ?? '---', - $log->product->name ?? 'Unknown Product', + $log->product->localized_name ?? __('Unknown Product'), $log->slot_no, number_format($log->amount, 2, '.', ''), $statusLabel, diff --git a/app/Models/Machine/MachineStockMovement.php b/app/Models/Machine/MachineStockMovement.php index 9fb7450..73c4522 100644 --- a/app/Models/Machine/MachineStockMovement.php +++ b/app/Models/Machine/MachineStockMovement.php @@ -76,7 +76,7 @@ class MachineStockMovement extends Model public function product(): BelongsTo { - return $this->belongsTo(Product::class); + return $this->belongsTo(Product::class)->withTrashed(); } public function creator(): BelongsTo diff --git a/app/Models/Transaction/DispenseRecord.php b/app/Models/Transaction/DispenseRecord.php index 7121e09..8e791d7 100644 --- a/app/Models/Transaction/DispenseRecord.php +++ b/app/Models/Transaction/DispenseRecord.php @@ -45,6 +45,6 @@ class DispenseRecord extends Model public function product() { - return $this->belongsTo(Product::class); + return $this->belongsTo(Product::class)->withTrashed(); } } diff --git a/app/Models/Transaction/OrderItem.php b/app/Models/Transaction/OrderItem.php index 2562aed..6f12d30 100644 --- a/app/Models/Transaction/OrderItem.php +++ b/app/Models/Transaction/OrderItem.php @@ -34,6 +34,6 @@ class OrderItem extends Model public function product() { - return $this->belongsTo(Product::class); + return $this->belongsTo(Product::class)->withTrashed(); } } diff --git a/resources/views/admin/sales/partials/order-detail-panel.blade.php b/resources/views/admin/sales/partials/order-detail-panel.blade.php index 3ec6d03..c2f2eae 100644 --- a/resources/views/admin/sales/partials/order-detail-panel.blade.php +++ b/resources/views/admin/sales/partials/order-detail-panel.blade.php @@ -126,15 +126,19 @@
@foreach($order->items as $item) -
-
+
+
@if(isset($item->product->image_url) && $item->product->image_url) - - @else - + + @endif + +
+ - @endif +

{{ $item->product_name }}

@@ -198,7 +202,7 @@ #{{ str_pad($dispense->slot_no, 2, '0', STR_PAD_LEFT) }} -

{{ $dispense->product->name ?? __('Unknown') }}

+

{{ $dispense->product->localized_name ?? __('Unknown Product') }}

@php diff --git a/resources/views/admin/sales/partials/tab-dispense.blade.php b/resources/views/admin/sales/partials/tab-dispense.blade.php index 199d2ba..465bbee 100644 --- a/resources/views/admin/sales/partials/tab-dispense.blade.php +++ b/resources/views/admin/sales/partials/tab-dispense.blade.php @@ -188,7 +188,7 @@
- {{ $log->product->name ?? 'Unknown Product' }} + {{ $log->product->localized_name ?? __('Unknown Product') }}
{{ __('Slot') }}: {{ $log->slot_no }} @@ -287,7 +287,7 @@ __('Product / Slot') }}

- {{ $log->product->name ?? 'Unknown' }} + {{ $log->product->localized_name ?? __('Unknown Product') }}

{{ __('Slot') }}: {{ $log->slot_no }}