'
+ +' '
+ +''
- +' '
- +''
+ +' '
+ +'"+ + target: document.getElementById(shop_code+"_notify_new_order"), + text: "You have new orders
"+ "Are you accept or reject for these orders "+order_lists+"?", type: 'success', - timer: 1000, + html: true, closeOnConfirm: false, closeOnCancel: false, allowOutsideClick: false - },function(isConfirm){ + }, function (isConfirm) { if(isConfirm){ swal.close(); } }); + // $("#notify_new_order_lists").text(order_lists); + // if($("#notify_new_order").hasClass("hidden")){ + // $("#notify_new_order").removeClass("hidden"); + // } + // $("#notify_new_order").on('show.bs.modal', function(e){ + // $("#notify_order_send_to_kitchen").addClass("hidden"); + // $("#notify_order_ready_to_delivery").addClass("hidden"); + // }).on('shown.bs.modal', function(e){ + // $("#notify_new_order").focus(); + // }).on('hide.bs.modal', function (e) { + // $("#notify_new_order").addClass("hidden"); + // }).modal({show: true, keyboard: false, backdrop: false}); } } }); diff --git a/app/assets/javascripts/channels/check_order_ready_to_delivery.js b/app/assets/javascripts/channels/check_order_ready_to_delivery.js index 84dd1982..319f7781 100644 --- a/app/assets/javascripts/channels/check_order_ready_to_delivery.js +++ b/app/assets/javascripts/channels/check_order_ready_to_delivery.js @@ -5,6 +5,7 @@ App.check_order_ready_to_delivery = App.cable.subscriptions.create('CheckOrderRe received: function(data) { var order = data.data; + var shop_code = data.shop_code; if(order.length > 0){ var order_lists = ""; $.each(order, function(key, value){ @@ -19,21 +20,32 @@ App.check_order_ready_to_delivery = App.cable.subscriptions.create('CheckOrderRe // 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.
"+ + target: document.getElementById(shop_code+"_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, + html: true, closeOnConfirm: false, closeOnCancel: false, allowOutsideClick: false - },function(isConfirm){ + }, function (isConfirm) { if(isConfirm){ swal.close(); } }); + // $("#notify_order_ready_to_delivery_lists").text(order_lists); + // if($("#notify_order_ready_to_delivery").hasClass("hidden")){ + // $("#notify_order_ready_to_delivery").removeClass("hidden"); + // } + // $("#notify_order_ready_to_delivery").on('shown.bs.modal', function(e){ + // $("#notify_new_order").addClass("hidden"); + // $("#notify_order_send_to_kitchen").addClass("hidden"); + // }).on('shown.bs.modal', function(e){ + // $("#notify_order_ready_to_delivery").focus(); + // }).on('hide.bs.modal', function (e) { + // $("#notify_order_ready_to_delivery").addClass("hidden"); + // }).modal({show: true, keyboard: false, backdrop: false}); } } }); diff --git a/app/assets/javascripts/channels/check_order_send_to_kitchen.js b/app/assets/javascripts/channels/check_order_send_to_kitchen.js index 6727dbdb..df9eb324 100644 --- a/app/assets/javascripts/channels/check_order_send_to_kitchen.js +++ b/app/assets/javascripts/channels/check_order_send_to_kitchen.js @@ -5,6 +5,7 @@ App.check_order_send_to_kitchen = App.cable.subscriptions.create('CheckOrderSend received: function(data) { var order = data.data; + var shop_code = data.shop_code; if(order.length > 0){ var order_lists = ""; $.each(order, function(key, value){ @@ -19,21 +20,32 @@ App.check_order_send_to_kitchen = App.cable.subscriptions.create('CheckOrderSend // alert(order_lists); swal({ - html: true, title: 'Information', - target: document.getElementById('notify_order_send_to_kitchen'), - text: "You have to send order to kitchen.
"+ + target: document.getElementById(shop_code+"_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, + html: true, closeOnConfirm: false, closeOnCancel: false, allowOutsideClick: false - },function(isConfirm){ + }, function (isConfirm) { if(isConfirm){ swal.close(); } }); + // $("#notify_order_send_to_kitchen_lists").text(order_lists); + // if($("#notify_order_send_to_kitchen").hasClass("hidden")){ + // $("#notify_order_send_to_kitchen").removeClass("hidden"); + // } + // $("#notify_order_send_to_kitchen").on('show.bs.modal', function(e){ + // $("#notify_new_order").addClass("hidden"); + // $("#notify_order_ready_to_delivery").addClass("hidden"); + // }).on('shown.bs.modal', function(e){ + // $("#notify_order_send_to_kitchen").focus(); + // }).on('hide.bs.modal', function (e) { + // $("#notify_order_send_to_kitchen").addClass("hidden"); + // }).modal({show: true, keyboard: false, backdrop: false}); } } }); diff --git a/app/assets/javascripts/channels/order_queue_station.js b/app/assets/javascripts/channels/order_queue_station.js index c8b59231..a72a7893 100755 --- a/app/assets/javascripts/channels/order_queue_station.js +++ b/app/assets/javascripts/channels/order_queue_station.js @@ -29,18 +29,21 @@ App.order_queue_station = App.cable.subscriptions.create('OrderQueueStationChann //end count var date = new Date(items[field]["created_at"]); - var show_date = date.getDate() + "-" + (date.getMonth()+1) + "-" + date.getFullYear() + ' ' + date.getHours()+ ':' + date.getMinutes(); + // var show_date = date.getDate() + "-" + (date.getMonth()+1) + "-" + date.getFullYear() + ' ' + date.getHours()+ ':' + date.getMinutes(); + var show_date =date.getHours()+ ':' + date.getMinutes() +' '+(date.getHours() >= 12 ? 'PM' : 'AM'); if (oqs_id == items[field]["order_queue_station_id"]) { - + var table_type = (items[field]["table_type"] != null) ? items[field]["table_type"]:""; + var zone = (items[field]["zone"] != null) ? "-"+items[field]["zone"]:"No Table"; + (name === 'true') ? 'Y' :'N'; row ='
' diff --git a/app/assets/javascripts/channels/order_reservation.js b/app/assets/javascripts/channels/order_reservation.js index 68da8d87..468e4c31 100644 --- a/app/assets/javascripts/channels/order_reservation.js +++ b/app/assets/javascripts/channels/order_reservation.js @@ -3,26 +3,27 @@ App.order_reservation = App.cable.subscriptions.create('OrderReservationChannel' disconnected: function() {}, - received: function(data) { + received: function(data) { + var shop_code = data.shop_code; var order = data.data; if(order.length > 0){ - $('.order_reserve_cable tbody').html(""); - $(".nav-item.red > a > p.num").text(order.length); + $('.custom-table.'+shop_code+'_order_reserve_cable tbody').html(""); + $("."+shop_code+" > .nav-item.red > a > p.num").text(order.length); $.each(order, function(key,value){ var active_class = ""; if(key==0){ active_class = "tr-active"; - showNewOrder(order[key]); + showNewOrder(order[key],shop_code); } var rowCount = key+1; var date = new Date(value.created_at); 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 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(value.delivery_type == "service"){ + if(value.provider == "food2u" || value.provider == "yangondoor2door"){ delivery_type = "DELIVERY"; - }else if(value.delivery_type == "pick_up"){ + }else if(value.provider == "pick_up"){ delivery_type = "PICK-UP"; }else{ delivery_type = "DIRECT DELIVERY"; @@ -42,7 +43,7 @@ App.order_reservation = App.cable.subscriptions.create('OrderReservationChannel' +'' +' '; - $('.custom-table.order_reserve_cable tbody').append(row); + $('.custom-table.'+shop_code+'_order_reserve_cable tbody').append(row); }); } diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js index ca1bd0b9..ae8b727c 100644 --- a/app/assets/javascripts/custom.js +++ b/app/assets/javascripts/custom.js @@ -54,7 +54,7 @@ $(document).ready(function() { }); $('#modal-set-slimscroll').slimScroll({ - height: height-$('#modal-slimscroll').attr('data-height'), + height: height-$('#modal-set-slimscroll').attr('data-height'), size: '5px', color: 'rgba(0,0,0,0.5)', alwaysVisible: false, @@ -62,6 +62,17 @@ $(document).ready(function() { railBorderRadius: '0', touchScrollStep : 45 }); + + $('#customer-info-slimscroll').slimScroll({ + height: height-$('#customer-info-slimscroll').attr('data-height'), + size: '5px', + color: 'rgba(0,0,0,0.5)', + alwaysVisible: false, + borderRadius: '0', + railBorderRadius: '0', + touchScrollStep : 45 + }); + // $('.delete').click(function(){ // var method = $(this).attr('data-method'); diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js index c60accdf..83618770 100644 --- a/app/assets/javascripts/order_reservation.js +++ b/app/assets/javascripts/order_reservation.js @@ -2,6 +2,10 @@ $(function() { $("#discount").hide(); $(".expected_time").hide(); + $('#accepted').hide(); + $('#cancel').hide(); + $(".tbl_customer").hide(); + $(".order_close_cashier").hide(); $(function() { $('.first-1').click(); }); @@ -11,6 +15,10 @@ $(function() { $(".nav-item").on("click", function(){ type = $(this).attr("data-type"); refreshDetailData(); + $('#accepted').hide(); + $('#cancel').hide(); + $(".tbl_customer").hide(); + $(".order_close_cashier").hide(); if (type == "pending") { $(".first-1").click(); $('#accepted').text("ACCEPT"); @@ -24,18 +32,24 @@ $(function() { $('#accepted').text("READY TO DELIVERY"); $('#accepted').attr("data-value","delivery"); }else if(type == "completed"){ + // $('#cancel').hide(); $(".fourth-1").click(); - $('#accepted').text("PICK-UP"); + $('#accepted').text("COMPLETE"); $('#accepted').attr("data-value","completed"); - } + }else if(type == "processed"){ + $(".fifth-1").click(); + $(".order_close_cashier").show(); + // $('#accepted').hide(); + // $('#cancel').hide(); + } // console.log(type); }); $("#accepted").on("click", function(){ if($(this).text().trim() == "ACCEPT"){ - var requested_time = $("#requested_date_time").text(); + $("#status").text($(this).attr("data-value")); + var requested_time = $("#requested_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"); @@ -47,35 +61,155 @@ $(function() { }); $("#cancel").on("click", function(){ - 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); + var order_status = $("#order_status").text(); + $("#status").text($(this).attr("data-value")); + if(order_status!="new" && order_status!= "accepted" && order_status!="send_to_kitchen"){ + $("#AccessCodeModal").modal({show: true, backdrop: false, keyboard: false}); + }else{ + $("#rejected_reasonModal").modal({show: true, backdrop: false, keyboard: false}); + } }); - $("#save").on("click",function(){ - $("#waiting_timeErr").text(""); + $(".send_status").on("click",function(){ + $("#reject_reasonErr").html(""); + if($('#reject_reason').val() != ""){ + var order_status = $("#order_status").text(); + var status = $("#status").text(); + var order_id = $('#order_id').text(); + var callback = $('#callback_url').text(); + var ref_no = $('#ref_no').text(); + var reason = ""; + var approved_code = $("#approved_code").text(); + if(order_status == 'ready_to_delivery'){ + reason = "VOID || " + $('#reject_reason').val(); + }else{ + reason = $('#reject_reason').val(); + } + callback_url(callback,ref_no,order_id,status,"","","",reason,approved_code); + }else{ + $("#reject_reasonErr").html("This is required field"); + } + }); + + $(".timer_type").on("click",function(){ + if($(this).hasClass("selected-item")){ + $(this).removeClass("selected-item"); + }else{ + $(this).addClass("selected-item"); + } + }); + + $(".time_interval").on("click",function(){ + var type = ''; + if($(".timer_type").hasClass("selected-item")){ + type = 'after'; + } + var minutes = $(this).attr("data-value"); + // console.log(type); + // console.log($(this).attr("data-value")); + var status = $("#status").text(); var order_id = $('#order_id').text(); var ref_no = $('#ref_no').text(); var callback = $('#callback_url').text(); - var requested_time = new Date($("#requested_date_time").text()); - var date_time = requested_time.getFullYear()+'-'+(requested_time.getMonth() > 10? requested_time.getMonth() : '0'+ (requested_time.getMonth() + 1))+'-'+(requested_time.getDate()> 10? requested_time.getDate() : '0' + requested_time.getDate()); - var waiting_time = new Date(date_time+' '+$("#waiting_time").val()); - // requested_time.setHours(requested_time.getHours() - 1); + // var requested_time = new Date($("#requested_date_time").text()); + // if(type == 'after'){ + // requested_time.setMinutes(requested_time.getMinutes() + minutes); + // }else{ + // requested_time.setMinutes(requested_time.getMinutes() - minutes); + // } // console.log(requested_time); - if(waiting_time.getTime() < requested_time.getTime()){ - var time_diff = (requested_time.getTime() - waiting_time.getTime()); - var expected_time = (Math.floor(time_diff) / 1000) / 60; - callback_url(callback,ref_no,order_id,status,expected_time,waiting_time); - }else{ - $("#waiting_time").val(""); - $("#waiting_timeErr").text("Expected waiting time is greater than requested time!"); + callback_url(callback,ref_no,order_id,status,type,minutes); + }); + + $('#order_close_cashier').on('click',function(e){ + e.preventDefault(); // Prevent the href from redirecting directly + var linkURL = '/origami/shift/ordering/close'; + warnBeforeRedirect(linkURL); + }); + + $(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; } }); + + // $('button[data-dismiss="modal"]').on('click', function(){ $(this).parent().parent().parent().parent().modal('hide'); }); + + // $(".new_order_close").on("click",function(){ + // var code = $(this).attr("data-value"); + // $("#"+code+"_doemal_new_order").modal("hide"); + // }); + + // $("[data-dismiss='modal']").on('click', function() { + // $('body').addClass('modal-open-fix'); + // if($('body').css("padding-right") == '15px') { + // $('body').addClass('modal-open-fix-pad'); + // } + // setTimeout(function() { + // if($('body').hasClass('modal-open-fix-pad')) { + // $('body').css('padding-right', '15px'); + // } + // $('body').addClass('modal-open').removeClass('modal-open-fix, modal-open-fix-pad'); + // }, 1000); + // }); }); +function warnBeforeRedirect(linkURL) { + swal({ + title: "Alert!", + text: "Are you sure you want to close cashier?", + type: "warning", + showCancelButton: true + }, function() { + // Redirect the user + window.location.href = linkURL; + }); +} + +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); + $("#approved_code").text(code); + $('#AccessCodeModal').modal('hide'); + $("#rejected_reasonModal").modal({show: true, backdrop: false, keyboard: false}); + }else{ + swal("Opps",result.message,"warning") + } + } + }); +} + function customTableClick(){ $(".custom-table .custom-tr").on("click", function(){ $(".custom-tr").removeClass("tr-active"); @@ -92,6 +226,7 @@ function refreshDetailData(){ $("#sr_number").text(""); $("#delivery_info").text(""); $("#contact_info").text(""); + $("#invoice_no").text(""); $('.summary-items').html(""); $('#sub_total').text("0.00"); $('#delivery_fee').text("0.00"); @@ -99,6 +234,8 @@ function refreshDetailData(){ $('#discount_amount').text("0.00"); $('#total_tax').text("0.00"); $('#grand_total').text("0.00"); + $(".tbl_customer").hide(); + $(".order_close_cashier").hide(); } //show order list @@ -112,20 +249,31 @@ function show_order_detail(url,sr_no){ dataType: "json", success: function(data) { // console.log(data); + $(".tbl_customer").show(); + if(data.status != "delivered"){ + $('#accepted').show(); + if(data.status != "ready_to_delivery" && data.status != "send_to_kitchen"){ + $('#cancel').show(); + } + }else{ + $('#accepted').hide(); + $('#cancel').hide(); + } 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; + // var requested_date = newDate.getFullYear() + '-' + (newDate.getMonth() >= 10? newDate.getMonth() : '0' + (newDate.getMonth() + 1)) +'-'+ (newDate.getDate() >= 10? newDate.getDate() : '0' + newDate.getDate()) +' '+time; + var requested_date = getOrderMonth(newDate.getMonth()) +' '+ (newDate.getDate() >= 10? newDate.getDate() : '0' + newDate.getDate()) +', '+newDate.getFullYear()+'('+getOrderDay(newDate.getDay())+')'+' '+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; + // 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 : ''); + $('#expected_time').text(data.expected_waiting_time? data.expected_waiting_time : ''); }else{ $('.expected_time').hide(); $('#expected_time').text(''); @@ -156,7 +304,8 @@ function show_order_detail(url,sr_no){ $("#discount").show(); } - $('#requested_date_time').text(requested_date); + //customer info detail + // $('#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'); @@ -174,18 +323,21 @@ function show_order_detail(url,sr_no){ $('#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"){ + $("#trans_ref").text(data.transaction_ref); + if(delivery.provider == "food2u" || delivery.provider == "yangondoor2door"){ $("#delivery_info").text("(DELIVERY)"); - }else if(delivery.delivery_type == "pick_up"){ + $("#delivery_to").text("DELIVERY"); + }else if(delivery.provider == "pick_up"){ $("#delivery_info").text("(PICK-UP)"); + $("#delivery_to").text("PICK-UP"); }else{ $("#delivery_info").text("(DIRECT DELIVERY)"); + $("#delivery_to").text("DIRECT DELIVERY"); } if(data.order_remark!=null && data.order_remark!=""){ @@ -193,11 +345,22 @@ function show_order_detail(url,sr_no){ }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"]); + + if(data.remark!=null && data.remark!=""){ + var doemal_remark = data.remark.split("||"); + var remark = doemal_remark[0] +", "+ doemal_remark[1]; + $("#remark").text(remark); }else{ - $("#contact_info").text(data["order_reservation_id"]); + $("#remark").text(""); + } + + //no and order id info + $("#sr_number").text("NO."+sr_no); + $("#order_status").text(data.status); + if (data["receipt_no"]) { + $("#invoice_no").text(data["receipt_no"]); + }else{ + $("#invoice_no").text(data["order_reservation_id"]); } } @@ -207,40 +370,42 @@ function show_order_detail(url,sr_no){ //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){ +function callback_url(callback,ref_no,order_id,status,min_type,time,exptime,reason,approved_code){ var url = 'order_reservation/update'; var post_url = "order_reservation/send_status"; var waiting_time = ""; + var expected_time = ""; + var type = ""; + var reject_reason = ""; + var access_code = ""; if(time!=undefined && time!=""){ waiting_time = time; } - var expected_time = ""; if(exptime!=undefined && exptime!=""){ expected_time = exptime; } + if(min_type!=undefined && min_type!=""){ + type = min_type; + } + if(reason!=undefined && reason!=""){ + reject_reason = reason; + } + if(approved_code!=undefined && approved_code!=""){ + access_code = approved_code; + } + $.ajax({ type: "POST", url: post_url, - data: {url: callback, ref_no: ref_no, status: status, waiting_time: waiting_time}, + data: {url: callback, ref_no: ref_no, status: status, waiting_time: waiting_time, min_type: type, reason: reject_reason}, dataType: "json", success: function(data) { if(data.status){ $.ajax({ type: "POST", url: url, - data: {'order_id': order_id, 'status': status, 'expected_time' : expected_time}, + data: {order_id: order_id, status: status, min_type: min_type, expected_time: waiting_time, remark: reason, access_code: access_code}, dataType: "json", success: function(data) { if (data.status) { @@ -255,6 +420,18 @@ function callback_url(callback,ref_no,order_id,status,time,exptime){ }, 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'; + }); } } }); @@ -278,26 +455,63 @@ function callback_url(callback,ref_no,order_id,status,time,exptime){ 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'); + var time = [(date.getHours()>10? date.getHours() : '0'+date.getHours()) - (isPM && !isMidday ? 12 : 0), + (date.getMinutes()>10? date.getMinutes() : '0'+date.getMinutes()) || '00'].join(':') + + (isPM ? ' PM' : ' AM'); return time; } -function showNewOrder(order_reservation){ - // console.log(order_reservation); +function showNewOrder(order_reservation,shop_code){ 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; + var requested_date = date.getFullYear() + '-' + (date.getMonth() >= 10? date.getMonth() : '0' + (date.getMonth() + 1)) +'-'+ (date.getDate() >= 10? date.getDate() : '0' + date.getDate()) +' '+time; + //audio play + var audio = new Audio('/'+shop_code+'-beep.mp3'); // define your audio + // setTimeout(function(){ + // audio.loop = true; + audio.play(); + // },10000); + + // $("#new_order").text(order_reservation.order_reservation_id); + // $("#new_order_date").text(requested_date); + // if($("#"+shop_code+"_doemal_new_order").hasClass("hidden")){ + // $("#"+shop_code+"_doemal_new_order").removeClass("hidden"); + // } + // $("#"+shop_code+"_doemal_new_order").on('show.bs.modal', function(e){ + // $("#notify_new_order").addClass("hidden"); + // $("#notify_order_send_to_kitchen").addClass("hidden"); + // $("#notify_order_ready_to_delivery").addClass("hidden"); + // }).on('shown.bs.modal', function(e){ + // $("#"+shop_code+"_doemal_new_order").focus(); + // }).on('hide.bs.modal', function (e) { + // $("#"+shop_code+"_doemal_new_order").addClass("hidden"); + // }).modal({show: true, keyboard: false, backdrop: false}); swal({ - html: true, title: 'Information', - text: "You have new order " + order_reservation.order_reservation_id + " at "+requested_date+"", + target: document.getElementById(shop_code+"_notify_new_order"), + text: "You have new order "+ + ""+order_reservation.order_reservation_id+" requested for "+requested_date+"?", type: 'success', + html: true, closeOnConfirm: false, closeOnCancel: false, allowOutsideClick: false + }, function (isConfirm) { + if(isConfirm){ + audio.pause(); + swal.close(); + } }); } +} + +function getOrderMonth(month){ + var MONTHS = ["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sept","Oct","Nov","Dec"]; + return MONTHS[month]; +} + +function getOrderDay(day){ + var DAYS = ["Monday","Tuesday","Wednesday","Thursday","Friday","Saturday","Sunday"]; + return DAYS[day]; } \ No newline at end of file diff --git a/app/assets/stylesheets/addorder.scss b/app/assets/stylesheets/addorder.scss index d8adba16..ba1089d2 100755 --- a/app/assets/stylesheets/addorder.scss +++ b/app/assets/stylesheets/addorder.scss @@ -247,4 +247,27 @@ i.logout_icon{ } .list-menu > a:hover{ text-decoration: none; +} +.cashier_number{ + width: 33%; + height:58px; + line-height:58px; + text-align:center; + background:#54A5AF; + // float:left; + // margin:2px; + font-size:20px; + color:white; + // cursor:pointer; +} +.border-top{ + border-top:1px solid #fff; +} + +.border-right{ + border-right:1px solid #fff; +} + +.border-left{ + border-left:1px solid #fff; } \ No newline at end of file diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 212c5288..855ee984 100755 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -10,6 +10,7 @@ @import "BSBMaterial/style"; @import "BSBMaterial/themes/all-themes"; @import "reset"; +@import "fileinput.min"; /* Reset */ @@ -452,6 +453,10 @@ iframe { width: 150%; height: 100%; } + +#receipt_pdf { + height: 400px; +} /* End iframe */ /* section class for webview */ diff --git a/app/controllers/api/order_reserve/order_reservation_controller.rb b/app/controllers/api/order_reserve/order_reservation_controller.rb index f34c0f6f..1bb257de 100644 --- a/app/controllers/api/order_reserve/order_reservation_controller.rb +++ b/app/controllers/api/order_reserve/order_reservation_controller.rb @@ -6,53 +6,57 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController def check_customer customer_id = 0 + status = false if !params[:name] render :json => { :status => false, :message => "name is required!" } elsif !params[:email] render :json => { :status => false, :message => "email is required!" } elsif !params[:membership_id] render :json => { :status => false, :message => "membership_id is required!" } - end - - check_customer = Customer.find_by_email_and_membership_id(params[:email],params[:membership_id]) - if !check_customer.nil? - customer_id = check_customer.customer_id else - customer = Customer.addCustomer(params) - customer_id = customer.id + status = true end - render :json => { :status => true, :data => { :customer_id => customer_id} } + if status + check_customer = Customer.find_by_email_and_membership_id(params[:email],params[:membership_id]) + if !check_customer.nil? + customer_id = check_customer.customer_id + else + customer = OrderReservation.addCustomer(params) + customer_id = customer.id + end + render :json => { :status => true, :data => { :customer_id => customer_id} } + end end def create status = false if !params[:cus_info] - render :json => { :status => false, :message => "cus_info is required!" } + result = { :status => false, :message => "cus_info is required!" } elsif !params[:requested_time] - render :json => { :status => false, :message => "requested_time is required!" } + result = { :status => false, :message => "requested_time is required!" } elsif !params[:callback_url] - render :json => { :status => false, :message => "callback_url is required!" } + result = { :status => false, :message => "callback_url is required!" } elsif !params[:reference] - render :json => { :status => false, :message => "reference is required!" } + result = { :status => false, :message => "reference is required!" } elsif !params[:order_type] - render :json => { :status => false, :message => "order_type is required!" } + result = { :status => false, :message => "order_type is required!" } elsif params[:order_type] == ORDER || params[:order_type] == ORDER_RESERVATION if !params[:order_info] - render :json => { :status => false, :message => "order_info is required!" } + result = { :status => false, :message => "order_info is required!" } else status = true end elsif params[:order_type] == RESERVATION || params[:order_type] == ORDER_RESERVATION if !params[:reservation_info] - render :json => { :status => false, :message => "reservation_info is required!" } + result = { :status => false, :message => "reservation_info is required!" } else status = true end elsif !params[:payment_info] - render :json => { :status => false, :message => "payment_info is required!" } + result = { :status => false, :message => "payment_info is required!" } elsif !params[:delivery_info] - render :json => { :status => false, :message => "delivery_info is required!" } + result = { :status => false, :message => "delivery_info is required!" } end if status == true @@ -60,15 +64,64 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController order_reservation_id, flag = OrderReservation.addOrderReservationInfo(order_reservation) if flag #&& ENV["SERVER_MODE"] != 'cloud' + shop = Shop.find_by_id(1) + if !shop.shop_code.nil? + shop_code = shop.shop_code + else + shop_code = '' + end + + result = { :status => true, :order_reservation_id => order_reservation_id, :message => "Order reservation is successfully created!" } order_reservation = OrderReservation.get_pending_orders #find(order_reservation_id) - ActionCable.server.broadcast "order_reservation_channel",data: order_reservation - end - - if flag - render :json => { :status => true, :order_reservation_id => order_reservation_id, :message => "Order reservation is successfully created!" } + ActionCable.server.broadcast "order_reservation_channel",data: order_reservation,shop_code: shop_code else - render :json => { :status => true, :order_reservation_id => order_reservation_id, :message => "Order reservation is already existed!" } + result = { :status => true, :order_reservation_id => order_reservation_id, :message => "Order reservation is already existed!" } end end + + puts "!!! send doemal ::" + puts result + + Rails.logger.debug "send status to doemal" + Rails.logger.debug result + render :json => result + end + + def update_status + order_reservation_id = params[:id] + status = params[:status] + remark = params[:remark] + + if params[:status] && params[:remark] + reason = status +"||"+remark + order_reservation = OrderReservation.find(order_reservation_id) + + if status == 'REMOVE' + if order_reservation.status == "new" || order_reservation.status == "accepted" + OrderReservation.update_order_reservation(order_reservation_id, nil, "rejected",nil,remark) + result = {:status=> true, :message => "rejected" } + else + result = {:status=> false, :message => "Status :: "+order_reservation.status+" cann't remove!" } + end + elsif status == 'FOC' + if order_reservation.status == "new" || order_reservation.status == "accepted" || order_reservation.status == "send_to_kitchen" + OrderReservation.update_order_reservation(order_reservation_id, nil, nil,nil,reason) + result = {:status=> true, :message => "FOC successfully" } + else + result = {:status=> false, :message => "Status :: "+order_reservation.status+" cann't get FOC!" } + end + elsif status == 'VOID' + if order_reservation.status == "ready_to_delivery" + OrderReservation.update_order_reservation(order_reservation_id, nil, nil,nil,reason) + result = {:status=> true, :message => "VOID successfully" } + else + result = {:status=> false, :message => "Status :: "+order_reservation.status+" cann't VOID!" } + end + end + else + result = { :status => false, :order_reservation_id => order_reservation_id, :message => "status and remark is required!" } + end + + render :json => result end end diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb index d937c6c3..49afe833 100755 --- a/app/controllers/api/orders_controller.rb +++ b/app/controllers/api/orders_controller.rb @@ -220,33 +220,39 @@ class Api::OrdersController < Api::ApiController if ENV["SERVER_MODE"] != "cloud" #no print in cloud server # print assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code) - # order queue stations - oqs = assigned_item.order_queue_station + assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'") - order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf - - unique_code="OrderItemPdf" - if !order_slim_pdf.empty? - order_slim_pdf.each do |order_item_slim| - if order_item_slim[0] == 'OrderSlimPdf' - if order_item_slim[1] == '1' - unique_code="OrderItemSlimPdf" - else - unique_code="OrderItemPdf" - end - elsif order_item_slim[0] == 'OrderSetPdf' - if order_item_slim[1] == '1' - unique_code="OrderSetItemPdf" - else - unique_code="OrderItemPdf" + if !assigned_items.nil? + assigned_items.each do |assign_item| + # order queue stations + oqs = assign_item.order_queue_station + + order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf + + unique_code="OrderItemPdf" + if !order_slim_pdf.empty? + order_slim_pdf.each do |order_item_slim| + if order_item_slim[0] == 'OrderSlimPdf' + if order_item_slim[1] == '1' + unique_code="OrderItemSlimPdf" + else + unique_code="OrderItemPdf" + end + elsif order_item_slim[0] == 'OrderSetPdf' + if order_item_slim[1] == '1' + unique_code="OrderSetItemPdf" + else + unique_code="OrderItemPdf" + end + end end end + + print_settings=PrintSetting.find_by_unique_code(unique_code) + order_queue_printer= Printer::OrderQueuePrinter.new(print_settings) + order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Cancelled)", before_updated_qty ) end end - - print_settings=PrintSetting.find_by_unique_code(unique_code) - order_queue_printer= Printer::OrderQueuePrinter.new(print_settings) - order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Cancelled)", before_updated_qty ) end return return_json_status_with_code(200, "updated successfully!") diff --git a/app/controllers/api/restaurant/menu_controller.rb b/app/controllers/api/restaurant/menu_controller.rb index 96ba3cc0..011e4602 100755 --- a/app/controllers/api/restaurant/menu_controller.rb +++ b/app/controllers/api/restaurant/menu_controller.rb @@ -11,7 +11,10 @@ class Api::Restaurant::MenuController < Api::ApiController # to hash menu_array = [] all_menu.each do |m| - menu_array.push(m.to_json(:include => {:menu_categories => { :include => { :menu_items => { :include => [:menu_item_sets, :menu_item_instances => {:include => :menu_instance_item_sets}]} } }})) + menu_array.push(m.to_json(:include => {:menu_categories => + { :include => { :menu_items => + { :include => [:menu_item_sets, :menu_item_instances => + { :include => :menu_instance_item_sets}]} } }})) end #export Checksum file generate by md5 diff --git a/app/controllers/concerns/token_verification.rb b/app/controllers/concerns/token_verification.rb index b49ef597..c1bce9b2 100755 --- a/app/controllers/concerns/token_verification.rb +++ b/app/controllers/concerns/token_verification.rb @@ -18,7 +18,7 @@ module TokenVerification # Rails.logger.debug "token - " + token.to_s if(options.length !=0 && options["from"] == "DOEMAL") if(ENV["SERVER_MODE"] === "cloud") - from = "local" #request.subdomain.downcase + "." + request.domain.downcase + from = request.subdomain.downcase + "." + request.domain.downcase #"local" aes = MyAesCrypt.new return aes.checkKeyForAuth(from, token) end diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb index 1d0ad8e4..97f75135 100755 --- a/app/controllers/crm/customers_controller.rb +++ b/app/controllers/crm/customers_controller.rb @@ -96,7 +96,7 @@ class Crm::CustomersController < BaseCrmController # POST /crm/customers # POST /crm/customers.json - def create + def create # Remove "" default first params[:customer][:tax_profiles].delete_at(0) @crm_customers = Customer.new(customer_params) diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb index 4bc99f59..e8f0edb5 100644 --- a/app/controllers/oqs/edit_controller.rb +++ b/app/controllers/oqs/edit_controller.rb @@ -27,49 +27,55 @@ class Oqs::EditController < BaseOqsController remarks = params[:remarks] order_item = OrderItem.find(order_items_id) - before_updated_qty = order_item.qty + order = Order.find(order_item.order_id) + if qty_weight.to_i <= order_item.qty.to_i + before_updated_qty = order_item.qty - order_item.item_order_by = current_user.name - order_item.qty = qty_weight - order_item.remark = remarks - order_item.save + order_item.item_order_by = current_user.name + order_item.qty = qty_weight + order_item.remark = remarks + order_item.save - if ENV["SERVER_MODE"] != "cloud" #no print in cloud server - # print - assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code) - assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'") - - if !assigned_items.nil? - assigned_items.each do |assign_item| - # order queue stations - oqs = assign_item.order_queue_station + if ENV["SERVER_MODE"] != "cloud" && order.source == 'cashier' #no print in cloud server + # print + assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code) + assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'") + + if !assigned_items.nil? + assigned_items.each do |assign_item| + # order queue stations + oqs = assign_item.order_queue_station - order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf - - unique_code="OrderItemPdf" - if !order_slim_pdf.empty? - order_slim_pdf.each do |order_item_slim| - if order_item_slim[0] == 'OrderSlimPdf' - if order_item_slim[1] == '1' - unique_code="OrderItemSlimPdf" - else - unique_code="OrderItemPdf" - end - elsif order_item_slim[0] == 'OrderSetPdf' - if order_item_slim[1] == '1' - unique_code="OrderSetItemPdf" - else - unique_code="OrderItemPdf" + order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf + + unique_code="OrderItemPdf" + if !order_slim_pdf.empty? + order_slim_pdf.each do |order_item_slim| + if order_item_slim[0] == 'OrderSlimPdf' + if order_item_slim[1] == '1' + unique_code="OrderItemSlimPdf" + else + unique_code="OrderItemPdf" + end + elsif order_item_slim[0] == 'OrderSetPdf' + if order_item_slim[1] == '1' + unique_code="OrderSetItemPdf" + else + unique_code="OrderItemPdf" + end end end end - end - print_settings=PrintSetting.find_by_unique_code(unique_code) - order_queue_printer= Printer::OrderQueuePrinter.new(print_settings) - order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Cancelled)", before_updated_qty ) + print_settings=PrintSetting.find_by_unique_code(unique_code) + order_queue_printer= Printer::OrderQueuePrinter.new(print_settings) + order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Cancelled)", before_updated_qty ) + end end end + render :json => {:status=> true } + else + render :json => {:status=> false, :message => "Not allowed over quantity!" } end end diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index 100635cd..63cb8736 100755 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -18,11 +18,15 @@ class Origami::AddordersController < BaseOrigamiController if check_mobile @webview = true end - - today = DateTime.now - day = Date.today.wday - @menus = Menu.all - @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') + + # if params[:menu] == "true" + @menus = [] + @menu = [] + # else + # @menus = Menu.all + # @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') + # end + @table_id = params[:id] @table = DiningFacility.find(@table_id) @booking = @table.get_booking @@ -59,10 +63,12 @@ class Origami::AddordersController < BaseOrigamiController end def get_item_instance - @id = MenuItemInstance.find(params[:id]) + @instance = MenuItemInstance.find(params[:id]) end def get_menu() + puts "sssssssssssssss" +puts params[:id] if (params[:id]) #Pull this menu @menu = Menu.find_by_id(params[:id]) @@ -115,8 +121,6 @@ class Origami::AddordersController < BaseOrigamiController end items_arr.push(items) } -puts items_arr.to_json - puts "sssssssssssssssssssssss" # begin # if params[:order_source] == "quick_service" # customer_id = "CUS-000000000002" # for no customer id from mobile diff --git a/app/controllers/origami/dashboard_controller.rb b/app/controllers/origami/dashboard_controller.rb index 8bdd5c27..9977850f 100644 --- a/app/controllers/origami/dashboard_controller.rb +++ b/app/controllers/origami/dashboard_controller.rb @@ -3,6 +3,8 @@ class Origami::DashboardController < BaseOrigamiController def index @shop = Shop.first + + today = DateTime.now.strftime('%Y-%m-%d') # @orders = Sale::where("payment_status='new' and sale_status='bill' and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'").count() # @sales = Sale::where("payment_status='paid' and sale_status='completed' and DATE_FORMAT(receipt_date,'%Y-%m-%d') = '#{today}'").count() @@ -56,6 +58,13 @@ class Origami::DashboardController < BaseOrigamiController # get printer info @print_settings = PrintSetting.get_precision_delimiter() @current_user = current_user + #dine-in cashier + dinein_cashier = Lookup.collection_of('dinein_cashier') + @dinein_cashier = 0 + if !dinein_cashier[0].nil? + @dinein_cashier = dinein_cashier[0][1] + end + #quick service quick_service = Lookup.collection_of('quick_service') @quick_service = 0 @@ -74,4 +83,8 @@ class Origami::DashboardController < BaseOrigamiController end end +def get_all_menu + @menus = Menu.all +end + end diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index ed857104..81724ff5 100755 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -30,9 +30,9 @@ class Origami::HomeController < BaseOrigamiController @membership = MembershipSetting::MembershipSetting @payment_methods = PaymentMethodSetting.all - bookings = Booking.all - if !bookings.today.nil? - @order_items_count = Hash.new + # bookings = Booking.all + # if !bookings.today.nil? + # @order_items_count = Hash.new # bookings.each do |booking| # if booking.sale_id.nil? && booking.booking_status != 'moved' # if !booking.booking_orders.empty? @@ -60,7 +60,7 @@ class Origami::HomeController < BaseOrigamiController # end # end # end - end + # end @dining.bookings.active.each do |booking| if booking.sale_id.nil? && booking.booking_status != 'moved' @@ -132,7 +132,7 @@ class Origami::HomeController < BaseOrigamiController def check_emp_access_code pin_code = params[:code] employee = Employee.find_by_emp_id(pin_code) - if employee && employee.role == "manager" + if employee && (employee.role == "manager" || employee.role == "supervisor") result = {:status=> true, :message=>"Success" } else result = {:status=> false, :message=>"Invalid Access Code" } diff --git a/app/controllers/origami/moveroom_controller.rb b/app/controllers/origami/moveroom_controller.rb index b7260863..8f1430a6 100755 --- a/app/controllers/origami/moveroom_controller.rb +++ b/app/controllers/origami/moveroom_controller.rb @@ -11,6 +11,8 @@ class Origami::MoveroomController < BaseOrigamiController @orders = Order.all.order('date desc') @status_order = "" + @status_sale = "" + @sale_array = Array.new @dining = DiningFacility.find(params[:dining_id]) @dining.bookings.each do |booking| if booking.sale_id.nil? @@ -18,21 +20,38 @@ class Origami::MoveroomController < BaseOrigamiController booking.booking_orders.each do |booking_order| order = Order.find(booking_order.order_id) @obj_order = order + @customer = order.customer @date = order.created_at + @booking= booking order.order_items.each do |item| @order_items.push(item) end + accounts = @customer.tax_profiles + @account_arr =[] + accounts.each do |acc| + account = TaxProfile.find(acc) + @account_arr.push(account) + end end @status_order = 'order' else sale = Sale.find(booking.sale_id) - if sale.sale_status != "completed" + if sale.sale_status != "completed" && sale.sale_status != "waste" && sale.sale_status != "spoile" + @sale_array.push(sale) if @status_order == 'order' @status_order = 'sale' end + @booking= booking @date = sale.created_at @status_sale = 'sale' @obj_sale = sale + @customer = sale.customer + accounts = @customer.tax_profiles + @account_arr =[] + accounts.each do |acc| + account = TaxProfile.find(acc) + @account_arr.push(account) + end end end end diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb index eaf7fca1..7efdd46c 100755 --- a/app/controllers/origami/movetable_controller.rb +++ b/app/controllers/origami/movetable_controller.rb @@ -18,7 +18,6 @@ class Origami::MovetableController < BaseOrigamiController if booking.sale_id.nil? @order_items = Array.new booking.booking_orders.each do |booking_order| - order = Order.find(booking_order.order_id) @obj_order = order @customer = order.customer @@ -37,7 +36,7 @@ class Origami::MovetableController < BaseOrigamiController @status_order = 'order' else sale = Sale.find(booking.sale_id) - if sale.sale_status != "completed" + if sale.sale_status != "completed" && sale.sale_status != "waste" && sale.sale_status != "spoile" @sale_array.push(sale) if @status_order == 'order' @status_order = 'sale' diff --git a/app/controllers/origami/order_reservation_controller.rb b/app/controllers/origami/order_reservation_controller.rb index 12a3ee2f..a3421fbd 100644 --- a/app/controllers/origami/order_reservation_controller.rb +++ b/app/controllers/origami/order_reservation_controller.rb @@ -1,41 +1,43 @@ class Origami::OrderReservationController < BaseOrigamiController def index - @order = OrderReservation.latest_order + @order = OrderReservation.latest_order #.active @count_on_order = OrderReservation.get_count_on_order + @count_on_completed = OrderReservation.get_count_on_completed + @shop = Shop.find_by_id(1) end def update @id = params[:order_id] @status = params[:status] - expected_waiting_time = params[:expected_time] + min_type = params[:min_type] + if min_type != "" + expected_waiting_time = params[:expected_time] + else + expected_waiting_time = min_type + " " +params[:expected_time] + end + remark = params[:remark] + access_code = params[:access_code] @order_reservation = OrderReservation.find(@id) - status = true - - if status - if @status == "processed" - result = OrderReservation.create_doemal_order(@order_reservation,current_user) - elsif @status == "delivery" - OrderReservation.update_order_reservation(@id, nil, "ready_to_delivery") - response = OrderReservation.send_status_to_ordering(@order_reservation.callback_url,@order_reservation.transaction_ref,"ready_to_delivery") - result = {:status=> true, :message => "ready for delivery" } - elsif @status == "completed" - result = OrderReservation.update_doemal_payment(@order_reservation,current_user) - else - if @status == "cancel" - OrderReservation.update_order_reservation(@id, nil, "cancelled") - result = {:status=> true, :message => "rejected" } - else - OrderReservation.update_order_reservation(@id, nil, "accepted", expected_waiting_time) - result = {:status=> true, :message => "accepted" } - end - end - render :json => result.to_json + if @status == "processed" + result = OrderReservation.create_doemal_order(@order_reservation,current_user) + elsif @status == "delivery" + OrderReservation.update_order_reservation(@id, nil, "ready_to_delivery") + response = OrderReservation.send_status_to_ordering(@order_reservation.callback_url,@order_reservation.transaction_ref,"ready_to_delivery") + result = {:status=> true, :message => "ready for delivery" } + elsif @status == "completed" + result = OrderReservation.update_doemal_payment(@order_reservation,current_user) else - result = {:status=> false, :message => "Order not accepted !" } - render :json => result.to_json - end + if @status == "rejected" + OrderReservation.update_order_reservation(@id, nil, "rejected",nil,remark,access_code,current_user) + result = {:status=> true, :message => "rejected" } + else + OrderReservation.update_order_reservation(@id, nil, "accepted", expected_waiting_time) + result = {:status=> true, :message => "accepted" } + end + end + render :json => result.to_json end def get_order @@ -46,13 +48,7 @@ class Origami::OrderReservationController < BaseOrigamiController end def send_status - if params[:status] == "cancel" - status = "rejected" - else - status = params[:status] - end - - response = OrderReservation.send_status_to_ordering(params[:url],params[:ref_no],status,params[:waiting_time]) + response = OrderReservation.send_status_to_ordering(params[:url],params[:ref_no],params[:status],params[:waiting_time],params[:min_type],params[:reason]) render :json => response end diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 3c5219af..7df42118 100755 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -279,6 +279,9 @@ class Origami::PaymentsController < BaseOrigamiController new_total = Sale.get_rounding_adjustment(saleObj.grand_total) @rounding_adj = new_total-saleObj.grand_total saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:@rounding_adj) + @sale_data.grand_total = new_total + @sale_data.old_grand_total = saleObj.grand_total + @sale_data.rounding_adjustment = @rounding_adj else @rounding_adj = @sale_data.rounding_adjustment end diff --git a/app/controllers/origami/quick_service_controller.rb b/app/controllers/origami/quick_service_controller.rb index d5d3437b..86433417 100644 --- a/app/controllers/origami/quick_service_controller.rb +++ b/app/controllers/origami/quick_service_controller.rb @@ -10,24 +10,30 @@ class Origami::QuickServiceController < ApplicationController def index today = DateTime.now day = Date.today.wday - @menus = Menu.all - @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') + # if params[:menu] == "true" + @menus = [] + @menu = [] + # else + # @menus = Menu.all + # @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') + # end @zone = Zone.all @customer = Customer.all @tables = Table.all.active.order('status desc') @rooms = Room.all.active.order('status desc') - # @tables = Table.all.active.order('zone_id asc').group("zone_id") - # @rooms = Room.all.active.order('zone_id asc').group("zone_id") - # @all_table = Table.all.active.order('status desc') - # @all_room = Room.all.active.order('status desc') - render "origami/addorders/detail" + render "origami/addorders/detail" end def modify_order today = DateTime.now day = Date.today.wday - @menus = Menu.all - @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') + # if params[:menu] == "true" + @menus = [] + @menu = [] + # else + # @menus = Menu.all + # @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') + # end if(params[:id][0,3] == "BKI") @table_id = nil @table = nil diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb index 1c5b5430..0f27567a 100755 --- a/app/controllers/origami/sale_edit_controller.rb +++ b/app/controllers/origami/sale_edit_controller.rb @@ -5,8 +5,10 @@ class Origami::SaleEditController < BaseOrigamiController sale_id = params[:sale_id] if params[:table_id] @table_id = params[:table_id] + @table_type = DiningFacility.find(@table_id).type else @table_id = nil + @table_type = nil end @cashier_type = params[:type] @@ -48,10 +50,13 @@ class Origami::SaleEditController < BaseOrigamiController end end end - action_by = current_user.id - approved_by = Employee.find_by_emp_id(access_code) + # FOr Sale Audit + action_by = current_user.name + if access_code != "null" + action_by = Employee.find_by_emp_id(access_code).name + end 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, approved_by.name,remark,"SALEITEMVOID" ) + sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,saleObj.cashier_id, action_by,remark,"SALEITEMVOID" ) saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount) ProductCommission.create_product_commission(@newsaleitem, saleitemObj) @@ -82,10 +87,12 @@ class Origami::SaleEditController < BaseOrigamiController order_id = SaleOrder.find_by_sale_id(saleitemObj.sale_id).order_id order = Order.find(order_id) - action_by = current_user.id - approved_by = Employee.find_by_emp_id(access_code) + action_by = current_user.name + if access_code != "null" + action_by = Employee.find_by_emp_id(access_code).name + end 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, approved_by.name,remark,"SALEITEMFOC" ) + sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,saleObj.cashier_id, action_by,remark,"SALEITEMFOC" ) saleObj.compute_by_sale_items(saleObj.sale_id, saleObj.sale_items, saleObj.total_discount,order.source) ProductCommission.create_product_commission(@newsaleitem, saleitemObj) @@ -124,10 +131,12 @@ class Origami::SaleEditController < BaseOrigamiController saleitemObj.unit_price = update_price 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) + action_by = current_user.name + if access_code != "null" + action_by = Employee.find_by_emp_id(access_code).name + end 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, approved_by.name,remark,"SALEITEMEDIT" ) + sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,sale.cashier_id, action_by,remark,"SALEITEMEDIT" ) # saleitemObj.remark = 'edit' unless saleitemObj.product_name.include? 'updated' @@ -175,10 +184,12 @@ class Origami::SaleEditController < BaseOrigamiController order_id = SaleOrder.find_by_sale_id(saleitemObj.sale_id).order_id order = Order.find(order_id) - action_by = current_user.id - approved_by = Employee.find_by_emp_id(access_code) + action_by = current_user.name + if access_code != "null" + action_by = Employee.find_by_emp_id(access_code).name + end 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, approved_by.name,remark,"ITEMCANCELVOID" ) + sale_audit = SaleAudit.record_audit_for_edit(saleitemObj.sale_id,saleObj.cashier_id, action_by,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/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb index 5f074bb5..2d2ca4fb 100755 --- a/app/controllers/origami/split_bill_controller.rb +++ b/app/controllers/origami/split_bill_controller.rb @@ -19,7 +19,9 @@ class Origami::SplitBillController < BaseOrigamiController table_bookings = Booking.where("dining_facility_id = #{dining_id} and sale_id IS NOT NULL") if !table_bookings.nil? table_bookings.each do |table_booking| - @sale_data.push(table_booking.sale) + if table_booking.sale.sale_status != 'waste' && table_booking.sale.sale_status != 'spoile' + @sale_data.push(table_booking.sale) + end end end diff --git a/app/controllers/origami/table_invoices_controller.rb b/app/controllers/origami/table_invoices_controller.rb index 1e8b1fbd..bc89d598 100755 --- a/app/controllers/origami/table_invoices_controller.rb +++ b/app/controllers/origami/table_invoices_controller.rb @@ -22,7 +22,7 @@ class Origami::TableInvoicesController < BaseOrigamiController end end #end rounding adjustment - if sale.sale_status != "completed" + if sale.sale_status != "completed" && sale.sale_status != "waste" && sale.sale_status != "spoile" @sale_array.push(sale) end end @@ -52,7 +52,7 @@ class Origami::TableInvoicesController < BaseOrigamiController end end #end rounding adjustment - if sale.sale_status != "completed" && sale.sale_status != 'void' + if sale.sale_status != "completed" && sale.sale_status != 'void' && sale.sale_status != "waste" && sale.sale_status != "spoile" @sale_array.push(sale) end end diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb index d601b0c0..5d9aa923 100755 --- a/app/controllers/origami/void_controller.rb +++ b/app/controllers/origami/void_controller.rb @@ -72,9 +72,12 @@ class Origami::VoidController < BaseOrigamiController # FOr Sale Audit action_by = current_user.name - approved_by = Employee.find_by_emp_id(access_code) + if access_code != "null" + action_by = Employee.find_by_emp_id(access_code).name + end + # 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, approved_by.name,remark,"SALEVOID" ) + sale_audit = SaleAudit.record_audit_for_edit(sale_id,sale.cashier_id, action_by,remark,"SALEVOID" ) # For Print diff --git a/app/controllers/origami/waste_spoile_controller.rb b/app/controllers/origami/waste_spoile_controller.rb index de7df434..9cfde698 100755 --- a/app/controllers/origami/waste_spoile_controller.rb +++ b/app/controllers/origami/waste_spoile_controller.rb @@ -55,9 +55,11 @@ class Origami::WasteSpoileController < BaseOrigamiController # FOr Sale Audit action_by = current_user.name - approved_by = Employee.find_by_emp_id(access_code) + if access_code != "null" + action_by = Employee.find_by_emp_id(access_code).name + end # 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, approved_by.name,remark,remark ) + sale_audit = SaleAudit.record_audit_for_edit(sale_id,sale.cashier_id, action_by,remark,remark ) # For Print diff --git a/app/controllers/reports/order_reservation_controller.rb b/app/controllers/reports/order_reservation_controller.rb index fb9517e4..bb351982 100644 --- a/app/controllers/reports/order_reservation_controller.rb +++ b/app/controllers/reports/order_reservation_controller.rb @@ -1,7 +1,7 @@ class Reports::OrderReservationController < BaseReportController # authorize_resource :class => false def index - @payments = [["All Payment",''], ["Cash Payment","cash"], ["Credit Payment","creditnote"], ["FOC Payment","foc"], ["Other Payment","card"]] + @providers = [["All",''], ["Direct Delivery","direct_delivery"],["Pick-Up","pick_up"],["food2u","food2u"], ["ygndoor2door","ygndoor2door"]] from, to = get_date_range_from_params @@ -17,8 +17,9 @@ class Reports::OrderReservationController < BaseReportController @shift = ShiftSale.where('shift_started_at = ? and shift_closed_at = ? ',shift_sale.shift_started_at, shift_sale.shift_closed_at) end end - payment_type = params[:payment_type] - @sale_data = Sale.get_sales_by_order_reservation(@shift_sale_range,@shift,from,to,payment_type) + + provider = params[:provider] + @order_reservation_data = OrderReservation.get_order_reservation_by_shift(@shift_sale_range,@shift,from,to,provider) @from = from @to = to # get printer info @@ -40,7 +41,7 @@ class Reports::OrderReservationController < BaseReportController def show from, to = get_date_range_from_params - @sale_data = Sale.get_by_shift_sale(from,to,Sale::SALE_STATUS_COMPLETED) + @sale_data = Sale.get_by_shift_sale_by_item(from,to,Sale::SALE_STATUS_COMPLETED) date_arr = Array.new @sale_data.each do |sale| diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb index a86fb9b2..aa1dd8bd 100755 --- a/app/controllers/reports/receipt_no_controller.rb +++ b/app/controllers/reports/receipt_no_controller.rb @@ -20,7 +20,7 @@ authorize_resource :class => false payment_type = params[:payment_type] @sale_data = Sale.get_shift_sales_by_receipt_no(@shift_sale_range,@shift,from,to,payment_type) @sale_taxes = Sale.get_separate_tax(@shift_sale_range,@shift,from,to,payment_type) - @tax_profiles = TaxProfile.order('order_by asc').limit(2) + @tax_profiles = TaxProfile.where('group_type = "cashier"').order('order_by asc').limit(2) @from = from @to = to # get printer info diff --git a/app/controllers/settings/cashier_terminals_controller.rb b/app/controllers/settings/cashier_terminals_controller.rb index 31e8da04..1d1c5497 100755 --- a/app/controllers/settings/cashier_terminals_controller.rb +++ b/app/controllers/settings/cashier_terminals_controller.rb @@ -16,10 +16,12 @@ class Settings::CashierTerminalsController < ApplicationController # GET /settings/cashier_terminals/new def new @settings_cashier_terminal = CashierTerminal.new + @server_mode = ENV["SERVER_MODE"] end # GET /settings/cashier_terminals/1/edit def edit + @server_mode = ENV["SERVER_MODE"] end # POST /settings/cashier_terminals diff --git a/app/controllers/settings/menus_controller.rb b/app/controllers/settings/menus_controller.rb index f73226f4..39b9b021 100755 --- a/app/controllers/settings/menus_controller.rb +++ b/app/controllers/settings/menus_controller.rb @@ -195,7 +195,9 @@ class Settings::MenusController < ApplicationController # end end - file_path = "public/menus/" + menu.name + ".xlsx" + directory_name = "public/menus" + Dir.mkdir(directory_name) unless File.exists?(directory_name) + file_path = directory_name +"/" + menu.name + ".xlsx" p.serialize(file_path) render :json => { status: true, path: file_path } end diff --git a/app/controllers/settings/order_queue_stations_controller.rb b/app/controllers/settings/order_queue_stations_controller.rb index adcbc507..2458096e 100755 --- a/app/controllers/settings/order_queue_stations_controller.rb +++ b/app/controllers/settings/order_queue_stations_controller.rb @@ -18,10 +18,12 @@ class Settings::OrderQueueStationsController < ApplicationController # GET /settings/order_queue_stations/new def new @settings_order_queue_station = OrderQueueStation.new + @server_mode = ENV["SERVER_MODE"] end # GET /settings/order_queue_stations/1/edit def edit + @server_mode = ENV["SERVER_MODE"] end # POST /settings/order_queue_stations diff --git a/app/models/ability.rb b/app/models/ability.rb index 497e9322..fbf66f57 100755 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -248,6 +248,7 @@ class Ability can :reprint, :payment can :rounding_adj, :payment can :print, :payment + can :foc, :payment can :manage, Commission can :manage, Commissioner diff --git a/app/models/customer.rb b/app/models/customer.rb index c380f24b..b05caaf6 100755 --- a/app/models/customer.rb +++ b/app/models/customer.rb @@ -352,28 +352,6 @@ class Customer < ApplicationRecord end - #new customer for doemal - def self.addCustomer(params) - if params[:gender] == "female" - gender = "Female" - else - gender = "Male" - end - customer = Customer.new - customer.name = params[:name] - customer.email = params[:email] - customer.contact_no = params[:contact_no] - customer.gender = params[:gender] - customer.address = params[:address] - customer.date_of_birth = params[:date_of_birth] ? Time.parse(params[:date_of_birth]).strftime("%Y-%m-%d") : '' - customer.membership_id = params[:membership_id] - customer.customer_type = "Takeaway" - customer.tax_profiles = ["2"] - customer.save - - return customer - end - WALKIN = "CUS-000000000001" TAKEAWAY = "CUS-000000000002" diff --git a/app/models/menu_category.rb b/app/models/menu_category.rb index 948ffe69..218bacb8 100755 --- a/app/models/menu_category.rb +++ b/app/models/menu_category.rb @@ -81,7 +81,7 @@ class MenuCategory < ApplicationRecord def get_sub_category menu_category = MenuCategory.find_by_menu_category_id(self.id) - if menu_category + if !menu_category.nil? return true end return false diff --git a/app/models/my_aes_crypt.rb b/app/models/my_aes_crypt.rb index 8f3cde09..4116f2a2 100644 --- a/app/models/my_aes_crypt.rb +++ b/app/models/my_aes_crypt.rb @@ -64,7 +64,7 @@ class MyAesCrypt shop_json["data"].each do |j| if j["lookup"] == from # add [0...44] for production cloud for remove \n - if(j["value"]["key"] == token) + if(j["value"]["key"].gsub(/\s+/, "") == token) return true end end diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb index 889491ed..1541828c 100755 --- a/app/models/order_queue_station.rb +++ b/app/models/order_queue_station.rb @@ -57,7 +57,11 @@ class OrderQueueStation < ApplicationRecord if oqs.auto_print && order_source != "quick_service" if oqs_order_items.length > 0 - print_slip(oqs, order, oqs_order_items) + if oqs.cut_per_item + print_slip_item(oqs, order, oqs_order_items) + else + print_slip(oqs, order, oqs_order_items) + end is_auto_printed = true end end @@ -91,8 +95,12 @@ class OrderQueueStation < ApplicationRecord end if oqs.auto_print && order_source != "quick_service" - if oqs_order_items.length > 0 - print_slip(oqs, order, oqs_order_items) + if oqs_order_items.length > 0 + if oqs.cut_per_item + print_slip_item(oqs, order, oqs_order_items) + else + print_slip(oqs, order, oqs_order_items) + end is_auto_printed = true end end @@ -137,8 +145,12 @@ class OrderQueueStation < ApplicationRecord end if oqs.auto_print - if oqs_order_items.length > 0 - print_slip(oqs, order, oqs_order_items) + if oqs_order_items.length > 0 + if oqs.cut_per_item + print_slip_item(oqs, order, oqs_order_items) + else + print_slip(oqs, order, oqs_order_items) + end is_auto_printed = true end end @@ -165,8 +177,12 @@ class OrderQueueStation < ApplicationRecord end if oqs.auto_print - if oqs_order_items.length > 0 - print_slip(oqs, order, oqs_order_items) + if oqs_order_items.length > 0 + if oqs.cut_per_item + print_slip_item(oqs, order, oqs_order_items) + else + print_slip(oqs, order, oqs_order_items) + end is_auto_printed = true end end @@ -211,7 +227,7 @@ class OrderQueueStation < ApplicationRecord end #Print order_item in 1 slip per item - def print_slip_item(oqs, assigned_item) + def print_slip_item(oqs, order, assigned_items) order_slim_pdf = Lookup.collection_of("print_settings") #print_settings with name:OrderSlimPdf unique_code="OrderItemPdf" if !order_slim_pdf.empty? @@ -232,14 +248,17 @@ class OrderQueueStation < ApplicationRecord end end - order_item = OrderItem.where("order_id='#{assigned_item.order_id}' AND item_instance_code='#{assigned_item.instance_code}'").first() + # order_item = OrderItem.where("order_id='#{assigned_item.order_id}' AND item_instance_code='#{assigned_item.instance_code}'").first() # print when complete click print_settings=PrintSetting.find_by_unique_code(unique_code) order_queue_printer= Printer::OrderQueuePrinter.new(print_settings) - order_queue_printer.print_order_item(print_settings, oqs,item.order_id, order_item.order_items_id, print_status="" ) - + if !assigned_items.nil? + assigned_items.each do |order_item| + order_queue_printer.print_order_item(print_settings, oqs,order_item.order_id, order_item.order_items_id, print_status="" ) + end + end # update print status for completed same order items - assigned_order_item.each do |ai| + AssignedOrderItem.where("order_id = '#{ order.order_id }'").find_each do |ai| ai.print_status=true ai.save end diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb index e5b95f8c..84209845 100644 --- a/app/models/order_reservation.rb +++ b/app/models/order_reservation.rb @@ -7,6 +7,7 @@ class OrderReservation < ApplicationRecord has_many :order_reservation_items has_one :delivery + scope :active, -> { where("created_at BETWEEN '#{DateTime.now.utc.beginning_of_day}' AND '#{DateTime.now.utc.end_of_day}'") } scope :latest_order, -> { order("order_reservation_id desc, created_at desc") } SEND_TO_KITCHEN = "send_to_kitchen" @@ -14,6 +15,28 @@ class OrderReservation < ApplicationRecord DELIVERED = "delivered" COMPLETED = "completed" + #new customer for doemal + def self.addCustomer(params) + if params[:gender] == "female" + gender = "Female" + else + gender = "Male" + end + customer = Customer.new + customer.name = params[:name] + customer.email = params[:email] + customer.contact_no = params[:contact_no] ? params[:contact_no] : '' + customer.gender = gender + customer.address = params[:address] ? params[:address] : '' + customer.date_of_birth = params[:date_of_birth] ? Time.parse(params[:date_of_birth]).strftime("%Y-%m-%d") : '' + customer.membership_id = params[:membership_id] + customer.customer_type = "Takeaway" + customer.tax_profiles = ["2"] + customer.save + + return customer + end + def self.addOrderReservationInfo(order_reserve) Rails.logger.debug order_reserve.to_s check_order_reservation = OrderReservation.where("transaction_ref = ?",order_reserve[:reference]) @@ -29,7 +52,7 @@ class OrderReservation < ApplicationRecord order_reservation.payment_type = order_reserve[:payment_info][:payment_type] order_reservation.payment_status = order_reserve[:payment_info][:payment_status] order_reservation.payment_ref = order_reserve[:payment_info][:payment_ref] - order_reservation.taxes = order_reserve[:payment_info][:taxes] + order_reservation.taxes = order_reserve[:payment_info][:taxes].to_json order_reservation.total_amount = order_reserve[:payment_info][:sub_total] order_reservation.total_tax = order_reserve[:payment_info][:total_tax] order_reservation.discount_amount = order_reserve[:payment_info][:discount_amount] @@ -39,7 +62,7 @@ class OrderReservation < ApplicationRecord end if order_reserve[:reservation_info] order_reservation.total_customer = order_reserve[:reservation_info][:total_user] - order_reservation.reservation_remark = order_reserve[:reservation_info][:reservation_note] + order_reservation.order_remark = order_reserve[:reservation_info][:reservation_note] end order_reservation.save! if order_reserve[:order_info][:items] @@ -70,9 +93,6 @@ class OrderReservation < ApplicationRecord count += 1 items_arr.push(items) } - - puts items_arr.to_json - puts "sssssssssssssssssssssss" customer_id = order.customer_id @order = Order.new @@ -101,9 +121,12 @@ class OrderReservation < ApplicationRecord #order reservation status updated update_order_reservation(order.id, @sale.sale_id, SEND_TO_KITCHEN) - result = {:status=> @status, :data => @sale, :message => "created" } - return result + result = {:status=> @status, :data => @sale, :message => "send to kitchen" } + else + result = {:status=> @status, :message => "No current shift open for this employee!" } end + + return result end def self.update_doemal_payment(order,current_user) @@ -137,7 +160,7 @@ class OrderReservation < ApplicationRecord end end - def self.send_status_to_ordering(url,ref_no,status,waiting_time=nil) + def self.send_status_to_ordering(url,ref_no,status,waiting_time=nil,min_type=nil,reason=nil) base_url = 'https://api.doemal.com' token = '3T-tnlYtFJ-5Z1vY6XQqxQ' order_reservation = Lookup.collection_of("order_reservation") @@ -155,9 +178,10 @@ class OrderReservation < ApplicationRecord end Rails.logger.debug "Doemal URL" + base_url post_url = base_url + url - - if !waiting_time.nil? - send_params = {id: ref_no, waiting_time: waiting_time, status: status} + if waiting_time != "" + send_params = {id: ref_no,type: min_type, waiting_time: waiting_time, status: status} + elsif reason != "" + send_params = {id: ref_no, status: status, reason: reason} else send_params = {id: ref_no, status: status} end @@ -184,20 +208,77 @@ class OrderReservation < ApplicationRecord return response end - def self.update_order_reservation(id, sale_id, status, expected_waiting_time=nil) + def self.update_order_reservation(id, sale_id, status, expected_waiting_time=nil, remark=nil, access_code=nil, current_user=nil) order_reservation = OrderReservation.find(id) if sale_id.present? order_reservation.sale_id = sale_id end if !expected_waiting_time.nil? - order_reservation.expected_waiting_time = DateTime.parse(expected_waiting_time).utc + order_reservation.expected_waiting_time = expected_waiting_time + end + if !status.nil? + order_reservation.status = status + end + if !remark.nil? + order_reservation.order_remark = remark + end + if status == "delivered" + order_reservation.payment_status = "paid" end - order_reservation.status = status order_reservation.save + + # if !order_reservation.sale_id.nil? && status == "rejected" + # void_doemal_payment(order_reservation.sale_id, remark, access_code, current_user) + # end + end + + def self.void_doemal_payment(sale_id, remark, access_code, current_user) + if Sale.exists?(sale_id) + sale = Sale.find_by_sale_id(sale_id) + # update count for shift sale + if(sale.sale_status == "completed") + if sale.shift_sale_id != nil + shift = ShiftSale.find(sale.shift_sale_id) + shift.calculate(sale_id, "void") + end + else + # void before sale payment complete + if sale.shift_sale_id != nil + shift = ShiftSale.find(sale.shift_sale_id) + shift.total_void = shift.total_void + sale.grand_total + shift.save + end + end + + sale.payment_status = 'void' + sale.sale_status = 'void' + sale.save + + # 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, approved_by.name,remark,"SALEVOID" ) + + # update complete order items in oqs + SaleOrder.where("sale_id = '#{ sale_id }'").find_each do |sodr| + AssignedOrderItem.where("order_id = '#{ sodr.order_id }'").find_each do |aoi| + aoi.delivery_status = 1 + aoi.save + end + end + end end def self.get_count_on_order - order_reservation = OrderReservation.select("COUNT(order_reservation_id) as count, status").group("status") + order_reservation = OrderReservation.select("COUNT(order_reservation_id) as count, status") + .where("status != 'delivered'") + .group("status") + end + + def self.get_count_on_completed + order_reservation = OrderReservation.select("COUNT(order_reservation_id) as count") + .where("created_at BETWEEN '#{DateTime.now.beginning_of_day}' AND '#{DateTime.now.end_of_day}' AND status = 'delivered'").first() end def self.get_pending_orders @@ -208,34 +289,80 @@ class OrderReservation < ApplicationRecord end def self.check_new_order + shop = Shop.find_by_id(1) + if !shop.shop_code.nil? + shop_code = shop.shop_code + else + shop_code = '' + end 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 + ActionCable.server.broadcast "check_new_order_channel",data: order_reservation, shop_code: shop_code end end end def self.check_order_send_to_kitchen - today = Time.now.utc - order_reservation = OrderReservation.where("status='accepted' and requested_time > '#{today}'") + shop = Shop.find_by_id(1) + if !shop.shop_code.nil? + shop_code = shop.shop_code + else + shop_code = '' + end + order_reservation = OrderReservation.where("status='accepted' and requested_time <= '#{Time.now.utc}'") if order_reservation.length > 0 if ENV["SERVER_MODE"] == 'cloud' - ActionCable.server.broadcast "check_order_send_to_kitchen_channel",data: order_reservation + ActionCable.server.broadcast "check_order_send_to_kitchen_channel",data: order_reservation, shop_code: shop_code 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}'") + shop = Shop.find_by_id(1) + if !shop.shop_code.nil? + shop_code = shop.shop_code + else + shop_code = '' + end + order_reservation = OrderReservation.where("status='send_to_kitchen' and requested_time <= '#{Time.now.utc}'") if order_reservation.length > 0 if ENV["SERVER_MODE"] == 'cloud' - ActionCable.server.broadcast "check_order_ready_to_delivery_channel",data: order_reservation + ActionCable.server.broadcast "check_order_ready_to_delivery_channel",data: order_reservation, shop_code: shop_code end end end + def self.get_order_reservation_by_shift(shift_sale_range,shift,from,to,provider) + ## => left join -> show all sales although no orders + if provider.blank? + provider = '' + else + if provider.present? + provider = " and deliveries.provider = '#{provider}'" + end + end + + query = OrderReservation.select("order_reservations.*, deliveries.provider, deliveries.delivery_fee, customers.name, customers.email") + .joins(" JOIN deliveries on deliveries.order_reservation_id = order_reservations.order_reservation_id") + .joins(" JOIN customers on customers.customer_id = order_reservations.customer_id") + .joins(" JOIN sales on sales.sale_id = order_reservations.sale_id") + if shift.present? + query = query.where("sales.shift_sale_id in (?) #{provider} and sales.sale_status= 'completed' and sale_payments.payment_amount != 0", shift.to_a) + .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") + .group("sales.sale_id") + elsif shift_sale_range.present? + query = query.where("sales.sale_status='completed' #{provider} and sale_payments.payment_amount != 0 and sales.shift_sale_id in (?)",shift_sale_range.to_a) + .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") + .group("sales.sale_id") + else + query = query.where("sales.sale_status='completed' and sales.receipt_date between ? and ? #{provider} and sale_payments.payment_amount != 0",from,to) + .joins("join sale_payments on sale_payments.sale_id = sales.sale_id") + .group("sales.sale_id") + end + return query +end + private def generate_custom_id self.order_reservation_id = SeedGenerator.generate_id(self.class.name, "ODRS") diff --git a/app/models/sale.rb b/app/models/sale.rb index e8a203fa..60cf0d7a 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -430,28 +430,55 @@ class Sale < ApplicationRecord # customer.tax_profiles.each do |cus_tax| # if cus_tax.to_i == tax.id if tax.group_type.to_s == order_source.to_s - sale_tax = SaleTax.new(:sale => sale) - sale_tax.tax_name = tax.name - sale_tax.tax_rate = tax.rate + if customer.customer_type.downcase == 'takeaway' + if tax.name.downcase == 'commercial tax' + sale_tax = SaleTax.new(:sale => sale) + sale_tax.tax_name = tax.name + sale_tax.tax_rate = tax.rate - # substract , to give after discount - total_tax = total_taxable - total_discount - #include or execulive - if tax.inclusive - rate = tax.rate - divided_value = (100 + rate)/rate - sale_tax.tax_payable_amount = total_tax / divided_value - else - sale_tax.tax_payable_amount = total_tax * tax.rate / 100 - total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount - end - #new taxable amount is standard rule for step by step - if shop.calc_tax_order - total_taxable = total_taxable + sale_tax.tax_payable_amount - end + # substract , to give after discount + total_tax = total_taxable - total_discount + #include or execulive + if tax.inclusive + rate = tax.rate + divided_value = (100 + rate)/rate + sale_tax.tax_payable_amount = total_tax / divided_value + else + sale_tax.tax_payable_amount = total_tax * tax.rate / 100 + total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount + end + #new taxable amount is standard rule for step by step + if shop.calc_tax_order + total_taxable = total_taxable + sale_tax.tax_payable_amount + end - sale_tax.inclusive = tax.inclusive - sale_tax.save + sale_tax.inclusive = tax.inclusive + sale_tax.save + end + else + sale_tax = SaleTax.new(:sale => sale) + sale_tax.tax_name = tax.name + sale_tax.tax_rate = tax.rate + + # substract , to give after discount + total_tax = total_taxable - total_discount + #include or execulive + if tax.inclusive + rate = tax.rate + divided_value = (100 + rate)/rate + sale_tax.tax_payable_amount = total_tax / divided_value + else + sale_tax.tax_payable_amount = total_tax * tax.rate / 100 + total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount + end + #new taxable amount is standard rule for step by step + if shop.calc_tax_order + total_taxable = total_taxable + sale_tax.tax_payable_amount + end + + sale_tax.inclusive = tax.inclusive + sale_tax.save + end end # end # end @@ -484,6 +511,33 @@ class Sale < ApplicationRecord # customer.tax_profiles.each do |cus_tax| # if cus_tax.to_i == tax.id if tax.group_type.to_s == order_source.to_s + if customer.customer_type.downcase == 'takeaway' + if tax.name.downcase == 'commercial tax' + sale_tax = SaleTax.new(:sale => self) + sale_tax.tax_name = tax.name + sale_tax.tax_rate = tax.rate + + # substract , to give after discount + total_tax = total_taxable - self.total_discount + #include or execulive + if tax.inclusive + rate = tax.rate + divided_value = (100 + rate)/rate + sale_tax.tax_payable_amount = total_tax / divided_value + else + sale_tax.tax_payable_amount = total_tax * tax.rate / 100 + total_tax_amount = total_tax_amount + sale_tax.tax_payable_amount + end + + #new taxable amount is standard rule for step by step + if shop.calc_tax_order + total_taxable = total_taxable + sale_tax.tax_payable_amount + end + + sale_tax.inclusive = tax.inclusive + sale_tax.save + end + else sale_tax = SaleTax.new(:sale => self) sale_tax.tax_name = tax.name sale_tax.tax_rate = tax.rate @@ -507,6 +561,7 @@ class Sale < ApplicationRecord sale_tax.inclusive = tax.inclusive sale_tax.save + end end # end # end diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb index fc32098f..d01ee5e0 100755 --- a/app/models/sale_item.rb +++ b/app/models/sale_item.rb @@ -98,9 +98,8 @@ class SaleItem < ApplicationRecord discount_accounts = [] Account.all.each do |a| discount_account = {:name => a.title, :price => 0} - # Check for actual sale items - sale_items.where("status = 'Discount'").find_each do |si| + sale_items.where("status = 'Discount'").each do |si| if si.account_id == a.id discount_account[:price] = (discount_account[:price].abs + si.price.abs) * (1) end diff --git a/app/pdf/order_set_item_pdf.rb b/app/pdf/order_set_item_pdf.rb index 1e7b9c7f..14a8ff62 100755 --- a/app/pdf/order_set_item_pdf.rb +++ b/app/pdf/order_set_item_pdf.rb @@ -4,8 +4,8 @@ class OrderSetItemPdf < Prawn::Document def initialize(print_settings,order_set_item, print_status, options, alt_name, before_updated_qty) self.page_width = print_settings.page_width self.page_height = print_settings.page_height - self.header_font_size = printer_settings.header_font_size.to_i - self.item_font_size = printer_settings.item_font_size.to_i + self.header_font_size = print_settings.header_font_size.to_i + self.item_font_size = print_settings.item_font_size.to_i self.margin = 0 self.price_width = 40 # No Need for item self.qty_width = 40 diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 95a6a277..59e6a320 100755 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -206,7 +206,6 @@ class ReceiptBillPdf < Prawn::Document total_price = item.price #item.qty*item.unit_price - comment for room charges price = item.unit_price product_name = item.product_name - total_qty += item.qty y_position = cursor diff --git a/app/uploaders/commissioner_image_uploader.rb b/app/uploaders/commissioner_image_uploader.rb index 639ce7d7..8baa6dac 100644 --- a/app/uploaders/commissioner_image_uploader.rb +++ b/app/uploaders/commissioner_image_uploader.rb @@ -19,6 +19,14 @@ class CommissionerImageUploader < CarrierWave::Uploader::Base # "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}" end + def filename + if Shop.find(1).shop_code.nil? + "#{original_filename}" if original_filename.present? + else + "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? + end + end + # def cache_dir # '/tmp/images' # end diff --git a/app/uploaders/customer_image_uploader.rb b/app/uploaders/customer_image_uploader.rb index 1de0f3ad..3c4c6f67 100644 --- a/app/uploaders/customer_image_uploader.rb +++ b/app/uploaders/customer_image_uploader.rb @@ -19,6 +19,14 @@ class CustomerImageUploader < CarrierWave::Uploader::Base # "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}" end + def filename + if Shop.find(1).shop_code.nil? + "#{original_filename}" if original_filename.present? + else + "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? + end + end + # def cache_dir # '/tmp/images' # end diff --git a/app/uploaders/employee_image_uploader.rb b/app/uploaders/employee_image_uploader.rb index fd64db42..f1e32849 100644 --- a/app/uploaders/employee_image_uploader.rb +++ b/app/uploaders/employee_image_uploader.rb @@ -19,6 +19,14 @@ class EmployeeImageUploader < CarrierWave::Uploader::Base # "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}" end + def filename + if Shop.find(1).shop_code.nil? + "#{original_filename}" if original_filename.present? + else + "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? + end + end + # def cache_dir # '/tmp/images' # end diff --git a/app/uploaders/menu_item_image_uploader.rb b/app/uploaders/menu_item_image_uploader.rb index 90755159..fdf63f8d 100755 --- a/app/uploaders/menu_item_image_uploader.rb +++ b/app/uploaders/menu_item_image_uploader.rb @@ -19,6 +19,14 @@ class MenuItemImageUploader < CarrierWave::Uploader::Base # "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}" end + def filename + if Shop.find(1).shop_code.nil? + "#{original_filename}" if original_filename.present? + else + "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? + end + end + # def cache_dir # '/tmp/images' # end diff --git a/app/uploaders/product_image_uploader.rb b/app/uploaders/product_image_uploader.rb index fd037f0a..4b702a00 100755 --- a/app/uploaders/product_image_uploader.rb +++ b/app/uploaders/product_image_uploader.rb @@ -19,6 +19,14 @@ class ProductImageUploader < CarrierWave::Uploader::Base # "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}" end + def filename + if Shop.find(1).shop_code.nil? + "#{original_filename}" if original_filename.present? + else + "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? + end + end + # def cache_dir # '/tmp/images' # end diff --git a/app/uploaders/shop_image_uploader.rb b/app/uploaders/shop_image_uploader.rb index 63a01c21..009d83d9 100644 --- a/app/uploaders/shop_image_uploader.rb +++ b/app/uploaders/shop_image_uploader.rb @@ -19,6 +19,14 @@ class ShopImageUploader < CarrierWave::Uploader::Base # "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}" end + def filename + if Shop.find(1).shop_code.nil? + "#{original_filename}" if original_filename.present? + else + "#{Shop.find(1).shop_code}_#{original_filename}" if original_filename.present? + end + end + # def cache_dir # '/tmp/images' # end diff --git a/app/views/crm/customers/edit.json.jbuilder b/app/views/crm/customers/edit.json.jbuilder index 60148085..555989a4 100755 --- a/app/views/crm/customers/edit.json.jbuilder +++ b/app/views/crm/customers/edit.json.jbuilder @@ -1,4 +1,4 @@ json.extract! @crm_customer, :id, :name, :company, :contact_no, :email, :date_of_birth, :membership_id, :membership_type, :membership_authentication_code, - :salutation, :gender,:nrc_no,:address,:card_no, :paypar_account_no, :customer_type, :tax_profiles + :salutation, :gender,:nrc_no,:address,:card_no, :paypar_account_no, :customer_type, :image_path, :tax_profiles json.url crm_customer_url(@crm_customer, format: :json) \ No newline at end of file diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index 87f3cabd..96f1f985 100755 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -185,7 +185,7 @@ $(document).on('click',".customer_tr",function(){ url: url, data: {}, dataType: "json", - success: function(data) { + success: function(data) { // Selected for Taxes var taxes = JSON.stringify(data.tax_profiles); var parse_taxes = JSON.parse(taxes); @@ -193,7 +193,7 @@ $(document).on('click',".customer_tr",function(){ $("#customer_tax_profiles option[value='" + value + "']").attr("selected","selected").css({'color':'#fff','background':'#215d9c'}); }); - $('#customer_id').val(data.id); + $('#customer_id').val(data.id); $('#customer_name').val(data.name); $('#customer_company').val(data.company); $('#customer_contact_no').val(data.contact_no); @@ -205,6 +205,9 @@ $(document).on('click',".customer_tr",function(){ $('#paypar_account_no').val(data.paypar_account_no); $('#customer_address').val(data.address); $('#customer_date_of_birth').val(data.date_of_birth); + if(data.image_path.url!=undefined && data.image_path.url!=null){ + $('.menu-item-img .img-thumbnail').attr('src',data.image_path.url); + } $('#customer_membership_type').val(data.membership_type); $('.selectpicker > option[value="'+data.membership_type+'"]').attr('selected','selected'); if (data.gender == 'Male') { diff --git a/app/views/crm/customers/show.json.jbuilder b/app/views/crm/customers/show.json.jbuilder index ffc312a2..3a6a8cb9 100755 --- a/app/views/crm/customers/show.json.jbuilder +++ b/app/views/crm/customers/show.json.jbuilder @@ -1,4 +1,4 @@ json.extract! @crm_customer, :id, :name, :company, :contact_no, :email, :date_of_birth, :membership_id, :membership_type, :membership_authentication_code, - :salutation, :gender,:nrc_no,:address,:card_no, :paypar_account_no, :customer_type, :tax_profiles + :salutation, :gender,:nrc_no,:address,:card_no, :paypar_account_no, :customer_type, :image_path, :tax_profiles json.url crm_customer_url(@crm_customer, format: :json) diff --git a/app/views/crm/dining_queues/_form.html.erb b/app/views/crm/dining_queues/_form.html.erb index 51e2c097..7c50a06d 100755 --- a/app/views/crm/dining_queues/_form.html.erb +++ b/app/views/crm/dining_queues/_form.html.erb @@ -11,8 +11,8 @@ <%= f.input :queue_no , :class => "dining",:id => "dining", :readonly => true%> <%= f.hidden_field :customer_id %> <%= f.input :name %> - <%= f.input :contact_no %> - <%= f.input :seater %> + <%= f.input :contact_no , input_html: { min: 1, :onkeypress => "return isNumberKey(event);", :onkeyup => "notChar(this.value);" } %> + <%= f.input :seater , input_html: { min: 1, :onkeypress => "return isNumberKey(event);", :onkeyup => "notNegative(this.value);" } %> <%= f.input :remark %>
@@ -111,11 +111,29 @@ \ No newline at end of file diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index 31386cfe..e1cdb699 100755 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -142,7 +142,6 @@ $(document).ready(function(){ var webview = <%= @webview %>; showHideNavbar(webview,"index"); - $(".tables").on('click', function(){ var dining_id = $(this).attr("data-id"); window.location.href = '/origami/table/' + dining_id; diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 54dd9e41..2915d3ca 100755 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -487,8 +487,13 @@ <% if current_login_employee.role != "waiter" %> - Edit - Void + <% if current_login_employee.role == "cashier" %> + Edit + Void + <% else %> +