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

app/controllers/origami/discounts_controller.rb

@@ -6,52 +6,91 @@ class Origami::DiscountsController < BaseOrigamiController
     if Sale.exists?(sale_id)
       @sale_data = Sale.find(sale_id)
     end
+
+    @accounts = Account.all
+  end
+
+  #discount page show from origami index with selected order
+  def create
+    sale_id = params[:sale_id]
+    discount_items = JSON.parse(params[:discount_items])
+    overall_discount = params[:overall_discount]
+    sub_total = params[:sub_total]
+
+    if Sale.exists?(sale_id)
+      sale = Sale.find(sale_id)
+      sale.total_discount = overall_discount.to_f        
+      sale.total_amount = sub_total.to_f
+      sale.grand_total = (sub_total.to_f - overall_discount.to_f) + sale.total_tax;  
+      sale.save   
+      if discount_items.length > 0
+        #save sale item for discount
+        discount_items.each do |di|
+          puts di
+          origin_sale_item = SaleItem.find(di["id"])
+          sale_item = SaleItem.new
+
+          sale_item.sale_id = sale_id
+          sale_item.product_code = origin_sale_item != nil ? origin_sale_item.product_code : sale_id
+          sale_item.product_name = di["name"]
+          sale_item.remark = "Discount"
+
+          sale_item.qty = 1
+          sale_item.unit_price = di["price"]
+          sale_item.taxable_price = di["price"]
+          sale_item.is_taxable = 0
+
+          sale_item.price = di["price"]
+          sale_item.save
+        end                 
+      end      
+    end    
   end
 
   #discount for selected order
-  def create
-  	sale_id = params[:sale_id]
-    sale_item_id = params[:sale_item_id]
-  	discount_type = params[:discount_type]
-  	discount_value = params[:discount_value]
-  	discount_amount = params[:discount_amount]
-  	grand_total = params[:grand_total]
-    product_name = "Overall Discount"
+  # def create
+  # 	sale_id = params[:sale_id]
+  #   sale_item_id = params[:sale_item_id]
+  # 	discount_type = params[:discount_type]
+  # 	discount_value = params[:discount_value]
+  # 	discount_amount = params[:discount_amount]
+  # 	grand_total = params[:grand_total]
+  #   product_name = "Overall Discount"
 
-  	if discount_type == 0
-  		remark="Discount " + discount_amount + " as net"
-  	else
-  		remark="Discount " + discount_amount + " as percentage"
-  	end
+  # 	if discount_type == 0
+  # 		remark="Discount " + discount_amount + " as net"
+  # 	else
+  # 		remark="Discount " + discount_amount + " as percentage"
+  # 	end
 
-  	#update discount for sale
-  	sale = Sale.find(sale_id)
-  	sale.total_discount = sale.total_discount + discount_amount.to_f
-  	sale.grand_total = grand_total
-	  sale.save
+  # 	#update discount for sale
+  # 	sale = Sale.find(sale_id)
+  # 	sale.total_discount = sale.total_discount + discount_amount.to_f
+  # 	sale.grand_total = grand_total
+	 #  sale.save
 
-  	#save sale item for discount
-    if sale_item_id != nil
-      origin_sale_item = SaleItem.find(sale_item_id)
-      product_name = origin_sale_item.product_name + "-Disocunt"
-    end
-    sale_item = SaleItem.new
+  # 	#save sale item for discount
+  #   if sale_item_id != nil
+  #     origin_sale_item = SaleItem.find(sale_item_id)
+  #     product_name = origin_sale_item.product_name + "-Disocunt"
+  #   end
+  #   sale_item = SaleItem.new
 
-    #pull
-    sale_item.sale_id = sale_id
-    sale_item.product_code = origin_sale_item != nil ? origin_sale_item.product_code : sale_id
-    sale_item.product_name = product_name
-    sale_item.remark = remark
+  #   #pull
+  #   sale_item.sale_id = sale_id
+  #   sale_item.product_code = origin_sale_item != nil ? origin_sale_item.product_code : sale_id
+  #   sale_item.product_name = product_name
+  #   sale_item.remark = remark
 
-    sale_item.qty = 1
-    sale_item.unit_price = (0-discount_amount.to_f)
-    sale_item.taxable_price = discount_amount
-    sale_item.is_taxable = 0
+  #   sale_item.qty = 1
+  #   sale_item.unit_price = (0-discount_amount.to_f)
+  #   sale_item.taxable_price = discount_amount
+  #   sale_item.is_taxable = 0
 
-    sale_item.price = sale_item.qty * sale_item.unit_price
-    sale_item.save
+  #   sale_item.price = sale_item.qty * sale_item.unit_price
+  #   sale_item.save
 
-    redirect_to origami_path(sale_id)
-  end
+  #   redirect_to origami_path(sale_id)
+  # end
 
 end

app/controllers/origami/payments_controller.rb

@@ -10,11 +10,13 @@ class Origami::PaymentsController < BaseOrigamiController
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
       sale_payment = SalePayment.new
-      sale_payment.process_payment(saleObj, @user, cash, "cash")
+       sale_payment.process_payment(saleObj, @user, cash, "cash")
+     
+      rebate_amount = nil
 
       unique_code = "ReceiptBillPdf"
       customer= Customer.find(saleObj.customer_id)
-
+      rebate_amount  = Customer.get_membership_transactions(customer)
       # get member information
       member_info = Customer.get_member_account(customer)
 
@@ -24,7 +26,7 @@ class Origami::PaymentsController < BaseOrigamiController
       food_total, beverage_total = SaleItem.calculate_food_beverage(saleObj.sale_items)
 
       printer = Printer::ReceiptPrinter.new(print_settings)
-      printer.print_receipt_bill(print_settings,saleObj.sale_items,saleObj,customer.name, food_total, beverage_total, member_info)
+      printer.print_receipt_bill(print_settings,saleObj.sale_items,saleObj,customer.name, food_total, beverage_total, member_info,rebate_amount)
     end
   end
 
@@ -88,7 +90,7 @@ class Origami::PaymentsController < BaseOrigamiController
 
       # get member information
       member_info = Customer.get_member_account(customer)
-
+      rebate_amount  = Customer.get_membership_transactions(customer)
       # get printer info
       print_settings=PrintSetting.find_by_unique_code(unique_code)
 
@@ -96,7 +98,7 @@ class Origami::PaymentsController < BaseOrigamiController
       food_total, beverage_total = SaleItem.calculate_food_beverage(saleObj.sale_items)
 
       printer = Printer::ReceiptPrinter.new(print_settings)
-      printer.print_receipt_bill(print_settings,saleObj.sale_items,saleObj,customer.name, food_total, beverage_total, member_info)
+      printer.print_receipt_bill(print_settings,saleObj.sale_items,saleObj,customer.name, food_total, beverage_total, member_info,rebate_amount)
   end
 
 

app/controllers/origami/request_bills_controller.rb

@@ -20,8 +20,11 @@ class Origami::RequestBillsController < BaseOrigamiController
     end
 
     unique_code = "ReceiptBillPdf"
-    customer= Customer.where('customer_id=' + @sale_data.customer_id)
-
+    # customer= Customer.where('customer_id=' +.customer_id)
+    
+    customer= Customer.find( @sale_data.customer_id)
+    # get member information
+      member_info = Customer.get_member_account(customer)
     # get printer info
     print_settings=PrintSetting.find_by_unique_code(unique_code)
 
@@ -32,6 +35,9 @@ class Origami::RequestBillsController < BaseOrigamiController
     food_total, beverage_total = SaleItem.calculate_food_beverage(@sale_items)
 
     printer = Printer::ReceiptPrinter.new(print_settings)
-    printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, food_total, beverage_total)
+
+    printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, food_total, beverage_total,member_info)
+    # redirect_to origami_path(@sale_data.sale_id)
+
   end
 end