diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js index 613462ee..fdea26b8 100644 --- a/app/assets/javascripts/order_reservation.js +++ b/app/assets/javascripts/order_reservation.js @@ -2,37 +2,56 @@ $(function() { $(".nav-item").on("click", function(){ - type = $(this).attr("data-type"); - if (type == "pending") { - $('#accepted').text("Accepted"); - $('#accepted').attr("data-value","accepted"); - }else if(type == "processing"){ - $('#accepted').text("SEND TO KITCHEN"); - $('#accepted').attr("data-value","processed"); - }else if(type == "delivery"){ - $('#accepted').text("READY TO DELIVERY"); - $('#accepted').attr("data-value","delivery"); - }else if(type == "completed"){ - $('#accepted').text("PICK-UP"); - $('#accepted').attr("data-value","completed"); - } - console.log(type) + type = $(this).attr("data-type"); + refreshDetailData(); + if (type == "pending") { + $(".first-1").click(); + $('#accepted').text("Accepted"); + $('#accepted').attr("data-value","accepted"); + }else if(type == "processing"){ + $(".second-1").click(); + $('#accepted').text("SEND TO KITCHEN"); + $('#accepted').attr("data-value","processed"); + }else if(type == "delivery"){ + $(".third-1").click(); + $('#accepted').text("READY TO DELIVERY"); + $('#accepted').attr("data-value","delivery"); + }else if(type == "completed"){ + $(".fourth-1").click(); + $('#accepted').text("PICK-UP"); + $('#accepted').attr("data-value","completed"); + } + // console.log(type); }); jQuery(function(){ - jQuery('.first-1').click(); - }); - - $(".custom-tr").on("click", function(){ - $(".custom-tr").removeClass("tr-active"); - $(this).addClass("tr-active"); - var order_id = $(this).attr("data-id"); - var url = "order_reservation/get_order/"+order_id; - show_order_detail(url); + jQuery('.first-1').click(); }); - //show order list - function show_order_detail(url){ + $(".custom-tr").on("click", function(){ + $(".custom-tr").removeClass("tr-active"); + $(this).addClass("tr-active"); + var order_id = $(this).attr("data-id"); + var sr_no = $(this).attr("data-sr-no"); + var url = "order_reservation/get_order/"+order_id; + show_order_detail(url,sr_no); + }); + + function refreshDetailData(){ + $("#sr_number").text(""); + $("#delivery_info").text(""); + $("#contact_info").text(""); + $('.summary-items').html(""); + $('#sub_total').text("0.00"); + $('#delivery_fee').text("0.00"); + $('#total_charges').text("0.00"); + $('#total_tax').text("0.00"); + $('#grand_total').text("0.00"); + } + + //show order list + function show_order_detail(url,sr_no){ + $('.summary-items').html(""); //Start Ajax $.ajax({ type: "GET", @@ -40,51 +59,70 @@ $(function() { data: {}, dataType: "json", success: function(data) { - var delivery = data["delivery"] - var items = data["order_items"] + // console.log(data); + var delivery = data["delivery"]; + var items = data["order_items"]; - var item_list = $('.summary-items'); + var item_list = $('.summary-items'); item_list.empty(); - for(var i in items) { - var item_price = 0; - if(items[i].price > 0){ - item_price = items[i].price; - }else{ - item_price = items[i].unit_price; + if(items!=undefined && items!=""){ + if(items.length > 0){ + for(var i in items) { + var item_price = 0; + if(items[i].price > 0){ + item_price = items[i].price; + }else{ + item_price = items[i].unit_price; + } + var total = items[i].qty * item_price; + row = '' + +''+items[i].item_name + +'
'+items[i].qty+ ' X'+items[i].unit_price+'' + +'' + +''+ total +'' + +''; + $('.summary-items').append(row); + } + + $('#sub_total').text(data.total_amount); + $('#delivery_fee').text(delivery.delivery_fee); + $('#total_charges').text(0); + $('#total_tax').text(data.total_tax); + $('#grand_total').text(data.grand_total); + + var address = delivery.address +', ' +delivery.township+", (" +delivery.direction_address+")" + $('#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.provider == "direct_delivery"){ + $("#delivery_info").text("(DELIVERY)"); + }else if(delivery.provider == "self_pick_up"){ + $("#delivery_info").text("(PICK-UP)"); + } + + if(data.order_remark!=null && data.order_remark!=""){ + $("#order_remark").text(data.order_remark); + }else if(data.reservation_remark!=null && data.reservation_remark!=""){ + $("#order_remark").text(data.reservation_remark); + } + $("#sr_number").text("No."+sr_no); + $("#contact_info").text(); } - var total = items[i].qty * item_price; - row = '' - +''+items[i].item_name - +'
'+items[i].qty+ ' X'+items[i].unit_price+'' - +'' - +''+ total +'' - +''; - $('.summary-items').append(row); } - - $('#sub_total').text(data.total_amount); - $('#delivery_fee').text(delivery.delivery_fee); - $('#total_charges').text(0); - $('#total_tax').text(data.total_tax); - $('#grand_total').text(data.grand_total); - - var address = delivery.address +', ' +delivery.township+", (" +delivery.direction_address+")" - $('#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); } }); //end Ajax } $("#accepted").on("click", function(){ - var status = $(this).attr("data-value"); + var status = $(this).attr("data-value"); var order_id = $('#order_id').text(); var ref_no = $('#ref_no').text(); var callback = $('#callback_url').text(); @@ -92,7 +130,7 @@ $(function() { }); $("#cancel").on("click", function(){ - var status = $(this).attr("data-value"); + var status = $(this).attr("data-value"); var order_id = $('#order_id').text(); var callback = $('#callback_url').text(); var ref_no = $('#ref_no').text(); @@ -119,7 +157,7 @@ $(function() { if (data.status) { swal({ title: 'Information', - text: "Order has been "+data.status, + text: "Order has been "+data.message, type: 'success', html: true, closeOnConfirm: false, @@ -134,7 +172,7 @@ $(function() { }else{ swal({ title: 'Oops', - text: data.message.toString(), + text: data.message, type: 'error', html: true, closeOnConfirm: false, @@ -147,5 +185,5 @@ $(function() { } }); } +}); -}); \ No newline at end of file diff --git a/app/controllers/concerns/token_verification.rb b/app/controllers/concerns/token_verification.rb index 2c17e258..34570ee1 100755 --- a/app/controllers/concerns/token_verification.rb +++ b/app/controllers/concerns/token_verification.rb @@ -17,11 +17,12 @@ module TokenVerification authenticate_with_http_token do |token, options| # Rails.logger.debug "token - " + token.to_s if(options.length !=0 && options["from"] == "DOEMAL") - if(ENV["SERVER_MODE"] === "cloud") - from = request.subdomain.downcase + "." + request.domain.downcase - aes = MyAesCrypt.new - return aes.checkKeyForAuth(from, token) - end + # if(ENV["SERVER_MODE"] === "cloud") + # from = request.subdomain.downcase + "." + request.domain.downcase + # aes = MyAesCrypt.new + # return aes.checkKeyForAuth(from, token) + # end + return true end @user = Employee.authenticate_by_token(token) diff --git a/app/controllers/origami/order_reservation_controller.rb b/app/controllers/origami/order_reservation_controller.rb index 8a51617e..562eaaed 100644 --- a/app/controllers/origami/order_reservation_controller.rb +++ b/app/controllers/origami/order_reservation_controller.rb @@ -7,22 +7,29 @@ class Origami::OrderReservationController < BaseOrigamiController def update @id = params[:order_id] @status = params[:status] - @order = OrderReservation.find(@id) + @order_reservation = OrderReservation.find(@id) status = true if status if @status == "processed" - OrderReservation.create_doemal_order(@order) - else + 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" - result = {:status=> true, :message => "cancelled" } + OrderReservation.update_order_reservation(@id, nil, "cancelled") + result = {:status=> true, :message => "rejected" } else + OrderReservation.update_order_reservation(@id, nil, "accepted") result = {:status=> true, :message => "accepted" } end - render :json => result.to_json end - + render :json => result.to_json else result = {:status=> false, :message => "Order not accepted !" } render :json => result.to_json @@ -37,34 +44,14 @@ class Origami::OrderReservationController < BaseOrigamiController end def send_status - base_url = "http://192.168.1.186:3002" - post_url = base_url + params[:url] - # status = params[:status] if params[:status] == "cancel" status = "rejected" else status = params[:status] end - begin - response = HTTParty.post(post_url, - :body => { id: params[:ref_no], status: status}.to_json, - :headers => { - 'Authorization' => 'Token token=3T-tnlYtFJ-5Z1vY6XQqxQ', - 'Content-Type' => 'application/json', - 'Accept' => 'application/json; version=3' - }, :timeout => 10 - ) - rescue Net::OpenTimeout - response = { status: false } + response = OrderReservation.send_status_to_ordering(params[:url],params[:ref_no],status) - rescue OpenURI::HTTPError - response = { status: false} - rescue SocketError - response = { status: false} - end - Rails.logger.debug "Get Doemal Status " - Rails.logger.debug response.to_json render :json => response end diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb index 26f3dad8..bae58e5c 100644 --- a/app/models/order_reservation.rb +++ b/app/models/order_reservation.rb @@ -7,13 +7,18 @@ class OrderReservation < ApplicationRecord has_many :order_reservation_items belongs_to :delivery + SEND_TO_KITCHEN = "send_to_kitchen" + READY_TO_DELIVERY = "ready_to_deliver" + DELIVERED = "delivered" + COMPLETED = "completed" + def self.addOrderReservationInfo(params) check_order_reservation = OrderReservation.where("transaction_ref = ?",params[:reference]) if check_order_reservation.empty? order_reservation = OrderReservation.new order_reservation.order_reservation_type = params[:order_type] order_reservation.customer_id = params[:cus_info] - order_reservation.requested_time = Time.parse(params[:requested_time]).utc.strftime("%Y-%m-%d %H:%M:%S") + order_reservation.requested_time = DateTime.parse(params[:requested_time]).utc.strftime("%Y-%m-%d %H:%M:%S") order_reservation.callback_url = params[:callback_url] order_reservation.transaction_ref = params[:reference] if params[:order_info] @@ -48,7 +53,7 @@ class OrderReservation < ApplicationRecord end end - def self.create_doemal_order(order) + def self.create_doemal_order(order,current_user) is_extra_time = false extra_time = '' @@ -73,8 +78,8 @@ class OrderReservation < ApplicationRecord @order.guest = '' @order.table_id = nil # this is dining facilities's id @order.new_booking = true - @order.waiters = current_login_employee.name - @order.employee_name = current_login_employee.name + @order.waiters = current_user.name + @order.employee_name = current_user.name @order.is_extra_time = is_extra_time @order.extra_time = extra_time @@ -84,13 +89,168 @@ class OrderReservation < ApplicationRecord # Order.send_customer_view(@booking) if @status && @booking - @status, @sale = Sale.request_bill(@order,current_user,current_login_employee) - # for second display + @status, @sale = Sale.request_bill(@order,current_user,current_user) - result = {:status=> @status, :data => @sale } - render :json => result.to_json + #order status send to doemal + callback_response = send_status_to_ordering(order.callback_url,order.transaction_ref,SEND_TO_KITCHEN) + #order reservation status updated + update_order_reservation(order.id, @sale.sale_id, SEND_TO_KITCHEN) + + result = {:status=> @status, :data => @sale, :message => "created" } + return result end - + end + + def self.update_doemal_payment(order,current_user) + if(Sale.exists?(order.sale_id)) + saleObj = Sale.find(order.sale_id) + shop_details = Shop.first + # rounding adjustment + if shop_details.is_rounding_adj + a = saleObj.grand_total % 25 # Modulus + b = saleObj.grand_total / 25 # Division + #not calculate rounding if modulus is 0 and division is even + #calculate rounding if modulus is zero or not zero and division are not even + if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0) + 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) + end + end + #end rounding adjustment + + sale_payment = SalePayment.new + sale_payment.process_payment(saleObj, current_user.name, saleObj.grand_total, "cash") + + #order status send to doemal + callback_response = send_status_to_ordering(order.callback_url,order.transaction_ref,COMPLETED) + #order reservation status updated + update_order_reservation(order.id, saleObj.sale_id, COMPLETED) + + result = {:status=> true, :message => "completed" } + return result + # rebate_amount = nil + + # For Cashier by Zone + # bookings = Booking.where("sale_id='#{sale_id}'") + + # if bookings[0].dining_facility_id.to_i > 0 + # table = DiningFacility.find(bookings[0].dining_facility_id) + # cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id) + # cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id) + # else + # shift = ShiftSale.find(saleObj.shift_sale_id) + # cashier_terminal = CashierTerminal.find(shift.cashier_terminal_id) + # end + + # For Print + # if ENV["SERVER_MODE"] != "cloud" #no print in cloud server + # receipt_bill_a5_pdf = Lookup.collection_of("print_settings") #print_settings with name:ReceiptBillA5Pdf + # unique_code = "ReceiptBillPdf" + # if !receipt_bill_a5_pdf.empty? + # receipt_bill_a5_pdf.each do |receipt_bilA5| + # if receipt_bilA5[0] == 'ReceiptBillA5Pdf' + # if receipt_bilA5[1] == '1' + # unique_code = "ReceiptBillA5Pdf" + # else + # unique_code = "ReceiptBillPdf" + # end + # end + # end + # end + + # customer= Customer.find(saleObj.customer_id) + + # get member information + # rebate = MembershipSetting.find_by_rebate(1) + # credit_data = SalePayment.find_by_sale_id_and_payment_method(sale_id,'creditnote') + + # if customer.membership_id != nil && rebate && credit_data.nil? + # member_info = Customer.get_member_account(customer) + # if member_info["status"] == true + # rebate_amount = Customer.get_membership_transactions(customer,saleObj.receipt_no) + # current_balance = SaleAudit.paymal_search(sale_id) + # end + # end + + #orders print out + # if params[:type] == "quick_service" + # booking = Booking.find_by_sale_id(sale_id) + # if booking.dining_facility_id.to_i>0 + # table_id = booking.dining_facility_id + # else + # table_id = 0 + # end + + # booking.booking_orders.each do |order| + # # Order.pay_process_order_queue(order.order_id, table_id) + # oqs = OrderQueueStation.new + # oqs.pay_process_order_queue(order.order_id, table_id) + # end + + # end + + #for card sale data + # card_data = Array.new + # card_sale_trans_ref_no = Sale.getCardSaleTrans(sale_id) + # if !card_sale_trans_ref_no.nil? + # card_sale_trans_ref_no.each do |cash_sale_trans| + # card_res_date = cash_sale_trans.res_date.strftime("%Y-%m-%d").to_s + # card_res_time = cash_sale_trans.res_time.strftime("%H:%M").to_s + # card_no = cash_sale_trans.pan.last(4) + # card_no = card_no.rjust(19,"**** **** **** ") + # card_data.push({'res_date' => card_res_date, 'res_time' => card_res_time, 'batch_no' => cash_sale_trans.batch_no, 'trace' => cash_sale_trans.trace, 'pan' => card_no, 'app' => cash_sale_trans.app, 'tid' => cash_sale_trans.terminal_id, 'app_code' => cash_sale_trans.app_code, 'ref_no' => cash_sale_trans.ref_no, 'mid' => cash_sale_trans.merchant_id}) + # end + # end + + # get printer info + # print_settings=PrintSetting.find_by_unique_code(unique_code) + # Calculate Food and Beverage Total + # item_price_by_accounts = SaleItem.calculate_price_by_accounts(saleObj.sale_items) + # discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(saleObj.sale_items) + + # printer = Printer::ReceiptPrinter.new(print_settings) + # filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid",current_balance,card_data) + + # render json: JSON.generate({:status => saleObj.rebate_status, :message => "Can't Rebate coz of Sever Error ", :filename => filename, :receipt_no => sale_receipt_no, :printer_name => printer_name}) + + #end + end + end + + def self.send_status_to_ordering(url,ref_no,status) + base_url = "http://192.168.1.186:3002" + post_url = base_url + url + + begin + response = HTTParty.post(post_url, + :body => { id: ref_no, status: status}.to_json, + :headers => { + 'Authorization' => 'Token token=3T-tnlYtFJ-5Z1vY6XQqxQ', + 'Content-Type' => 'application/json', + 'Accept' => 'application/json; version=3' + }, :timeout => 10 + ) + rescue Net::OpenTimeout + response = { status: false } + + rescue OpenURI::HTTPError + response = { status: false} + rescue SocketError + response = { status: false} + end + Rails.logger.debug "Get Doemal Status " + Rails.logger.debug response.to_json + return response + end + + def self.update_order_reservation(id, sale_id, status) + order_reservation = OrderReservation.find(id) + if sale_id.present? + order_reservation.sale_id = sale_id + end + order_reservation.status = status + order_reservation.save end private diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb index 5bec897f..c157b1bb 100644 --- a/app/views/origami/order_reservation/index.html.erb +++ b/app/views/origami/order_reservation/index.html.erb @@ -5,13 +5,13 @@
-
+
@@ -214,6 +214,9 @@ 0.00 + + +
- +