fix orders.info

innocommerce · Jan 13, 2025 · 14999ae · 14999ae
1 parent 0185471
commit 14999ae
Show file tree

Hide file tree

Showing 17 changed files with 81 additions and 42 deletions.
diff --git a/innopacks/panel/resources/views/orders/info.blade.php b/innopacks/panel/resources/views/orders/info.blade.php
@@ -154,54 +154,45 @@
     </div>
   </div>
 
-  <div class="card mb-4">
-    <div class="card-header">
-      <h5 class="card-title mb-0">{{ __('front/checkout.order_comment') }}</h5>
-    </div>
-    <div class="card-body row">
-      <div class="col-12 col-md-6 fs-5">
-        <p>{{ __('panel/order.customer_remarks') }}</p>
-        <div class=" mt-2 mb-5 ">
-            <h6> {{ $order->comment }}
-            </h6>
+  <div class="mt-4">
+    <div class="card mb-4">
+        <div class="card-header">
+            <h5 class="card-title mb-0">{{ __('front/checkout.order_comment') }}</h5>
         </div>
-      </div>
-      <div class="col-12 col-md-6 fs-5">
-        <p >{{ __('panel/order.administrator_remarks') }}</p>
-        <div class="mt-2 ">
-          <h6 class="mb-2" >
-            {{ $order->admin_note }} 
-        </h6>  
-            <button class="btn btn-sm btn-primary" data-bs-toggle="modal" data-bs-target="#admin_note">
-             编辑
-            </button>      
-          <div class="modal fade" id="admin_note" tabindex="-1" role="dialog" aria-labelledby="admin_note"
-               aria-hidden="true">
-            <div class="modal-dialog modal-dialog-centered ">
-              <div class="modal-content border border-secondary rounded">
-                <div class="modal-header ">
-                  <h4 class="modal-title" id="admin_note">
-                    管理员备注
-                  </h4>
-                </div>
-                <div class="modal-body">
-                                    <textarea class="form-control admin-comment-input"
-                                              rows="5"
-                                              data-order-id="{{ $order->id }}">{{ $order->admin_note }}</textarea>
+        <div class="card-body">
+            <div class="row">
+                <div class="col-12 col-md-6 mb-4"> 
+                    <h6 class="fs-5">{{ __('panel/order.customer_remarks') }}</h6>
+                    <p class="mb-0">{{ $order->comment }}</p>
                 </div>
-                <div class="modal-footer">
-                  <button type="button" class="btn btn-default" data-bs-dismiss="modal">关闭</button>
-                  <button type="button" class="btn btn-primary" onclick="submitComment()">
-                    提交
-                  </button>
+                <div class="col-12 col-md-6 mb-3">
+                    <h6 class="fs-5">{{ __('panel/order.administrator_remarks') }}</h6>
+                    <p class="mb-0">{{ $order->admin_note }}</p>
+                    <button class="btn btn-sm btn-primary mt-2" data-bs-toggle="modal" data-bs-target="#admin_note">
+                       {{ __('panel/order.compile') }}
+                    </button>
+
+                    <div class="modal fade" id="admin_note" tabindex="-1" aria-labelledby="admin_noteLabel" aria-hidden="true">
+                        <div class="modal-dialog modal-dialog-centered">
+                            <div class="modal-content border border-secondary rounded">
+                                <div class="modal-header">
+                                    <h4 class="modal-title" id="admin_noteLabel">{{ __('panel/order.administrator_remarks') }}</h4>
+                                </div>
+                                <div class="modal-body">
+                                    <textarea class="form-control admin-comment-input" rows="5" data-order-id="{{ $order->id }}">{{ $order->admin_note }}</textarea>
+                                </div>
+                                <div class="modal-footer">
+                                    <button type="button" class="btn btn-default" data-bs-dismiss="modal">{{ __('panel/order.close') }}</button>
+                                    <button type="button" class="btn btn-primary" onclick="submitComment()">{{ __('panel/order.submit') }}</button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
-              </div>
             </div>
-          </div>
         </div>
-      </div>
     </div>
-  </div>
+</div>
 
   <div class="card mb-4">
     <div class="card-header">

diff --git a/lang/ar/panel/order.php b/lang/ar/panel/order.php
@@ -27,7 +27,9 @@
     'billing_zipcode'        => 'الرمز البريدي للفاتورة',
     'calling_code'           => 'رمز الدولة',
     'cancelled'              => 'ملغي',
+    'close'                  => 'إغلاق',
     'comment'                => 'ملاحظة',
+    'compile'                => 'تحرير',
     'completed'              => 'مكتمل',
     'created'                => 'تم الإنشاء',
     'created_at'             => 'وقت الطلب',
@@ -66,6 +68,7 @@
     'shipping_zipcode'       => 'الرمز البريدي للشحن',
     'sku_code'               => 'رمز SKU',
     'status'                 => 'الحالة',
+    'submit'                 => 'إرسال',
     'subtotal'               => 'المجموع الجزئي',
     'telephone'              => 'رقم الهاتف',
     'total'                  => 'إجمالي الطلب',

diff --git a/lang/de/panel/order.php b/lang/de/panel/order.php
@@ -27,7 +27,9 @@
     'billing_zipcode'        => 'Rechnungsplz',
     'calling_code'           => 'Landescode',
     'cancelled'              => 'Abgebrochen',
+    'close'                  => 'إغلاق',
     'comment'                => 'Kommentar',
+    'compile'                => 'تحرير',
     'completed'              => 'Abgeschlossen',
     'created'                => 'Erstellt',
     'created_at'             => 'Bestellzeit',
@@ -66,6 +68,7 @@
     'shipping_zipcode'       => 'Lieferplz',
     'sku_code'               => 'SKU',
     'status'                 => 'Status',
+    'submit'                 => 'إرسال',
     'subtotal'               => 'Zwischensumme',
     'telephone'              => 'Telefon',
     'total'                  => 'Bestellbetrag',

diff --git a/lang/en/panel/order.php b/lang/en/panel/order.php
@@ -27,7 +27,9 @@
     'billing_zipcode'        => 'Billing Zipcode',
     'calling_code'           => 'Calling Code',
     'cancelled'              => 'Cancelled',
+    'close'                  => 'إغلاق',
     'comment'                => 'Comment',
+    'compile'                => 'تحرير',
     'completed'              => 'Completed',
     'created'                => 'Created',
     'created_at'             => 'Place At',
@@ -70,6 +72,7 @@
     'shipping_zipcode'       => 'Shipping Zipcode',
     'sku_code'               => 'SKU',
     'status'                 => 'Status',
+    'submit'                 => 'إرسال',
     'subtotal'               => 'Subtotal',
     'telephone'              => 'Telephone',
     'total'                  => 'Total',

diff --git a/lang/es/panel/order.php b/lang/es/panel/order.php
@@ -27,7 +27,9 @@
     'billing_zipcode'        => 'Código postal de facturación',
     'calling_code'           => 'Código de llamada',
     'cancelled'              => 'Cancelado',
+    'close'                  => 'Cerrar',
     'comment'                => 'Comentario',
+    'compile'                => 'Editar',
     'completed'              => 'Completado',
     'created'                => 'Creado',
     'created_at'             => 'Fecha de creación',
@@ -66,6 +68,7 @@
     'shipping_zipcode'       => 'Código postal de envío',
     'sku_code'               => 'SKU',
     'status'                 => 'Estado',
+    'submit'                 => 'Enviar',
     'subtotal'               => 'Subtotal',
     'telephone'              => 'Teléfono',
     'total'                  => 'Total',

diff --git a/lang/fr/panel/order.php b/lang/fr/panel/order.php
@@ -27,7 +27,9 @@
     'billing_zipcode'        => 'Code postal pour la facturation',
     'calling_code'           => 'Code de pays',
     'cancelled'              => 'Annulé',
+    'close'                  => 'Fermer',
     'comment'                => 'Commentaire',
+    'compile'                => 'Éditer',
     'completed'              => 'Complété',
     'created'                => 'Créé',
     'created_at'             => 'Heure de commande',
@@ -66,6 +68,7 @@
     'shipping_zipcode'       => 'Code postal pour la livraison',
     'sku_code'               => 'SKU',
     'status'                 => 'Statut',
+    'submit'                 => 'Soumettre',
     'subtotal'               => 'Sous-total',
     'telephone'              => 'Téléphone',
     'total'                  => 'Montant de la commande',

diff --git a/lang/id/panel/order.php b/lang/id/panel/order.php
@@ -27,7 +27,9 @@
     'billing_zipcode'        => 'Kode Pos Penagihan',
     'calling_code'           => 'Kode Negara',
     'cancelled'              => 'Dibatalkan',
+    'close'                  => 'Tutup',
     'comment'                => 'Komentar',
+    'compile'                => 'Edit',
     'completed'              => 'Selesai',
     'created'                => 'Dibuat',
     'created_at'             => 'Waktu Pemesanan',
@@ -66,6 +68,7 @@
     'shipping_zipcode'       => 'Kode Pos Pengiriman',
     'sku_code'               => 'Kode SKU',
     'status'                 => 'Status',
+    'submit'                 => 'Kirim',
     'subtotal'               => 'Subtotal',
     'telephone'              => 'Nomor Telepon',
     'total'                  => 'Total Pesanan',

diff --git a/lang/it/panel/order.php b/lang/it/panel/order.php
@@ -27,7 +27,9 @@
     'billing_zipcode'        => 'CAP di fatturazione',
     'calling_code'           => 'Codice di chiamata',
     'cancelled'              => 'Cancellato',
+    'close'                  => 'Chiudi',
     'comment'                => 'Commento',
+    'compile'                => 'Compilare',
     'completed'              => 'Completato',
     'created'                => 'Creato',
     'created_at'             => 'Data ordine',
@@ -66,6 +68,7 @@
     'shipping_zipcode'       => 'CAP di spedizione',
     'sku_code'               => 'SKU',
     'status'                 => 'Stato',
+    'submit'                 => 'Invia',
     'subtotal'               => 'Subtotale',
     'telephone'              => 'Telefono',
     'total'                  => 'Totale ordine',

diff --git a/lang/ja/panel/order.php b/lang/ja/panel/order.php
@@ -27,7 +27,9 @@
     'billing_zipcode'        => '請求先郵便番号',
     'calling_code'           => '国番号',
     'cancelled'              => 'キャンセル',
+    'close'                  => '閉じる',
     'comment'                => 'コメント',
+    'compile'                => '編集',
     'completed'              => '完了',
     'created'                => '作成',
     'created_at'             => '注文日時',
@@ -66,6 +68,7 @@
     'shipping_zipcode'       => '配送先郵便番号',
     'sku_code'               => 'SKU',
     'status'                 => 'ステータス',
+    'submit'                 => '送信',
     'subtotal'               => '小計',
     'telephone'              => '電話番号',
     'total'                  => '注文金額',

diff --git a/lang/ko/panel/order.php b/lang/ko/panel/order.php
@@ -27,7 +27,9 @@
     'billing_zipcode'        => '청구지 우편번호',
     'calling_code'           => '국가 코드',
     'cancelled'              => '취소됨',
+    'close'                  => '닫기',
     'comment'                => '의견',
+    'compile'                => '편집',
     'completed'              => '완료',
     'created'                => '생성',
     'created_at'             => '주문 시간',
@@ -66,6 +68,7 @@
     'shipping_zipcode'       => '배송지 우편번호',
     'sku_code'               => 'SKU',
     'status'                 => '상태',
+    'submit'                 => '제출',
     'subtotal'               => '소계',
     'telephone'              => '전화번호',
     'total'                  => '주문 금액',

diff --git a/lang/ms/panel/order.php b/lang/ms/panel/order.php
@@ -27,7 +27,9 @@
     'billing_zipcode'        => 'Poskod Bil',
     'calling_code'           => 'Kod Negara',
     'cancelled'              => 'Dibatalkan',
+    'close'                  => 'Tutup',
     'comment'                => 'Komen',
+    'compile'                => 'Edit',
     'completed'              => 'Selesai',
     'created'                => 'Dicipta',
     'created_at'             => 'Masa Tempahan',
@@ -66,6 +68,7 @@
     'shipping_zipcode'       => 'Poskod Penghantaran',
     'sku_code'               => 'Kod SKU',
     'status'                 => 'Status',
+    'submit'                 => 'Hantar',
     'subtotal'               => 'Jumlah Kecil',
     'telephone'              => 'Nombor Telefon',
     'total'                  => 'Jumlah Pesanan',

diff --git a/lang/pt/panel/order.php b/lang/pt/panel/order.php
@@ -27,7 +27,9 @@
     'billing_zipcode'        => 'CEP de Cobrança',
     'calling_code'           => 'Código de Chamada do País',
     'cancelled'              => 'Cancelado',
+    'close'                  => 'Fechar',
     'comment'                => 'Comentário',
+    'compile'                => 'Editar',
     'completed'              => 'Completo',
     'created'                => 'Criado',
     'created_at'             => 'Data do Pedido',
@@ -66,6 +68,7 @@
     'shipping_zipcode'       => 'CEP de Entrega',
     'sku_code'               => 'SKU',
     'status'                 => 'Status',
+    'submit'                 => 'Enviar',
     'subtotal'               => 'Subtotal',
     'telephone'              => 'Telefone',
     'total'                  => 'Valor do Pedido',

diff --git a/lang/ru/panel/order.php b/lang/ru/panel/order.php
@@ -27,7 +27,9 @@
     'billing_zipcode'        => 'Почтовый индекс для выставления счета',
     'calling_code'           => 'Код страны',
     'cancelled'              => 'Отменен',
+    'close'                  => 'Закрыть',
     'comment'                => 'Комментарий',
+    'compile'                => 'Редактировать',
     'completed'              => 'Завершен',
     'created'                => 'Создано',
     'created_at'             => 'Время оформления заказа',
@@ -66,6 +68,7 @@
     'shipping_zipcode'       => 'Почтовый индекс для доставки',
     'sku_code'               => 'SKU',
     'status'                 => 'Статус',
+    'submit'                 => 'Отправить',
     'subtotal'               => 'Промежуточный итог',
     'telephone'              => 'Телефон',
     'total'                  => 'Общая стоимость заказа',

diff --git a/lang/th/panel/order.php b/lang/th/panel/order.php
@@ -27,7 +27,9 @@
     'billing_zipcode'        => 'รหัสไปรษณีย์สำหรับออกบิล',
     'calling_code'           => 'รหัสโทรศัพท์',
     'cancelled'              => 'ถูกยกเลิก',
+    'close'                  => 'ปิด',
     'comment'                => 'ความคิดเห็น',
+    'compile'                => 'แก้ไข',
     'completed'              => 'เสร็จสมบูรณ์',
     'created'                => 'สร้าง',
     'created_at'             => 'วันที่สร้าง',
@@ -66,6 +68,7 @@
     'shipping_zipcode'       => 'รหัสไปรษณีย์สำหรับจัดส่ง',
     'sku_code'               => 'รหัส SKU',
     'status'                 => 'สถานะ',
+    'submit'                 => 'ส่ง',
     'subtotal'               => 'ยอดรวม',
     'telephone'              => 'โทรศัพท์',
     'total'                  => 'ยอดรวมทั้งหมด',

diff --git a/lang/vi/panel/order.php b/lang/vi/panel/order.php
@@ -27,7 +27,9 @@
     'billing_zipcode'        => 'mã bưu điện hóa đơn',
     'calling_code'           => 'mã quốc gia',
     'cancelled'              => 'đã hủy',
+    'close'                  => 'Đóng',
     'comment'                => 'bình luận',
+    'compile'                => 'Chỉnh sửa',
     'completed'              => 'đã hoàn thành',
     'created'                => 'tạo',
     'created_at'             => 'thời gian đặt hàng',
@@ -66,6 +68,7 @@
     'shipping_zipcode'       => 'mã bưu điện giao hàng',
     'sku_code'               => 'mã SKU',
     'status'                 => 'trạng thái',
+    'submit'                 => 'Gửi',
     'subtotal'               => 'tổng phụ',
     'telephone'              => 'số điện thoại',
     'total'                  => 'tổng đơn hàng',

diff --git a/lang/zh_cn/panel/order.php b/lang/zh_cn/panel/order.php
@@ -27,7 +27,9 @@
     'billing_zipcode'        => '账单邮编',
     'calling_code'           => '国家代码',
     'cancelled'              => '已取消',
+    'close'                  => '关闭',
     'comment'                => '备注',
+    'compile'                => '编辑',
     'completed'              => '已完成',
     'created'                => '创建',
     'created_at'             => '下单时间',
@@ -70,6 +72,7 @@
     'shipping_zipcode'       => '收货邮编',
     'sku_code'               => 'SKU',
     'status'                 => '状态',
+    'submit'                 => '提交',
     'subtotal'               => '小计',
     'telephone'              => '电话号码',
     'total'                  => '订单金额',

diff --git a/lang/zh_hk/panel/order.php b/lang/zh_hk/panel/order.php
@@ -27,7 +27,9 @@
     'billing_zipcode'        => '賬單郵編',
     'calling_code'           => '國家代碼',
     'cancelled'              => '已取消',
+    'close'                  => '關閉',
     'comment'                => '備註',
+    'compile'                => '編輯',
     'completed'              => '已完成',
     'created'                => '創建',
     'created_at'             => '下單時間',
@@ -66,6 +68,7 @@
     'shipping_zipcode'       => '收貨郵編',
     'sku_code'               => 'SKU',
     'status'                 => '狀態',
+    'submit'                 => '提交',
     'subtotal'               => '小計',
     'telephone'              => '電話號碼',
     'total'                  => '訂單金額',