[PROMOTE] dev -> demo
1. sales: 交易記錄 UI 顯示 payment_type 42 (取物單) 的 member_barcode 欄位 2. chore: 同步 Order Model、API 文件 (api-docs.php) 與三語系 (zh_TW/en/ja) 對齊更新
This commit is contained in:
sky121113
commit
55494fe5ba
@ -82,6 +82,7 @@ class Order extends Model
|
||||
34 => __('PlusPay'),
|
||||
40 => __('Member Verify Pickup'),
|
||||
41 => __('Staff Card'),
|
||||
42 => __('Pickup Voucher'),
|
||||
50 => __('Offline + LINE Pay'),
|
||||
51 => __('Offline + JKO Pay'),
|
||||
52 => __('Offline + Easy Wallet'),
|
||||
|
||||
@ -593,7 +593,7 @@ return [
|
||||
'order.original_amount' => ['type' => 'numeric', 'description' => '(選填) 原始標價金額', 'required' => false],
|
||||
'order.discount_amount' => ['type' => 'numeric', 'description' => '(選填) 折扣金額，預設 0', 'required' => false],
|
||||
'order.points_used' => ['type' => 'integer', 'description' => '(選填) 使用點數，預設 0', 'required' => false],
|
||||
'order.payment_type' => ['type' => 'integer', 'description' => "(必填) 支付類型代碼：\n1:信用卡, 2:悠遊卡/一卡通, 3:掃碼支付, 4:紙鈔機, 5:通行碼, 6:取貨碼, 7:來店禮, 8:問卷, 9:零錢, 41:員工卡。\n21~25:線下付款+X (21:線下+1, 22:線下+2, 23:線下+3, 24:線下+4, 25:線下+9)。\n30:LINE Pay, 31:街口, 32:悠遊付, 33:Pi, 34:全盈+。\n40:會員驗證取貨商品。\n50~54:線下付款+TapPay (50:線下+30, 51:線下+31, 52:線下+32, 53:線下+33, 54:線下+34)。\n60:點數/優惠卷全額折抵。61~69:會員+X (61:會員+1...69:會員+9)。\n90~94:會員+TapPay (90:會員+30...94:會員+34)。\n100:遠端出貨。"],
|
||||
'order.payment_type' => ['type' => 'integer', 'description' => "(必填) 支付類型代碼：\n1:信用卡, 2:悠遊卡/一卡通, 3:掃碼支付, 4:紙鈔機, 5:通行碼, 6:取貨碼, 7:來店禮, 8:問卷, 9:零錢, 41:員工卡, 42:取物單。\n21~25:線下付款+X (21:線下+1, 22:線下+2, 23:線下+3, 24:線下+4, 25:線下+9)。\n30:LINE Pay, 31:街口, 32:悠遊付, 33:Pi, 34:全盈+。\n40:會員驗證取貨商品。\n50~54:線下付款+TapPay (50:線下+30, 51:線下+31, 52:線下+32, 53:線下+33, 54:線下+34)。\n60:點數/優惠卷全額折抵。61~69:會員+X (61:會員+1...69:會員+9)。\n90~94:會員+TapPay (90:會員+30...94:會員+34)。\n100:遠端出貨。"],
|
||||
'order.payment_status' => ['type' => 'integer', 'description' => '(必填) 支付狀態 (1:成功)'],
|
||||
'order.code_id' => ['type' => 'string', 'description' => '(選填) 閉環勾稽用的代碼 ID (payment_type 為 5, 6, 41 時必填)', 'required' => false],
|
||||
'order.payment_request' => ['type' => 'string', 'description' => '(選填) 金流請求原始字串', 'required' => false],
|
||||
|
||||
@ -1354,6 +1354,7 @@
|
||||
"Pickup Code (8 Digits)": "Pickup Code (8 Digits)",
|
||||
"Pickup Codes": "Pickup Codes",
|
||||
"Pickup Ticket": "Pickup Ticket",
|
||||
"Pickup Voucher": "Pickup Voucher",
|
||||
"Pickup code cancelled.": "Pickup code cancelled.",
|
||||
"Pickup code generated: :code": "Pickup code generated: :code",
|
||||
"Pickup code updated.": "Pickup code updated.",
|
||||
|
||||
@ -1349,6 +1349,7 @@
|
||||
"Pickup Code (8 Digits)": "受取コード (8桁)",
|
||||
"Pickup Codes": "受取コード",
|
||||
"Pickup Ticket": "商品受取チケット",
|
||||
"Pickup Voucher": "受取票",
|
||||
"Pickup code cancelled.": "受取コードがキャンセルされました。",
|
||||
"Pickup code generated: :code": "受取コードが生成されました: :code",
|
||||
"Pickup code updated.": "受取コードが更新されました。",
|
||||
|
||||
@ -1354,6 +1354,7 @@
|
||||
"Pickup Code (8 Digits)": "取貨碼 (8 位數)",
|
||||
"Pickup Codes": "取貨碼",
|
||||
"Pickup Ticket": "商品領取券",
|
||||
"Pickup Voucher": "取物單",
|
||||
"Pickup code cancelled.": "取貨碼已取消",
|
||||
"Pickup code generated: :code": "已生成取貨碼：:code",
|
||||
"Pickup code updated.": "取貨碼已更新",
|
||||
|
||||
@ -114,6 +114,21 @@
|
||||
</section>
|
||||
@endif
|
||||
|
||||
@if($order->payment_type == 42 && !empty($order->member_barcode))
|
||||
<section class="space-y-4">
|
||||
<div class="flex items-center gap-2 px-1">
|
||||
<div class="w-1.5 h-4 bg-cyan-500 rounded-full"></div>
|
||||
<h3 class="text-sm font-black text-slate-800 dark:text-white uppercase tracking-widest">{{ __('Pickup Voucher Info') }}</h3>
|
||||
</div>
|
||||
<div class="grid grid-cols-2 gap-8 p-8 bg-slate-50/50 dark:bg-slate-800/30 rounded-[2rem] border border-slate-100 dark:border-slate-800">
|
||||
<div class="space-y-1 col-span-2">
|
||||
<p class="text-[10px] font-black text-slate-400 dark:text-slate-500 uppercase tracking-widest">{{ __('Member Barcode') }}</p>
|
||||
<p class="text-sm font-extrabold text-slate-700 dark:text-slate-200">{{ $order->member_barcode }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
@endif
|
||||
|
||||
{{-- 商品明細 --}}
|
||||
<section class="space-y-4">
|
||||
<div class="flex items-center justify-between px-1">
|
||||
|
||||
@ -243,6 +243,14 @@
|
||||
{{ $order->staffCardLog->staffCard->name }} ({{ $order->staffCardLog->staffCard->employee_id }})
|
||||
</span>
|
||||
@endif
|
||||
@if($order->payment_type == 42 && !empty($order->member_barcode))
|
||||
<span class="text-[10px] text-cyan-600 dark:text-cyan-400 font-extrabold mt-1.5 flex items-center gap-1">
|
||||
<svg class="w-3.5 h-3.5 shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24" stroke-width="2.5">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M15 9h3.75M15 12h3.75M15 15h3.75M4.5 19.5h15a2.25 2.25 0 002.25-2.25V6.75A2.25 2.25 0 0019.5 4.5h-15a2.25 2.25 0 00-2.25 2.25v10.5A2.25 2.25 0 004.5 19.5zm6-10.125a1.875 1.875 0 11-3.75 0 1.875 1.875 0 013.75 0zm1.294 6.336a6.721 6.721 0 01-3.17.789 6.721 6.721 0 01-3.168-.789 3.376 3.376 0 016.338 0z" />
|
||||
</svg>
|
||||
{{ $order->member_barcode }}
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</td>
|
||||
<td class="px-6 py-6 whitespace-nowrap">
|
||||
@ -380,6 +388,14 @@
|
||||
{{ $order->staffCardLog->staffCard->name }} ({{ $order->staffCardLog->staffCard->employee_id }})
|
||||
</div>
|
||||
@endif
|
||||
@if($order->payment_type == 42 && !empty($order->member_barcode))
|
||||
<div class="text-[10px] text-cyan-600 dark:text-cyan-400 font-extrabold mt-1 flex items-center gap-1">
|
||||
<svg class="w-3.5 h-3.5 shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24" stroke-width="2.5">
|
||||
<path stroke-linecap="round" stroke-linejoin="round" d="M15 9h3.75M15 12h3.75M15 15h3.75M4.5 19.5h15a2.25 2.25 0 002.25-2.25V6.75A2.25 2.25 0 0019.5 4.5h-15a2.25 2.25 0 00-2.25 2.25v10.5A2.25 2.25 0 004.5 19.5zm6-10.125a1.875 1.875 0 11-3.75 0 1.875 1.875 0 013.75 0zm1.294 6.336a6.721 6.721 0 01-3.17.789 6.721 6.721 0 01-3.168-.789 3.376 3.376 0 016.338 0z" />
|
||||
</svg>
|
||||
{{ $order->member_barcode }}
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
<div>
|
||||
<p class="text-[10px] font-black text-slate-400 dark:text-slate-500 uppercase tracking-widest mb-1">{{
|
||||
@ -422,4 +438,4 @@
|
||||
{{-- Pagination --}}
|
||||
<div class="mt-8 border-t border-slate-100/50 dark:border-slate-800/50 pt-6">
|
||||
{{ $orders->links('vendor.pagination.luxury', ['page_param' => 'orders_page']) }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user