From 5875fe380e32cbfc16dbf09c7c94771161eb62bd Mon Sep 17 00:00:00 2001 From: sky121113 Date: Tue, 16 Jun 2026 13:41:51 +0800 Subject: [PATCH] =?UTF-8?q?[FIX]=20=E9=8A=B7=E5=94=AE=E6=8E=83=E7=A2=BC?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F=E7=B4=B0=E5=88=86=E8=88=87?= =?UTF-8?q?=E8=A8=82=E5=96=AE=E8=A9=B3=E6=83=85=E7=99=BC=E7=A5=A8=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. AnalysisController 與 Order 將付款方式 3 由「掃碼支付」細分為「掃碼支付-玉山」，並新增 11「掃碼支付-TayPay」。 2. 訂單詳情面板（order-detail-panel）發票操作按鈕（列印／作廢／勾稽／補開）改為一致的圖示按鈕樣式，並補上捐贈發票不可列印提示。 3. 銷售列表（sales/index）與發票分頁（tab-invoices）配合調整顯示。 4. 三語系新增 QR Code Payment - E.SUN／TayPay 文案並對齊排序。 Co-Authored-By: Claude Opus 4.8 (1M context) --- .../Controllers/Admin/AnalysisController.php | 3 +- app/Models/Transaction/Order.php | 3 +- lang/en.json | 2 + lang/ja.json | 2 + lang/zh_TW.json | 2 + resources/views/admin/sales/index.blade.php | 32 ++++++++- .../partials/order-detail-panel.blade.php | 66 ++++++++++++++----- .../sales/partials/tab-invoices.blade.php | 11 +--- 8 files changed, 90 insertions(+), 31 deletions(-) diff --git a/app/Http/Controllers/Admin/AnalysisController.php b/app/Http/Controllers/Admin/AnalysisController.php index 9bd1ee0..4c61a01 100644 --- a/app/Http/Controllers/Admin/AnalysisController.php +++ b/app/Http/Controllers/Admin/AnalysisController.php @@ -88,13 +88,14 @@ class AnalysisController extends Controller $availablePaymentTypes = [ 1 => __('Credit Card'), 2 => __('E-Ticket (EasyCard/iPass)'), - 3 => __('QR Code Payment'), + 3 => __('QR Code Payment - E.SUN'), // 掃碼支付-玉山 4 => __('Bill Acceptor'), 5 => __('Pass Code'), 6 => __('Pickup Code'), 7 => __('Welcome Gift'), 8 => __('Questionnaire'), 9 => __('Coin Acceptor'), + 11 => __('QR Code Payment - TayPay'), // 掃碼支付-TayPay 41 => __('Staff Card'), 42 => __('Pickup Voucher'), ]; diff --git a/app/Models/Transaction/Order.php b/app/Models/Transaction/Order.php index f2b1b48..5b1de78 100644 --- a/app/Models/Transaction/Order.php +++ b/app/Models/Transaction/Order.php @@ -86,7 +86,7 @@ class Order extends Model return [ 1 => __('Credit Card'), 2 => __('E-Ticket (EasyCard/iPass)'), - 3 => __('QR Code Payment'), + 3 => __('QR Code Payment - E.SUN'), // 掃碼支付-玉山 4 => __('Bill Acceptor'), 5 => __('Pass Code'), // 使用者要求由「通關密碼」改為「通行碼」 6 => __('Pickup Code'), @@ -94,6 +94,7 @@ class Order extends Model 8 => __('Questionnaire'), 9 => __('Coin Acceptor'), 10 => __('Mobile Pay'), // NFC 手機感應（行動支付，信用卡軌道，依使用者按鈕分類） + 11 => __('QR Code Payment - TayPay'), // 掃碼支付-TayPay 21 => __('Offline + 1'), 22 => __('Offline + 2'), 23 => __('Offline + 3'), diff --git a/lang/en.json b/lang/en.json index 17c6bc4..c9dc84d 100644 --- a/lang/en.json +++ b/lang/en.json @@ -1643,6 +1643,8 @@ "QR CODE": "QR CODE", "QR Code": "QR Code", "QR Code Payment": "QR Code Payment", + "QR Code Payment - E.SUN": "QR Code Payment - E.SUN", + "QR Code Payment - TayPay": "QR Code Payment - TayPay", "QR Scan Payment": "QR Scan Payment", "Qty": "Qty", "Qty Change": "Qty Change", diff --git a/lang/ja.json b/lang/ja.json index dcc6d43..7b74256 100644 --- a/lang/ja.json +++ b/lang/ja.json @@ -1643,6 +1643,8 @@ "QR CODE": "QRコード", "QR Code": "QRコード", "QR Code Payment": "QRコード決済", + "QR Code Payment - E.SUN": "QRコード決済-玉山銀行", + "QR Code Payment - TayPay": "QRコード決済-TayPay", "QR Scan Payment": "QRスキャン決済", "Qty": "数量", "Qty Change": "変動数", diff --git a/lang/zh_TW.json b/lang/zh_TW.json index 0d96db4..1d6b970 100644 --- a/lang/zh_TW.json +++ b/lang/zh_TW.json @@ -1643,6 +1643,8 @@ "QR CODE": "二維碼", "QR Code": "QR Code", "QR Code Payment": "掃碼支付", + "QR Code Payment - E.SUN": "掃碼支付-玉山", + "QR Code Payment - TayPay": "掃碼支付-TayPay", "QR Scan Payment": "掃碼支付功能", "Qty": "數量", "Qty Change": "異動數量", diff --git a/resources/views/admin/sales/index.blade.php b/resources/views/admin/sales/index.blade.php index 878583b..733c684 100644 --- a/resources/views/admin/sales/index.blade.php +++ b/resources/views/admin/sales/index.blade.php @@ -92,6 +92,14 @@ + + {{-- 發票作廢 / 補開 確認框（自製 UI，取代瀏覽器原生 confirm） --}} + + @endsection @@ -102,7 +110,29 @@ function salesCenter() { showPanel: false, activeTab: '{{ $tab }}', tabLoading: null, - + showVoidModal: false, + showReissueModal: false, + pendingInvoiceForm: '', + + confirmVoidInvoice(formId) { + this.pendingInvoiceForm = formId; + this.showVoidModal = true; + }, + + confirmReissueInvoice(formId) { + this.pendingInvoiceForm = formId; + this.showReissueModal = true; + }, + + submitInvoiceAction() { + if (this.pendingInvoiceForm) { + const form = document.getElementById(this.pendingInvoiceForm); + if (form) form.submit(); + } + this.showVoidModal = false; + this.showReissueModal = false; + }, + init() { const params = new URLSearchParams(window.location.search); const urlTab = params.get('tab'); 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 aa3f391..c244e02 100644 --- a/resources/views/admin/sales/partials/order-detail-panel.blade.php +++ b/resources/views/admin/sales/partials/order-detail-panel.blade.php @@ -309,27 +309,57 @@ - @if($invStatus === 'issued') -
- @if($invPrintable) -
- @csrf - +
+ @else + {{ __('Donation invoices cannot be printed') }} + @endif + {{-- 作廢：使用自製確認框 UI（不用瀏覽器原生 confirm） --}} + + + @elseif(in_array($invStatus, ['pending', 'failed'])) + {{-- 查詢（對帳） --}} +
+ @csrf + +
+ {{-- 補開 --}} + + - - @else - {{ __('Donation invoices cannot be printed') }} @endif -
- @csrf - -
- @endif diff --git a/resources/views/admin/sales/partials/tab-invoices.blade.php b/resources/views/admin/sales/partials/tab-invoices.blade.php index f84cdd5..8219e52 100644 --- a/resources/views/admin/sales/partials/tab-invoices.blade.php +++ b/resources/views/admin/sales/partials/tab-invoices.blade.php @@ -254,16 +254,7 @@ @endif - @if($st === 'issued') -
- @csrf - -
- @endif + {{-- 作廢按鈕僅在「訂單詳情」提供，列表操作欄不再顯示 --}}