From dac00291a7f5bd021373e4f2347556f2cc80be50 Mon Sep 17 00:00:00 2001
From: sky121113
Star Cloud System
+Tenant: {{ Auth::user()->company?->name ?? __('Platform Operator') }}
+ + +{{ __('Vending Machine Product Replenishment') }}
+{{ __('Order Number') }}
+{{ $order->order_no }}
+{{ __('Source Warehouse') }}
+{{ $order->warehouse?->name ?? '-' }}
+{{ __('Target Machine') }}
+{{ $order->machine?->name ?? '-' }} ({{ $order->machine?->serial_no }})
+{{ __('Created By') }}
+{{ $order->creator?->name ?? __('System') }}
+{{ __('Assigned Personnel') }}
+{{ $order->assignee?->name ?? __('Unassigned') }}
+{{ __('Created At') }}
+{{ $order->created_at->timezone('Asia/Taipei')->format('Y-m-d H:i:s') }}
+{{ __('Print Time') }}
+{{ now()->timezone('Asia/Taipei')->format('Y-m-d H:i:s') }}
+{{ __('Note') }}
+{{ $order->note }}
+| + {{ __('Slot') }} + | ++ {{ __('Image') }} + | ++ {{ __('Product Name') }} + | ++ {{ __('Barcode') }} + | ++ {{ __('Stock Snap') }} + | ++ {{ __('Replenish Qty') }} + | ++ {{ __('Check') }} + | + ++ {{ __('Actual Qty') }} + | +
|---|---|---|---|---|---|---|---|
| + + {{ $item->slot_no }} + + | +
+
+ @if($item->product?->image_url)
+
+ |
+
+ {{ $item->product?->localized_name ?? __('Unknown') }} +ID: {{ $item->product_id }} + |
+ + {{ $item->product?->barcode ?? '-' }} + | ++ {{ $item->current_stock }} / {{ $item->max_stock }} + | +
+ x{{ $item->quantity }} + |
+
+ + + | + ++ + | +
{{ __('Print Notice') }}
+{{ __('Please make sure to enable "Background graphics" in your browser print settings to print product images and styled components correctly.') }}
+{{ __('Prepared By') }}
+ +{{ __('Warehouse Stock Out') }}
+ +{{ __('Courier/Replenisher') }}
+ +{{ __('Machine Inbound Confirmation') }}
+ +Star Cloud System
+Tenant: {{ Auth::user()->company?->name ?? __('Platform Operator') }}
+ + ++ {{ $order->type === \App\Models\Warehouse\TransferOrder::TYPE_W2W ? __('Warehouse to Warehouse Transfer') : __('Machine to Warehouse Return') }} +
+{{ __('Order Number') }}
+{{ $order->order_no }}
+{{ __('Source Warehouse') }}
+{{ $order->fromWarehouse?->name ?? '-' }}
+ @else +{{ __('Source Machine') }}
++ {{ $order->fromMachine?->name ?? '-' }} + ({{ $order->fromMachine?->serial_no }}) +
+ @endif +{{ __('Target Warehouse') }}
+{{ $order->toWarehouse?->name ?? '-' }}
+{{ __('Created By') }}
+{{ $order->creator?->name ?? __('System') }}
+{{ __('Transfer Type') }}
++ {{ $order->type === \App\Models\Warehouse\TransferOrder::TYPE_W2W ? __('Warehouse to Warehouse') : __('Machine to Warehouse') }} +
+{{ __('Created At') }}
+{{ $order->created_at->timezone('Asia/Taipei')->format('Y-m-d H:i:s') }}
+{{ __('Print Time') }}
+{{ now()->timezone('Asia/Taipei')->format('Y-m-d H:i:s') }}
+{{ __('Note') }}
+{{ $order->note }}
+| + # + | ++ {{ __('Image') }} + | ++ {{ __('Product Name') }} + | ++ {{ __('Barcode') }} + | ++ {{ __('Transfer Qty') }} + | ++ {{ __('Check') }} + | + ++ {{ __('Actual Qty') }} + | +
|---|---|---|---|---|---|---|
| + {{ $index + 1 }} + | +
+
+ @if($item->product?->image_url)
+
+ |
+
+ {{ $item->product?->localized_name ?? __('Unknown') }} +ID: {{ $item->product_id }} + |
+ + {{ $item->product?->barcode ?? '-' }} + | +
+ x{{ $item->quantity }} + |
+
+ + + | + ++ + | +
{{ __('Print Notice') }}
+{{ __('Please make sure to enable "Background graphics" in your browser print settings to print product images and styled components correctly.') }}
+{{ __('Prepared By') }}
+ +{{ __('Transfer Out Confirmation') }}
+ +{{ __('Courier/Dispatcher') }}
+ +{{ __('Transfer In Confirmation') }}
+ +| + | {{ __('Slot') }} | -+ | {{ __('Image') }} | -+ | {{ __('Product Name') }} | -+ | {{ __('Barcode') }} | -+ | {{ __('Stock Snap') }} | -+ | {{ __('Replenish Qty') }} | -+ | {{ __('Check') }} | -+ | {{ __('Actual Qty') }} |
-
+
@if($item->product?->image_url)
|
-
- {{ $item->product?->localized_name ?? __('Unknown') }} + |
+ {{ $item->product?->localized_name ?? __('Unknown') }} ID: {{ $item->product_id }} |
- + | {{ $item->product?->barcode ?? '-' }} | -+ | {{ $item->current_stock }} / {{ $item->max_stock }} | -+ |
x{{ $item->quantity }} |
diff --git a/resources/views/admin/warehouses/print/transfer.blade.php b/resources/views/admin/warehouses/print/transfer.blade.php
index 317b3c7..d4bcbcd 100644
--- a/resources/views/admin/warehouses/print/transfer.blade.php
+++ b/resources/views/admin/warehouses/print/transfer.blade.php
@@ -151,29 +151,29 @@
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| + | # | -+ | {{ __('Image') }} | -+ | {{ __('Product Name') }} | -+ | {{ __('Barcode') }} | -+ | {{ __('Transfer Qty') }} | -+ | {{ __('Check') }} | -+ | {{ __('Actual Qty') }} |
-
+
@if($item->product?->image_url)
|
-
- {{ $item->product?->localized_name ?? __('Unknown') }} + |
+ {{ $item->product?->localized_name ?? __('Unknown') }} ID: {{ $item->product_id }} |
- + | {{ $item->product?->barcode ?? '-' }} | -+ |
x{{ $item->quantity }} |
From f59efc6dc7a3126a66d726c5ab7c8862cc67eace Mon Sep 17 00:00:00 2001
From: sky121113
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| + {{ __('Welcome Gift Code') }} + | ++ {{ __('Name / Machine') }} + | ++ {{ __('Discount Value') }} + | ++ {{ __('Usage Status') }} + | ++ {{ __('Expires At') }} + | ++ {{ __('Status') }} + | ++ {{ __('Actions') }} + | +
|---|---|---|---|---|---|---|
| + @if($gift->status === 'active' && (!$gift->expires_at || $gift->expires_at->isFuture())) + code }}'; activeTicketUrl = '{{ $gift->ticket_url }}'; showQrModal = true" + class="text-lg font-black font-mono text-cyan-600 dark:text-cyan-400 tracking-widest bg-cyan-50 dark:bg-cyan-500/10 px-4 py-1.5 rounded-xl border border-cyan-100 dark:border-cyan-500/20 shadow-sm cursor-pointer hover:bg-cyan-100 dark:hover:bg-cyan-500/20 transition-all"> + {{ $gift->code }} + + @else + + {{ $gift->code }} + + @endif + | +
+
+ {{ $gift->name }}
+ {{
+ $gift->machine->name }}
+ |
+ + + {{ $gift->discount_label }} + + | ++ @if($gift->usage_type === 'unlimited') + + {{ __('Unlimited') }} ({{ __('Used: :count', ['count' => $gift->usage_count]) }}) + + @else + @if($gift->usage_count > 0) + + {{ __('Used') }} + + @else + + {{ __('Once') }} + + @endif + @endif + | +
+ @if($gift->expires_at)
+
+ {{ $gift->expires_at->format('Y-m-d H:i') }}
+
+ {{ $gift->expires_at->isPast() ? __('Expired') : $gift->expires_at->diffForHumans() }}
+
+ @else
+
+ {{ __('Permanent') }}
+
+ @endif
+ |
+
+ @php
+ $displayStatus = $gift->status === 'active' && $gift->expires_at?->isPast() ? 'expired'
+ : ($gift->status === 'disabled' ? 'cancelled' : $gift->status);
+ @endphp
+ |
+
+
+ @if($gift->status === 'active' && (!$gift->expires_at || $gift->expires_at->isFuture()))
+
+
+
+ @endif
+
+ @if($gift->status === 'active')
+
+ @endif
+
+ |
+
+ {{ $gift->name }} +
++ {{ __('Machine') }}
++ {{ $gift->machine->name }}
++ {{ __('Discount Value') }}
++ {{ $gift->discount_label }}
++ {{ __('Usage Status') }}
++ @if($gift->usage_type === 'unlimited') + {{ __('Unlimited') }} ({{ $gift->usage_count }}) + @else + @if($gift->usage_count > 0) + {{ __('Used') }} + @else + {{ __('Once') }} + @endif + @endif +
++ {{ __('Expires At') }}
++ {{ $gift->expires_at ? $gift->expires_at->format('Y-m-d H:i') : __('Permanent') }} +
+| + {{ __('Machine / Welcome Gift') }} | ++ {{ __('Action') }} | ++ {{ __('Welcome Gift Code') }} | ++ {{ __('Discount') }} | ++ {{ __('Sales Record') }} | + ++ {{ __('Time') }} | +
|---|---|---|---|---|---|
|
+
+
+
+
+
+
+
+ {{ $log->machine->name ?? $log->machine->serial_no ?? '-' }}
+
+
+ {{ $log->welcomeGift->name ?? '-' }}
+
+
+ |
+
+ |
+ + + {{ $log->welcomeGift->code ?? '-' }} + + | ++ + {{ $log->welcomeGift->discount_label ?? '-' }} + + | ++ @if($log->order_id) + + + {{ $log->order?->order_no ?? '#' . $log->order_id }} + + @else + - + @endif + | + ++ + {{ $log->created_at?->format('Y-m-d H:i:s') }} + + | +
|
+
+
+
+
+
+ {{ + __('No records found') }} + |
+ |||||
+ {{ $log->welcomeGift->name ?? '-' }}
+{{ + __('Welcome Gift Code') }}
++ {{ $log->welcomeGift->code ?? '-' }} +
+{{ + __('Discount') }}
++ {{ $log->welcomeGift->discount_label ?? '-' }} +
+{{ + __('Sales Record') }}
+ @if($log->order_id) + + {{ $log->order?->order_no ?? '#' . $log->order_id }} + + @else +-
+ @endif +{{ + __('Time') }}
++ {{ $log->created_at?->format('Y-m-d H:i:s') }}
+{{ __('Scan to authorize testing or maintenance') }}
{{ $passCode->machine->serial_no }}
{{ __('Expiry Time') }}
@@ -85,11 +72,6 @@
{{ config('app.name') }} © {{ date('Y') }}
-{{ __('Scan to pick up your product') }}
{{ __('Pickup Code') }}
-{{ $pickupCode->code }}
+{{ $pickupCode->code }}
{{ __('Expiry Time') }}
@@ -92,11 +82,6 @@
{{ config('app.name') }} © {{ date('Y') }}
-{{ __('Scan QR Code') }}
+{{ __('Welcome Gift Code') }}
+{{ $welcomeGift->code }}
+{{ __('Expiry Time') }}
++ {{ $welcomeGift->expires_at ? $welcomeGift->expires_at->format('Y/m/d H:i') : __('Permanent') }} +
+{{ - __('Operator') }}
-{{ - $log->user->name ?? __('Machine') }}
-{{ __('Pickup Code') }}
diff --git a/resources/views/admin/sales/welcome-gifts/partials/tab-list.blade.php b/resources/views/admin/sales/welcome-gifts/partials/tab-list.blade.php index 5e8f776..75f6cfd 100644 --- a/resources/views/admin/sales/welcome-gifts/partials/tab-list.blade.php +++ b/resources/views/admin/sales/welcome-gifts/partials/tab-list.blade.php @@ -38,7 +38,18 @@