From 38db9dbb0bb83a7abdee56dedd44539da5324f4a Mon Sep 17 00:00:00 2001 From: Sumit Panwar Date: Mon, 1 Apr 2024 18:31:41 +0530 Subject: [PATCH] Design changes and issues resolved --- .../default/sass/controllers/_order.sass | 19 ++--- .../controllers/orders/_documents.tpl | 8 +- .../controllers/orders/_product_line.tpl | 12 +-- .../orders/_rooms_informaion_table.tpl | 2 +- .../controllers/orders/helpers/view/view.tpl | 80 +++++++++---------- .../orders/modals/_add_room_booking.tpl | 2 +- .../modals/_extra_services_facilities.tpl | 11 ++- .../_extra_services_service_products.tpl | 18 ++--- .../orders/modals/_order_payment_detail.tpl | 4 +- .../orders/modals/_room_reallocation.tpl | 4 +- controllers/admin/AdminOrdersController.php | 4 +- js/admin/orders.js | 72 +++++++++-------- 12 files changed, 113 insertions(+), 123 deletions(-) diff --git a/admin/themes/default/sass/controllers/_order.sass b/admin/themes/default/sass/controllers/_order.sass index 3e7fc4b75..5c8b3bb5b 100644 --- a/admin/themes/default/sass/controllers/_order.sass +++ b/admin/themes/default/sass/controllers/_order.sass @@ -76,10 +76,7 @@ padding: 15px border-radius: 2px box-shadow: none - a.order_detail_link - color: #3862D8 - text-decoration: none - cursor: pointer + .nav-tabs>li.active>a color: #333 .text-bold @@ -127,7 +124,6 @@ a font-size: 12px font-weight: 600 - color: #3862D8 text-transform: capitalize text-decoration: none i @@ -155,7 +151,7 @@ top: unset left: unset thead > tr > th - padding: 12px 16px 12px 16px + padding: 12px 8px background: #F5F5F5 border: none font-weight: 600 @@ -190,13 +186,6 @@ .btn-primary border: none font-weight: 600 - background: rgba(56,98,216,0.1) - color: #3862D8 - i - color: #3862D8 - &:hover - background: rgba(56,98,216,0.1) - opacity: 0.8 .message-body margin-bottom: 15px p.message-item-text @@ -224,12 +213,14 @@ .modal-footer padding: 15px 0px 0px 0px .btn-close - color: #3862D8 + color: #00aff0 font-weight: 600 padding: 10px border: none .btn-close:hover background: none + .btn-close:focus + outline: none .btn+.btn margin-left: 10px diff --git a/admin/themes/default/template/controllers/orders/_documents.tpl b/admin/themes/default/template/controllers/orders/_documents.tpl index c46f5209e..ba6a131e8 100644 --- a/admin/themes/default/template/controllers/orders/_documents.tpl +++ b/admin/themes/default/template/controllers/orders/_documents.tpl @@ -59,9 +59,9 @@ {if get_class($document) eq 'OrderInvoice'} - + {elseif get_class($document) eq 'OrderSlip'} - + {/if} {if get_class($document) eq 'OrderInvoice'} {$document->getInvoiceNumberFormatted($current_id_lang, $order->id_shop)} @@ -88,7 +88,7 @@ {if get_class($document) eq 'OrderInvoice'} - + {if $document->note eq ''}  {l s='Add note'} {else} @@ -96,7 +96,7 @@ {/if} {if $document->getRestPaid()} - +  {l s='Enter payment'} {/if} diff --git a/admin/themes/default/template/controllers/orders/_product_line.tpl b/admin/themes/default/template/controllers/orders/_product_line.tpl index 00983e6f7..073e707db 100644 --- a/admin/themes/default/template/controllers/orders/_product_line.tpl +++ b/admin/themes/default/template/controllers/orders/_product_line.tpl @@ -33,7 +33,7 @@

{$data.room_type}

- + {$data['hotel_name']} @@ -65,7 +65,7 @@ {if $data['children']} -