git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

Browse Source
This commit is contained in:
phyusin
2018-04-09 13:56:11 +06:30
parent f6ba7403c5 308ecf9491
commit b5016edb0d
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/bookings_controller.rb
View File

@@ -1,5 +1,5 @@
class Api::BookingsController < Api::ApiController class Api::BookingsController < Api::ApiController
skip_before_action :authenticate # skip_before_action :authenticate
#Show customer by ID #Show customer by ID
def index def index
@customer = Customer.find_by(params[:id]) @customer = Customer.find_by(params[:id])

2
app/controllers/api/check_in_process_controller.rb
View File

@@ -1,5 +1,5 @@
class Api::CheckInProcessController < Api::ApiController class Api::CheckInProcessController < Api::ApiController
# before_action :authenticate
def check_in_time def check_in_time
if params[:dining_id] if params[:dining_id]
dining_facility = DiningFacility.find(params[:dining_id]) dining_facility = DiningFacility.find(params[:dining_id])

2
app/controllers/api/orders_controller.rb
View File

@@ -1,5 +1,5 @@
class Api::OrdersController < Api::ApiController class Api::OrdersController < Api::ApiController
skip_before_action :authenticate # skip_before_action :authenticate
#Description #Description
# This API show current order details # This API show current order details
# Input Params - order_id # Input Params - order_id

4
app/pdf/order_summary_set_pdf.rb
View File

@@ -4,8 +4,8 @@ class OrderSummarySetPdf < Prawn::Document
def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty) def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty)
self.page_width = print_settings.page_width self.page_width = print_settings.page_width
self.page_height = print_settings.page_height self.page_height = print_settings.page_height
self.header_font_size = printer_settings.header_font_size.to_i self.header_font_size = print_settings.header_font_size.to_i
self.item_font_size = printer_settings.item_font_size.to_i self.item_font_size = print_settings.item_font_size.to_i
self.margin = 0 self.margin = 0
self.price_width = 40 # No Need for item self.price_width = 40 # No Need for item
self.qty_width = 40 self.qty_width = 40

4
app/pdf/order_summary_slim_pdf.rb
View File

@@ -4,8 +4,8 @@ class OrderSummarySlimPdf < Prawn::Document
def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty) def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty)
self.page_width = print_settings.page_width self.page_width = print_settings.page_width
self.page_height = print_settings.page_height self.page_height = print_settings.page_height
self.header_font_size = printer_settings.header_font_size.to_i self.header_font_size = print_settings.header_font_size.to_i
self.item_font_size = printer_settings.item_font_size.to_i self.item_font_size = print_settings.item_font_size.to_i
self.margin = 0 self.margin = 0
self.price_width = 40 # No Need for item self.price_width = 40 # No Need for item
self.qty_width = 40 self.qty_width = 40