Merge branch 'r-1902001-01' of gitlab.com:code2lab/SXRestaurant into r-1902001-01

2019-05-08 18:01:52 +06:30
parent b2532ce5f3 c85a5f4b10
commit adca701275
28 changed files with 7546 additions and 73 deletions
--- a/app/controllers/origami/other_charges_controller.rb
+++ b/app/controllers/origami/other_charges_controller.rb
@@ -46,6 +46,7 @@ class Origami::OtherChargesController < BaseOrigamiController
 	          sale_item = SaleItem.new

 	          sale_item.sale_id = sale_id
+	          sale_item.menu_category_code = "0.0"
 	          sale_item.menu_category_name = "Other Charges"
 	          sale_item.product_code = "Other Charges"
 	          sale_item.product_name = "*" + di["name"]
--- a/app/controllers/origami/table_invoices_controller.rb
+++ b/app/controllers/origami/table_invoices_controller.rb
@@ -30,6 +30,7 @@ class Origami::TableInvoicesController < BaseOrigamiController
 	end

  def show
+    puts 'Catch me if you can.......................'
    @table = DiningFacility.find(params[:table_id])
    @membership = MembershipSetting::MembershipSetting
    @payment_methods = PaymentMethodSetting.all