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

app/controllers/origami/customers_controller.rb

@@ -28,11 +28,10 @@ class Origami::CustomersController < BaseOrigamiController
     @crm_customers   = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(50)
     @crm_customer    = Customer.new
     
-    if flash["errors"]
-      @crm_customer.valid?
-    end
+    # if flash["errors"]
+    #   @crm_customer.valid?
+    # end
   
-   
     respond_to do |format|
       # format.html { render :template => "crm/customers/index" }
       format.html { render action: "index"}

app/controllers/origami/request_bills_controller.rb

@@ -8,15 +8,17 @@ class Origami::RequestBillsController < BaseOrigamiController
     check_booking = Booking.find_by_booking_id(booking_id)
     if check_booking.sale_id.nil?
       # Create Sale if it doesn't exist
+      puts "current_login_employee"
+      puts current_login_employee.name
       @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee)
       @sale_data = Sale.find_by_sale_id(@sale_id)
-      @sale_items = SaleItem.where("sale_id=?",@sale_id)            
+      @sale_items = SaleItem.where("sale_id=?",@sale_id)
     else
       @sale_data = Sale.find_by_sale_id(check_booking.sale_id)
       @sale_items = SaleItem.where("sale_id=?",@sale_data.sale_id)
     end
 
-    unique_code = "ReceiptBillPdf"   
+    unique_code = "ReceiptBillPdf"
     customer= Customer.where('customer_id=' + @sale_data.customer_id)
 
     # get printer info
@@ -28,10 +30,8 @@ class Origami::RequestBillsController < BaseOrigamiController
     # Calculate Food and Beverage Total
     food_total, beverage_total = SaleItem.calculate_food_beverage(@sale_items)
 
-    printer = Printer::ReceiptPrinter.new(print_settings)   
+    printer = Printer::ReceiptPrinter.new(print_settings)
     printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, food_total, beverage_total)
     redirect_to origami_path(@sale_data.sale_id)
   end
 end
-
-

app/controllers/transactions/sales_controller.rb

@@ -104,7 +104,19 @@ class Transactions::SalesController < ApplicationController
   end
 
   def manual_void_sale
-     sale_id = params[:sale_id]
+
+     sale_id           = params[:sale_id]
+     reason            = params[:reason]
+     sale              = Sale.find(sale_id)
+     sale.sales_status = 'void'
+     sale.remarks      = reason
+     sale.void_by      = current_user.id
+     if sale.save  
+       sale =SaleAudit.record_audit_void(sale_id, current_user.id, current_user.id, reason)
+     end
+     respond_to do |format|
+       format.html { redirect_to transactions_sales_url, notice: 'Sale was successfully void.' }
+     end
      
   end