From 965962e49d4ef008ccc7371d286fbe4c3a62e31b Mon Sep 17 00:00:00 2001 From: phyusin Date: Wed, 2 May 2018 16:33:04 +0630 Subject: [PATCH 01/17] change some func: --- .../javascripts/channels/order_reservation.js | 9 +++++---- app/assets/javascripts/order_reservation.js | 16 ++++++++++++---- .../order_reservation_controller.rb | 3 +-- app/models/order_reservation.rb | 2 +- .../origami/order_reservation/index.html.erb | 5 ++--- 5 files changed, 21 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/channels/order_reservation.js b/app/assets/javascripts/channels/order_reservation.js index 0a3ef37c..fb42bf82 100644 --- a/app/assets/javascripts/channels/order_reservation.js +++ b/app/assets/javascripts/channels/order_reservation.js @@ -9,21 +9,22 @@ App.checkin = App.cable.subscriptions.create('OrderReservationChannel', { var order = data.data; if(order.length > 0){ $('.order_reserve_cable tbody').html(""); + $(".nav-item.red > a > p.num").text(order.length); $.each(order, function(key,value){ var rowCount = key+1; var date = new Date(value.created_at); - var deliveries = value["delivery"]; + // var deliveries = value["delivery"]; var isPM = date.getHours() >= 12; var isMidday = date.getHours() == 12; var time = [date.getHours() - (isPM && !isMidday ? 12 : 0), date.getMinutes() || '00'].join(':') + (isPM ? ' PM' : 'AM'); - var created_at = date.getFullYear() +'-'+ (date.getMonth() > 10? date.getMonth() : '0' + (date.getMonth() + 1)) +'-'+ date.getDate(); + var created_at = date.getFullYear() +'-'+ (date.getMonth() > 10? date.getMonth() : '0' + (date.getMonth() + 1)) +'-'+ (date.getDate()>10?date.getDate() : '0'+date.getDate()); var delivery_type = ""; - if(deliveries.delivery_type == "service"){ + if(value.delivery_type == "service"){ delivery_type = "DELIVERY"; - }else if(deliveries.delivery_type == "pick_up"){ + }else if(value.delivery_type == "pick_up"){ delivery_type = "PICK-UP"; }else{ delivery_type = "DIRECT DELIVERY"; diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js index b99dad8d..8f9b3f4d 100644 --- a/app/assets/javascripts/order_reservation.js +++ b/app/assets/javascripts/order_reservation.js @@ -166,10 +166,18 @@ $(function() { } $("#accepted").on("click", function(){ - var requested_time = $("#requested_date_time").text(); - $("#requested_order_time").text(requested_time); - showTimePicker(requested_time); - $("#waiting_timeModal").modal({show : true, backdrop: false, keyboard : false}); + if($(this).text().trim() == "ACCEPT"){ + var requested_time = $("#requested_date_time").text(); + $("#requested_order_time").text(requested_time); + showTimePicker(requested_time); + $("#waiting_timeModal").modal({show : true, backdrop: false, keyboard : false}); + }else{ + var status = $(this).attr("data-value"); + var order_id = $('#order_id').text(); + var callback = $('#callback_url').text(); + var ref_no = $('#ref_no').text(); + callback_url(callback,ref_no,order_id,status); + } }); $("#cancel").on("click", function(){ diff --git a/app/controllers/api/order_reserve/order_reservation_controller.rb b/app/controllers/api/order_reserve/order_reservation_controller.rb index 57337b5e..f34c0f6f 100644 --- a/app/controllers/api/order_reserve/order_reservation_controller.rb +++ b/app/controllers/api/order_reserve/order_reservation_controller.rb @@ -59,9 +59,8 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController order_reservation = params order_reservation_id, flag = OrderReservation.addOrderReservationInfo(order_reservation) - order_reservation = OrderReservation.get_pending_orders #find(order_reservation_id) - if flag #&& ENV["SERVER_MODE"] != 'cloud' + order_reservation = OrderReservation.get_pending_orders #find(order_reservation_id) ActionCable.server.broadcast "order_reservation_channel",data: order_reservation end diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb index d60d908e..12f11252 100644 --- a/app/models/order_reservation.rb +++ b/app/models/order_reservation.rb @@ -201,7 +201,7 @@ class OrderReservation < ApplicationRecord end def self.get_pending_orders - order_reservation = OrderReservation.select("order_reservations.*,deliveries.provider,deliveries.delivery_type") + order_reservation = OrderReservation.select("order_reservations.*,del.provider,del.delivery_type") .joins(" JOIN deliveries as del on del.order_reservation_id=order_reservations.order_reservation_id") .where("order_reservations.status='new'") .order("order_reservations.order_reservation_id desc, order_reservations.created_at desc") diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb index 9c6df102..0adb528f 100644 --- a/app/views/origami/order_reservation/index.html.erb +++ b/app/views/origami/order_reservation/index.html.erb @@ -60,7 +60,7 @@ <%=i%> - <%= order.created_at.utc.getlocal.strftime("%d-%m-%Y") %> + <%= order.created_at.utc.getlocal.strftime("%Y-%m-%d") %> <%= order.created_at.utc.getlocal.strftime("%I:%M %p") %> @@ -197,7 +197,6 @@ - <%= order.delivery.to_json %> <% if order.delivery.delivery_type == 'service' %> DELIVERY <% elsif order.delivery.delivery_type == 'pick_up' %> @@ -351,7 +350,7 @@ - EXPECTED WAITING TIME
+ EXPECTED TIME
From 0748478bb45ae5da8d9c351c1fae0a024da604ee Mon Sep 17 00:00:00 2001 From: phyusin Date: Thu, 3 May 2018 09:28:21 +0630 Subject: [PATCH 02/17] order reservation js --- app/assets/javascripts/channels/order_reservation.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/channels/order_reservation.js b/app/assets/javascripts/channels/order_reservation.js index fb42bf82..8acf8997 100644 --- a/app/assets/javascripts/channels/order_reservation.js +++ b/app/assets/javascripts/channels/order_reservation.js @@ -11,6 +11,10 @@ App.checkin = App.cable.subscriptions.create('OrderReservationChannel', { $('.order_reserve_cable tbody').html(""); $(".nav-item.red > a > p.num").text(order.length); $.each(order, function(key,value){ + var active_class = ""; + if(key==0){ + active_class = "tr-active"; + } var rowCount = key+1; var date = new Date(value.created_at); // var deliveries = value["delivery"]; @@ -30,7 +34,7 @@ App.checkin = App.cable.subscriptions.create('OrderReservationChannel', { delivery_type = "DIRECT DELIVERY"; } - row = '' + row = '' +''+rowCount +'' +''+created_at @@ -42,7 +46,7 @@ App.checkin = App.cable.subscriptions.create('OrderReservationChannel', { +'' +''+ delivery_type +'' +'' - +' ' + +' '; $('.order_reserve_cable tbody').append(row); }); From 02fe2e57cc503514ec1900c2bc5dc12c3d3e91e0 Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 3 May 2018 09:29:18 +0630 Subject: [PATCH 03/17] no changes --- app/controllers/concerns/token_verification.rb | 3 +-- config/initializers/action_controller.rb | 4 ++-- config/secrets.yml | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/controllers/concerns/token_verification.rb b/app/controllers/concerns/token_verification.rb index 85c9b858..b49ef597 100755 --- a/app/controllers/concerns/token_verification.rb +++ b/app/controllers/concerns/token_verification.rb @@ -24,8 +24,7 @@ module TokenVerification end end - @user = Employee. - (token) + @user = Employee.authenticate_by_token(token) if @user return true #Maybe log - login? diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb index a3b19ebe..b84bca54 100644 --- a/config/initializers/action_controller.rb +++ b/config/initializers/action_controller.rb @@ -8,7 +8,7 @@ class ActionController::Base from = request.subdomain.downcase + "." + request.domain.downcase @license = cache_license(ENV["SX_PROVISION_URL"], from) # request.subdomain.downcase if (!@license.nil?) - logger.info "Location - " + @license.dbhost + logger.info "Location - " + @license.dbschema ActiveRecord::Base.establish_connection(website_connection(@license)) # authenticate_session_token # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema @@ -97,7 +97,7 @@ class ActionController::API from = request.subdomain.downcase + "." + request.domain.downcase @license = cache_license(ENV["SX_PROVISION_URL"], from) # request.subdomain.downcase if (!@license.nil?) - # logger.info "Location - " + @license.dbhost + logger.info "Location - " + @license.dbschema ActiveRecord::Base.establish_connection(website_connection(@license)) # authenticate_session_token # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema diff --git a/config/secrets.yml b/config/secrets.yml index b0d7c5c8..218234f1 100755 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -13,7 +13,7 @@ development: secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61 sx_provision_url: https://connect.pos-myanmar.com/bensai/api #connect.smartsales.dev/api #connect.smartsales.asia/api #provision.zsai.ws/api - server_mode: cloud + server_mode: application cipher_type: AES-256-CBC sx_key: Wh@t1$C2L From 9ff3018323dbd34be4143cfed88c1d1288fcc6ff Mon Sep 17 00:00:00 2001 From: phyusin Date: Thu, 3 May 2018 17:22:59 +0630 Subject: [PATCH 04/17] add alert for new,send_to_kitchen and ready_to_delivery --- .../javascripts/channels/check_new_order.js | 40 ++ .../channels/check_order_ready_to_delivery.js | 40 ++ .../channels/check_order_send_to_kitchen.js | 40 ++ .../javascripts/channels/order_reservation.js | 16 +- app/assets/javascripts/order_reservation.js | 450 +++++++++--------- app/channels/check_new_order_channel.rb | 10 + .../check_order_ready_to_delivery_channel.rb | 10 + .../check_order_send_to_kitchen_channel.rb | 10 + .../origami/moveroom_controller.rb | 2 + .../origami/movetable_controller.rb | 2 + app/models/order_reservation.rb | 29 ++ .../origami/moveroom/move_dining.html.erb | 4 + .../origami/movetable/move_dining.html.erb | 4 + .../origami/order_reservation/index.html.erb | 11 +- config/schedule.rb | 12 + 15 files changed, 445 insertions(+), 235 deletions(-) create mode 100644 app/assets/javascripts/channels/check_new_order.js create mode 100644 app/assets/javascripts/channels/check_order_ready_to_delivery.js create mode 100644 app/assets/javascripts/channels/check_order_send_to_kitchen.js create mode 100644 app/channels/check_new_order_channel.rb create mode 100644 app/channels/check_order_ready_to_delivery_channel.rb create mode 100644 app/channels/check_order_send_to_kitchen_channel.rb diff --git a/app/assets/javascripts/channels/check_new_order.js b/app/assets/javascripts/channels/check_new_order.js new file mode 100644 index 00000000..5bd64013 --- /dev/null +++ b/app/assets/javascripts/channels/check_new_order.js @@ -0,0 +1,40 @@ +App.check_new_order = App.cable.subscriptions.create('CheckNewOrderChannel', { + connected: function() {}, + + disconnected: function() {}, + + received: function(data) { + var order = data.data; + if(order.length > 0){ + var order_lists = ""; + $.each(order, function(key, value){ + if(key==0){ + order_lists = value.order_reservation_id; + }else if(key == (order.length - 1)){ + order_lists += ' and ' + value.order_reservation_id; + }else{ + order_lists += ', ' + value.order_reservation_id; + } + }); + + // alert(order_lists); + swal({ + html: true, + title: 'Information', + target: document.getElementById('notify_new_order'), + text: "You have new orders.
"+ + "Are you accept or reject for these orders "+order_lists+"?", + type: 'success', + timer: 1000, + closeOnConfirm: false, + closeOnCancel: false, + allowOutsideClick: false + },function(isConfirm){ + if(isConfirm){ + swal.close(); + } + }); + } + } +}); + diff --git a/app/assets/javascripts/channels/check_order_ready_to_delivery.js b/app/assets/javascripts/channels/check_order_ready_to_delivery.js new file mode 100644 index 00000000..84dd1982 --- /dev/null +++ b/app/assets/javascripts/channels/check_order_ready_to_delivery.js @@ -0,0 +1,40 @@ +App.check_order_ready_to_delivery = App.cable.subscriptions.create('CheckOrderReadyToDeliveryChannel', { + connected: function() {}, + + disconnected: function() {}, + + received: function(data) { + var order = data.data; + if(order.length > 0){ + var order_lists = ""; + $.each(order, function(key, value){ + if(key==0){ + order_lists = value.order_reservation_id; + }else if(key == (order.length - 1)){ + order_lists += ' and ' + value.order_reservation_id; + }else{ + order_lists += ', ' + value.order_reservation_id; + } + }); + + // alert(order_lists); + swal({ + html: true, + title: 'Information', + target: document.getElementById('notify_order_ready_to_delivery'), + text: "You have orders that are ready to deliver.
"+ + "Could you ready these orders "+order_lists+" to deliver?", + type: 'success', + timer: 1000, + closeOnConfirm: false, + closeOnCancel: false, + allowOutsideClick: false + },function(isConfirm){ + if(isConfirm){ + swal.close(); + } + }); + } + } +}); + diff --git a/app/assets/javascripts/channels/check_order_send_to_kitchen.js b/app/assets/javascripts/channels/check_order_send_to_kitchen.js new file mode 100644 index 00000000..6727dbdb --- /dev/null +++ b/app/assets/javascripts/channels/check_order_send_to_kitchen.js @@ -0,0 +1,40 @@ +App.check_order_send_to_kitchen = App.cable.subscriptions.create('CheckOrderSendToKitchenChannel', { + connected: function() {}, + + disconnected: function() {}, + + received: function(data) { + var order = data.data; + if(order.length > 0){ + var order_lists = ""; + $.each(order, function(key, value){ + if(key==0){ + order_lists = value.order_reservation_id; + }else if(key == (order.length - 1)){ + order_lists += ' and ' + value.order_reservation_id; + }else{ + order_lists += ', ' + value.order_reservation_id; + } + }); + + // alert(order_lists); + swal({ + html: true, + title: 'Information', + target: document.getElementById('notify_order_send_to_kitchen'), + text: "You have to send order to kitchen.
"+ + "Could you send these orders "+order_lists+" to kitchen?", + type: 'success', + timer: 1000, + closeOnConfirm: false, + closeOnCancel: false, + allowOutsideClick: false + },function(isConfirm){ + if(isConfirm){ + swal.close(); + } + }); + } + } +}); + diff --git a/app/assets/javascripts/channels/order_reservation.js b/app/assets/javascripts/channels/order_reservation.js index 8acf8997..68da8d87 100644 --- a/app/assets/javascripts/channels/order_reservation.js +++ b/app/assets/javascripts/channels/order_reservation.js @@ -1,6 +1,4 @@ -App.checkin = App.cable.subscriptions.create('OrderReservationChannel', { -// App.messages = App.cable.subscriptions.create('MessagesChannel', { - +App.order_reservation = App.cable.subscriptions.create('OrderReservationChannel', { connected: function() {}, disconnected: function() {}, @@ -14,15 +12,11 @@ App.checkin = App.cable.subscriptions.create('OrderReservationChannel', { var active_class = ""; if(key==0){ active_class = "tr-active"; + showNewOrder(order[key]); } var rowCount = key+1; var date = new Date(value.created_at); - // var deliveries = value["delivery"]; - var isPM = date.getHours() >= 12; - var isMidday = date.getHours() == 12; - var time = [date.getHours() - (isPM && !isMidday ? 12 : 0), - date.getMinutes() || '00'].join(':') + - (isPM ? ' PM' : 'AM'); + var time = timeFormat(date); var created_at = date.getFullYear() +'-'+ (date.getMonth() > 10? date.getMonth() : '0' + (date.getMonth() + 1)) +'-'+ (date.getDate()>10?date.getDate() : '0'+date.getDate()); var delivery_type = ""; @@ -48,11 +42,11 @@ App.checkin = App.cable.subscriptions.create('OrderReservationChannel', { +'' +' '; - $('.order_reserve_cable tbody').append(row); + $('.custom-table.order_reserve_cable tbody').append(row); }); } - + customTableClick(); } }); diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js index 8f9b3f4d..c60accdf 100644 --- a/app/assets/javascripts/order_reservation.js +++ b/app/assets/javascripts/order_reservation.js @@ -1,12 +1,19 @@ $(function() { - + $("#discount").hide(); + $(".expected_time").hide(); + $(function() { + $('.first-1').click(); + }); + + customTableClick(); + $(".nav-item").on("click", function(){ type = $(this).attr("data-type"); refreshDetailData(); if (type == "pending") { $(".first-1").click(); - $('#accepted').text("Accepted"); + $('#accepted').text("ACCEPT"); $('#accepted').attr("data-value","accepted"); }else if(type == "processing"){ $(".second-1").click(); @@ -24,147 +31,6 @@ $(function() { // console.log(type); }); - $(function(){ - $('.first-1').click(); - }); - - $(".custom-tr").on("click", function(){ - $(".custom-tr").removeClass("tr-active"); - $(this).addClass("tr-active"); - var order_id = $(this).attr("data-id"); - var sr_no = $(this).attr("data-sr-no"); - var url = "order_reservation/get_order/"+order_id; - show_order_detail(url,sr_no); - }); - - function refreshDetailData(){ - $('#requested_date_time').text(""); - $("#sr_number").text(""); - $("#delivery_info").text(""); - $("#contact_info").text(""); - $('.summary-items').html(""); - $('#sub_total').text("0.00"); - $('#delivery_fee').text("0.00"); - $('#total_charges').text("0.00"); - $('#discount_amount').text("0.00"); - $('#total_tax').text("0.00"); - $('#grand_total').text("0.00"); - } - - //show order list - function show_order_detail(url,sr_no){ - $('.summary-items').html(""); - //Start Ajax - $.ajax({ - type: "GET", - url: url, - data: {}, - dataType: "json", - success: function(data) { - // console.log(data); - var delivery = data["delivery"]; - var items = data["order_items"]; - var item_list = $('.summary-items'); - - var newDate = new Date(data.requested_time); - var isPM = newDate.getHours() >= 12; - var isMidday = newDate.getHours() == 12; - var time = [newDate.getHours() - (isPM && !isMidday ? 12 : 0), - newDate.getMinutes() || '00'].join(':') + - (isPM ? ' PM' : 'AM'); - var requested_date = newDate.getFullYear() + '-' + (newDate.getMonth() > 10? newDate.getMonth() : '0' + (newDate.getMonth() + 1)) +'-'+ (newDate.getDate() > 10? newDate.getDate() : '0' + newDate.getDate()) +' '+time; - - if((data.expected_waiting_time!=undefined) && (data.expected_waiting_time!=null)){ - var expDate = new Date(data.expected_waiting_time); - var isPM = expDate.getHours() >= 12; - var isMidday = expDate.getHours() == 12; - var exptime = [expDate.getHours() - (isPM && !isMidday ? 12 : 0), - expDate.getMinutes() || '00'].join(':') + - (isPM ? ' PM' : 'AM'); - var expected_time = expDate.getFullYear() + '-' + (expDate.getMonth() > 10? expDate.getMonth() : '0' + (expDate.getMonth() + 1)) +'-'+ (expDate.getDate() > 10? expDate.getDate() : '0' + expDate.getDate()) +' '+exptime; - $('.expected_time').show(); - $('#expected_time').text(expected_time? expected_time : ''); - }else{ - $('.expected_time').hide(); - $('#expected_time').text(''); - } - - item_list.empty(); - - if(items!=undefined && items!=""){ - if(items.length > 0){ - for(var i in items) { - var item_price = 0; - if(items[i].price > 0){ - item_price = items[i].price; - }else{ - item_price = items[i].unit_price; - } - var total = items[i].qty * item_price; - row = '' - +''+items[i].item_name - +'
'+items[i].qty+ ' X'+items[i].unit_price+'' - +'' - +''+ total +'' - +''; - $('.summary-items').append(row); - } - - if(data.discount_amount > 0){ - $("#discount").show(); - } - - $('#requested_date_time').text(requested_date); - $('#sub_total').text(data.total_amount); - $('#delivery_fee').text((parseFloat(delivery.delivery_fee) > 0)? delivery.delivery_fee : '0.0'); - $('#total_charges').text((parseFloat(data.convenience_charge) > 0)? data.convenience_charge : '0.0'); - $('#discount_amount').text((parseFloat(data.discount_amount) > 0)? data.discount_amount : '0.0'); - $('#total_tax').text(data.total_tax); - $('#grand_total').text(data.grand_total); - - var address = delivery.address; - if(delivery.township != null && delivery.township!=""){ - address += ', ' +delivery.township; - }else if(delivery.direction_address!=null && delivery.direction_address!=""){ - address += ", (" +delivery.direction_address+")"; - } - $('#requested_time').text(requested_date); - $('#customer_name').text(data.customer_name); - $('#phone').text(data.phone); - $('#address').text(address); - $('#delivery_to').text(delivery.provider); - - $('#ref_no').text(data.transaction_ref); - $('#callback_url').text(data.callback_url); - $('#order_id').text(data.order_reservation_id); - - if(delivery.delivery_type == "service"){ - $("#delivery_info").text("(DELIVERY)"); - }else if(delivery.delivery_type == "pick_up"){ - $("#delivery_info").text("(PICK-UP)"); - }else{ - $("#delivery_info").text("(DIRECT DELIVERY)"); - } - - if(data.order_remark!=null && data.order_remark!=""){ - $("#order_remark").text(data.order_remark); - }else if(data.reservation_remark!=null && data.reservation_remark!=""){ - $("#order_remark").text(data.reservation_remark); - } - $("#sr_number").text("NO."+sr_no); - if (data["receipt_no"]) { - $("#contact_info").text(data["receipt_no"]); - }else{ - $("#contact_info").text(data["order_reservation_id"]); - } - - } - } - } - }); - //end Ajax - } - $("#accepted").on("click", function(){ if($(this).text().trim() == "ACCEPT"){ var requested_time = $("#requested_date_time").text(); @@ -188,78 +54,6 @@ $(function() { callback_url(callback,ref_no,order_id,status); }); - function showTimePicker(requested_time){ - // var date = new Date(requested_time); - // var isPM = date.getHours() >= 12; - // var isMidday = date.getHours() == 12; - // var time = [date.getHours() - (isPM && !isMidday ? 12 : 0), - // date.getMinutes() || '00'].join(':') + - // (isPM ? 'pm' : 'am'); - // console.log(time); - $('.timepicker').bootstrapMaterialDatePicker({ - format: 'HH:mm', - useSeconds: false, - clearButton: true, - date: false - }); - } - - function callback_url(callback,ref_no,order_id,status,time,exptime){ - var url = 'order_reservation/update'; - var post_url = "order_reservation/send_status"; - var waiting_time = ""; - if(time!=undefined && time!=""){ - waiting_time = time; - } - var expected_time = ""; - if(exptime!=undefined && exptime!=""){ - expected_time = exptime; - } - $.ajax({ - type: "POST", - url: post_url, - data: {url: callback, ref_no: ref_no, status: status, waiting_time: waiting_time}, - dataType: "json", - success: function(data) { - if(data.status){ - $.ajax({ - type: "POST", - url: url, - data: {'order_id': order_id, 'status': status, 'expected_time' : expected_time}, - dataType: "json", - success: function(data) { - if (data.status) { - swal({ - title: 'Information', - text: "Order has been "+data.message, - type: 'success', - html: true, - closeOnConfirm: false, - closeOnCancel: false, - allowOutsideClick: false - }, function () { - window.location.href = '/origami/order_reservation'; - }); - } - } - }); - }else{ - swal({ - title: 'Oops', - text: data.message, - type: 'error', - html: true, - closeOnConfirm: false, - closeOnCancel: false, - allowOutsideClick: false - }, function () { - window.location.href = '/origami/order_reservation'; - }); - } - } - }); - } - $("#save").on("click",function(){ $("#waiting_timeErr").text(""); var status = $("#status").text(); @@ -279,7 +73,231 @@ $(function() { $("#waiting_time").val(""); $("#waiting_timeErr").text("Expected waiting time is greater than requested time!"); } - }); }); +function customTableClick(){ + $(".custom-table .custom-tr").on("click", function(){ + $(".custom-tr").removeClass("tr-active"); + $(this).addClass("tr-active"); + var order_id = $(this).attr("data-id"); + var sr_no = $(this).attr("data-sr-no"); + var url = "order_reservation/get_order/"+order_id; + show_order_detail(url,sr_no); + }); +} + +function refreshDetailData(){ + $('#requested_date_time').text(""); + $("#sr_number").text(""); + $("#delivery_info").text(""); + $("#contact_info").text(""); + $('.summary-items').html(""); + $('#sub_total').text("0.00"); + $('#delivery_fee').text("0.00"); + $('#total_charges').text("0.00"); + $('#discount_amount').text("0.00"); + $('#total_tax').text("0.00"); + $('#grand_total').text("0.00"); +} + +//show order list +function show_order_detail(url,sr_no){ + $('.summary-items').html(""); + //Start Ajax + $.ajax({ + type: "GET", + url: url, + data: {}, + dataType: "json", + success: function(data) { + // console.log(data); + var delivery = data["delivery"]; + var items = data["order_items"]; + var item_list = $('.summary-items'); + + var newDate = new Date(data.requested_time); + var time = timeFormat(newDate); + var requested_date = newDate.getFullYear() + '-' + (newDate.getMonth() > 10? newDate.getMonth() : '0' + (newDate.getMonth() + 1)) +'-'+ (newDate.getDate() > 10? newDate.getDate() : '0' + newDate.getDate()) +' '+time; + + if((data.expected_waiting_time!=undefined) && (data.expected_waiting_time!=null)){ + var expDate = new Date(data.expected_waiting_time); + var exptime = timeFormat(expDate); + var expected_time = expDate.getFullYear() + '-' + (expDate.getMonth() > 10? expDate.getMonth() : '0' + (expDate.getMonth() + 1)) +'-'+ (expDate.getDate() > 10? expDate.getDate() : '0' + expDate.getDate()) +' '+exptime; + $('.expected_time').show(); + $('#expected_time').text(expected_time? expected_time : ''); + }else{ + $('.expected_time').hide(); + $('#expected_time').text(''); + } + + item_list.empty(); + + if(items!=undefined && items!=""){ + if(items.length > 0){ + for(var i in items) { + var item_price = 0; + if(items[i].price > 0){ + item_price = items[i].price; + }else{ + item_price = items[i].unit_price; + } + var total = items[i].qty * item_price; + row = '' + +''+items[i].item_name + +'
'+items[i].qty+ ' X'+items[i].unit_price+'' + +'' + +''+ total +'' + +''; + $('.summary-items').append(row); + } + + if(data.discount_amount > 0){ + $("#discount").show(); + } + + $('#requested_date_time').text(requested_date); + $('#sub_total').text(data.total_amount); + $('#delivery_fee').text((parseFloat(delivery.delivery_fee) > 0)? delivery.delivery_fee : '0.0'); + $('#total_charges').text((parseFloat(data.convenience_charge) > 0)? data.convenience_charge : '0.0'); + $('#discount_amount').text((parseFloat(data.discount_amount) > 0)? data.discount_amount : '0.0'); + $('#total_tax').text(data.total_tax); + $('#grand_total').text(data.grand_total); + + var address = delivery.address; + if(delivery.township != null && delivery.township!=""){ + address += ', ' +delivery.township; + }else if(delivery.direction_address!=null && delivery.direction_address!=""){ + address += ", (" +delivery.direction_address+")"; + } + $('#requested_time').text(requested_date); + $('#customer_name').text(data.customer_name); + $('#phone').text(data.phone); + $('#address').text(address); + $('#delivery_to').text(delivery.provider); + + $('#ref_no').text(data.transaction_ref); + $('#callback_url').text(data.callback_url); + $('#order_id').text(data.order_reservation_id); + + if(delivery.delivery_type == "service"){ + $("#delivery_info").text("(DELIVERY)"); + }else if(delivery.delivery_type == "pick_up"){ + $("#delivery_info").text("(PICK-UP)"); + }else{ + $("#delivery_info").text("(DIRECT DELIVERY)"); + } + + if(data.order_remark!=null && data.order_remark!=""){ + $("#order_remark").text(data.order_remark); + }else if(data.reservation_remark!=null && data.reservation_remark!=""){ + $("#order_remark").text(data.reservation_remark); + } + $("#sr_number").text("NO."+sr_no); + if (data["receipt_no"]) { + $("#contact_info").text(data["receipt_no"]); + }else{ + $("#contact_info").text(data["order_reservation_id"]); + } + + } + } + } + }); + //end Ajax +} + +function showTimePicker(requested_time){ + // var date = new Date(requested_time); + // var time = timeFormat(date); + // console.log(time); + $('.timepicker').bootstrapMaterialDatePicker({ + format: 'HH:mm', + useSeconds: false, + clearButton: true, + date: false + }); +} + +function callback_url(callback,ref_no,order_id,status,time,exptime){ + var url = 'order_reservation/update'; + var post_url = "order_reservation/send_status"; + var waiting_time = ""; + if(time!=undefined && time!=""){ + waiting_time = time; + } + var expected_time = ""; + if(exptime!=undefined && exptime!=""){ + expected_time = exptime; + } + $.ajax({ + type: "POST", + url: post_url, + data: {url: callback, ref_no: ref_no, status: status, waiting_time: waiting_time}, + dataType: "json", + success: function(data) { + if(data.status){ + $.ajax({ + type: "POST", + url: url, + data: {'order_id': order_id, 'status': status, 'expected_time' : expected_time}, + dataType: "json", + success: function(data) { + if (data.status) { + swal({ + title: 'Information', + text: "Order has been "+data.message, + type: 'success', + html: true, + closeOnConfirm: false, + closeOnCancel: false, + allowOutsideClick: false + }, function () { + window.location.href = '/origami/order_reservation'; + }); + } + } + }); + }else{ + swal({ + title: 'Oops', + text: data.message, + type: 'error', + html: true, + closeOnConfirm: false, + closeOnCancel: false, + allowOutsideClick: false + }, function () { + window.location.href = '/origami/order_reservation'; + }); + } + } + }); +} + +function timeFormat(date){ + var isPM = date.getHours() >= 12; + var isMidday = date.getHours() == 12; + var time = [date.getHours() - (isPM && !isMidday ? 12 : 0), + date.getMinutes() || '00'].join(':') + + (isPM ? ' PM' : 'AM'); + return time; +} + +function showNewOrder(order_reservation){ + // console.log(order_reservation); + if((order_reservation!=undefined) && (order_reservation!=null) && (order_reservation!="")){ + var date = new Date(order_reservation.requested_time); + var time = timeFormat(date); + var requested_date = date.getFullYear() + '-' + (date.getMonth() > 10? date.getMonth() : '0' + (date.getMonth() + 1)) +'-'+ (date.getDate() > 10? date.getDate() : '0' + date.getDate()) +' '+time; + swal({ + html: true, + title: 'Information', + text: "You have new order " + order_reservation.order_reservation_id + " at "+requested_date+"", + type: 'success', + closeOnConfirm: false, + closeOnCancel: false, + allowOutsideClick: false + }); + } +} \ No newline at end of file diff --git a/app/channels/check_new_order_channel.rb b/app/channels/check_new_order_channel.rb new file mode 100644 index 00000000..8a7dfcfb --- /dev/null +++ b/app/channels/check_new_order_channel.rb @@ -0,0 +1,10 @@ +class CheckNewOrderChannel < ApplicationCable::Channel + def subscribed + stream_from "check_new_order_channel" + end + + def unsubscribed + stop_all_streams + # Any cleanup needed when channel is unsubscribed + end +end diff --git a/app/channels/check_order_ready_to_delivery_channel.rb b/app/channels/check_order_ready_to_delivery_channel.rb new file mode 100644 index 00000000..6f5e1a06 --- /dev/null +++ b/app/channels/check_order_ready_to_delivery_channel.rb @@ -0,0 +1,10 @@ +class CheckOrderReadyToDeliveryChannel < ApplicationCable::Channel + def subscribed + stream_from "check_order_ready_to_delivery_channel" + end + + def unsubscribed + stop_all_streams + # Any cleanup needed when channel is unsubscribed + end +end diff --git a/app/channels/check_order_send_to_kitchen_channel.rb b/app/channels/check_order_send_to_kitchen_channel.rb new file mode 100644 index 00000000..c0821483 --- /dev/null +++ b/app/channels/check_order_send_to_kitchen_channel.rb @@ -0,0 +1,10 @@ +class CheckOrderSendToKitchenChannel < ApplicationCable::Channel + def subscribed + stream_from "check_order_send_to_kitchen_channel" + end + + def unsubscribed + stop_all_streams + # Any cleanup needed when channel is unsubscribed + end +end diff --git a/app/controllers/origami/moveroom_controller.rb b/app/controllers/origami/moveroom_controller.rb index 316ab894..b7260863 100755 --- a/app/controllers/origami/moveroom_controller.rb +++ b/app/controllers/origami/moveroom_controller.rb @@ -3,6 +3,8 @@ class Origami::MoveroomController < BaseOrigamiController authorize_resource :class => false def move_dining + @webview = check_mobile + @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') @complete = Sale.all diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb index bbc02bdc..eaf7fca1 100755 --- a/app/controllers/origami/movetable_controller.rb +++ b/app/controllers/origami/movetable_controller.rb @@ -3,6 +3,8 @@ class Origami::MovetableController < BaseOrigamiController authorize_resource :class => false def move_dining + @webview = check_mobile + @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') @complete = Sale.all diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb index 12f11252..e5b95f8c 100644 --- a/app/models/order_reservation.rb +++ b/app/models/order_reservation.rb @@ -207,6 +207,35 @@ class OrderReservation < ApplicationRecord .order("order_reservations.order_reservation_id desc, order_reservations.created_at desc") end + def self.check_new_order + order_reservation = OrderReservation.where("status='new'") + if order_reservation.length > 0 + if ENV["SERVER_MODE"] == 'cloud' + ActionCable.server.broadcast "check_new_order_channel",data: order_reservation + end + end + end + + def self.check_order_send_to_kitchen + today = Time.now.utc + order_reservation = OrderReservation.where("status='accepted' and requested_time > '#{today}'") + if order_reservation.length > 0 + if ENV["SERVER_MODE"] == 'cloud' + ActionCable.server.broadcast "check_order_send_to_kitchen_channel",data: order_reservation + end + end + end + + def self.check_order_ready_to_delivery + today = Time.now.utc + order_reservation = OrderReservation.where("status='send_to_kitchen' and requested_time > '#{today}'") + if order_reservation.length > 0 + if ENV["SERVER_MODE"] == 'cloud' + ActionCable.server.broadcast "check_order_ready_to_delivery_channel",data: order_reservation + end + end + end + private def generate_custom_id self.order_reservation_id = SeedGenerator.generate_id(self.class.name, "ODRS") diff --git a/app/views/origami/moveroom/move_dining.html.erb b/app/views/origami/moveroom/move_dining.html.erb index b46834ca..240d3b20 100755 --- a/app/views/origami/moveroom/move_dining.html.erb +++ b/app/views/origami/moveroom/move_dining.html.erb @@ -166,6 +166,10 @@ \ No newline at end of file +
+
+
\ No newline at end of file diff --git a/config/schedule.rb b/config/schedule.rb index 4b3f6a3b..8f151e3d 100755 --- a/config/schedule.rb +++ b/config/schedule.rb @@ -12,4 +12,16 @@ end every 1.minutes do runner "DiningFacility.checkin_time" +end + +every 3.minutes do + runner "OrderReservation.check_new_order" +end + +every 5.minutes do + runner "OrderReservation.check_order_send_to_kitchen" +end + +every 5.minutes do + runner "OrderReservation.check_order_ready_to_delivery" end \ No newline at end of file From ffd3f5f158e076078200da55bf8ed442f54d4f84 Mon Sep 17 00:00:00 2001 From: phyusin Date: Thu, 3 May 2018 17:53:07 +0630 Subject: [PATCH 05/17] check exception in check_user --- app/controllers/base_origami_controller.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb index 66cc2880..3cb1eacc 100755 --- a/app/controllers/base_origami_controller.rb +++ b/app/controllers/base_origami_controller.rb @@ -5,7 +5,6 @@ class BaseOrigamiController < ActionController::Base before_action :check_user #before_action :check_installation - protect_from_forgery with: :exception helper_method :shop_detail, :current_token @@ -23,6 +22,10 @@ class BaseOrigamiController < ActionController::Base }.to_json end else + if ENV["SERVER_MODE"] != 'cloud' + protect_from_forgery with: :exception + end + if current_user.nil? redirect_to root_path end From b0377afb8f3411cd54f8a4be760cc8baf1b9c06d Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 3 May 2018 17:53:34 +0630 Subject: [PATCH 06/17] no change --- app/controllers/base_origami_controller.rb | 2 +- app/controllers/origami/other_charges_controller.rb | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/controllers/base_origami_controller.rb b/app/controllers/base_origami_controller.rb index 66cc2880..0c01a735 100755 --- a/app/controllers/base_origami_controller.rb +++ b/app/controllers/base_origami_controller.rb @@ -15,7 +15,7 @@ class BaseOrigamiController < ActionController::Base redirect_to origami_dashboard_path end - def check_user + def check_user if check_mobile if current_user.nil? return render status: 401, json: { diff --git a/app/controllers/origami/other_charges_controller.rb b/app/controllers/origami/other_charges_controller.rb index 28ab2c06..4b94990b 100755 --- a/app/controllers/origami/other_charges_controller.rb +++ b/app/controllers/origami/other_charges_controller.rb @@ -15,12 +15,11 @@ class Origami::OtherChargesController < BaseOrigamiController @table = DiningFacility.find(@sale_data.bookings[0].dining_facility_id) else @table = nil - end - + end end end - def create + def create sale_id = params[:sale_id] other_charges_items = JSON.parse(params[:other_charges_items]) sub_total = params[:sub_total] @@ -79,8 +78,6 @@ class Origami::OtherChargesController < BaseOrigamiController if !table.nil? dining = {:table_id => table_id, :table_type => table.type } render :json => dining.to_json - end - - end - + end + end end \ No newline at end of file From 69eeede474e01e9b76cabe79c0d0b0d6867ec43a Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 3 May 2018 18:08:27 +0630 Subject: [PATCH 07/17] update access code --- app/assets/javascripts/origami.js | 40 +++ app/assets/stylesheets/origami.scss | 13 + app/controllers/origami/home_controller.rb | 12 + .../origami/payments_controller.rb | 3 +- .../origami/sale_edit_controller.rb | 16 +- app/controllers/origami/void_controller.rb | 4 +- .../origami/waste_spoile_controller.rb | 6 +- app/models/ability.rb | 12 + app/views/origami/addorders/detail.html.erb | 36 +- app/views/origami/home/show.html.erb | 88 +++-- app/views/origami/payments/show.html.erb | 316 +++++++++++------- app/views/origami/sale_edit/edit.html.erb | 8 +- config/routes.rb | 5 + 13 files changed, 388 insertions(+), 171 deletions(-) diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index ca021430..a2d78063 100755 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -192,6 +192,41 @@ $(document).on('turbolinks:load', function() { return false; }); + + $(document).on('click', '.access_modal', function(event){ + type = $(this).data("type"); + $(".ok").attr("data-action",type) + $('#AccessCodeModal').modal('show'); + }); + + $(document).on('click', '.access_number', function(event){ + if(event.handled !== true) { + var original_value = $('#access_code').val(); + var input_type = $(this).attr("data-type"); + + switch (input_type) { + case 'num': + var input_value = $(this).attr("data-value"); + if (original_value){ + $('#access_code').val(original_value + input_value); + }else{ + $('#access_code').val(original_value + input_value); + } + break; + case 'ok': + var type = $(this).attr("data-action"); + code = $('#access_code').val(); + check_emp_access_code(code,type) + break; + case 'clr': + $('#access_code').val(""); + break; + } + event.handled = true; + } else { + return false; + } + }); }); /* start check first bill or not funs: */ @@ -423,3 +458,8 @@ function showHideNavbar(webview,page){ } } } + +function createAccessCode(code) { + localStorage.setItem("access_code",code); +} + diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 1de250a3..212c5288 100755 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -93,6 +93,19 @@ select.form-control { // cursor:pointer; } +.access_number{ + width: 33%; + height:58px; + line-height:58px; + text-align:center; + background:#54A5AF; + // float:left; + // margin:2px; + font-size:20px; + color:white; + // cursor:pointer; +} + .del_cashier_number{ opacity:0.6, } diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 745d6f33..ed857104 100755 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -129,6 +129,18 @@ class Origami::HomeController < BaseOrigamiController end end +def check_emp_access_code + pin_code = params[:code] + employee = Employee.find_by_emp_id(pin_code) + if employee && employee.role == "manager" + result = {:status=> true, :message=>"Success" } + else + result = {:status=> false, :message=>"Invalid Access Code" } + end + render :json => result.to_json + +end + private def set_dining diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 3baed9f3..3c5219af 100755 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -446,8 +446,7 @@ class Origami::PaymentsController < BaseOrigamiController end saleObj.update_attributes(grand_total: 0, rounding_adjustment: 0, amount_received: 0, amount_changed: 0) - puts "FOC" - puts saleObj.to_json + sale_payment = SalePayment.new sale_payment.process_payment(saleObj, current_user.name, cash, "foc" ,remark) # For Cashier by Zone diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb index 1743f881..1c5b5430 100755 --- a/app/controllers/origami/sale_edit_controller.rb +++ b/app/controllers/origami/sale_edit_controller.rb @@ -17,6 +17,7 @@ class Origami::SaleEditController < BaseOrigamiController def item_void saleitemId = params[:sale_item_id] remark = params[:remark] + access_code = params[:access_code] saleitemObj = SaleItem.find(saleitemId) saleitemObj.status = 'void' saleitemObj.remark = remark @@ -48,8 +49,9 @@ class Origami::SaleEditController < BaseOrigamiController end end action_by = current_user.id + approved_by = Employee.find_by_emp_id(access_code) remark = "Void Sale Item ID #{saleitemObj.sale_item_id} | Receipt No #{saleObj.receipt_no} | Item Name ->#{saleitemObj.product_name}-Product Code ->#{saleitemObj.product_code}-Instance Code ->#{saleitemObj.item_instance_code}" - sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,saleObj.cashier_id, action_by,remark,"SALEITEMVOID" ) + sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,saleObj.cashier_id, approved_by.name,remark,"SALEITEMVOID" ) saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount) ProductCommission.create_product_commission(@newsaleitem, saleitemObj) @@ -58,6 +60,7 @@ class Origami::SaleEditController < BaseOrigamiController def item_foc saleitemId = params[:sale_item_id] remark = params[:remark] + access_code = params[:access_code] saleitemObj = SaleItem.find(saleitemId) saleitemObj.status = 'foc' saleitemObj.remark = remark @@ -80,8 +83,9 @@ class Origami::SaleEditController < BaseOrigamiController order = Order.find(order_id) action_by = current_user.id + approved_by = Employee.find_by_emp_id(access_code) remark = "FOC Sale Item ID #{saleitemObj.sale_item_id} | Receipt No #{saleObj.receipt_no} | Item Name ->#{saleitemObj.product_name}-Product Code ->#{saleitemObj.product_code}-Instance Code ->#{saleitemObj.item_instance_code}Receipt No #{saleObj.receipt_no}" - sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,saleObj.cashier_id, action_by,remark,"SALEITEMFOC" ) + sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,saleObj.cashier_id, approved_by.name,remark,"SALEITEMFOC" ) saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount,order.source) ProductCommission.create_product_commission(@newsaleitem, saleitemObj) @@ -111,6 +115,7 @@ class Origami::SaleEditController < BaseOrigamiController saleitemId = params[:sale_item_id] update_qty = params[:update_qty] update_price = params[:update_price] + access_code = params[:access_code] saleitemObj = SaleItem.find(saleitemId) sale = Sale.find(saleitemObj.sale_id) @@ -120,8 +125,9 @@ class Origami::SaleEditController < BaseOrigamiController saleitemObj.taxable_price = update_qty.to_f * update_price.to_f action_by = current_user.id + approved_by = Employee.find_by_emp_id(access_code) remark = "Update Qty #{update_qty} Price [#{saleitemObj.price}]| Receipt No #{sale.receipt_no} | Item Name ->#{saleitemObj.product_name}-Product Code ->#{saleitemObj.product_code}-Instance Code ->#{saleitemObj.item_instance_code}" - sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,sale.cashier_id, action_by,remark,"SALEITEMEDIT" ) + sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,sale.cashier_id, approved_by.name,remark,"SALEITEMEDIT" ) # saleitemObj.remark = 'edit' unless saleitemObj.product_name.include? 'updated' @@ -152,6 +158,7 @@ class Origami::SaleEditController < BaseOrigamiController # make cancel void item def item_void_cancel saleitemId = params[:sale_item_id] + access_code = params[:access_code] saleitemObj = SaleItem.find(saleitemId) both = SaleItem.where('product_code=?', saleitemObj.product_code) both.each do |item| @@ -169,8 +176,9 @@ class Origami::SaleEditController < BaseOrigamiController order = Order.find(order_id) action_by = current_user.id + approved_by = Employee.find_by_emp_id(access_code) remark = "Cancle Void Sale Item ID #{saleitemObj.sale_item_id} | Item Name ->#{saleitemObj.product_name}-Product Code ->#{saleitemObj.product_code}-Instance Code ->#{saleitemObj.item_instance_code}|Receipt No #{saleObj.receipt_no}" - sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,saleObj.cashier_id, action_by,remark,"ITEMCANCELVOID" ) + sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,saleObj.cashier_id, approved_by.name,remark,"ITEMCANCELVOID" ) saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount, order.source) ProductCommission.remove_product_commission(saleitemObj) diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb index 83dce707..d601b0c0 100755 --- a/app/controllers/origami/void_controller.rb +++ b/app/controllers/origami/void_controller.rb @@ -5,6 +5,7 @@ class Origami::VoidController < BaseOrigamiController sale_id = params[:sale_id] remark = params[:remark] order_source = params[:type] #tax profile source + access_code = params[:access_code] if Sale.exists?(sale_id) sale = Sale.find_by_sale_id(sale_id) @@ -71,8 +72,9 @@ class Origami::VoidController < BaseOrigamiController # FOr Sale Audit action_by = current_user.name + approved_by = Employee.find_by_emp_id(access_code) # remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table ->#{table.name}" - sale_audit = SaleAudit.record_audit_for_edit(sale_id,sale.cashier_id, action_by,remark,"SALEVOID" ) + sale_audit = SaleAudit.record_audit_for_edit(sale_id,sale.cashier_id, approved_by.name,remark,"SALEVOID" ) # For Print diff --git a/app/controllers/origami/waste_spoile_controller.rb b/app/controllers/origami/waste_spoile_controller.rb index 2b2d9c33..de7df434 100755 --- a/app/controllers/origami/waste_spoile_controller.rb +++ b/app/controllers/origami/waste_spoile_controller.rb @@ -3,7 +3,8 @@ class Origami::WasteSpoileController < BaseOrigamiController sale_id = params[:sale_id] remark = params[:remark] - order_source = params[:type] #tax profile source + order_source = params[:type] + access_code = params[:access_code] #tax profile source if Sale.exists?(sale_id) sale = Sale.find_by_sale_id(sale_id) SaleTax.where("sale_id='#{sale_id}'").find_each do |existing_tax| @@ -54,8 +55,9 @@ class Origami::WasteSpoileController < BaseOrigamiController # FOr Sale Audit action_by = current_user.name + approved_by = Employee.find_by_emp_id(access_code) # remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table ->#{table.name}" - sale_audit = SaleAudit.record_audit_for_edit(sale_id,sale.cashier_id, action_by,remark,remark ) + sale_audit = SaleAudit.record_audit_for_edit(sale_id,sale.cashier_id, approved_by.name,remark,remark ) # For Print diff --git a/app/models/ability.rb b/app/models/ability.rb index 5eab518f..497e9322 100755 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -126,6 +126,7 @@ class Ability # can :overall_void, :void can :index, :home can :show, :home + can :check_emp_access_code, :home can :read, Order can :update, Order can :manage, Booking @@ -151,6 +152,7 @@ class Ability can :create, :payment can :reprint, :payment can :rounding_adj, :payment + can :foc, :payment can :print, :payment can :move_dining, :movetable @@ -183,6 +185,16 @@ class Ability can :print, :print can :print_order_summary, :print + + can :edit, :sale_edit + can :item_void, :sale_edit + can :item_void_cancel, :sale_edit + can :cancel_all_void, :sale_edit + can :apply_void, :sale_edit + can :item_foc, :sale_edit + can :item_edit, :sale_edit + + can :overall_void, :void elsif user.role == "account" diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index d434eb48..7e8cbb2c 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -297,24 +297,24 @@ -
-
1
-
2
-
3
-
4
-
-
-
5
-
6
-
7
-
8
-
-
-
9
-
0
-
00
-
Clr
-
+
+
1
+
2
+
3
+
4
+
+
+
5
+
6
+
7
+
8
+
+
+
9
+
0
+
00
+
Clr
+
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index cc5e0f2f..54dd9e41 100755 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -485,8 +485,10 @@ <% end %> <% if current_login_employee.role != "waiter" %> - -
-
- -
-
- -
-
- -
+
+ +
+
1
+
2
+
3
+
4
+
+
+
5
+
6
+
7
+
8
+
+
+
9
+
0
+
Clr
+
OK
+ +
@@ -957,6 +968,7 @@ }); $('#void').on('click', function () { + var access_code = localStorage.getItem("access_code"); if ($(this).attr('active')=== "true") { swal({ title: "Alert", @@ -975,7 +987,7 @@ $.ajax({ type: 'POST', url: ajax_url, - data: "remark="+ remark + "&sale_id=" + sale_id, + data: "remark="+ remark + "&sale_id=" + sale_id+ "&access_code=" + access_code, success: function (result) { // For Server Print - from jade if ($("#server_mode").val() == "cloud") { @@ -1052,6 +1064,12 @@ return attribute_arr; } + $(document).on('click', '.access_modal', function(event){ + type = $(this).data("type"); + $(".ok").attr("data-action",type) + $('#AccessCodeModal').modal('show'); + }); + function waste_and_spoilage(remark) { swal({ title: "Alert", @@ -1081,4 +1099,34 @@ } }); } + + function check_emp_access_code(access_code,type) { + var url = "/origami/check_emp_access_code/" + access_code ; + $.ajax({ + type: 'POST', + url: url, + data: {}, + success: function (result) { + console.log(result); + if (result.status == true) { + createAccessCode(code); + if (type == "edit") { + var dining_id = "<%= @dining.id %>"; + var sale_id = "<%= @obj_sale.sale_id rescue "" %>"; + window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type +"/edit"; + }else if(type == "void"){ + $('#AccessCodeModal').modal('hide'); + $('#voidModal').modal('show'); + + // overall_void(); + }else if(type == "waste_and_spoilage"){ + + } + }else{ + swal("Opps",result.message,"warning") + } + } + }); + } + diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index d1a9eef4..41f02b5d 100755 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -350,16 +350,20 @@ reply Back - - - <% if @cashier_type=="quick_service" %> + --> + FOC + Void + Waste + Spoile +<% if @cashier_type=="quick_service" %>
-