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

app/controllers/crm/customers_controller.rb

@@ -17,9 +17,9 @@ class Crm::CustomersController < BaseCrmController
     @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
     # @membership     = Customer.get_member_group
     # if @membership["status"] == true
     #   @member_group = @membership["data"]
@@ -65,15 +65,19 @@ class Crm::CustomersController < BaseCrmController
                                                       'Accept'       => 'application/json'
                                               }
                       )
-      
-      @type = "-"
-      @balance = 0.00
-      response["data"].each do |res|
-        if res["accountable_type"] == "RebateAccount"
-           @balance = res["balance"]
-           @type    = "RebateAccount"
-        end         
+      if(response["status"] == true)
+        @membership = response["data"]
+      else
+        @membership = 0
       end
+      # @type = "-"
+      # @balance = 0.00
+      # response["data"].each do |res|
+      #   if res["accountable_type"] == "RebateAccount"
+      #      @balance = res["balance"]
+      #      @type    = "RebateAccount"
+      #   end         
+      # end
       
       #end customer amount
 

app/controllers/transactions/sales_controller.rb

@@ -10,7 +10,7 @@ class Transactions::SalesController < ApplicationController
     today       = Date.today
     
     if receipt_no.nil?
-      @sales = Sale.order("sale_id").page(params[:page])
+      @sales = Sale.order("sale_id")
       #@products = Product.order("name").page(params[:page]).per(5)
     else
       @sales = Sale.search(receipt_no)    
@@ -27,7 +27,16 @@ class Transactions::SalesController < ApplicationController
   def show
    
     @sale = Sale.find(params[:id])
-    # @sale_receivables = SaleReceivable.where('sale_id = ?', @sale.id)
+
+    @order_items = []
+    @sale.sale_orders.each do |sale_order|
+      order = Order.find(sale_order.order_id)
+      #if (order.status == "new")
+        @order_items = @order_items + order.order_items
+      #end
+    end
+
+    @sale_receivables = SalePayment.where('sale_id = ?', @sale.id)
     respond_to do |format|
       format.html # show.html.erb
       format.json { render json: @sale }