From b41c85132dd13dfc34867d59a566ae08d842de0d Mon Sep 17 00:00:00 2001 From: phyusin Date: Wed, 25 Apr 2018 15:07:43 +0630 Subject: [PATCH 01/24] add order and reservation, quick service in lookups and add date and order by in order reservation --- README.md | 8 ++++++ .../javascripts/channels/order_reservation.js | 7 +++-- .../order_reservation_controller.rb | 6 ++-- .../origami/dashboard_controller.rb | 16 +++++++++++ .../origami/order_reservation_controller.rb | 2 +- .../origami/payments_controller.rb | 2 +- app/models/order_reservation.rb | 2 ++ app/views/origami/dashboard/index.html.erb | 4 +++ .../origami/order_reservation/index.html.erb | 28 +++++++++++++------ app/views/print_settings/_form.html.erb | 2 +- 10 files changed, 61 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 43a2091e..0605a14a 100755 --- a/README.md +++ b/README.md @@ -188,6 +188,14 @@ Add Base URL for DOEMAL 1) settings/lookups => { type:order_reservation, name: BaseURL, value:'{doemal url}' } 2) settings/lookups => { type:order_reservation, name: Token, value:'{doemal token}' } +Add Feature for Quick Service + ** '0' means can not use quick service and '1' means can use quick service ** + => settings/lookups => { type:quick_service, name: QuickService, value:'{0 or 1}' } + +Add Feature for Order and Reservation + ** '0' means can not use order reservation and '1' means can use order reservation ** + => settings/lookups => { type:order_reservation, name: OrderReservation, value:'{0 or 1}' } + * ToDo list 1. Migration diff --git a/app/assets/javascripts/channels/order_reservation.js b/app/assets/javascripts/channels/order_reservation.js index 605afe16..e3c06e47 100644 --- a/app/assets/javascripts/channels/order_reservation.js +++ b/app/assets/javascripts/channels/order_reservation.js @@ -18,13 +18,16 @@ App.checkin = App.cable.subscriptions.create('OrderReservationChannel', { var time = [date.getHours() - (isPM && !isMidday ? 12 : 0), date.getMinutes() || '00'].join(':') + (isPM ? ' PM' : 'AM'); + var requested_date = date.getDate() + '-' + date.getMonth() + '-' + date.getFullYear() row = '' +''+rowCount +'' - +''+time + +''+requested_date +'' - +''+order.grand_total + +''+time + +'' + +''+order.grand_total +'' +'' +''+ order.status +'' diff --git a/app/controllers/api/order_reserve/order_reservation_controller.rb b/app/controllers/api/order_reserve/order_reservation_controller.rb index 61e89c39..81e12952 100644 --- a/app/controllers/api/order_reserve/order_reservation_controller.rb +++ b/app/controllers/api/order_reserve/order_reservation_controller.rb @@ -60,9 +60,9 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController order_reservation_id, flag = OrderReservation.addOrderReservationInfo(order_reservation) order_reservation = OrderReservation.find(order_reservation_id) - # if ENV["SERVER_MODE"] != 'cloud' - # ActionCable.server.broadcast "order_reservation_channel",data: order_reservation - # end + if flag #&& ENV["SERVER_MODE"] != 'cloud' + 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!" } else diff --git a/app/controllers/origami/dashboard_controller.rb b/app/controllers/origami/dashboard_controller.rb index f888ac57..8bdd5c27 100644 --- a/app/controllers/origami/dashboard_controller.rb +++ b/app/controllers/origami/dashboard_controller.rb @@ -56,6 +56,22 @@ class Origami::DashboardController < BaseOrigamiController # get printer info @print_settings = PrintSetting.get_precision_delimiter() @current_user = current_user + #quick service + quick_service = Lookup.collection_of('quick_service') + @quick_service = 0 + if !quick_service[0].nil? + @quick_service = quick_service[0][1] + end + #order reservation + order_reservation = Lookup.collection_of('order_reservation') + @order_reservation = 0 + if !order_reservation.empty? + order_reservation.each do |order_reserve| + if order_reserve[0] == 'OrderReservation' + @order_reservation = order_reserve[1] + end + end + end end end diff --git a/app/controllers/origami/order_reservation_controller.rb b/app/controllers/origami/order_reservation_controller.rb index 562eaaed..0d5d5277 100644 --- a/app/controllers/origami/order_reservation_controller.rb +++ b/app/controllers/origami/order_reservation_controller.rb @@ -1,7 +1,7 @@ class Origami::OrderReservationController < BaseOrigamiController def index - @order = OrderReservation.all + @order = OrderReservation.latest_order end def update diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index dbd1cbb1..5337bac5 100755 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -6,7 +6,7 @@ class Origami::PaymentsController < BaseOrigamiController def first_bill sale_id = params[:sale_id] # sale_id sale_data = Sale.find_by_sale_id(sale_id) - sale_items = SaleItem.where("sale_id=?",sale_id) + sale_items = SaleItem.select("sale_id,product_code,item_instance_code,product_name,product_alt_name,account_id,status,remark,SUM(qty) as qty,unit_price,taxable_price,price,is_taxable").where("sale_id=?",sale_id).group("item_instance_code,price") member_info = nil # For Cashier by Zone diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb index 3c401e31..296523cb 100644 --- a/app/models/order_reservation.rb +++ b/app/models/order_reservation.rb @@ -7,6 +7,8 @@ class OrderReservation < ApplicationRecord has_many :order_reservation_items belongs_to :delivery + scope :latest_order, -> { order("order_reservation_id desc, requested_time asc") } + SEND_TO_KITCHEN = "send_to_kitchen" READY_TO_DELIVERY = "ready_to_deliver" DELIVERED = "delivered" diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb index 1b6a554e..330c963f 100644 --- a/app/views/origami/dashboard/index.html.erb +++ b/app/views/origami/dashboard/index.html.erb @@ -18,6 +18,7 @@
+ <% if @quick_service == '1' %>
@@ -26,6 +27,7 @@
<%= t :quick_service %>
+ <% end %>
@@ -34,6 +36,7 @@
<%= t :dine_in_cashier %>
+ <% if @order_reservation == '1' %>
@@ -42,6 +45,7 @@
<%= t :order_reservation %>
+ <% end %>
<% if !@current_user.nil? && @current_user.role != 'waiter' %> diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb index 15f173ce..87533715 100644 --- a/app/views/origami/order_reservation/index.html.erb +++ b/app/views/origami/order_reservation/index.html.erb @@ -31,10 +31,13 @@ <%=i%> - + + <%= order.requested_time.utc.getlocal.strftime("%d-%m-%Y") %> + + <%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %> - + <%=order.grand_total%> @@ -63,10 +66,13 @@ <%=i%> - + + <%= order.requested_time.utc.getlocal.strftime("%d-%m-%Y") %> + + <%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %> - + <%=order.grand_total%> @@ -94,10 +100,13 @@ <%=i%> - + + <%= order.requested_time.utc.getlocal.strftime("%d-%m-%Y") %> + + <%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %> - + <%=order.grand_total%> @@ -125,10 +134,13 @@ <%=i%> - + + <%= order.requested_time.utc.getlocal.strftime("%d-%m-%Y") %> + + <%= order.requested_time.utc.getlocal.strftime("%I:%M %p") %> - + <%=order.grand_total%> diff --git a/app/views/print_settings/_form.html.erb b/app/views/print_settings/_form.html.erb index ae1f90c1..e07da111 100755 --- a/app/views/print_settings/_form.html.erb +++ b/app/views/print_settings/_form.html.erb @@ -16,7 +16,7 @@ <% if(@server_mode != 'cloud') %> <%= f.input :printer_name, :as => :select, :collection => Printer::PrinterWorker.printers, include_blank: false %> <% else %> - <%= f.input :printer_name, :as => :select, :collection => [] %> + <%= f.input :printer_name %> <% end %> <%= f.input :brand_name %> <%= f.input :printer_type %> From 81407cf95eb35811ae4b33fec068ed9244babf83 Mon Sep 17 00:00:00 2001 From: phyusin Date: Wed, 25 Apr 2018 15:33:54 +0630 Subject: [PATCH 02/24] change query for sale items --- app/controllers/origami/payments_controller.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 5337bac5..3baed9f3 100755 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -6,7 +6,7 @@ class Origami::PaymentsController < BaseOrigamiController def first_bill sale_id = params[:sale_id] # sale_id sale_data = Sale.find_by_sale_id(sale_id) - sale_items = SaleItem.select("sale_id,product_code,item_instance_code,product_name,product_alt_name,account_id,status,remark,SUM(qty) as qty,unit_price,taxable_price,price,is_taxable").where("sale_id=?",sale_id).group("item_instance_code,price") + sale_items = SaleItem.unscoped.select("sale_id,product_code,item_instance_code,product_name,product_alt_name,account_id,status,remark,SUM(qty) as qty,SUM(unit_price) as unit_price,SUM(taxable_price) as taxable_price,SUM(price) as price,is_taxable").where("sale_id=?",sale_id).group("item_instance_code,unit_price") member_info = nil # For Cashier by Zone @@ -99,6 +99,7 @@ class Origami::PaymentsController < BaseOrigamiController if(Sale.exists?(sale_id)) saleObj = Sale.find(sale_id) + sale_items = SaleItem.unscoped.select("sale_id,product_code,item_instance_code,product_name,product_alt_name,account_id,status,remark,SUM(qty) as qty,SUM(unit_price) as unit_price,SUM(taxable_price) as taxable_price,SUM(price) as price,is_taxable").where("sale_id=?",sale_id).group("item_instance_code,unit_price") shop_details = Shop.first # rounding adjustment if shop_details.is_rounding_adj @@ -204,7 +205,7 @@ class Origami::PaymentsController < BaseOrigamiController 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) + filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,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}) From 172c2136cc5900245659e66c9b2a8cd8aa0c6fb4 Mon Sep 17 00:00:00 2001 From: phyusin Date: Wed, 25 Apr 2018 15:40:57 +0630 Subject: [PATCH 03/24] add order reservation in clear data --- lib/tasks/clear_data.rake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/tasks/clear_data.rake b/lib/tasks/clear_data.rake index cd4fec49..6e556c52 100755 --- a/lib/tasks/clear_data.rake +++ b/lib/tasks/clear_data.rake @@ -20,6 +20,9 @@ namespace :clear do SeedGenerator.where("id > 1").update(:current => 0, :next => 0) Receipt.delete_all ReceiptDetail.delete_all + OrderReservation.delete_all + OrderReservationItem.delete_all + Delivery.delete_all puts "Clear Data Done." end From 3a85481dcdf136774b33604b08dc85b53ed04d77 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 26 Apr 2018 13:07:31 +0630 Subject: [PATCH 04/24] update dinga and paymal --- app/assets/javascripts/addorder.js | 19 +++++++++++++------ app/controllers/origami/dinga_controller.rb | 7 ++++--- app/controllers/origami/paymal_controller.rb | 6 +++--- .../reports/receipt_no_controller.rb | 2 +- app/models/sale_payment.rb | 11 ++++++----- app/views/origami/addorders/detail.html.erb | 12 +++++++----- app/views/origami/dashboard/index.html.erb | 5 ++++- app/views/origami/dinga/index.html.erb | 4 ++-- app/views/origami/paymal/index.html.erb | 6 ++---- 9 files changed, 42 insertions(+), 30 deletions(-) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 1044bc6f..b45b6402 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -457,9 +457,10 @@ $(function() { var items = $('.selected-set'); if (items.length >= min_qty) { - + if ($('#server_mode').val() != "cloud") { item = get_set_item(items); customer_display_view(item,"set_add"); + } var option = [] attribute_arr = [] @@ -786,8 +787,10 @@ $(function() { $('.add_to_order').attr('data-options',JSON.stringify(option_arr)); $('.add_to_order').attr('data-opt',JSON.stringify(option_arr)); var item_data = $(this); - item = get_item(item_data,"add_to_order"); - customer_display_view(item,"add"); + if ($('#server_mode').val() != "cloud") { + item = get_item(item_data,"add_to_order"); + customer_display_view(item,"add"); + } show_item_detail(item_data,"add_to_order"); calculate_sub_total(); @@ -796,8 +799,10 @@ $(function() { // click plus icon for add $(document).on('click', '.add_icon', function(event){ var item_data = $(this); - item = get_item(item_data,"add_icon"); - customer_display_view(item,"add"); + if ($('#server_mode').val() != "cloud") { + item = get_item(item_data,"add_icon"); + customer_display_view(item,"add"); + } show_item_detail(item_data,"add_icon"); calculate_sub_total(); }); //End Add Icon Click @@ -922,7 +927,9 @@ console.log(d_option) window.location.href = "/origami/room/" + table_id } } - customer_display_view(null,"reload"); + if ($('#server_mode').val() != "cloud") { + customer_display_view(null,"reload"); + } } }); // }else{ diff --git a/app/controllers/origami/dinga_controller.rb b/app/controllers/origami/dinga_controller.rb index 586403f9..87caddfa 100644 --- a/app/controllers/origami/dinga_controller.rb +++ b/app/controllers/origami/dinga_controller.rb @@ -86,11 +86,12 @@ def create # saleObj = Sale.find(sale_id) sale_payment = SalePayment.new - status, @sale = sale_payment.process_payment(saleObj, @user, cash, "dinga",account_no) - if status == true + status, @sale,@membership_data = sale_payment.process_payment(saleObj, @user, cash, "dinga",account_no) + + if status == true && @membership_data["status"] == true @out = true, "Success!" else - @out =false, "Please try again payment!" + @out =false, @membership_data["message"] end end end diff --git a/app/controllers/origami/paymal_controller.rb b/app/controllers/origami/paymal_controller.rb index 1321cf87..e9d3cb6c 100644 --- a/app/controllers/origami/paymal_controller.rb +++ b/app/controllers/origami/paymal_controller.rb @@ -88,11 +88,11 @@ def create # saleObj = Sale.find(sale_id) sale_payment = SalePayment.new - status, @sale = sale_payment.process_payment(saleObj, @user, cash, "paymal",account_no) - if status == true + status, @sale,@membership_data = sale_payment.process_payment(saleObj, @user, cash, "paymal",account_no) + if status == true && @membership_data["status"] == true @out = true, "Success!" else - @out =false, "Please try again payment!" + @out =false, @membership_data["message"] end end end diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb index cff7887c..a86fb9b2 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') + @tax_profiles = TaxProfile.order('order_by asc').limit(2) @from = from @to = to # get printer info diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 3dba0a9b..5f372581 100755 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -23,6 +23,7 @@ class SalePayment < ApplicationRecord if (amount_due >= 0) payment_status = false + membership_data = nil #route to payment type case payment_method when "cash" @@ -52,11 +53,11 @@ class SalePayment < ApplicationRecord when "foc" payment_status = foc_payment when "paymal" - payment_status = paymal_payment + payment_status,membership_data = paymal_payment when "JunctionPay" payment_status = junction_pay_payment when "dinga" - payment_status = dinga_payment + payment_status,membership_data = dinga_payment else puts "it was something else" end @@ -73,7 +74,7 @@ class SalePayment < ApplicationRecord end end - return true, self.save + return true, self.save,membership_data else #record an payment in sale-audit # remark = "No outstanding Amount - Grand Total [#{invoice.grand_total}] | Due [#{amount_due}] | Paid [#{invoice.amount_received}]" @@ -430,7 +431,7 @@ class SalePayment < ApplicationRecord sale_update_payment_status(0) end - return payment_status + return payment_status,membership_data end def junction_pay_payment @@ -480,7 +481,7 @@ class SalePayment < ApplicationRecord sale_update_payment_status(0) end - return payment_status + return payment_status,membership_data end diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 235e958a..4b9a94c2 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -490,11 +490,13 @@
<% end %> - + " id="server_mode"> + + diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb index 51481148..28d6a4d8 100755 --- a/app/views/origami/jcb/index.html.erb +++ b/app/views/origami/jcb/index.html.erb @@ -200,8 +200,7 @@ $('#jcb_pay').on('click',function(){ var receipt_no = "<%= @receipt_no %>"; var bank_integration = "<%= @bank_integration %>"; $("#reference_no_Err").html(""); - if(reference_no.length > 0){ - if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){ + if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){ $(this).off("click"); //start member discount 5% by pay card // var sub_total = $('#sub-total').text(); @@ -247,8 +246,5 @@ $('#jcb_pay').on('click',function(){ swal ( "Oops" , "Enter Amount!" , "error" ); } } - }else{ - $("#reference_no_Err").html("can't be blank"); - } }) diff --git a/app/views/origami/master/index.html.erb b/app/views/origami/master/index.html.erb index 38237f1a..301452b8 100755 --- a/app/views/origami/master/index.html.erb +++ b/app/views/origami/master/index.html.erb @@ -198,7 +198,6 @@ var receipt_no = "<%= @receipt_no %>"; var bank_integration = "<%= @bank_integration %>"; $("#reference_no_Err").html(""); - if(reference_no.length > 0){ if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){ $(this).off("click"); @@ -245,8 +244,5 @@ swal ( "Oops" , "Enter Amount!" , "error" ); } } - }else{ - $("#reference_no_Err").html("can't be blank"); - } }) diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb index f0115c0e..3edb1f7a 100755 --- a/app/views/origami/mpu/index.html.erb +++ b/app/views/origami/mpu/index.html.erb @@ -204,9 +204,8 @@ var bank_integration = "<%= @bank_integration %>"; var cashier_type = "<%= @cashier_type %>"; $("#reference_no_Err").html(""); - if(reference_no.length > 0){ - if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){ - $(this).off("click"); + if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){ + $(this).off("click"); //start member discount 5% by pay card // var sub_total = $('#sub-total').text(); // var member_id = $('#membership_id').text(); @@ -244,15 +243,12 @@ }); } - }else{ - if (amount>0) { - swal ( "Oops" , "Paid Amount is over!" , "error" ); - }else{ - swal ( "Oops" , "Enter Amount!" , "error" ); - } - } - }else{ - $("#reference_no_Err").html("can't be blank"); + }else{ + if (amount>0) { + swal ( "Oops" , "Paid Amount is over!" , "error" ); + }else{ + swal ( "Oops" , "Enter Amount!" , "error" ); + } } }) diff --git a/app/views/origami/unionpay/index.html.erb b/app/views/origami/unionpay/index.html.erb index 250f97d1..73b7001c 100755 --- a/app/views/origami/unionpay/index.html.erb +++ b/app/views/origami/unionpay/index.html.erb @@ -202,7 +202,6 @@ var receipt_no = "<%= @receipt_no %>"; $("#reference_no_Err").html(""); - if(reference_no.length > 0){ if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){ $(this).off("click"); //start member discount 5% by pay card @@ -250,8 +249,5 @@ swal ( "Oops" , "Enter Amount!" , "error" ); } } - }else{ - $("#reference_no_Err").html("can't be blank"); - } }) diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb index 52d14c4b..a03a886b 100755 --- a/app/views/origami/visa/index.html.erb +++ b/app/views/origami/visa/index.html.erb @@ -201,9 +201,8 @@ var receipt_no = "<%= @receipt_no %>"; console.log(amount); console.log($("#validamount").attr("value")); - $("#reference_no_Err").html(""); - if(reference_no.length > 0){ - if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){ + $("#reference_no_Err").html(""); + if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){ $(this).off("click"); //start member discount 5% by pay card // var sub_total = $('#sub-total').text(); @@ -244,14 +243,11 @@ }); } }else{ - if (amount>0) { - swal ( "Oops" , "Paid Amount is over!" , "error" ); - }else{ - swal ( "Oops" , "Enter Amount!" , "error" ); - } + if (amount>0) { + swal ( "Oops" , "Paid Amount is over!" , "error" ); + }else{ + swal ( "Oops" , "Enter Amount!" , "error" ); } - }else{ - $("#reference_no_Err").html("can't be blank"); } }); From 9aabed8ad54e34d35361bf8a68d5b59a9e44ac1c Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 26 Apr 2018 17:36:59 +0630 Subject: [PATCH 06/24] update screte..yml --- config/secrets.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/secrets.yml b/config/secrets.yml index b0d7c5c8..2768d134 100755 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -12,8 +12,8 @@ development: secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61 - sx_provision_url: https://connect.pos-myanmar.com/bensai/api #connect.smartsales.dev/api #connect.smartsales.asia/api #provision.zsai.ws/api - server_mode: cloud + sx_provision_url: connect.pos-myanmar.com/api #connect.smartsales.dev/api #connect.smartsales.asia/api #provision.zsai.ws/api + server_mode: application cipher_type: AES-256-CBC sx_key: Wh@t1$C2L @@ -24,7 +24,7 @@ test: # instead read values from the environment. production: secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22 - sx_provision_url: https://connect.pos-myanmar.com/api #192.168.1.147:3002/api + sx_provision_url: connect.pos-myanmar.com/api #192.168.1.147:3002/api server_mode: application cipher_type: AES-256-CBC sx_key: Wh@t1$C2L From eb61e949092f7af0140295f63ae5f77abc25257c Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 27 Apr 2018 10:39:29 +0630 Subject: [PATCH 07/24] update addorder get menu and sub menu --- app/assets/javascripts/addorder.js | 17 ++++++++++++----- app/controllers/origami/addorders_controller.rb | 2 ++ app/models/menu_category.rb | 8 ++++++++ app/views/origami/addorders/detail.html.erb | 6 +++--- 4 files changed, 25 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index b45b6402..f38f04a0 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -101,6 +101,13 @@ $(function() { var menu_id = $(this).attr("data-id"); var url = "get_menu_category/"+menu_id; show_menu_item_list(url); + + var sub_id = $(this).attr("data-sub-id"); + if (sub_id) { + var sub_url = "get_menu_sub_category/"+menu_id; + sub_category = $(this).find('.sub_category_list'); + show_sub_category_list(sub_url,sub_category); + } }); //End menu category Click @@ -1232,7 +1239,7 @@ console.log(d_option) //click menu sidebar menu category - $(document).on('click', '.sub_click', function(event){ + $(document).on('click', '.sub_clickssss', function(event){ event.preventDefault(); var menu_id = $(this).attr("data-id"); var url = "get_menu_sub_category/"+menu_id; @@ -1267,11 +1274,11 @@ console.log(d_option) data = data.sub_category; if (data.length>0) { - if ((sub_category.hasClass('hidden'))) { + // if ((sub_category.hasClass('hidden'))) { $(sub_category).removeClass('hidden'); - }else{ - $(sub_category).addClass('hidden'); - } + // }else{ + // $(sub_category).addClass('hidden'); + // } for(var i in data) { diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index 100635cd..0c149f0a 100755 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -23,6 +23,8 @@ class Origami::AddordersController < BaseOrigamiController day = Date.today.wday @menus = Menu.all @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') + puts "ssssssssssssssssssssssss" + puts @menu.to_json @table_id = params[:id] @table = DiningFacility.find(@table_id) @booking = @table.get_booking diff --git a/app/models/menu_category.rb b/app/models/menu_category.rb index 7fb23647..6440444a 100755 --- a/app/models/menu_category.rb +++ b/app/models/menu_category.rb @@ -78,6 +78,14 @@ class MenuCategory < ApplicationRecord end end + def get_sub_category + menu_category = MenuCategory.find_by_menu_category_id(self.id) + if menu_category + return true + end + return false + end + private # def generate_menu_category_code diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 4b9a94c2..fd823182 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -46,7 +46,7 @@ <% if type %> <% if !menu.code.include? "SPL" %> -
  • +
  • <%= menu.name%>
    • - - - - -
    -
    -
    -
    -
    - - <% @menu.each do |menu| %> - <% if !menu.valid_time.nil? %> - <% if menu.menu_category_id.nil? %> - - <% if type %> - <% if !menu.code.include? "SPL" %> -
    -
    -

    <%=menu.name%>

    -

    <%=menu.code%>

    -

    -
    - <% end%> - - <% else %> - <% if @table.get_current_checkout_booking.nil? %> - <% if !menu.code.include? "SPL" %> -
    -
    -

    <%=menu.name%>

    -

    <%=menu.code%>

    -

    -
    - <% end%> - <% else %> -
    -
    -

    <%=menu.name%>

    -

    <%=menu.code%>

    -

    -
    - <% end%> - - <% end %> - <% end%> <% end %> - <%end %> + <% end%> + <% end %> + <%end %> +
    +
    +
    - - - -
    - - <% if type && modify_order%> - - - - - <%elsif !modify_order && type%> - - - + Back + + + + + <%elsif !modify_order && type%> + + + - Select - + Select + - <%else%> - - <%end%> + <%else%> + + <%end%>
    -
    - <% if type %> +
    + <% if type %>
    -
    - ORDER DETAILS -
    +
    + ORDER DETAILS +
    + + <% if modify_order %> + <% if @table.nil? %> +
    Table :
    + + + <% else%> +
    Table : <%=@table.name%>
    + + + <% end%> + + + + + +
    + +
    + <% else%> + +
    - <% if modify_order %> - <% if @table.nil? %> -
    Table :
    - - - <% else%> -
    Table : <%=@table.name%>
    - - - <% end%> - - - - - <% else%> - - <% end%>
    +
    + +
    + <% end%> + + +
    <% else %> -
    - ORDER DETAILS | Table-<%=@table.name%> +
    +
    + ORDER DETAILS | Table-<%=@table.name%> + + -
    - <% end%> - -
    -
    -
    - - - - - - - - - - - - -
    #ItemsQTYPrice
    -
    -
    - - - - - - - - -
    Total:0.00
    - <% if type && modify_order%> - - - - <%elsif !modify_order && type%> - - <% if current_user.role != "waiter"%> - - - <%end%> - <% if current_user.role == "waiter"%> - - <%end%> - <%else%> - - <%end%> +
    +
    + +
    + <% end%> - -
    -
    -
    +
    +
    +
    + + + + + + + + + + - - +
    #ItemsQTYPrice
    +
    +
    + + + + + + + + +
    Total:0.00
    + <% if type && modify_order%> + + + + <%elsif !modify_order && type%> + + <% if current_user.role != "waiter"%> + + + <%end%> + <% if current_user.role == "waiter"%> + + <%end%> + <%else%> + + <%end%> + + +
    +
    +
    + + +