From d800a5d28d5165598e6d68c4a60c69131b8d0c29 Mon Sep 17 00:00:00 2001 From: phyusin Date: Thu, 12 Apr 2018 11:11:51 +0630 Subject: [PATCH 01/39] license --- config/initializers/action_controller.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/initializers/action_controller.rb b/config/initializers/action_controller.rb index 802324cf..2facee87 100644 --- a/config/initializers/action_controller.rb +++ b/config/initializers/action_controller.rb @@ -20,11 +20,11 @@ class ActionController::Base end else #check for license file - # if check_license - # current_license(ENV["SX_PROVISION_URL"]) - # else - # redirect_to activate_path - # end + if check_license + current_license(ENV["SX_PROVISION_URL"]) + else + redirect_to activate_path + end end end From a009f359fadb2cec92c0e5cc00ef62602383a8b2 Mon Sep 17 00:00:00 2001 From: San Wai Lwin Date: Wed, 18 Apr 2018 14:44:25 +0630 Subject: [PATCH 02/39] update puma production --- config/puma.rb | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) delete mode 100755 config/puma.rb diff --git a/config/puma.rb b/config/puma.rb deleted file mode 100755 index c8e0145e..00000000 --- a/config/puma.rb +++ /dev/null @@ -1,48 +0,0 @@ -# Puma can serve each request in a thread from an internal thread pool. -# The `threads` method setting takes two numbers a minimum and maximum. -# Any libraries that use thread pools should be configured to match -# the maximum value specified for Puma. Default is set to 5 threads for minimum -# and maximum, this matches the default thread size of Active Record. -# -threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }.to_i -threads threads_count, threads_count - -# Specifies the `port` that Puma will listen on to receive requests, default is 3000. -# -port ENV.fetch("PORT") { 3000 } - -# Specifies the `environment` that Puma will run in. -# -environment ENV.fetch("RAILS_ENV") { "development" } - -# Specifies the number of `workers` to boot in clustered mode. -# Workers are forked webserver processes. If using threads and workers together -# the concurrency of the application would be max `threads` * `workers`. -# Workers do not work on JRuby or Windows (both of which do not support -# processes). -# -# workers ENV.fetch("WEB_CONCURRENCY") { 2 } - -# Use the `preload_app!` method when specifying a `workers` number. -# This directive tells Puma to first boot the application and load code -# before forking the application. This takes advantage of Copy On Write -# process behavior so workers use less memory. If you use this option -# you need to make sure to reconnect any threads in the `on_worker_boot` -# block. -# -# preload_app! - -# The code in the `on_worker_boot` will be called if you are using -# clustered mode by specifying a number of `workers`. After each worker -# process is booted this block will be run, if you are using `preload_app!` -# option you will want to use this block to reconnect to any threads -# or connections that may have been created at application boot, Ruby -# cannot share connections between processes. -# -# on_worker_boot do -# ActiveRecord::Base.establish_connection if defined?(ActiveRecord) -# end - -# Allow puma to be restarted by `rails restart` command. - -plugin :tmp_restart From 924edd823a96221c707d7637981342996ef36689 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Thu, 19 Apr 2018 10:49:58 +0630 Subject: [PATCH 03/39] update shift_sale migration file and secret yml --- config/secrets.yml | 2 +- db/migrate/20170626191519_create_shift_sales.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/secrets.yml b/config/secrets.yml index 6e8b73d4..b0d7c5c8 100755 --- a/config/secrets.yml +++ b/config/secrets.yml @@ -24,7 +24,7 @@ test: # instead read values from the environment. production: secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22 - sx_provision_url: connect.smartsales.asia/api #192.168.1.147:3002/api + sx_provision_url: https://connect.pos-myanmar.com/api #192.168.1.147:3002/api server_mode: application cipher_type: AES-256-CBC sx_key: Wh@t1$C2L diff --git a/db/migrate/20170626191519_create_shift_sales.rb b/db/migrate/20170626191519_create_shift_sales.rb index f18a2c1c..bd19a8cf 100755 --- a/db/migrate/20170626191519_create_shift_sales.rb +++ b/db/migrate/20170626191519_create_shift_sales.rb @@ -21,7 +21,7 @@ class CreateShiftSales < ActiveRecord::Migration[5.1] t.integer :dining_count, :default => 0 t.integer :takeaway_count, :default => 0 t.integer :member_count, :default => 0 - t.decimal :total_rounding,, :precision => 10, :scale => 2, :null => false, :default => 0.00 + t.decimal :total_rounding, :precision => 10, :scale => 2, :null => false, :default => 0.00 t.integer :total_receipt, :default => 0 t.decimal :total_void, :default => 0 t.timestamps From c6f654808ce22b9a44f3b2c7b26cfc831c9aa6fd Mon Sep 17 00:00:00 2001 From: phyusin Date: Fri, 4 May 2018 14:09:58 +0630 Subject: [PATCH 04/39] add dine-in cashier settings in lookups --- README.md | 4 ++++ app/controllers/origami/dashboard_controller.rb | 7 +++++++ app/controllers/origami/order_reservation_controller.rb | 2 +- app/models/order_reservation.rb | 5 +++-- app/views/origami/dashboard/index.html.erb | 2 ++ 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0605a14a..dfebed49 100755 --- a/README.md +++ b/README.md @@ -188,6 +188,10 @@ 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 Dine-in Cashier + ** '0' means can not use dine-in cashier and '1' means can use dine-in cashier ** + => settings/lookups => { type:dinein_cashier, name: DineInCashier, value:'{0 or 1}' } + 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}' } diff --git a/app/controllers/origami/dashboard_controller.rb b/app/controllers/origami/dashboard_controller.rb index 8bdd5c27..027b89a5 100644 --- a/app/controllers/origami/dashboard_controller.rb +++ b/app/controllers/origami/dashboard_controller.rb @@ -56,6 +56,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 diff --git a/app/controllers/origami/order_reservation_controller.rb b/app/controllers/origami/order_reservation_controller.rb index 12a3ee2f..32f0e63d 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.latest_order + @order = OrderReservation.latest_order #.active @count_on_order = OrderReservation.get_count_on_order end diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb index e5b95f8c..f4f610fc 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" @@ -218,7 +219,7 @@ class OrderReservation < ApplicationRecord def self.check_order_send_to_kitchen today = Time.now.utc - order_reservation = OrderReservation.where("status='accepted' and requested_time > '#{today}'") + order_reservation = OrderReservation.where("status='accepted' and requested_time > '#{today}' and expected_waiting_time < '#{today}'") if order_reservation.length > 0 if ENV["SERVER_MODE"] == 'cloud' ActionCable.server.broadcast "check_order_send_to_kitchen_channel",data: order_reservation @@ -228,7 +229,7 @@ class OrderReservation < ApplicationRecord def self.check_order_ready_to_delivery today = Time.now.utc - order_reservation = OrderReservation.where("status='send_to_kitchen' and requested_time > '#{today}'") + order_reservation = OrderReservation.where("status='send_to_kitchen' and requested_time > '#{today}' and expected_waiting_time < '#{today}'") if order_reservation.length > 0 if ENV["SERVER_MODE"] == 'cloud' ActionCable.server.broadcast "check_order_ready_to_delivery_channel",data: order_reservation diff --git a/app/views/origami/dashboard/index.html.erb b/app/views/origami/dashboard/index.html.erb index b6b36427..bbb19c78 100644 --- a/app/views/origami/dashboard/index.html.erb +++ b/app/views/origami/dashboard/index.html.erb @@ -28,6 +28,7 @@ <% end %> + <% if @dinein_cashier == '1' %>
@@ -36,6 +37,7 @@
<%= t :dine_in_cashier %>
+ <% end %> <% if @order_reservation == '1' %>
From 727070a1b8c9823d9863170dfcc612b85d545f05 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 4 May 2018 14:19:17 +0630 Subject: [PATCH 05/39] update void access code --- .../origami/addorders_controller.rb | 3 - app/views/origami/addorders/detail.html.erb | 80 ++++++------ app/views/origami/sales/show.html.erb | 120 +++++++++++++++++- 3 files changed, 156 insertions(+), 47 deletions(-) diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index 100635cd..a9820011 100755 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -18,9 +18,6 @@ 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') @table_id = params[:id] diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 5f451408..241fe79c 100644 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -43,46 +43,46 @@ Products <% @menu.each do |menu| %> - <% if !menu.valid_time.nil? %> - <% if menu.menu_category_id.nil? %> - - <% if type %> - <% if !menu.code.include? "SPL" %> -
  • - - <%= menu.name%> - - -
    • - <% end%> - - <% else %> - <% if @table.get_current_checkout_booking.nil? %> - <% if !menu.code.include? "SPL" %> -
  • - - <%= menu.name%> - - -
    • - <% end%> - <% else %> -
  • - - <%= menu.name%> - - -
    • - <% end%> - - <% end %> - <% end%> - <% end %> - <%end %> - + <% if !menu.valid_time.nil? %> + <% if menu.menu_category_id.nil? %> + + <% if type %> + <% if !menu.code.include? "SPL" %> +
  • + + <%= menu.name%> + + +
    • + <% end%> + + <% else %> + <% if @table.get_current_checkout_booking.nil? %> + <% if !menu.code.include? "SPL" %> +
  • + + <%= menu.name%> + + +
    • + <% end%> + <% else %> +
  • + + <%= menu.name%> + + +
    • + <% end%> + + <% end %> + <% end%> + <% end %> + <%end %> +
    diff --git a/app/views/origami/sales/show.html.erb b/app/views/origami/sales/show.html.erb index 0eaabce1..d5c47376 100755 --- a/app/views/origami/sales/show.html.erb +++ b/app/views/origami/sales/show.html.erb @@ -198,13 +198,74 @@
    - <% if @sale.sale_status != 'void' %> - - <% end %> + <% if @sale.sale_status != 'void' %> + <% if current_login_employee.role == "cashier" %> + Void + <% else %> + + <% end %> + <% end %>
    + + + + From ddc759926b346951d0a61dd3db5ec08092ff7efa Mon Sep 17 00:00:00 2001 From: phyusin Date: Fri, 4 May 2018 16:52:18 +0630 Subject: [PATCH 09/39] check sale_status for split bill --- app/controllers/origami/split_bill_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 From d0b14cf81b44e3bffbfdc97ee7439467d9ec04f1 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 4 May 2018 18:10:00 +0630 Subject: [PATCH 10/39] update access code in spereat view --- .../origami/addorders_controller.rb | 1 + .../origami/sale_edit_controller.rb | 2 + app/views/origami/home/show.html.erb | 2 +- app/views/origami/rooms/show.html.erb | 72 ++++++++++++++- .../origami/table_invoices/show.html.erb | 88 ++++++++++++++++++- 5 files changed, 159 insertions(+), 6 deletions(-) diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index a9820011..15d896e6 100755 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -20,6 +20,7 @@ class Origami::AddordersController < BaseOrigamiController end @menus = Menu.all @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') + @table_id = params[:id] @table = DiningFacility.find(@table_id) @booking = @table.get_booking diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb index 1c5b5430..0b3b989d 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] diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index a3e26d8d..8fa42403 100755 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -1116,7 +1116,7 @@ if (result.status == true) { createAccessCode(code); if (type == "edit") { - var dining_id = "<%= @dining.id %>"; + var dining_id = "<%= @dining.id rescue "" %> "; var sale_id = "<%= @obj_sale.sale_id rescue "" %>"; window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/"+cashier_type +"/edit"; }else if(type == "void"){ diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index bf01647e..fb3d9a75 100755 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -452,8 +452,13 @@ <% if current_login_employee.role != "waiter" %> + <% if current_login_employee.role == "cashier" %> + Edit + Void + <% else %> - " id="server_mode"> \ No newline at end of file diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 8fa42403..f7f51aa6 100755 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -1010,7 +1010,27 @@ $('#add_order').on('click', function () { var dining_id = "<%= @dining.id %>"; - window.location.href = '/origami/addorders/' + dining_id; + var menus = JSON.parse(localStorage.getItem("menus")); + var menu_arr = []; + if (menus != null) { + for(var i in menus) { + var arr = {}; + arr.id = menus[i]["id"]; + arr.name = menus[i]["name"]; + menu_arr.push(arr); + } + } + menu_arr = JSON.stringify(menu_arr); + console.log(menu_arr) + $.ajax({ + type: 'POST', + data: {menus: menu_arr}, + url: '/origami/addorders/' + dining_id, + success: function(data) { + + } + }); + //window.location.href = '/origami/addorders/' + dining_id+'/'+data; }); /* check in process */ diff --git a/config/routes.rb b/config/routes.rb index 0f329c95..071f6aa1 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -97,6 +97,7 @@ scope "(:locale)", locale: /en|mm/ do post '/check_emp_access_code/:code' => 'home#check_emp_access_code', :defaults => { :format => 'json' } get "dashboard" => "dashboard#index" + get "get_all_menu" => "dashboard#get_all_menu" get "quick_service" => "quick_service#index" @@ -237,7 +238,7 @@ scope "(:locale)", locale: /en|mm/ do get '/addorders/get_menu_sub_category/:id' => "addorders#get_menu_sub_category",:as => "get_menu_sub_category", :defaults => { :format => 'json' } get '/addorders/products/list' => "addorders#get_all_product",:as => "get_all_product", :defaults => { :format => 'json' } - get '/:addorders/:id' => "addorders#detail" + post '/:addorders/:id' => "addorders#detail", as: 'addorders_detail' post '/:addorders/create' => "addorders#create",:as => "addorder_create", :defaults => { :format => 'json' } From 42a15d302353dee09b689e9e76751f705ceafdea Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 8 May 2018 15:54:15 +0630 Subject: [PATCH 13/39] update cache menu --- .../origami/addorders_controller.rb | 15 +++---- app/views/origami/addorders/detail.html.erb | 8 ++-- app/views/origami/home/show.html.erb | 40 +++++++++---------- config/routes.rb | 2 +- 4 files changed, 30 insertions(+), 35 deletions(-) diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index e8f539c8..fd298fb3 100755 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -19,14 +19,13 @@ class Origami::AddordersController < BaseOrigamiController @webview = true end - if params[:menus].present? - @menus = JSON.parse(params[:menus], object_class: OpenStruct) - puts @menus.to_json - @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') - else + # if params[:menus].present? + # @menus = JSON.parse(params[:menus], object_class: OpenStruct) + # @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') + # else @menus = Menu.all @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') - end + # end @table_id = params[:id] @table = DiningFacility.find(@table_id) @@ -48,10 +47,6 @@ class Origami::AddordersController < BaseOrigamiController else @booking = nil end - - respond_to do |format| - format.html { redirect_to origami_addorders_detail_path } - end end def get_menu_category () diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 84c533ac..43ab6db0 100644 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -60,18 +60,18 @@ <% else %> <% if @table.get_current_checkout_booking.nil? %> <% if !menu.code.include? "SPL" %> -
  • +
  • - <%= menu.name%> + <%= menu.name%>
    • <% end%> <% else %> -
  • +
  • - <%= menu.name%> + <%= menu.name%> diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index f7f51aa6..242b5fdd 100755 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -1010,27 +1010,27 @@ $('#add_order').on('click', function () { var dining_id = "<%= @dining.id %>"; - var menus = JSON.parse(localStorage.getItem("menus")); - var menu_arr = []; - if (menus != null) { - for(var i in menus) { - var arr = {}; - arr.id = menus[i]["id"]; - arr.name = menus[i]["name"]; - menu_arr.push(arr); - } - } - menu_arr = JSON.stringify(menu_arr); - console.log(menu_arr) - $.ajax({ - type: 'POST', - data: {menus: menu_arr}, - url: '/origami/addorders/' + dining_id, - success: function(data) { + // var menus = JSON.parse(localStorage.getItem("menus")); + // var menu_arr = []; + // if (menus != null) { + // for(var i in menus) { + // var arr = {}; + // arr.id = menus[i]["id"]; + // arr.name = menus[i]["name"]; + // menu_arr.push(arr); + // } + // } + // menu_arr = JSON.stringify(menu_arr); + // console.log(menu_arr) + // $.ajax({ + // type: 'POST', + // data: {menus: menu_arr}, + // url: '/origami/addorders/' + dining_id, + // success: function(data) { - } - }); - //window.location.href = '/origami/addorders/' + dining_id+'/'+data; + // } + // }); + window.location.href = '/origami/addorders/' + dining_id; }); /* check in process */ diff --git a/config/routes.rb b/config/routes.rb index 071f6aa1..df4d4da0 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -238,7 +238,7 @@ scope "(:locale)", locale: /en|mm/ do get '/addorders/get_menu_sub_category/:id' => "addorders#get_menu_sub_category",:as => "get_menu_sub_category", :defaults => { :format => 'json' } get '/addorders/products/list' => "addorders#get_all_product",:as => "get_all_product", :defaults => { :format => 'json' } - post '/:addorders/:id' => "addorders#detail", as: 'addorders_detail' + get '/:addorders/:id' => "addorders#detail" post '/:addorders/create' => "addorders#create",:as => "addorder_create", :defaults => { :format => 'json' } From 04f05d366f1c43ace1099190da0d07f56a60a9e9 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 8 May 2018 16:38:22 +0630 Subject: [PATCH 14/39] update addorder js --- app/assets/javascripts/addorder.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 3c221a1d..af36a6e3 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -1428,8 +1428,14 @@ show_menu_list(menu_items); if (menus != null) { for(var j in menus) { var categories = menus[j]["categories"]; + console.log("categories"); + console.log(categories); for(var ii in categories) { + console.log(menu_id); + console.log(categories[ii]["parent_id"]); if (menu_id == categories[ii]["parent_id"]) { + console.log("parrrrrrrrrrrrrrrrr"); + console.log(categories[ii]["parent_id"]); var sub_category_list = $('.sub_category_list'); sub_category_list.empty(); $(sub_category).removeClass('hidden'); From 1716d14df3fc9262ad05e90ea3b51bf510bd88de Mon Sep 17 00:00:00 2001 From: phyusin Date: Tue, 8 May 2018 17:28:09 +0630 Subject: [PATCH 15/39] change order reservation --- .../javascripts/channels/check_new_order.js | 21 +- .../channels/check_order_ready_to_delivery.js | 22 +- .../channels/check_order_send_to_kitchen.js | 21 +- app/assets/javascripts/order_reservation.js | 158 ++++++--- .../order_reservation_controller.rb | 20 +- .../origami/order_reservation_controller.rb | 16 +- app/controllers/settings/menus_controller.rb | 4 +- app/models/order_reservation.rb | 53 ++- .../origami/order_reservation/index.html.erb | 306 +++++++++++++----- config/locales/en.yml | 1 + config/locales/mm.yml | 1 + 11 files changed, 430 insertions(+), 193 deletions(-) diff --git a/app/assets/javascripts/channels/check_new_order.js b/app/assets/javascripts/channels/check_new_order.js index 08872705..d0061443 100644 --- a/app/assets/javascripts/channels/check_new_order.js +++ b/app/assets/javascripts/channels/check_new_order.js @@ -18,25 +18,8 @@ App.check_new_order = App.cable.subscriptions.create('CheckNewOrderChannel', { }); // alert(order_lists); - swal({ - html: true, - title: 'Information', - target: document.getElementById('notify_new_order'), - text: "You have new orders.
    "+ - "Are you accept or reject for these orders "+order_lists+"?", - type: 'success', - timer: 1000, - closeOnConfirm: false, - closeOnCancel: false, - allowOutsideClick: false - },function(isConfirm){ - if(isConfirm){ - swal.close(); - } - }); - // $("#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}); + $("#notify_new_order_lists").text(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 53fa23af..d2bebadb 100644 --- a/app/assets/javascripts/channels/check_order_ready_to_delivery.js +++ b/app/assets/javascripts/channels/check_order_ready_to_delivery.js @@ -18,26 +18,8 @@ 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.
    "+ - "Could you ready these orders "+order_lists+" to deliver?", - type: 'success', - timer: 1000, - closeOnConfirm: false, - closeOnCancel: false, - allowOutsideClick: false - },function(isConfirm){ - if(isConfirm){ - swal.close(); - } - }); - - // $("#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}); + $("#notify_order_ready_to_delivery_lists").text(order_lists); + $("#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 82e107ee..9b83b3c6 100644 --- a/app/assets/javascripts/channels/check_order_send_to_kitchen.js +++ b/app/assets/javascripts/channels/check_order_send_to_kitchen.js @@ -18,25 +18,8 @@ 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.
    "+ - "Could you send these orders "+order_lists+" to kitchen?", - type: 'success', - timer: 1000, - closeOnConfirm: false, - closeOnCancel: false, - allowOutsideClick: false - },function(isConfirm){ - if(isConfirm){ - swal.close(); - } - }); - // $("#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}); + $("#notify_order_send_to_kitchen_lists").text(order_lists); + $("#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 942ef3cf..5ff2d0ad 100644 --- a/app/assets/javascripts/order_reservation.js +++ b/app/assets/javascripts/order_reservation.js @@ -11,6 +11,8 @@ $(function() { $(".nav-item").on("click", function(){ type = $(this).attr("data-type"); refreshDetailData(); + $('#accepted').show(); + $('#cancel').show(); if (type == "pending") { $(".first-1").click(); $('#accepted').text("ACCEPT"); @@ -27,7 +29,11 @@ $(function() { $(".fourth-1").click(); $('#accepted').text("PICK-UP"); $('#accepted').attr("data-value","completed"); - } + }else if(type == "processed"){ + $(".fifth-1").click(); + $('#accepted').hide(); + $('#cancel').hide(); + } // console.log(type); }); @@ -36,7 +42,6 @@ $(function() { $("#status").text($(this).attr("data-value")); var requested_time = $("#requested_date_time").text(); $("#requested_order_time").text(requested_time); - showTimePicker(requested_time); $("#waiting_timeModal").modal({show : true, backdrop: false, keyboard : false}); }else{ var status = $(this).attr("data-value"); @@ -48,38 +53,106 @@ $(function() { }); $("#cancel").on("click", function(){ - var status = $(this).attr("data-value"); + var order_status = $("#order_status").text(); + $("#status").text($(this).attr("data-value")); + if(order_status!="new" && order_status!= "accepted"){ + $("#AccessCodeModal").modal({show: true, backdrop: false, keyboard: false}); + }else{ + $("#rejected_reasonModal").modal({show: true, backdrop: false, keyboard: false}); + } + }); + + $(".send_status").on("click",function(){ + var status = $("#status").text(); 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 reason = $('#reject_reason').val(); + var approved_code = $("#approved_code").text(); + callback_url(callback,ref_no,order_id,status,"","","",reason,approved_code); }); - $("#save").on("click",function(){ - $("#waiting_timeErr").text(""); + $(".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 = '+'; + } + 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); - // console.log(requested_time); - // console.log(date_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; + if(type == '+'){ + requested_time.setMinutes(requested_time.getMinutes() + minutes); }else{ - var time_diff = (waiting_time.getTime() - requested_time.getTime()); - var expected_time = (Math.floor(time_diff) / 1000) / 60; - // $("#waiting_time").val(""); - // $("#waiting_timeErr").text("Expected waiting time is greater than requested time!"); + requested_time.setMinutes(requested_time.getMinutes() - minutes); + } + console.log(requested_time); + callback_url(callback,ref_no,order_id,status,type,minutes,requested_time); + }); + + $(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; } - callback_url(callback,ref_no,order_id,status,expected_time,waiting_time); }); }); +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"); @@ -96,6 +169,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"); @@ -184,6 +258,7 @@ function show_order_detail(url,sr_no){ $('#callback_url').text(data.callback_url); $('#order_id').text(data.order_reservation_id); + $("#trans_ref").text(data.transaction_ref); if(delivery.delivery_type == "service"){ $("#delivery_info").text("(DELIVERY)"); }else if(delivery.delivery_type == "pick_up"){ @@ -197,11 +272,13 @@ 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); + $("#order_status").text(data.status); if (data["receipt_no"]) { - $("#contact_info").text(data["receipt_no"]); + $("#invoice_no").text(data["receipt_no"]); }else{ - $("#contact_info").text(data["order_reservation_id"]); + $("#invoice_no").text(data["order_reservation_id"]); } } @@ -211,40 +288,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, expected_time: expected_time, remark: reason, access_code: access_code}, dataType: "json", success: function(data) { if (data.status) { @@ -294,8 +373,13 @@ 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; + //audio play var audio = new Audio('/beep-07.wav'); // define your audio - audio.play(); + // setTimeout(function(){ + // audio.loop = true; + audio.play(); + // },10000); + swal({ html: true, title: 'Information', diff --git a/app/controllers/api/order_reserve/order_reservation_controller.rb b/app/controllers/api/order_reserve/order_reservation_controller.rb index f34c0f6f..84ee8676 100644 --- a/app/controllers/api/order_reserve/order_reservation_controller.rb +++ b/app/controllers/api/order_reserve/order_reservation_controller.rb @@ -6,23 +6,27 @@ 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 = Customer.addCustomer(params) + customer_id = customer.id + end + render :json => { :status => true, :data => { :customer_id => customer_id} } + end end def create diff --git a/app/controllers/origami/order_reservation_controller.rb b/app/controllers/origami/order_reservation_controller.rb index 32f0e63d..42140f90 100644 --- a/app/controllers/origami/order_reservation_controller.rb +++ b/app/controllers/origami/order_reservation_controller.rb @@ -8,7 +8,9 @@ class Origami::OrderReservationController < BaseOrigamiController def update @id = params[:order_id] @status = params[:status] - expected_waiting_time = params[:expected_time] + expected_waiting_time = params[:expected_time] + remark = params[:remark] + access_code = params[:access_code] @order_reservation = OrderReservation.find(@id) status = true @@ -23,8 +25,8 @@ class Origami::OrderReservationController < BaseOrigamiController elsif @status == "completed" result = OrderReservation.update_doemal_payment(@order_reservation,current_user) else - if @status == "cancel" - OrderReservation.update_order_reservation(@id, nil, "cancelled") + 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) @@ -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/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/models/order_reservation.rb b/app/models/order_reservation.rb index 8ea716c2..e1f7c209 100644 --- a/app/models/order_reservation.rb +++ b/app/models/order_reservation.rb @@ -138,7 +138,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") @@ -158,7 +158,9 @@ class OrderReservation < ApplicationRecord post_url = base_url + url if !waiting_time.nil? - send_params = {id: ref_no, waiting_time: waiting_time, status: status} + send_params = {id: ref_no,type: min_type, waiting_time: waiting_time, status: status} + elsif !reason.nil? + send_params = {id: ref_no, status: status, reason: reason} else send_params = {id: ref_no, status: status} end @@ -185,7 +187,7 @@ 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 @@ -194,7 +196,52 @@ class OrderReservation < ApplicationRecord order_reservation.expected_waiting_time = DateTime.parse(expected_waiting_time).utc end order_reservation.status = status + if !remark.nil? + order_reservation.order_remark = remark + end 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 diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb index 150c4ee9..5322206e 100644 --- a/app/views/origami/order_reservation/index.html.erb +++ b/app/views/origami/order_reservation/index.html.erb @@ -1,48 +1,62 @@ <%= stylesheet_link_tag 'order_reservation', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'order_reservation', 'data-turbolinks-track': 'reload' %>
    + + <% + pending_count = 0 + accepted_count = 0 + delivered_count = 0 + completed_count = 0 + processed_count = 0 + %> + <% if !@count_on_order.nil? + @count_on_order.each do |count_order| + if count_order.status == "new" + pending_count = count_order.count + elsif count_order.status == "accepted" + accepted_count = count_order.count + elsif count_order.status == "send_to_kitchen" + delivered_count = count_order.count + elsif count_order.status == "ready_to_delivery" + completed_count = count_order.count + elsif count_order.status == "delivered" + processed_count = count_order.count + end + end + end %> +
    -
    +
    @@ -215,6 +229,48 @@
    + +
    +
    + +
    +
    @@ -230,7 +286,11 @@ - + + + + + @@ -296,7 +356,7 @@ - @@ -321,7 +381,7 @@ -
    +
    @@ -336,8 +396,8 @@ + + + <% i=1 @order.each do |order| %> - <% if order.status == 'delivered' %> + <% if order.status == 'delivered' && (order.created_at.utc.getlocal.strftime("%Y-%m-%d") == DateTime.now.strftime("%Y-%m-%d")) %> @@ -114,18 +127,31 @@ - - - - - - - - - + + + + + + + + + <% end end %> + + + + + + + + + + + + +
    - NAME
    - + REF.
    +     		REQUESTED TIME
    @@ -346,14 +406,20 @@
    - PHONE
    - + NAME
    +     		EXPECTED TIME
    + PHONE
    + +
    ADDRESS
    @@ -391,37 +457,41 @@
    - - -
    -
    -
    -
    - -
    -
    - +
    +
    +
    - -
    -
    -
    - - + -
    + + + + + diff --git a/config/locales/en.yml b/config/locales/en.yml index 45e3d3fb..63e45b92 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -79,6 +79,7 @@ en: processing: "Processing" delivering: "Delivering" completed: "Completed" + processed: "Processed" views: btn: diff --git a/config/locales/mm.yml b/config/locales/mm.yml index 6c0d36a1..f6f353e2 100644 --- a/config/locales/mm.yml +++ b/config/locales/mm.yml @@ -74,6 +74,7 @@ mm: processing: "Processing" delivering: "Delivering" completed: "Completed" + processed: "Processed" views: btn: From b9778d7b5b69fe99e566554afc8f6f4671e0830d Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Tue, 8 May 2018 17:44:01 +0630 Subject: [PATCH 16/39] update addorder js --- app/assets/javascripts/addorder.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index af36a6e3..71cf182e 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -1421,23 +1421,19 @@ show_menu_list(menu_items); //show menu item list when click menu category function show_sub_category_list(url,sub_category,menu_id){ - var menu_list = $('.sub_category_list'); - menu_list.empty(); + var sub_category_list = $('.sub_category_list'); + sub_category_list.empty(); menus = JSON.parse(localStorage.getItem("menus")); if (menus != null) { for(var j in menus) { var categories = menus[j]["categories"]; - console.log("categories"); - console.log(categories); for(var ii in categories) { - console.log(menu_id); - console.log(categories[ii]["parent_id"]); if (menu_id == categories[ii]["parent_id"]) { console.log("parrrrrrrrrrrrrrrrr"); console.log(categories[ii]["parent_id"]); - var sub_category_list = $('.sub_category_list'); - sub_category_list.empty(); + console.log(menu_id); + $(sub_category).removeClass('hidden'); row = '
  • ' +''+ categories[ii].name+'' From 4faee913f35c78fd879c6b4ef0b62cb08875f068 Mon Sep 17 00:00:00 2001 From: phyusin Date: Wed, 9 May 2018 11:28:01 +0630 Subject: [PATCH 17/39] change order reservation -not finished --- .../javascripts/channels/check_new_order.js | 19 +++- .../channels/check_order_ready_to_delivery.js | 19 +++- .../channels/check_order_send_to_kitchen.js | 19 +++- app/assets/javascripts/order_reservation.js | 27 ++++-- .../order_reservation_controller.rb | 8 ++ .../origami/order_reservation_controller.rb | 1 + .../reports/order_reservation_controller.rb | 4 +- app/models/order_reservation.rb | 18 +++- .../origami/order_reservation/index.html.erb | 25 +++--- .../reports/order_reservation/index.html.erb | 89 +++++++++++++++++-- config/locales/en.yml | 9 +- config/locales/mm.yml | 7 ++ config/routes.rb | 1 + 13 files changed, 211 insertions(+), 35 deletions(-) diff --git a/app/assets/javascripts/channels/check_new_order.js b/app/assets/javascripts/channels/check_new_order.js index d0061443..403874e9 100644 --- a/app/assets/javascripts/channels/check_new_order.js +++ b/app/assets/javascripts/channels/check_new_order.js @@ -18,8 +18,23 @@ App.check_new_order = App.cable.subscriptions.create('CheckNewOrderChannel', { }); // alert(order_lists); - $("#notify_new_order_lists").text(order_lists); - $("#notify_new_order").modal({show: true, keyboard: false, backdrop: false}); + swal({ + title: 'Information', + target: document.getElementById("notify_new_order"), + text: "You have new orders
    "+ + "Are you accept or reject for these orders "+order_lists+"?", + type: 'success', + html: true, + closeOnConfirm: false, + closeOnCancel: false, + allowOutsideClick: false + }, function (isConfirm) { + if(isConfirm){ + swal.close(); + } + }); + // $("#notify_new_order_lists").text(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 d2bebadb..4627dede 100644 --- a/app/assets/javascripts/channels/check_order_ready_to_delivery.js +++ b/app/assets/javascripts/channels/check_order_ready_to_delivery.js @@ -18,8 +18,23 @@ App.check_order_ready_to_delivery = App.cable.subscriptions.create('CheckOrderRe }); // alert(order_lists); - $("#notify_order_ready_to_delivery_lists").text(order_lists); - $("#notify_order_ready_to_delivery").modal({show: true, keyboard: false, backdrop: false}); + swal({ + title: 'Information', + target: document.getElementById("notify_order_ready_to_delivery"), + text: "You have orders that are ready to deliver
    "+ + "Could you ready these orders "+order_lists+" to deliver?", + type: 'success', + html: true, + closeOnConfirm: false, + closeOnCancel: false, + allowOutsideClick: false + }, function (isConfirm) { + if(isConfirm){ + swal.close(); + } + }); + // $("#notify_order_ready_to_delivery_lists").text(order_lists); + // $("#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 9b83b3c6..31c6b75c 100644 --- a/app/assets/javascripts/channels/check_order_send_to_kitchen.js +++ b/app/assets/javascripts/channels/check_order_send_to_kitchen.js @@ -18,8 +18,23 @@ App.check_order_send_to_kitchen = App.cable.subscriptions.create('CheckOrderSend }); // alert(order_lists); - $("#notify_order_send_to_kitchen_lists").text(order_lists); - $("#notify_order_send_to_kitchen").modal({show: true, keyboard: false, backdrop: false}); + swal({ + title: 'Information', + target: document.getElementById("notify_order_send_to_kitchen"), + text: "You have to send order to kitchen
    "+ + "Could you send these orders "+order_lists+" to kitchen?", + type: 'success', + html: true, + closeOnConfirm: false, + closeOnCancel: false, + allowOutsideClick: false + }, function (isConfirm) { + if(isConfirm){ + swal.close(); + } + }); + // $("#notify_order_send_to_kitchen_lists").text(order_lists); + // $("#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 5ff2d0ad..2764d2a5 100644 --- a/app/assets/javascripts/order_reservation.js +++ b/app/assets/javascripts/order_reservation.js @@ -55,7 +55,7 @@ $(function() { $("#cancel").on("click", function(){ var order_status = $("#order_status").text(); $("#status").text($(this).attr("data-value")); - if(order_status!="new" && order_status!= "accepted"){ + 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}); @@ -63,13 +63,24 @@ $(function() { }); $(".send_status").on("click",function(){ - var status = $("#status").text(); - var order_id = $('#order_id').text(); - var callback = $('#callback_url').text(); - var ref_no = $('#ref_no').text(); - var reason = $('#reject_reason').val(); - var approved_code = $("#approved_code").text(); - callback_url(callback,ref_no,order_id,status,"","","",reason,approved_code); + $("#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(){ diff --git a/app/controllers/api/order_reserve/order_reservation_controller.rb b/app/controllers/api/order_reserve/order_reservation_controller.rb index 84ee8676..59e99967 100644 --- a/app/controllers/api/order_reserve/order_reservation_controller.rb +++ b/app/controllers/api/order_reserve/order_reservation_controller.rb @@ -75,4 +75,12 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController end end end + + def update_status + order_reservation_id = params[:id] + status = params[:status] + remark = params[:remark] + + + end end diff --git a/app/controllers/origami/order_reservation_controller.rb b/app/controllers/origami/order_reservation_controller.rb index 42140f90..bf32f43b 100644 --- a/app/controllers/origami/order_reservation_controller.rb +++ b/app/controllers/origami/order_reservation_controller.rb @@ -3,6 +3,7 @@ class Origami::OrderReservationController < BaseOrigamiController def index @order = OrderReservation.latest_order #.active @count_on_order = OrderReservation.get_count_on_order + @count_on_completed = OrderReservation.get_count_on_completed end def update diff --git a/app/controllers/reports/order_reservation_controller.rb b/app/controllers/reports/order_reservation_controller.rb index 22c408fe..b101c37e 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 - @providers = [["All",''], ["food2u","food2u"], ["Self Pick-Up","pick_up"], ["Ygndoor2door","ygndoor2door"], ["Direct Delivery","direct_delivery"]] + @providers = [["All",''], ["food2u","food2u"], ["Pick-Up","pick_up"], ["ygndoor2door","ygndoor2door"], ["Direct Delivery","direct_delivery"]] from, to = get_date_range_from_params @@ -19,7 +19,7 @@ class Reports::OrderReservationController < BaseReportController end provider = params[:provider] - @sale_data = OrderReservation.get_order_reservation_by_shift(@shift_sale_range,@shift,from,to,provider) + @order_reservation_data = OrderReservation.get_order_reservation_by_shift(@shift_sale_range,@shift,from,to,provider) @from = from @to = to # get printer info diff --git a/app/models/order_reservation.rb b/app/models/order_reservation.rb index e1f7c209..35b2e2ee 100644 --- a/app/models/order_reservation.rb +++ b/app/models/order_reservation.rb @@ -199,6 +199,11 @@ class OrderReservation < ApplicationRecord if !remark.nil? order_reservation.order_remark = remark end + + if status == "delivered" + order_reservation.payment_status = "paid" + end + order_reservation.save if !order_reservation.sale_id.nil? && status == "rejected" @@ -245,7 +250,14 @@ class OrderReservation < ApplicationRecord 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 @@ -294,7 +306,9 @@ class OrderReservation < ApplicationRecord end end - query = OrderReservation.joins(" JOIN deliveries on deliveries.order_reservation_id = order_reservations.order_reservation_id") + 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) diff --git a/app/views/origami/order_reservation/index.html.erb b/app/views/origami/order_reservation/index.html.erb index 5322206e..b6648bab 100644 --- a/app/views/origami/order_reservation/index.html.erb +++ b/app/views/origami/order_reservation/index.html.erb @@ -19,11 +19,14 @@ delivered_count = count_order.count elsif count_order.status == "ready_to_delivery" completed_count = count_order.count - elsif count_order.status == "delivered" - processed_count = count_order.count end end - end %> + end + + if !@count_on_completed.nil? + processed_count = @count_on_completed.count + end + %>
    @@ -237,7 +240,7 @@
    • <%=i%> @@ -443,6 +446,10 @@ + +
    +
    +
    @@ -508,6 +515,7 @@
    +
    @@ -557,7 +565,7 @@
    - --> diff --git a/app/views/reports/order_reservation/index.html.erb b/app/views/reports/order_reservation/index.html.erb index 459a9e58..d10a234c 100755 --- a/app/views/reports/order_reservation/index.html.erb +++ b/app/views/reports/order_reservation/index.html.erb @@ -28,25 +28,104 @@
    - - + <% if @shift_from %> <% if @shift_data.employee %> <% cashier_name = !@shift_data.nil? ? @shift_data.employee.name : '-' %> <% end %> - + <% end %> - + + + + + + + + + + + + + + + - + <% 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 %> + <% + total_amount = 0 + discount_amount = 0 + delivery_fee = 0 + convenience_charge = 0 + total_tax = 0 + delivery_tax = 0 + convenience_tax = 0 + commercial_tax = 0 + grand_total = 0 + %> + <% unless @order_reservation_data.blank? %> + <% @order_reservation_data.each do |order_reservation| %> + <% + provider = "" + total_amount = order_reservation.total_amount + discount_amount = order_reservation.discount_amount + delivery_fee = order_reservation.delivery_fee + convenience_charge = order_reservation.convenience_charge + total_tax = order_reservation.total_tax + grand_total = order_reservation.grand_total + %> + <% + if order_reservation.provider == 'pick_up' + provider = "Pick-Up" + elsif order_reservation.provider == 'direct_delivery' + provider = "Direct Delivery" + else + provider = order_reservation.provider + end + + # JSON.parse(order_reservation.taxes).each do |tax| + # delivery_tax = tax.delivery_tax + # convenience_tax = tax.convenience_tax + # commercial_tax = tax.commercial_tax + # end + %> + + + + + + + + + + + + + + + + + + <% end + end %>
    <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - <%= t("views.right_panel.detail.to_date") %> : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-'%> <%= t("views.right_panel.detail.from_date") %> : <%= @from.utc.getlocal.strftime("%Y-%b-%d") rescue '-' %> - <%= t("views.right_panel.detail.to_date") %> : <%= @to.utc.getlocal.strftime("%Y-%b-%d") rescue '-'%>
    <%= t("views.right_panel.detail.shift_name") %> = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )<%= t("views.right_panel.detail.shift_name") %> = <%= @shift_from %> - <%= @shift_to %> ( <%= cashier_name %> )
    <%= t :customer %><%= t("views.right_panel.detail.type") %><%= t("views.right_panel.detail.requested_time") %><%= t("views.right_panel.detail.provider") %><%= t :payment_method %><%= t :payment %> <%= t("views.right_panel.detail.status")%><%= t("views.right_panel.detail.sub_total") %><%= t("views.right_panel.detail.discount_amount") %><%= t("views.right_panel.detail.delivery_fee") %><%= t("views.right_panel.detail.convenience_charge") %><%= t("views.right_panel.detail.delivery_tax") %><%= t("views.right_panel.detail.convenience_tax") %><%= t("views.right_panel.detail.commercial_tax") %><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.tax") %><%= t("views.right_panel.detail.grand_total") %>
    <%= order_reservation.email %><%= order_reservation.order_reservation_type %><%= order_reservation.requested_time.utc.getlocal.strftime("%d %m %Y %I:%M %p") %><%= provider%><%= order_reservation.payment_type%><%= order_reservation.payment_status%><%= number_with_precision(total_amount , precision:precision.to_i,delimiter:delimiter)%><%= number_with_precision(discount_amount , precision:precision.to_i,delimiter:delimiter)%><%= number_with_precision(delivery_fee , precision:precision.to_i,delimiter:delimiter)%><%= number_with_precision(convenience_charge , precision:precision.to_i,delimiter:delimiter)%><%= number_with_precision(delivery_tax , precision:precision.to_i,delimiter:delimiter)%><%= number_with_precision(convenience_tax , precision:precision.to_i,delimiter:delimiter)%><%= number_with_precision(commercial_tax , precision:precision.to_i,delimiter:delimiter)%><%= number_with_precision(total_tax , precision:precision.to_i,delimiter:delimiter)%><%= number_with_precision(grand_total , precision:precision.to_i,delimiter:delimiter)%>
    diff --git a/config/locales/en.yml b/config/locales/en.yml index 63e45b92..8c19c4ee 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -436,7 +436,7 @@ en: item: "Item" revenue: "Revenue" total_price_by: "Total Price By" - sub_total: "Sub Total" + sub_totalိိ: "Sub Total" cash_received: "Cash Received" card_sales: "Card Sales" select_payments: "Select Payments" @@ -472,6 +472,13 @@ en: foreigner: "Foreigner" local: "Local" order_reservation_report: "Order Reservation" + requested_time: "Requested Time" + provider: "Provider" + delivery_fee: "Delivery Fee" + delivery_tax: "Delivery Tax" + convenience_charge: "Convenience Charge" + convenience_tax: "Convenience Tax" + commercial_tax: "Commercial Tax" code_txt: "code " charge_txt: "charge" diff --git a/config/locales/mm.yml b/config/locales/mm.yml index f6f353e2..e6bdc2cf 100644 --- a/config/locales/mm.yml +++ b/config/locales/mm.yml @@ -466,6 +466,13 @@ mm: foreigner: "နိုင်ငံခြားသား" local: "နိုင်ငံသား" order_reservation_report: "ၾကိဳတင္ order မွာယူျခင္း" + requested_time: "Requested Time" + provider: "Provider" + delivery_fee: "Delivery Fee" + delivery_tax: "Delivery Tax" + convenience_charge: "Convenience Charge" + convenience_tax: "Convenience Tax" + commercial_tax: "Commercial Tax" code_txt: "ကုတ်ဒ် " charge_txt: "ကောက်ခံသည်" diff --git a/config/routes.rb b/config/routes.rb index 8ccdcb5c..6b888e1d 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -88,6 +88,7 @@ scope "(:locale)", locale: /en|mm/ do namespace :order_reserve do post "customer" => "order_reservation#check_customer" post "order" => "order_reservation#create" + post "callback/:id" => "order_reservation#update_status" end end From 1284ac8e49bc996e9eb6b1f3a5f7ca3691756dc9 Mon Sep 17 00:00:00 2001 From: Jueli Moon Aung Date: Wed, 9 May 2018 05:26:43 +0000 Subject: [PATCH 18/39] Symmetric Batch Monitoring and Alert --- db/sym_master.sql | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/db/sym_master.sql b/db/sym_master.sql index 3677fc2f..57408181 100755 --- a/db/sym_master.sql +++ b/db/sym_master.sql @@ -825,6 +825,49 @@ delete from sym_node; values('order_queue_stations','sx_2_cloud', 200, current_timestamp, current_timestamp); # End Oqs Channel +### Batch Monitoring ###### + +#Monitor# +insert into sym_monitor (monitor_id, node_group_id, external_id, type, threshold, run_period, run_count, severity_level, enabled, create_time, last_update_by, last_update_time) +value ('SystemBatchErrorMonitor', 'All', 'All', 'batchError', 1, 1, 1, 300, 1, now(), 'admin', now()); + +insert into sym_monitor (monitor_id, node_group_id, external_id, type, threshold, run_period, run_count, severity_level, enabled, create_time, last_update_by, last_update_time) +value ('SystemBatchUnsendMonitor', 'All', 'All', 'batchUnsent', 10, 1, 1, 100, 1, now(), 'admin', now()); + +insert into sym_monitor (monitor_id, node_group_id, external_id, type, threshold, run_period, run_count, severity_level, enabled, create_time, last_update_by, last_update_time) +value ('SystemLogMonitor', 'All', 'All', 'log', 1, 1, 1, 300, 1, now(), 'admin', now()); + +#Parameter# +insert into sym_parameter (external_id, node_group_id, param_key, param_value, create_time, last_update_by, last_update_time) +value ('All', 'All', 'smtp.allow.untrusted.cert', 'true', now(), 'admin', now()); + +insert into sym_parameter (external_id, node_group_id, param_key, param_value, create_time, last_update_by, last_update_time) +value ('All', 'All', 'smtp.auth', 'true', now(), 'admin', now()); + +insert into sym_parameter (external_id, node_group_id, param_key, param_value, create_time, last_update_by, last_update_time) +value ('All', 'All', 'smtp.from', 'sym_alert@smartsales.asia', now(), 'admin', now()); + +insert into sym_parameter (external_id, node_group_id, param_key, param_value, create_time, last_update_by, last_update_time) +value ('All', 'All', 'smtp.host', 'smtp.mailgun.org', now(), 'admin', now()); + +insert into sym_parameter (external_id, node_group_id, param_key, param_value, create_time, last_update_by, last_update_time) +value ('All', 'All', 'smtp.password', '1cc051ec3edf699d17b78e5cd14ceb6b', now(), 'admin', now()); + +insert into sym_parameter (external_id, node_group_id, param_key, param_value, create_time, last_update_by, last_update_time) +value ('All', 'All', 'smtp.port', '465', now(), 'admin', now()); + +insert into sym_parameter (external_id, node_group_id, param_key, param_value, create_time, last_update_by, last_update_time) +value ('All', 'All', 'smtp.starttls', 'false', now(), 'admin', now()); + +insert into sym_parameter (external_id, node_group_id, param_key, param_value, create_time, last_update_by, last_update_time) +value ('All', 'All', 'smtp.transport', 'smtps', now(), 'admin', now()); + +insert into sym_parameter (external_id, node_group_id, param_key, param_value, create_time, last_update_by, last_update_time) +value ('All', 'All', 'smtp.user', 'postmaster@smartsales.asia', now(), 'admin', now()); + + + +### End of Batch Monitoring #### insert into sym_node (node_id,node_group_id,external_id,sync_enabled,sync_url,schema_version,symmetric_version,database_type,database_version,heartbeat_time,timezone_offset,batch_to_send_count,batch_in_error_count,created_at_node_id) values ('000','sx','000',1,null,null,null,null,null,current_timestamp,null,0,0,'000'); From 1e05522c4268ff5ec62d09330fc86a0f343c0c97 Mon Sep 17 00:00:00 2001 From: phyusin Date: Wed, 9 May 2018 13:34:30 +0630 Subject: [PATCH 19/39] change report UI --- app/assets/javascripts/order_reservation.js | 2 +- .../reports/order_reservation/index.html.erb | 82 ++++++++++++------- 2 files changed, 55 insertions(+), 29 deletions(-) diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js index 2764d2a5..a1342846 100644 --- a/app/assets/javascripts/order_reservation.js +++ b/app/assets/javascripts/order_reservation.js @@ -73,7 +73,7 @@ $(function() { var reason = ""; var approved_code = $("#approved_code").text(); if(order_status == 'ready_to_delivery'){ - reason = "VOID ::" + $('#reject_reason').val(); + reason = "VOID || " + $('#reject_reason').val(); }else{ reason = $('#reject_reason').val(); } diff --git a/app/views/reports/order_reservation/index.html.erb b/app/views/reports/order_reservation/index.html.erb index d10a234c..37157392 100755 --- a/app/views/reports/order_reservation/index.html.erb +++ b/app/views/reports/order_reservation/index.html.erb @@ -71,26 +71,45 @@ delimiter = "" end %> <% - total_amount = 0 - discount_amount = 0 - delivery_fee = 0 - convenience_charge = 0 - total_tax = 0 - delivery_tax = 0 - convenience_tax = 0 - commercial_tax = 0 - grand_total = 0 + + discount_amount = 0.0 + delivery_fee = 0.0 + convenience_charge = 0.0 + delivery_tax = 0.0 + convenience_tax = 0.0 + commercial_tax = 0.0 + + total_discount_amount = 0 + total_delivery_fee = 0 + total_convenience_charge = 0 + total_delivery_tax = 0 + total_convenience_tax = 0 + total_commercial_tax = 0 + total_tax = 0.0 + total_amount = 0.0 + grand_total = 0.0 %> <% unless @order_reservation_data.blank? %> <% @order_reservation_data.each do |order_reservation| %> <% provider = "" - total_amount = order_reservation.total_amount discount_amount = order_reservation.discount_amount - delivery_fee = order_reservation.delivery_fee + delivery_fee = order_reservation.delivery_fee ? order_reservation.delivery_fee : 0.0 convenience_charge = order_reservation.convenience_charge - total_tax = order_reservation.total_tax - grand_total = order_reservation.grand_total + + (order_reservation.taxes).each do |tax| %> + + <% end + + total_discount_amount += discount_amount.to_f + total_delivery_fee += delivery_fee.to_f + total_convenience_charge += convenience_charge + total_delivery_tax += delivery_tax + total_convenience_tax += convenience_tax + total_commercial_tax += commercial_tax + total_tax += order_reservation.total_tax + total_amount += order_reservation.total_amount + grand_total += order_reservation.grand_total %> <% if order_reservation.provider == 'pick_up' @@ -100,12 +119,6 @@ else provider = order_reservation.provider end - - # JSON.parse(order_reservation.taxes).each do |tax| - # delivery_tax = tax.delivery_tax - # convenience_tax = tax.convenience_tax - # commercial_tax = tax.commercial_tax - # end %>
    <%= order_reservation.email %><%= provider%> <%= order_reservation.payment_type%> <%= order_reservation.payment_status%><%= number_with_precision(total_amount , precision:precision.to_i,delimiter:delimiter)%><%= number_with_precision(discount_amount , precision:precision.to_i,delimiter:delimiter)%><%= number_with_precision(delivery_fee , precision:precision.to_i,delimiter:delimiter)%><%= number_with_precision(convenience_charge , precision:precision.to_i,delimiter:delimiter)%><%= number_with_precision(delivery_tax , precision:precision.to_i,delimiter:delimiter)%><%= number_with_precision(convenience_tax , precision:precision.to_i,delimiter:delimiter)%><%= number_with_precision(commercial_tax , precision:precision.to_i,delimiter:delimiter)%><%= number_with_precision(total_tax , precision:precision.to_i,delimiter:delimiter)%><%= number_with_precision(grand_total , precision:precision.to_i,delimiter:delimiter)%><%= number_with_precision(order_reservation.total_amount, precision:precision.to_i, delimiter:delimiter) rescue '0.0'%><%= number_with_precision(discount_amount , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%><%= number_with_precision(delivery_fee , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%><%= number_with_precision(convenience_charge , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%><%= number_with_precision(delivery_tax , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%><%= number_with_precision(convenience_tax , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%><%= number_with_precision(commercial_tax , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%><%= number_with_precision(order_reservation.total_tax , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%><%= number_with_precision(order_reservation.grand_total , precision:precision.to_i, delimiter:delimiter) rescue '0.0' %>
    <%= number_with_precision(total_amount , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%><%= number_with_precision(total_discount_amount , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%><%= number_with_precision(total_delivery_fee , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%><%= number_with_precision(total_convenience_charge , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%><%= number_with_precision(total_delivery_tax , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%><%= number_with_precision(total_convenience_tax , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%><%= number_with_precision(total_commercial_tax , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%><%= number_with_precision(total_tax , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%><%= number_with_precision(grand_total , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%>
    From 2cdb18d338e9762c3235f6740560810b28b55d28 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 9 May 2018 13:56:37 +0630 Subject: [PATCH 20/39] menu cache for menu category --- app/assets/javascripts/addorder.js | 235 +-------------- .../origami/addorders_controller.rb | 19 +- app/views/origami/addorders/detail.html.erb | 285 +++++++++++------- app/views/origami/home/index.html.erb | 1 - app/views/origami/home/show.html.erb | 22 +- config/routes.rb | 2 +- 6 files changed, 201 insertions(+), 363 deletions(-) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 71cf182e..87124f55 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -2,6 +2,7 @@ $(function() { var role = $('#role').val(); type = window.location.href.indexOf("quick_service"); modify_order = window.location.href.indexOf("modify_order"); + //click menu sidebar menu category $(".product").on("click", function(){ var url = $(this).attr('data-ref'); @@ -101,6 +102,7 @@ $(function() { $('.sub_category_list').addClass("hidden"); var menu_id = $(this).attr("data-id"); var url = "get_menu_category/"+menu_id; + console.log(menu_id); show_menu_item_list(url,menu_id); var sub_id = $(this).attr("data-sub-id"); if (sub_id == "true") { @@ -133,117 +135,6 @@ $(function() { for(var ii in categories) { if (categories[ii]["id"] == menu_id) { var menu_items = categories[ii]["items"]; - // for(var field in menu_items) { - // if (menu_items[field].is_sub_item == false) { - // instances = menu_items[field].instances ; - - // if (!instances.length > 0) { - // swal("Hello Please Check!","Does not have instance item in this menu items ("+ menu_items[field].name+")","warning"); - // } - // if (instances.length > 0) { - // qty = 1; - // options = []; - // price = 0; - - // if (JSON.stringify(menu_items[field].item_sets)!='[]') { - // fa_plus = ''; - // add = ''; - // menu_item_box = 'add_icon'; - // data_target = 'sx_item_set_detailModal'; - // data_modal = 'modal' - // add_icon = "set_item_box" - // code = menu_items[field].code; - // name = menu_items[field].name; - // instances = menu_items[field].instances; - // $(instances).each(function(i){ - // if (instances[i].is_default == true) { - // price = parseFloat(instances[i].price).toFixed(2); - // }else{ - // price = 0; - // } - // }); - // is_available = menu_items[field].is_available ; - // is_on_promotion = 0; - // item_attributes = menu_items[field].attributes; - // promotion_price = menu_items[field].promotion_price; - // }else{ - // fa_plus = 'material-icons'; - // add = 'view_list' - // menu_item_box = 'menu_item_box'; - // data_target = 'sx_item_detailModal'; - // data_modal = '' - // add_icon = "add_icon" - - // $(instances).each(function(i){ - // if (instances[i].is_default === true) { - // code = instances[i].code; - // name = instances[i].name; - // price = parseFloat(instances[i].price).toFixed(2); - // is_available = instances[i].is_available ; - // is_on_promotion = instances[i].is_on_promotion; - // item_attributes = instances[i].values; - // promotion_price = instances[i].promotion_price; - // code = instances[i].code; - // } - // }); - // } - - // if (menu_items[field].image) { - // if (modify_order) { - // image_path = "../../"+menu_items[field].image; - // }else{ - // image_path = menu_items[field].image; - // } - - // }else{ - // if (modify_order) { - // image_path = "../../image/logo.png"; - // }else{ - // image_path = "image/logo.png"; - // } - // } - - // row = '
    ' - // +'
    ' - // +'
    '+ menu_items[field].name +'
    ' - // +"
    " - // +"" - // +add+ '' - // +'
    ' - // +'
    ' - // +"
    " - - // // +"
    " - // // +"" - // // +"
    " - - // +'
    ' - // +''+ price +'' - // +'
    ' - // +'
    '; - // $('.menu_items_list').append(row); - // } - // //end instances in menu-items alest 1 instance - // } - // //end is_sub_item false - // } show_menu_list(menu_items); } } @@ -272,118 +163,7 @@ $(function() { var menu_items_list = $('.menu_items_list'); menu_items_list.empty(); menu_items = data.menu_items; -show_menu_list(menu_items); - // for(var field in menu_items) { - // if (menu_items[field].is_sub_item == false) { - // instances = menu_items[field].instances ; - - // if (!instances.length > 0) { - // swal("Hello Please Check!","Does not have instance item in this menu items ("+ menu_items[field].name+")","warning"); - // } - // if (instances.length > 0) { - // qty = 1; - // options = []; - // price = 0; - - // if (JSON.stringify(menu_items[field].item_sets)!='[]') { - // fa_plus = ''; - // add = ''; - // menu_item_box = 'add_icon'; - // data_target = 'sx_item_set_detailModal'; - // data_modal = 'modal' - // add_icon = "set_item_box" - // code = menu_items[field].code; - // name = menu_items[field].name; - // instances = menu_items[field].instances; - // $(instances).each(function(i){ - // if (instances[i].is_default == true) { - // price = parseFloat(instances[i].price).toFixed(2); - // }else{ - // price = 0; - // } - // }); - // is_available = menu_items[field].is_available ; - // is_on_promotion = 0; - // item_attributes = menu_items[field].attributes; - // promotion_price = menu_items[field].promotion_price; - // }else{ - // fa_plus = 'material-icons'; - // add = 'view_list' - // menu_item_box = 'menu_item_box'; - // data_target = 'sx_item_detailModal'; - // data_modal = '' - // add_icon = "add_icon" - - // $(instances).each(function(i){ - // if (instances[i].is_default === true) { - // code = instances[i].code; - // name = instances[i].name; - // price = parseFloat(instances[i].price).toFixed(2); - // is_available = instances[i].is_available ; - // is_on_promotion = instances[i].is_on_promotion; - // item_attributes = instances[i].values; - // promotion_price = instances[i].promotion_price; - // code = instances[i].code; - // } - // }); - // } - - // if (menu_items[field].image) { - // if (modify_order) { - // image_path = "../../"+menu_items[field].image; - // }else{ - // image_path = menu_items[field].image; - // } - - // }else{ - // if (modify_order) { - // image_path = "../../image/logo.png"; - // }else{ - // image_path = "image/logo.png"; - // } - // } - - // row = '
    ' - // +'
    ' - // +'
    '+ menu_items[field].name +'
    ' - // +"
    " - // +"" - // +add+ '' - // +'
    ' - // +'
    ' - // +"
    " - - // // +"
    " - // // +"" - // // +"
    " - - // +'
    ' - // +''+ price +'' - // +'
    ' - // +'
    '; - // $('.menu_items_list').append(row); - // } - // //end instances in menu-items alest 1 instance - // } - // //end is_sub_item false - // } + show_menu_list(menu_items); } }); //end Ajax @@ -1376,7 +1156,6 @@ show_menu_list(menu_items); $(".keypress_qty").on('keyup change', function (){ // $('.keypress_qty').keyup(function(e){ - id = $(this).attr('id'); value = $(this).val(); @@ -1429,11 +1208,7 @@ show_menu_list(menu_items); for(var j in menus) { var categories = menus[j]["categories"]; for(var ii in categories) { - if (menu_id == categories[ii]["parent_id"]) { - console.log("parrrrrrrrrrrrrrrrr"); - console.log(categories[ii]["parent_id"]); - console.log(menu_id); - + if (menu_id == categories[ii]["parent_id"]) { $(sub_category).removeClass('hidden'); row = '
  • ' +''+ categories[ii].name+'' @@ -1469,7 +1244,7 @@ show_menu_list(menu_items); // } for(var i in data) { - row = '
  • ' + row = '
  • ' +''+ data[i].name+'' +'
    • ' ; $(sub_category).append(row); diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb index fd298fb3..e4e17328 100755 --- a/app/controllers/origami/addorders_controller.rb +++ b/app/controllers/origami/addorders_controller.rb @@ -18,14 +18,17 @@ class Origami::AddordersController < BaseOrigamiController if check_mobile @webview = true end - - # if params[:menus].present? - # @menus = JSON.parse(params[:menus], object_class: OpenStruct) - # @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') - # else - @menus = Menu.all - @menu = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc') - # end +puts params[:menu] +puts "sssssssssssssssssssssssssss" + if params[:menus].present? + @menus = JSON.parse(params[:menus], object_class: OpenStruct) + @menu = JSON.parse(params[:category], object_class: OpenStruct) + puts @menus.to_json + puts @menu.to_json + 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) diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 43ab6db0..46847924 100644 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -5,29 +5,16 @@ <% type = request.path_info.include?('quick_service')%> <% modify_order = request.path_info.include?('modify_order')%> -
    +
    -
    - -
  • +
  • - <%= @menus[0].name %> -
      <% @menus.each do |menu| %> @@ -35,106 +22,166 @@ <%=menu.name%> <%end%> -
    -
    • - -
    -
    -
    -
    -
    - - <% @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 %> <% end%> - <% else %> -
    -
    -

    <%=menu.name%>

    -

    <%=menu.code%>

    -

    -
    + <% end %> + <%end %> + +
    +
    + + + + + +
    +
    +
    +
    +
    + + <% @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%>
    diff --git a/config/locales/en.yml b/config/locales/en.yml index 8c19c4ee..1c03285a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -479,6 +479,7 @@ en: convenience_charge: "Convenience Charge" convenience_tax: "Convenience Tax" commercial_tax: "Commercial Tax" + select_providers: "Select Providers" code_txt: "code " charge_txt: "charge" diff --git a/config/locales/mm.yml b/config/locales/mm.yml index e6bdc2cf..3a1aa2b6 100644 --- a/config/locales/mm.yml +++ b/config/locales/mm.yml @@ -473,6 +473,7 @@ mm: convenience_charge: "Convenience Charge" convenience_tax: "Convenience Tax" commercial_tax: "Commercial Tax" + select_providers: "Select Providers" code_txt: "ကုတ်ဒ် " charge_txt: "ကောက်ခံသည်" From efa53508834e829602f8d711c31eccdda746a26c Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Wed, 9 May 2018 16:46:54 +0630 Subject: [PATCH 23/39] cache menu --- app/assets/javascripts/addorder.js | 1 - app/views/origami/addorders/detail.html.erb | 187 +++++++++--------- .../origami/dashboard/_menu.json.jbuilder | 12 ++ 3 files changed, 100 insertions(+), 100 deletions(-) diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js index 87124f55..c079377f 100755 --- a/app/assets/javascripts/addorder.js +++ b/app/assets/javascripts/addorder.js @@ -102,7 +102,6 @@ $(function() { $('.sub_category_list').addClass("hidden"); var menu_id = $(this).attr("data-id"); var url = "get_menu_category/"+menu_id; - console.log(menu_id); show_menu_item_list(url,menu_id); var sub_id = $(this).attr("data-sub-id"); if (sub_id == "true") { diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index 46847924..36861d05 100644 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -77,56 +77,14 @@ @@ -212,43 +170,43 @@
    <% if type %> -
    -
    - ORDER DETAILS -
    +
    +
    + ORDER DETAILS +
    - <% if modify_order %> - <% if @table.nil? %> -
    Table :
    - - - <% else%> -
    Table : <%=@table.name%>
    - - - <% end%> + <% if modify_order %> + <% if @table.nil? %> +
    Table :
    + + + + <% else%> +
    Table : <%=@table.name%>
    + + + + <% end%> - - - + + + -
    - -
    - <% else%> - -
    +
    + +
    + <% else%> + +
    -
    -
    - -
    - <% end%> - - -
    +
    +
    + +
    + <% end%> +
    <% else %>
    @@ -259,6 +217,7 @@ +
    - +
    +
    +
    + +
    + - -
    - - + +
    +
    +
    +
    MOVE --> ' <%= @dining.name %> ' to
    + + <% if @status_order == 'order' && @status_sale != 'sale' %> + <% if !@obj_order.nil? %> +
    + <% else %> +
    + <% end %> + <% if !@booking.nil? %> + ORDER DETAILS | Table <%= @dining.name rescue "" %> + <% if @booking.checkout_by.nil? && !@booking.reserved_by.nil? %> + <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %> + <% else %> + Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> + <% end %> + <% end %> +
    + <% elsif @status_sale == 'sale' %> +
    INVOICE DETAILS | Table <%= @dining.name rescue "" %> + <% if !@booking.reserved_by.nil? && %> + <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %> + <% else %> + Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> + <% end %> +
    + <% else %> + ORDER DETAILS | Table <%= @dining.name rescue "" %> + <% end %> +
    +
    +
    +
    + <% if (!@sale_array.empty?) && (!@date.nil?) %> +
    +   Receipt No: + <% if @status_sale == 'sale' %> + <%= @sale_array[0].receipt_no rescue '' %> + <% end %> + +
    +
    +
    + Date: <%= @date.utc.getlocal.strftime("%d/%m/%Y-%I:%M %p") rescue '-' %> +
    +
    + <% elsif !@date.nil? %> +
    +   Order No: + <% if @status_order == 'order' %> + <%= @obj_order.order_id rescue '' %> + <% end %> + +
    +
    +
    + Date: <%= @date.utc.getlocal.strftime("%d/%m/%Y") rescue '-' %> +
    +
    + <% end %> +
    +
    +
    +
    + <% if @status_sale == 'sale' && !@sale_array.empty? %> + +   Customer : <%= @sale_array[0].customer.name rescue '' %> + <% elsif @status_order == 'order' && !@customer.nil? + %> + +   Customer : <%= @customer.name rescue "" %> + <% end %> + +
    +
    +
    +
    + + + + + + + + + + + <% + count = 0 + sub_total = 0 + if @status_sale == "sale" + @sale_array[0].sale_items.each do |sale_item| + count += 1 + sub_total = sub_total + sale_item.price + %> + + <% unless sale_item.price <= 0 %> + + + + + + + <% + end + end + end + + if @status_order == 'order' && @status_sale != 'sale' + unless @order_items.nil? || @order_items.empty? + count = 0 + @order_items.each do |order_item | + count += 1 + sub_total = sub_total + (order_item.price * order_item.qty) + + #unless order_item.price <= 0 %> + + + + + + + <% + #end + end + end + end + %> + +
    #ItemsQTYPrice
    <%= count %><%= sale_item.product_name %><%= sale_item.qty %><%= sale_item.price %>
    <%= count %><%= order_item.item_name %><%= order_item.qty %><%= order_item.qty*order_item.price %>
    +
    +
    +<% +if @status_sale == 'sale' + unless @order_items.nil? + %> + Pending New Order + + <% + @order_items.each do |order_item | + %> + + + + + + + + <% + end + %> +
    <%= order_item.item_name %><%= order_item.qty %><%= order_item.qty*order_item.price %>
    + + <% + else + @sale_array.each do |sale| + if @sale_array.size > 1 + unless sale.receipt_no == @sale_array[0].receipt_no + %> + Pending Payment + + + + + +
    Receipt No - <%= sale.receipt_no %>
    + <% + end + end + end + end +end +%> +
    +
    +
    MOVE ROOM
    +
    +
    + + +
    + + + + +
    +
    +
    diff --git a/app/views/origami/movetable/move_dining.html.erb b/app/views/origami/movetable/move_dining.html.erb index 76f704e8..64102211 100755 --- a/app/views/origami/movetable/move_dining.html.erb +++ b/app/views/origami/movetable/move_dining.html.erb @@ -22,27 +22,27 @@
    <% @tables.each do |table| %> <% if table.status == 'occupied' %> - <% if table.get_booking.nil? %> - <% if table.get_checkout_booking.nil? %> -
    - <% else %> -
    - <% end %> -
    - <%= table.name %> -
    -
    - <% else %> - <% if table.get_checkout_booking.nil? %> -
    - <% else %> -
    - <% end %> -
    - <%= table.name %> + <% if table.get_booking.nil? %> + <% if table.get_checkout_booking.nil? %> +
    + <% else %> +
    + <% end %> +
    + <%= table.name %> +
    -
    - <% end %> + <% else %> + <% if table.get_checkout_booking.nil? %> +
    + <% else %> +
    + <% end %> +
    + <%= table.name %> +
    +
    + <% end %> <% else %>
    @@ -54,119 +54,120 @@
    +
    <% @rooms.each do |room| %> <% if room.status == 'occupied' %> - <% if room.get_booking.nil? %> -
    + <% if room.get_booking.nil? %> +
    <% else %> -
    - <% end %> -
    - <%= room.name %> -
    +
    + <% end %> +
    + <%= room.name %>
    - <% else %> -
    -
    - <%= room.name %>
    + <% else %> +
    +
    + <%= room.name %> +
    +
    + <% end %> + <% end %>
    - <% end %> - <% end %> +
    + +
    - - +
    -
    - -
    - + - -
    -
    -
    -
    MOVE --> ' <%= @dining.name %> ' to
    - - <% if @status_order == 'order' && @status_sale != 'sale' %> - <% if !@obj_order.nil? %> -
    - <% else %> -
    - <% end %> - <% if !@booking.nil? %> - ORDER DETAILS | Table <%= @dining.name rescue "" %> - <% if @booking.checkout_by.nil? && !@booking.reserved_by.nil? %> - <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %> - <% else %> - Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <% end %> - <% end %> -
    - <% elsif @status_sale == 'sale' %> -
    INVOICE DETAILS | Table <%= @dining.name rescue "" %> - <% if !@booking.reserved_by.nil? && %> - <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %> - <% else %> - Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <% end %> -
    - <% else %> - ORDER DETAILS | Table <%= @dining.name rescue "" %> - <% end %> -
    -
    -
    -
    - <% if (!@sale_array.empty?) && (!@date.nil?) %> -
    -   Receipt No: - <% if @status_sale == 'sale' %> + +
    +
    +
    +
    MOVE --> ' <%= @dining.name %> ' to
    + + <% if @status_order == 'order' && @status_sale != 'sale' %> + <% if !@obj_order.nil? %> +
    + <% else %> +
    + <% end %> + <% if !@booking.nil? %> + ORDER DETAILS | Table <%= @dining.name rescue "" %> + <% if @booking.checkout_by.nil? && !@booking.reserved_by.nil? %> + <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %> + <% else %> + Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> + <% end %> + <% end %> +
    + <% elsif @status_sale == 'sale' %> +
    INVOICE DETAILS | Table <%= @dining.name rescue "" %> + <% if !@booking.reserved_by.nil? && %> + <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %> + <% else %> + Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> + <% end %> +
    + <% else %> + ORDER DETAILS | Table <%= @dining.name rescue "" %> + <% end %> +
    +
    +
    +
    + <% if (!@sale_array.empty?) && (!@date.nil?) %> +
    +   Receipt No: + <% if @status_sale == 'sale' %> <%= @sale_array[0].receipt_no rescue '' %> - <% end %> - -
    -
    -
    - Date: <%= @date.utc.getlocal.strftime("%d/%m/%Y-%I:%M %p") rescue '-' %> -
    -
    - <% elsif !@date.nil? %> -
    -   Order No: - <% if @status_order == 'order' %> - <%= @obj_order.order_id rescue '' %> + <% end %> + +
    +
    +
    + Date: <%= @date.utc.getlocal.strftime("%d/%m/%Y-%I:%M %p") rescue '-' %> +
    +
    + <% elsif !@date.nil? %> +
    +   Order No: + <% if @status_order == 'order' %> + <%= @obj_order.order_id rescue '' %> - <% end %> - -
    + <% end %> + +
    Date: <%= @date.utc.getlocal.strftime("%d/%m/%Y") rescue '-' %>
    - <% end %> + <% end %> +
    -
    -
    -
    - - <% if @status_sale == 'sale' && !@sale_array.empty? %> - -   Customer : <%= @sale_array[0].customer.name rescue '' %> - <% elsif @status_order == 'order' && !@customer.nil? - %> - -   Customer : <%= @customer.name rescue "" %> - <% end %> +
    +
    + + <% if @status_sale == 'sale' && !@sale_array.empty? %> + +   Customer : <%= @sale_array[0].customer.name rescue '' %> + <% elsif @status_order == 'order' && !@customer.nil? + %> + +   Customer : <%= @customer.name rescue "" %> + <% end %> +
    -
    -
    +
    @@ -243,7 +244,7 @@ if @status_sale == 'sale' end %>
    - + <% else @sale_array.each do |sale| @@ -289,30 +290,22 @@ end showHideNavbar(webview); $(".tables").on('click', function(){ - $('.tables').removeClass('selected-item'); - $(this).addClass('selected-item'); - var dining_name = $(this).attr("data-name"); - var dining_id = $(this).attr("data-id"); - var change_from = "<%= @dining.id %>"; - if (dining_id == change_from) { - /*$.alert({ - title: 'Alert!', - content: 'Please Select Another Table', - type: 'red', - typeAnimated: true, - btnClass: 'btn-danger', - });*/ - swal({ - title: "Alert!!", - text: 'Please Select Another Table !', - type: 'warning', - }); - }else{ - $('#moved').text(" ' " + dining_name + " ' ") - $('#change_table_value').val(dining_id); - } - - }) + $('.tables').removeClass('selected-item'); + $(this).addClass('selected-item'); + var dining_name = $(this).attr("data-name"); + var dining_id = $(this).attr("data-id"); + var change_from = "<%= @dining.id %>"; + if ((dining_id == change_from) || (dining_name==undefined)) { + swal({ + title: "Alert!!", + text: 'Please select another table !', + type: 'warning', + }); + }else{ + $('#moved').text(" ' " + dining_name + " ' ") + $('#change_table_value').val(dining_id); + } + }); $(".rooms").on('click', function(){ $('.rooms').removeClass('selected-item'); @@ -323,14 +316,14 @@ end if (dining_id == change_from) { swal({ title: "Alert!!", - text: 'Please Select Another Table !', + text: 'Please select another room !', type: 'warning', }); }else{ $('#moved').text(dining_name) $('#change_table_value').val(dining_id); } - }) + }); $('#move_table').on('click',function(){ change_to = $('#change_table_value').val(); @@ -362,7 +355,32 @@ end } }); } - }) + }); + + $('#add_invoice').on('click', function () { + var dining_id = "<%= @dining.id %>"; + var sale_id = $("#sale_id").val(); + var ajax_url = "/origami/sale/append_order"; + $.ajax({ + type: "POST", + url: ajax_url, + data: 'dining_id=' + dining_id + "&sale_id=" + sale_id, + success: function (result) { + swal({ + title: "Information!", + text: "Invoice updated", + html: true, + closeOnConfirm: false, + closeOnCancel: false, + allowOutsideClick: false + }, function () { + $("#first_bill").removeAttr('disabled'); + $("#pay").removeAttr('disabled'); + window.location.reload(); + }); + } + }); + }); }); $('#back').on('click',function(){ window.location.href = '/origami/table/'+ "<%= @dining.id %>"; diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb index fb3d9a75..359df149 100755 --- a/app/views/origami/rooms/show.html.erb +++ b/app/views/origami/rooms/show.html.erb @@ -30,7 +30,7 @@ <% @complete.each do |sale| %>
    - <%= sale.receipt_no %><%= sale.sale_status %> + <%= sale.receipt_no %><%= sale.sale_status %>
    <% end %> @@ -135,7 +135,7 @@
    <% @orders.each do |order| %> -
    +
    text-white" data-id="<%= order.order_id %>">
    <% order_status = "" diff --git a/app/views/origami/sales/show.html.erb b/app/views/origami/sales/show.html.erb index 7e3fc7e1..4bbee6a7 100755 --- a/app/views/origami/sales/show.html.erb +++ b/app/views/origami/sales/show.html.erb @@ -90,9 +90,24 @@
    <% @orders.each do |order| %> -
    +
    text-white" data-id="<%= order.order_id %>">
    - <%= order.order_id %> + <% + order_status = "" + sale_order = SaleOrder.find_by_order_id(order) + if sale_order + unless sale_order.sale_id.nil? + sale = Sale.find(sale_order.sale_id) + order_status = sale.sale_status + if order_status == 'new' + order_status = order.status + end + end + else + order_status = order.status + end + %> + <%= order.order_id %> <% if !order_status.empty? %>| <%= order_status %> <% end %>
    <% end %> @@ -198,7 +213,7 @@
    - <% if @sale.sale_status != 'void' %> + <% if @sale.sale_status != 'void' && @sale.sale_status != 'waste' && @sale.sale_status != 'spoile' %> <% if current_login_employee.role == "cashier" %> Void <% else %> diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb index 567b056b..9581d5df 100755 --- a/app/views/reports/receipt_no/index.html.erb +++ b/app/views/reports/receipt_no/index.html.erb @@ -59,20 +59,16 @@ <% 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 %> + precision = @print_settings.precision + else + precision = 0 + end + #check delimiter + if @print_settings.delimiter + delimiter = "," + else + delimiter = "" + end %> <% grand_total = 0 %> <% old_grand_total = 0 %> @@ -116,12 +112,18 @@   <%= 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 '-' %> + <% if !@sale_taxes.empty? + @sale_taxes.each do |tax| %> + <%= number_with_precision(tax.st_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %> + <% end %> + <% else %> + <% @tax_profiles.each do |tax| %> + 0 + <% end %> <% 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) %> + <%= number_with_precision(grand_total.to_f.round + rounding_adj, precision: precision.to_i ,delimiter: delimiter) rescue '0' %>