merge with crm and room fixed

app/controllers/crm/customers_controller.rb

@@ -115,7 +115,7 @@ class Crm::CustomersController < BaseCrmController
                                               'Content-Type' => 'application/json',
                                               'Accept'       => 'application/json'
                                                     },
-                                        :timeout => 100
+                                        :timeout => 10
                                )
 
                  rescue HTTParty::Error
@@ -209,8 +209,6 @@ end
                                                   },
                                       :timeout => 10
                               )
-            puts "hhhhhhhhh"
-            puts response.to_json
             rescue Net::OpenTimeout
               response = { status: false }
 

app/controllers/origami/payments_controller.rb

@@ -50,7 +50,7 @@ class Origami::PaymentsController < BaseOrigamiController
 
       unique_code = "ReceiptBillPdf"
       customer= Customer.find(saleObj.customer_id)
-      rebate_amount  = Customer.get_membership_transactions(customer)
+      rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
        #shop detail
       shop_details = Shop.find(1)
       # get member information
@@ -133,7 +133,7 @@ class Origami::PaymentsController < BaseOrigamiController
       shop_details = Shop.find(1)
       # get member information
       member_info = Customer.get_member_account(customer)
-      rebate_amount  = Customer.get_membership_transactions(customer)
+      rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
       # get printer info
       print_settings=PrintSetting.find_by_unique_code(unique_code)
 

app/controllers/origami/rooms_controller.rb

@@ -6,6 +6,7 @@ class Origami::RoomsController < BaseOrigamiController
     @complete = Sale.all
     @orders = Order.all.order('date desc')
     @room = DiningFacility.find(params[:room_id])
+    @sale_array = Array.new
     @room.bookings.each do |booking|
          if booking.sale_id.nil?
            @order_items = Array.new
@@ -23,12 +24,16 @@ class Origami::RoomsController < BaseOrigamiController
 
           sale = Sale.find(booking.sale_id)
            if sale.sale_status != "completed"
+            @sale_array.push(sale)
              @status = 'sale'
              @obj = sale
              @customer = sale.customer
            end
          end
     end
+    puts "hhhhhhhhhh"
+    puts @status
+    puts @obj.to_json
   end
 
 

app/controllers/transactions/sales_controller.rb

@@ -51,6 +51,7 @@ class Transactions::SalesController < ApplicationController
     end
 
     @sale_receivables = SalePayment.where('sale_id = ?', @sale.id)
+    @sale_audits = SaleAudit.where('sale_id = ?', @sale.id)
 
     #get customer amount
       @customer       = Customer.find(@sale.customer_id)