From 8af99742a3ed6e5c59aa148517ef61787647350f Mon Sep 17 00:00:00 2001 From: Myat Zin Wai Maw Date: Tue, 17 Dec 2019 15:06:37 +0630 Subject: [PATCH] bill and tax --- app/controllers/api/orders_controller.rb | 9 --------- app/controllers/foodcourt/home_controller.rb | 4 ++-- app/controllers/origami/pending_order_controller.rb | 8 ++++---- app/models/sale.rb | 2 ++ 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb index 777588ba..0c512f5d 100755 --- a/app/controllers/api/orders_controller.rb +++ b/app/controllers/api/orders_controller.rb @@ -122,21 +122,12 @@ class Api::OrdersController < Api::ApiController end @status, @booking = @order.generate - if @status && @booking - Order.process_order_queue(@order.order_id,@order.table_id,@order.source) - end if @order.table_id.to_i > 0 table = DiningFacility.find(@booking.dining_facility_id) type = 'order' from = getCloudDomain #get sub domain in cloud mode ActionCable.server.broadcast "order_channel",table: table,type:type,from:from end - # # for parallel order - # remoteIP = "" - # begin - # @status, @booking = @order.generate - # remoteIP = request.remote_ip - # end while request.remote_ip != remoteIP if current_user.role != "waiter" && params[:create_type] == "create_pay" if @status && @booking && (@order.source == 'quick_service') || (@order.source == 'food_court') || (@order.source == 'app') @status, @sale = Sale.request_bill(@order,current_user,current_user) diff --git a/app/controllers/foodcourt/home_controller.rb b/app/controllers/foodcourt/home_controller.rb index 09b85b16..3bfc6867 100755 --- a/app/controllers/foodcourt/home_controller.rb +++ b/app/controllers/foodcourt/home_controller.rb @@ -6,7 +6,7 @@ class Foodcourt::HomeController < BaseFoodcourtController @webview = check_mobile @tables = Table.unscoped.all.active.where("shop_code='#{@shop.shop_code}'").order('status desc') @rooms = Room.unscoped.all.active.where("shop_code='#{@shop.shop_code}'").order('status desc') - @complete = Sale.completed_sale("cashier",@shop.shop_code) + @complete = Sale.completed_sale("cashier") @orders = Order.includes("sale_orders").where("shop_code='#{@shop.shop_code}' and DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc') @customers = Customer.pluck("customer_id, name") @@ -21,7 +21,7 @@ class Foodcourt::HomeController < BaseFoodcourtController @webview = check_mobile @tables = Table.unscoped.all.active.where("shop_code='#{@shop.shop_code}'").order('status desc') @rooms = Room.unscoped.all.active.where("shop_code='#{@shop.shop_code}'").order('status desc') - @complete = Sale.completed_sale("cashier",@shop.shop_code) + @complete = Sale.completed_sale("cashier") @orders = Order.includes("sale_orders").where("shop_code='#{@shop.shop_code}' and DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc') @customers = Customer.pluck("customer_id, name") @shift = ShiftSale.current_open_shift(current_user) diff --git a/app/controllers/origami/pending_order_controller.rb b/app/controllers/origami/pending_order_controller.rb index c6bdb2e7..773a217e 100644 --- a/app/controllers/origami/pending_order_controller.rb +++ b/app/controllers/origami/pending_order_controller.rb @@ -5,7 +5,7 @@ class Origami::PendingOrderController < BaseOrigamiController @cashier_type = params[:type] @sale = Sale.pending_sale(@cashier_type) @order = Sale.pending_order(@cashier_type) - @completed = Sale.completed_sale(@cashier_type,@shop.shop_code) + @completed = Sale.completed_sale(@cashier_type) @customers = Customer.pluck("customer_id, name") @occupied_table = @sale.count.length + @order.count.length @@ -36,7 +36,7 @@ class Origami::PendingOrderController < BaseOrigamiController @cashier_type = params[:type] @sales = Sale.pending_sale(@cashier_type) @orders = Sale.pending_order(@cashier_type) - @completed = Sale.completed_sale(@cashier_type,@shop.shop_code) + @completed = Sale.completed_sale(@cashier_type) @customers = Customer.pluck("customer_id, name") @occupied_table = @sales.count.length + @orders.count.length @@ -46,7 +46,7 @@ class Origami::PendingOrderController < BaseOrigamiController @cashier_type = params[:type] @sales = Sale.pending_sale(@cashier_type) @orders = Sale.pending_order(@cashier_type) - @completed = Sale.completed_sale(@cashier_type,@shop.shop_code) + @completed = Sale.completed_sale(@cashier_type) @customers = Customer.pluck("customer_id, name") @occupied_table = @sales.count.length + @orders.count.length @@ -81,7 +81,7 @@ class Origami::PendingOrderController < BaseOrigamiController @cashier_type = params[:type] @sales = Sale.pending_sale(@cashier_type) @orders = Sale.pending_order(@cashier_type) - @completed = Sale.completed_sale(@cashier_type,@shop.shop_code) + @completed = Sale.completed_sale(@cashier_type) @occupied_table = @sales.count.length + @orders.count.length diff --git a/app/models/sale.rb b/app/models/sale.rb index 5b0b08d4..88bf96f9 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -527,6 +527,8 @@ class Sale < ApplicationRecord if order_source.to_s == "emenu" order_source = "cashier" + elsif order_source.to_s == "app" + order_source = "food_court" end tax_profiles = unique_tax_profiles(order_source, self.customer_id)