diff --git a/app/models/menu_category.rb b/app/models/menu_category.rb index 9930d3cd..200c4469 100755 --- a/app/models/menu_category.rb +++ b/app/models/menu_category.rb @@ -37,6 +37,25 @@ class MenuCategory < ApplicationRecord end end + def valid_time + + menu_category = MenuCategory.find(self.id) + menu = Menu.find(menu_category.menu_id) + from = menu.valid_time_from.strftime("%H:%m:%S") + to = menu.valid_time_to.strftime("%H:%m:%S") + current = Time.now.utc.getlocal.strftime("%H:%m:%S") + + from = from.split(':').map { |a| a.to_i }.inject(0) { |a, b| a * 60 + b} + to = to.split(':').map { |a| a.to_i }.inject(0) { |a, b| a * 60 + b} + current = current.split(':').map { |a| a.to_i }.inject(0) { |a, b| a * 60 + b} + + if current.between?(from, to) + return true + else + return nil + end + end + private # def generate_menu_category_code diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb index d84b0366..35248b97 100755 --- a/app/pdf/close_cashier_pdf.rb +++ b/app/pdf/close_cashier_pdf.rb @@ -360,7 +360,7 @@ class CloseCashierPdf < Prawn::Document text "Total #{amount.account_name} Amount :", :size => self.item_font_size, :align => :right end bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do - text "#{amount.total_price.round(2)} ", :size => self.item_font_size, :align => :right + text "#{number_with_precision(amount.total_price, :precision => precision.to_i, :delimiter => delimiter)} ", :size => self.item_font_size, :align => :right end end #end total amount by Account diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb index bebf18cc..ab813ec6 100755 --- a/app/views/origami/addorders/detail.html.erb +++ b/app/views/origami/addorders/detail.html.erb @@ -8,6 +8,7 @@