diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index fdeb6fe1..51ddc9eb 100755
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -74,7 +74,7 @@ class Crm::CustomersController < BaseCrmController
@response = Customer.get_membership_transactions(@customer)
Rails.logger.debug "get membership transactions response"
- Rails.logger.debug response.to_json
+ Rails.logger.debug @response.to_json
# @response = ""
#end customer amount
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index 8098dfe9..d283b06e 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -43,6 +43,17 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
MenuCategory.current_menu
end
end
+
+
+ def get_menu_sub_category ()
+ id = params[:id]
+ if (id)
+ #Pull this menu
+ @sub_menu = MenuCategory.where("menu_category_id = #{id}").active
+ # puts @menu.menu_items[1].item_attributes.to_json
+ return @sub_menu
+ end
+ end
def get_all_product()
@product = Product.all
diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb
index 59de9f6d..e0739e88 100755
--- a/app/controllers/origami/discounts_controller.rb
+++ b/app/controllers/origami/discounts_controller.rb
@@ -29,8 +29,6 @@ class Origami::DiscountsController < BaseOrigamiController
# sale.grand_total = (sub_total.to_f - overall_discount.to_f) + sale.total_tax;
# sale.save
if discount_items.length > 0
- puts discount_items.to_json
- puts "dddddddddddd"
#save sale item for discount
discount_items.each do |di|
diff --git a/app/models/dining_facility.rb b/app/models/dining_facility.rb
index 1b245b24..9948ec48 100755
--- a/app/models/dining_facility.rb
+++ b/app/models/dining_facility.rb
@@ -78,13 +78,13 @@ class DiningFacility < ApplicationRecord
def get_checkout_booking
booking = self.get_current_checkout_booking
if booking
- now = Time.now.utc
+ now = Time.now.utc.getlocal
hr = (now.strftime("%H").to_i).to_int
min = (now.strftime("%M").to_i).to_int
if !booking.checkout_at.nil?
- checkout_at = booking.checkout_at.utc
- checkout_at_hr = (checkout_at.utc.strftime("%H").to_i).to_int
- checkout_at_min = (checkout_at.utc.strftime("%M").to_i).to_int
+ checkout_at = booking.checkout_at.utc.getlocal
+ checkout_at_hr = (checkout_at.strftime("%H").to_i).to_int
+ checkout_at_min = (checkout_at.strftime("%M").to_i).to_int
checkout_at_min -= min
if (checkout_at_hr <= hr) && (checkout_at_min <= 15)
return booking
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index a62e7b90..c48dfa7f 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -294,6 +294,7 @@ class ReceiptBillPdf < Prawn::Document
balance = 0
rebate_balance =0
redeem = 0
+ redeem_count = 0
rebate_amount["data"].each do |res|
total = total + res["balance"]
#total redeem amount
@@ -318,7 +319,7 @@ class ReceiptBillPdf < Prawn::Document
end
# Total Rebate Amount if birthday
- if res["receipt_no"]== sale_data.receipt_no && res["account_status"]== "RebateBonusAccount" && res["status"]== "Rebate"
+ if res["receipt_no"]== sale_data.receipt_no && res["account_status"]== "RebatebonusAccount" && res["status"]== "Rebate"
rebate_balance = rebate_balance + res["deposit"]
move_down 5
y_position = cursor
@@ -332,20 +333,22 @@ class ReceiptBillPdf < Prawn::Document
#end Total rebate if birthday
end
- move_down 5
+ move_down 5
y_position = cursor
- bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
+ bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
text "Redeem Amount", :size => self.item_font_size,:align => :left
- end
+ end
bounding_box([self.item_description_width,y_position], :width =>self.label_width) do
text "#{number_with_precision(redeem, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
- end
+ end
if redeem == 0
old = total - rebate_balance
else
- old = balance + redeem
+ # if redeem_count == 0
+ old = balance + redeem
+ # end
end
move_down 5
diff --git a/app/views/origami/addorders/get_menu_sub_category.json.jbuilder b/app/views/origami/addorders/get_menu_sub_category.json.jbuilder
new file mode 100644
index 00000000..d391e4c5
--- /dev/null
+++ b/app/views/origami/addorders/get_menu_sub_category.json.jbuilder
@@ -0,0 +1,9 @@
+if @sub_menu
+ json.sub_category @sub_menu.each do |sub_cat|
+ json.id sub_cat.id
+ json.code sub_cat.code
+ json.name sub_cat.name
+ json.menu_id sub_cat.menu_id
+ json.menu_category_id sub_cat.menu_category_id
+ end
+end
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 780ace0b..6d83f852 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -132,7 +132,11 @@
<% end %>
ORDER DETAILS | Table <%= @dining.name rescue "" %>
- Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %>
+ <% 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 %>
<% elsif @status_sale == 'sale' %>
INVOICE DETAILS | Table <%= @dining.name rescue "" %>
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 0b65eae4..aee41b77 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -132,12 +132,20 @@