diff --git a/app/assets/javascripts/channels/second_display_view.js b/app/assets/javascripts/channels/second_display_view.js index 4f67961a..a9e8557c 100644 --- a/app/assets/javascripts/channels/second_display_view.js +++ b/app/assets/javascripts/channels/second_display_view.js @@ -289,5 +289,27 @@ App.checkin = App.cable.subscriptions.create("SecondDisplayViewChannel", { jQuery("#s_reload").click(); }, 3000); } + + if (status == "reload_and_update") { + $(".second_display_items tbody").empty(); + console.log("data.data", data.data); + var items = items.items + for (var i in items) { + $(".second_display_items tbody").append( + ` + ${parseInt(i) + 1} + ${items[i].product_name} + ${parseInt(items[i].qty)} + ${items[i].price} + + `, + ); + } + + $("#s_sub_total").text(data.data.subtotal); + $("#s_tatal_tax").text(data.data.total_tax); + $("#s_total_discount").text(data.data.total_discount); + $("#s_grand_total").text(data.data.grand_total); + } }, }); diff --git a/app/views/foodcourt/qrpay/precreate.html.erb b/app/views/foodcourt/qrpay/precreate.html.erb index 514289c6..9591dc82 100644 --- a/app/views/foodcourt/qrpay/precreate.html.erb +++ b/app/views/foodcourt/qrpay/precreate.html.erb @@ -465,6 +465,19 @@ var paymalcount = <%= @paymalcount %>; var customer_paypar_account = '<%= @sale_data.customer.paypar_account_no %>'; // console.log(pdf_view) $(document).ready(function(){ + + $.post('/foodcourt/customer_view', { + data: { + items: <%= raw @sale_data.sale_items.to_json %>, + subtotal: <%= number_with_precision(@sale_data.total_amount, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i) %>, + total_discount: <%= number_with_precision(@sale_data.total_discount, precision: precision.to_i) rescue number_with_precision(0, precision: precision.to_i) %>, + total_tax: <%= number_with_precision(@sale_data.total_tax, precision: precision.to_i) rescue number_with_precision(0, precision: precision.to_i) %>, + grand_total: <%= number_with_precision(@sale_data.grand_total, precision: precision.to_i ) rescue number_with_precision(0, precision: precision.to_i) %>, + }, + status: "reload_and_update" + }, function(result) {}, 'json'); + + $("#read_modal").modal('hide'); /* replace url type*/ if(!trans_flag){ diff --git a/app/views/foodcourt/second_display/_second_display.html.erb b/app/views/foodcourt/second_display/_second_display.html.erb index 91c8358a..65d8fdac 100644 --- a/app/views/foodcourt/second_display/_second_display.html.erb +++ b/app/views/foodcourt/second_display/_second_display.html.erb @@ -37,7 +37,7 @@ - Tax Amount (5%): + Tax: diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index bba10d8a..96005b92 100755 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -57,6 +57,9 @@ .new-design-navbar .navbar-brand:hover { opacity: 0.9; } +.new-design-navbar .navbar-brand img { + margin-right: 8px; +} .new-design-navbar .navbar-brand .material-icons { margin-right: 8px; @@ -145,25 +148,60 @@ font-feature-settings: 'liga'; } +/* Responsive Styles */ +@media (max-width: 768px) { + .new-design-navbar .navbar-center-section { + /* display: none; */ + } + + .new-design-navbar .navbar-right-section .connection-status-text, + .new-design-navbar .navbar-right-section .user-name-text { + display: none; + } + + .new-design-navbar .navbar-right-section .nav-item { + margin-left: 8px; + padding: 0 5px; + } + + .new-design-navbar .navbar-brand { + font-size: 1rem; + } + + .new-design-navbar .bars-toggle { + margin-right: 10px; + } +} + +@media (max-width: 480px) { + .new-design-navbar .navbar-brand-text { + display: none; + } + .new-design-navbar .navbar-brand img { + margin-right: 0; + } +} + <%# Top Bar - New Design %> <% if !request.path_info.include?('second_display') %>