From 860e8db202aa4252aac92c74351e31dc41b24549 Mon Sep 17 00:00:00 2001 From: San Wai Lwin Date: Fri, 9 Feb 2018 10:17:56 +0630 Subject: [PATCH] conflic data --- README.md | 8 +- app/assets/javascripts/OQS.js | 18 +- .../javascripts/channels/call_waiter.js | 22 +- app/controllers/api/bill_controller.rb | 3 +- .../api/call_waiters_controller.rb | 3 +- app/controllers/oqs/edit_controller.rb | 6 +- app/controllers/oqs/home_controller.rb | 66 ++- app/controllers/oqs/print_controller.rb | 2 +- app/controllers/origami/home_controller.rb | 33 +- app/controllers/origami/orders_controller.rb | 28 +- .../origami/payments_controller.rb | 4 +- app/controllers/origami/rooms_controller.rb | 30 +- app/controllers/origami/sales_controller.rb | 2 +- app/models/dining_facility.rb | 10 +- app/models/order.rb | 32 +- app/models/printer/order_queue_printer.rb | 56 +-- app/models/sale.rb | 41 +- app/models/sale_payment.rb | 6 +- app/pdf/order_item_pdf.rb | 20 +- app/pdf/order_item_slim_pdf.rb | 20 +- app/pdf/order_set_item_pdf.rb | 20 +- app/views/home/dashboard.html.erb | 2 +- app/views/layouts/_left_sidebar.html.erb | 1 + app/views/origami/home/show.html.erb | 36 +- app/views/origami/orders/show.html.erb | 425 ++++++++++-------- app/views/origami/rooms/show.html.erb | 20 + config/locales/en.yml | 1 + config/locales/mm.yml | 1 + config/schedule.rb | 2 +- 29 files changed, 622 insertions(+), 296 deletions(-) diff --git a/README.md b/README.md index 8c5cf006..97f43595 100755 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ ruby 2.4.1p111 Osaka - Auth Token => rj0MJ0XI5GsKZehE => New + Auth Token => wu8YvlLmah0CL => New ##note : Old => rj0MJ0XI5GsKZehE => code2lab => Old @@ -23,7 +23,7 @@ ruby 2.4.1p111 BITP - Auth Token => rj0MJ0XI5GsKZehE => New + Auth Token => pZBHXEFbGNj/G => New ##note : Old => rj0MJ0XI5GsKZehE => code2lab => Old @@ -103,6 +103,10 @@ Change type in mysql => ALTER TABLE [table_name] CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci #for table => ALTER DATABASE [database_name] CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci #for database +###please open +sudo cat /etc/sudoers +### cope and parse +%superuser ALL=(ALL) NOPASSWD: ALL * ToDo list diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js index da50ac34..35e08b4f 100755 --- a/app/assets/javascripts/OQS.js +++ b/app/assets/javascripts/OQS.js @@ -25,6 +25,7 @@ //= require custom.js $(document).on('turbolinks:load', function() { + var oqs_id = ""; $(".nav-completed").on("click", function(){ $("#completed").removeClass('hide') $(".oqs_append").addClass('hide') @@ -37,7 +38,8 @@ $(document).on('turbolinks:load', function() { $(".oqs_append").removeClass('hide'); $(this).addClass('oqs_active'); $(".queue_station").addClass('queue_station_box'); - var oqs_id = $(this).find(".oqs-id").text(); + oqs_id = $(this).find(".oqs-id").text(); + console.log(oqs_id); var url = 'oqs/get_items/'+oqs_id; show_details(url); @@ -142,8 +144,7 @@ $(document).on('turbolinks:load', function() { type: 'GET', url: '/oqs/' + orderNo, data: { 'status' : order_status }, - success: function(res){ - + success: function(res){ for (i = 0; i < res.length; i++) { var data = JSON.stringify(res[i]); var parse_data = JSON.parse(data); @@ -156,10 +157,19 @@ $(document).on('turbolinks:load', function() { }); } } - var order_item_row = "" + + + if (oqs_id > 0){ + var order_item_row = "" + "" + parse_data.item_name + set_instance_items + "" + "" + parse_data.qty + "" + ""; + }else{ + var order_item_row = "" + + "" + parse_data.item_name + set_instance_items + "" + + "" + parse_data.qty + "" + + ""; + } + $("#oqs-order-details-table").children("tbody").append(order_item_row); } } diff --git a/app/assets/javascripts/channels/call_waiter.js b/app/assets/javascripts/channels/call_waiter.js index 941a6359..f0a804a2 100644 --- a/app/assets/javascripts/channels/call_waiter.js +++ b/app/assets/javascripts/channels/call_waiter.js @@ -7,15 +7,27 @@ App.call_waiter = App.cable.subscriptions.create('CallWaiterChannel', { received: function(data) { table = data.table + time = data.time // for Notificaiotn message var element = "#notify-wrapper" - var placementFrom = "top"; - var placementAlign = "center"; var animateEnter = ""; var animateExit = ""; - var colorName = "alert-warning"; - var text = " Calling Waiter
"+table.name ; + + if (time == 'print_error') { + var colorName = "alert-danger"; + var placementFrom = "center"; + var placementAlign = "center"; + var text = " Hello
"+table ; + style ="" + }else{ + var colorName = "alert-warning"; + var placementFrom = "top"; + var placementAlign = "center"; + var text = " Calling Waiter
"+table.name ; + style ="width:180px !important;" + } + if (text != null || colorName != null){ showNotification(element, colorName, text, placementFrom, placementAlign, animateEnter, animateExit); @@ -43,7 +55,7 @@ App.call_waiter = App.cable.subscriptions.create('CallWaiterChannel', { enter: animateEnter, exit: animateExit }, - template: ' + + + +
+
+
+
ORDERS DETAILS
+
+
+
+
+ Order No: <%= @order.order_id %> + +
+
+ Date: <%= @order.created_at.utc.getlocal.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%> +
+
+
+
+ Customer :
+ +
+
"> +
+ + + + + + + + + + <% + sub_total = 0 + @order.order_items.each do |sale_item| + sub_total = sub_total + sale_item.price + %> + <% unless sale_item.price <= 0 %> + + + + + + <% + end + end + %> + +
ItemsQTYPrice
<%= sale_item.item_name %><%= sale_item.qty %><%= sale_item.price %>
+
+
+
+ + + + + + + + + + + + +
Sub Total:<%= sub_total %>
Discount:(<%=@selected_item.total_discount rescue 0%>)
+
+
+
+
+ + +
+ + <% if @sale_status != 'completed' %> + + <% end %> + +
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index 385129bf..17674fff 100755 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -50,6 +50,11 @@ <% end %>
<%= table.name %> + <% if !@order_items_count.nil? %> + <% if @order_items_count.key?(table.id) %> + (Orders : <%= @order_items_count[table.id] %>) + <% end %> + <% end %> billed
@@ -61,6 +66,11 @@ <% end %>
<%= table.name %> + <% if !@order_items_count.nil? %> + <% if @order_items_count.key?(table.id) %> + (Orders : <%= @order_items_count[table.id] %>) + <% end %> + <% end %> new
@@ -87,6 +97,11 @@
<%= room.name %> + <% if !@order_items_count.nil? %> + <% if @order_items_count.key?(room.id) %> + (Orders : <%= @order_items_count[room.id] %>) + <% end %> + <% end %> billed
@@ -95,6 +110,11 @@
<%= room.name %> + <% if !@order_items_count.nil? %> + <% if @order_items_count.key?(room.id) %> + (Orders : <%= @order_items_count[room.id] %>) + <% end %> + <% end %> new
diff --git a/config/locales/en.yml b/config/locales/en.yml index 6bc0271e..d4dc8005 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -70,6 +70,7 @@ en: sale_audits: "Sale Audits" bottom: "Bottom" payment: "Payment" + backend: "Backend" views: btn: diff --git a/config/locales/mm.yml b/config/locales/mm.yml index 6bdb1768..2d35b1bf 100755 --- a/config/locales/mm.yml +++ b/config/locales/mm.yml @@ -65,6 +65,7 @@ mm: sale_audits: "အရောင်းပြင်ဆင်ခြင်းများ" bottom: "အရောင်းအနဲဆုံး" payment: "ငွေပေးချေမှု" + backend: "Backend" views: btn: diff --git a/config/schedule.rb b/config/schedule.rb index 17f336a0..4b3f6a3b 100755 --- a/config/schedule.rb +++ b/config/schedule.rb @@ -11,5 +11,5 @@ every 30.minutes do end every 1.minutes do - runner "CheckinJob.perform" + runner "DiningFacility.checkin_time" end \ No newline at end of file