diff --git a/app/assets/javascripts/channels/second_display_view.js b/app/assets/javascripts/channels/second_display_view.js index abb0f486..a1420e8f 100644 --- a/app/assets/javascripts/channels/second_display_view.js +++ b/app/assets/javascripts/channels/second_display_view.js @@ -90,7 +90,11 @@ App.checkin = App.cable.subscriptions.create('SecondDisplayViewChannel', { +'' +''; $(".second_display_items tbody").append(row); - + + //slim scroll + var scrollContainer = $('#order-detail-slimscroll'); + scrollContainer.slimScroll({ scrollTo: scrollContainer[0].scrollHeight }); + } } } @@ -123,8 +127,10 @@ App.checkin = App.cable.subscriptions.create('SecondDisplayViewChannel', { +'' +''; $(".second_display_items tbody").append(row); - rowCount = rowCount + 1; + var scrollContainer = $('#order-detail-slimscroll'); + scrollContainer.slimScroll({ scrollTo: scrollContainer[0].scrollHeight }); + rowCount = rowCount + 1; } } diff --git a/app/controllers/foodcourt/payments_controller.rb b/app/controllers/foodcourt/payments_controller.rb index 048bab68..33e38291 100755 --- a/app/controllers/foodcourt/payments_controller.rb +++ b/app/controllers/foodcourt/payments_controller.rb @@ -645,9 +645,10 @@ class Foodcourt::PaymentsController < BaseFoodcourtController sale_id = params[:sale_id] order_source = params[:cashier_type] tax_type = params[:tax_type] + remark = "Change tax to #{tax_type.upcase} for Sale ID #{sale_id} by #{current_login_employee.name}" sale = Sale.find(sale_id) sale.compute_by_sale_items(sale.total_discount, nil, order_source, tax_type) - + SaleAudit.record_audit_change_tax(sale_id, remark, current_login_employee.name) render json: JSON.generate({:status => true}) end diff --git a/app/views/origami/second_display/_second_display.html.erb b/app/views/origami/second_display/_second_display.html.erb index 3ba175b0..9a8efdf7 100644 --- a/app/views/origami/second_display/_second_display.html.erb +++ b/app/views/origami/second_display/_second_display.html.erb @@ -4,23 +4,26 @@
| # | -Items | -QTY | -Price | +# | +Items | +QTY | +Price |
|---|