diff --git a/app/controllers/api/foodcourt/orders_controller.rb b/app/controllers/api/foodcourt/orders_controller.rb index b5e1eccc..41f1d185 100644 --- a/app/controllers/api/foodcourt/orders_controller.rb +++ b/app/controllers/api/foodcourt/orders_controller.rb @@ -6,7 +6,7 @@ class Api::Foodcourt::OrdersController < Api::ApiController if shift = ShiftSale.current_open_shift(current_login_employee) @order = Order.new - @order.source = params[:source] || "foodcourt" + @order.source = params[:source] || "food_court" @order.order_type = params[:order_type] || "Takeaway" @order.customer_id = params[:customer_id] || takeaway.customer_id # for no customer id from mobile @order.items = params[:order_items] diff --git a/app/controllers/api/foodcourt/void_controller.rb b/app/controllers/api/foodcourt/void_controller.rb index 904cdb9a..477001d7 100644 --- a/app/controllers/api/foodcourt/void_controller.rb +++ b/app/controllers/api/foodcourt/void_controller.rb @@ -2,7 +2,7 @@ class Api::Foodcourt::VoidController < Api::ApiController def create sale_id = params[:sale_id] - order_source = params[:type] || "foodcourt" #tax profile source + order_source = params[:type] || "food_court" #tax profile source access_code = params[:access_code] remark = params[:remark] diff --git a/app/models/sale_tax.rb b/app/models/sale_tax.rb index c5ecb728..5cbaa4a3 100755 --- a/app/models/sale_tax.rb +++ b/app/models/sale_tax.rb @@ -36,7 +36,7 @@ class SaleTax < ApplicationRecord end def display_name - "#{self.tax_name} (#{'Incl.' if self.inclusive} #{self.tax_rate}%" + "#{self.tax_name} (#{'Incl. ' if self.inclusive}#{self.tax_rate}%)" end private