diff --git a/app/assets/javascripts/channels/check_new_order.js b/app/assets/javascripts/channels/check_new_order.js index 5bd64013..08872705 100644 --- a/app/assets/javascripts/channels/check_new_order.js +++ b/app/assets/javascripts/channels/check_new_order.js @@ -34,6 +34,9 @@ App.check_new_order = App.cable.subscriptions.create('CheckNewOrderChannel', { swal.close(); } }); + // $("#notify_new_orderLabel").text("You have new orders."); + // $("#notify_new_orderBody").text("Are you accept or reject for these orders "+order_lists+"?"); + // $("#notify_new_order").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..53fa23af 100644 --- a/app/assets/javascripts/channels/check_order_ready_to_delivery.js +++ b/app/assets/javascripts/channels/check_order_ready_to_delivery.js @@ -34,6 +34,10 @@ App.check_order_ready_to_delivery = App.cable.subscriptions.create('CheckOrderRe swal.close(); } }); + + // $("#notify_order_ready_to_deliveryLabel").text("You have orders that are ready to deliver."); + // $("#notify_order_ready_to_deliveryBody").text("Could you ready these orders "+order_lists+" to deliver?"); + // $("#notify_order_ready_to_delivery").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..82e107ee 100644 --- a/app/assets/javascripts/channels/check_order_send_to_kitchen.js +++ b/app/assets/javascripts/channels/check_order_send_to_kitchen.js @@ -34,6 +34,9 @@ App.check_order_send_to_kitchen = App.cable.subscriptions.create('CheckOrderSend swal.close(); } }); + // $("#notify_order_send_to_kitchenLabel").text("You have to send order to kitchen."); + // $("#notify_order_send_to_kitchenBody").text("Could you send these orders "+order_lists+" to kitchen?"); + // $("#notify_order_send_to_kitchen").modal({show: true, keyboard: false, backdrop: false}); } } }); diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js index 07eab9e1..942ef3cf 100644 --- a/app/assets/javascripts/order_reservation.js +++ b/app/assets/javascripts/order_reservation.js @@ -294,6 +294,8 @@ function showNewOrder(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 audio = new Audio('/beep-07.wav'); // define your audio + audio.play(); swal({ html: true, title: 'Information', diff --git a/app/controllers/reports/order_reservation_controller.rb b/app/controllers/reports/order_reservation_controller.rb index fb9517e4..22c408fe 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",''], ["food2u","food2u"], ["Self Pick-Up","pick_up"], ["Ygndoor2door","ygndoor2door"], ["Direct Delivery","direct_delivery"]] 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] + @sale_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/models/order_reservation.rb b/app/models/order_reservation.rb index f4f610fc..8ea716c2 100644 --- a/app/models/order_reservation.rb +++ b/app/models/order_reservation.rb @@ -237,6 +237,34 @@ class OrderReservation < ApplicationRecord 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.joins(" JOIN deliveries on deliveries.order_reservation_id = order_reservations.order_reservation_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/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb index ea3a7b61..7820c3bb 100644 --- a/app/views/layouts/_left_sidebar.html.erb +++ b/app/views/layouts/_left_sidebar.html.erb @@ -132,6 +132,9 @@
  • Product Sale
    • +
  • + Order Reservation +
  • Receipt
    • diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb index 34664428..150c4ee9 100644 --- a/app/views/origami/order_reservation/index.html.erb +++ b/app/views/origami/order_reservation/index.html.erb @@ -409,6 +409,66 @@ + +
    diff --git a/app/views/reports/order_reservation/_shift_sale_report_filter.html.erb b/app/views/reports/order_reservation/_shift_sale_report_filter.html.erb index a1db6824..737325db 100755 --- a/app/views/reports/order_reservation/_shift_sale_report_filter.html.erb +++ b/app/views/reports/order_reservation/_shift_sale_report_filter.html.erb @@ -18,10 +18,10 @@ - <% if defined? payments %> + <% if defined? provider %>
    - <%= select_tag "payment_type", options_for_select(@payments, :selected => params[:payment_type]), :class => "form-control" %> + <%= select_tag "provider", options_for_select(@providers, :selected => params[:provider]), :class => "form-control" %>
    <% end %>
    @@ -56,28 +56,8 @@ var url = $('#custom_excel').attr('data-url'); $('#frm_report').attr('action',url) $('#frm_report').submit(); - // window.location = url; - }); - - var item = $('#item').val(); - var payment_type = $('#payment_type'); - - if(item == 'order'){ - $('#cashier').hide(); - $('#waiter').show(); - if(payment_type){ - $('#payment_type').hide(); - } - } - else if(item == 'sale'){ - $('#waiter').hide(); - $('#cashier').show(); - } - else{ - $('#waiter').hide(); - $('#cashier').show(); - $("#item").val('sale'); - } + // window.location = url; + }); }); <% if params[:shift_name].to_i > 0%> @@ -91,7 +71,6 @@ $("#from").val("<%=params[:from] rescue '-'%>"); $("#to").val("<%=params[:to] rescue '-'%>"); $("#sel_period").val(<%=params[:period] rescue '-'%>); - $("#sel_sale_type").val(<%=params[:sale_type] rescue '-'%>); // shift = $(".shift-id").text() // if (shift.length>0) { // $('.shift_name > option[value="'+shift+'"]').attr('selected','selected'); @@ -105,24 +84,4 @@ $(".btn-group button").removeClass("active"); <% report_type = params[:report_type].blank? ? "0" : params[:report_type] %> $("#btn_report_type_<%= report_type %>").addClass("active"); - - $('#item').change(function(){ - var item = $('#item').val(); - var payment_type = $('#payment_type'); - - if(item == 'sale'){ - $('#waiter').hide(); - $('#cashier').show(); - if(payment_type){ - $('#payment_type').show(); - } - } - else{ - $('#cashier').hide(); - $('#waiter').show(); - if(payment_type){ - $('#payment_type').hide(); - } - } - }); diff --git a/app/views/reports/order_reservation/index.html.erb b/app/views/reports/order_reservation/index.html.erb index 567b056b..459a9e58 100755 --- a/app/views/reports/order_reservation/index.html.erb +++ b/app/views/reports/order_reservation/index.html.erb @@ -1,7 +1,7 @@
    1. <%= t("views.right_panel.button.home") %>
      2. -
    2. <%= t("views.right_panel.detail.receipt_no_report") %>
      3. +
    3. <%= t("views.right_panel.detail.order_reservation_report") %>
      4. <%= link_to 'Back', dashboard_path %> @@ -42,102 +42,11 @@ <% end %> - <%= t("views.right_panel.detail.receipt_no") %> - <%= t :cashier %> <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %> - <%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %> - <% @tax_profiles.each do |tax| %> - <%= tax.name %> - <% end %> - - <%= t("views.right_panel.detail.grand_total") %> - <%= t("views.right_panel.detail.rnd_adj_sh") %> - <%= t("views.right_panel.detail.grand_total") %> +
      - <%= t("views.right_panel.detail.rnd_adj_sh") %> - + - <% if @print_settings.precision.to_i > 0 - precision = @print_settings.precision - else - precision = 0 - end - #check delimiter - if @print_settings.delimiter - delimiter = "," - else - delimiter = "" - end - - puts precision - puts "predelidm" - puts delimiter %> - - <% grand_total = 0 %> - <% old_grand_total = 0 %> - <% total_tax = 0 %> - <% guest_count = 0 %> - <% total_sum = 0 %> - <% discount_amt = 0 %> - <% other_amt = 0 %> - <% total_nett = 0 %> - <% rounding_adj = 0%> <% gov_tax = 0 %> <% service_charge = 0 %> - <%if @sale_data %> - <% @sale_data.each do |result| %> - - <% grand_total = grand_total.to_f + result.grand_total.to_f %> - <% old_grand_total = old_grand_total.to_f + result.old_grand_total.to_f %> - <% total_tax += result.total_tax.to_f %> - <% total_sum += result.total_amount.to_f %> - <% discount_amt += result.total_discount.to_f %> - <% rounding_adj += result.rounding_adjustment.to_f %> - - - - <%= result.receipt_no rescue '-' %> - <%= result.cashier_name rescue '-' %> - <%= number_with_precision(result.total_amount, precision: precision.to_i ,delimiter: delimiter) %> - <%= number_with_precision(result.total_discount, precision: precision.to_i ,delimiter: delimiter) %> - <%if result.customer.customer_type == "Takeaway"%> - <%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %> - <%end%> - <% result.sale_taxes.each do |tax| %> - <%= number_with_precision(tax.tax_payable_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %> - <%end%> - - <%= number_with_precision(result.grand_total, precision: precision.to_i ,delimiter: delimiter) %> - <%= result.rounding_adjustment.to_f rescue '-' %> - <%= number_with_precision(result.grand_total_after_rounding(), precision: precision.to_i ,delimiter: delimiter) rescue '-' %> - - - <% end %> - -   - <%= number_with_precision(total_sum, precision: precision.to_i ,delimiter: delimiter) rescue '-' %> - <%= number_with_precision(discount_amt, precision: precision.to_i ,delimiter: delimiter) rescue '-' %> - <% @sale_taxes.each do |tax| %> - <%= number_with_precision(tax.st_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %> - <% end %> - <%= number_with_precision(grand_total.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %> - <%= rounding_adj.to_f rescue '-' %> - <%= number_with_precision(grand_total.to_f.round + rounding_adj, precision: precision.to_i ,delimiter: delimiter) %> - - -   - <%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %> - <%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %> - - <% @tax_profiles.each do |tax| %> - <%= tax.name %> - <% end %> - <%= t("views.right_panel.detail.grand_total") %> - <%= t("views.right_panel.detail.rnd_adj_sh") %> - <%= t("views.right_panel.detail.grand_total") %> +
      - <%= t("views.right_panel.detail.rnd_adj_sh") %> - - - <%end%> +
    @@ -151,9 +60,7 @@ var check_arr = []; search_by_period(); $('#sel_period').change(function(){ - search_by_period(); - }); function search_by_period(){ @@ -216,7 +123,7 @@ from = $("#from").val(); to = $("#to").val(); } - url = '<%= reports_get_shift_by_date_path %>'; + url = '<%= reports_get_shift_by_order_reservation_path %>'; $.get(url, {period :period, period_type :period_type, from :from, to :to, report_type :shift_item} , function(data){ diff --git a/config/locales/en.yml b/config/locales/en.yml index cdce1df7..45e3d3fb 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -470,6 +470,7 @@ en: adult: "Adult" foreigner: "Foreigner" local: "Local" + order_reservation_report: "Order Reservation" code_txt: "code " charge_txt: "charge" diff --git a/config/locales/mm.yml b/config/locales/mm.yml index aba51ed5..6c0d36a1 100644 --- a/config/locales/mm.yml +++ b/config/locales/mm.yml @@ -464,6 +464,7 @@ mm: adult: "လူကြီး" foreigner: "နိုင်ငံခြားသား" local: "နိုင်ငံသား" + order_reservation_report: "ၾကိဳတင္ order မွာယူျခင္း" code_txt: "ကုတ်ဒ် " charge_txt: "ကောက်ခံသည်" diff --git a/config/routes.rb b/config/routes.rb index 0f329c95..ce5d44a5 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -445,6 +445,7 @@ scope "(:locale)", locale: /en|mm/ do resources :order_reservation, :only => [:index, :show] get "saleitem/get_shift_by_date", to: "saleitem#show", as: "get_shift_by_sale_item" get "receipt_no/get_shift_by_date", to: "receipt_no#get_shift_by_date", as: "get_shift_by_date" + get "order_reservation/get_shift_by_date", to: "order_reservation#show", as: "get_shift_by_order_reservation" end diff --git a/public/beep-07.wav b/public/beep-07.wav new file mode 100644 index 00000000..015e1f64 Binary files /dev/null and b/public/beep-07.wav differ