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

app/controllers/transactions/sales_controller.rb

@@ -50,6 +50,18 @@ class Transactions::SalesController < ApplicationController
     end
 
     @sale_receivables = SalePayment.where('sale_id = ?', @sale.id)
+
+    #get customer amount
+      @customer       = Customer.find(@sale.customer_id)
+      response        = Customer.get_member_account(@customer)
+
+      if(response["status"] == true)
+        @membership = response["data"]
+      else
+        @membership = 0
+      end
+      #end customer amount
+
     respond_to do |format|
       format.html # show.html.erb
       format.json { render json: @sale }
@@ -111,7 +123,6 @@ class Transactions::SalesController < ApplicationController
   end
 
   def manual_void_sale
-
      sale_id           = params[:sale_id]
      reason            = params[:reason]
      sale              = Sale.find(sale_id)
@@ -123,9 +134,21 @@ class Transactions::SalesController < ApplicationController
      respond_to do |format|
        format.html { redirect_to transactions_sales_url, notice: 'Sale was successfully void.' }
      end
-     
   end
 
+  def manual_complete_sale
+    sale_id           = params[:sale_id]
+    sale              = Sale.find(sale_id)
+    sale.sale_status  = 'completed'
+    sale.requested_by = current_login_employee.id
+    remark            = remark = "Complete for Sale ID #{sale_id} By #{current_login_employee.name}"
+    if sale.save
+      sale = SaleAudit.record_audit_complete(sale_id, remark, current_login_employee.id)
+    end
+    redirect_to transactions_sales_path
+  end
+  
+
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_transactions_sale