update crm

app/controllers/api/bill_controller.rb

@@ -9,11 +9,11 @@ class Api::BillController < Api::ApiController
     #create Bill by Booking ID
     if (params[:booking_id])
       @sale = Sale.new
-      @status = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee.name)
-    
+      @status, @sale_id = @sale.generate_invoice_from_booking(params[:booking_id], current_login_employee.name)
+
     elsif (params[:order_id])
       @sale = Sale.new
-      @status = @sale.generate_invoice_from_order(params[:order_id], current_login_employee.name)
+      @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee.name)
 
     end
   end

app/controllers/crm/customers_controller.rb

@@ -46,10 +46,10 @@ class Crm::CustomersController < BaseCrmController
   def create
 
     @crm_customers = Customer.new(customer_params)
-   
+
     respond_to do |format|
       if @crm_customers.save
-       
+
 
         name            = customer_params[:name]
         phone           = customer_params[:contact_no]
@@ -71,13 +71,10 @@ class Crm::CustomersController < BaseCrmController
                                         )
 
           if response["status"] == true
-           puts "hhhhhhhhhhhhhhhhhh"
-           puts params[:sale_id]
-           puts response.to_json
               customer = Customer.find(@crm_customers.customer_id)
               status   = customer.update_attributes(membership_id: response["customer_datas"]["id"])
-              if params[:sale_id] != 0 
-                format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created.' }               
+              if params[:sale_id] != 0
+                format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created.' }
               else
                  format.html { redirect_to '/crm/customers/'+params[:sale_id]+'/assign_sale_id', notice: 'Customer was successfully created.' }
               end
@@ -86,27 +83,27 @@ class Crm::CustomersController < BaseCrmController
 
               @crm_customers.destroy
 
-              if params[:sale_id] != 0 
+              if params[:sale_id] != 0
                 format.html { redirect_to crm_customers_path, notice: response["message"] }
-                
+
               else
                 format.html { redirect_to '/crm/customers/'+params[:sale_id]+'/assign_sale_id', notice: response["message"] }
               end
-              
+
           end
 
-        
+
         # format.json { render :index, status: :created, location: @crm_customers }
 
       else
         if params[:sale_id] != 0
           format.html { redirect_to crm_customers_path}
           format.json { render json: @crm_customers.errors, status: :unprocessable_entity }
-          
+
         else
           format.html { redirect_to '/crm/customers/'+params[:sale_id]+'/assign_sale_id', notice: response["message"] }
         end
-        
+
       end
     end
   end
@@ -114,7 +111,7 @@ class Crm::CustomersController < BaseCrmController
   # PATCH/PUT /crm/customers/1
   # PATCH/PUT /crm/customers/1.json
   def update
-    
+
     respond_to do |format|
       if @crm_customer.update(customer_params)
 
@@ -127,7 +124,7 @@ class Crm::CustomersController < BaseCrmController
         membership      = MembershipSetting.find_by_membership_type("paypar_url")
         app_token       = membership.auth_token.to_s
         url             = membership.gateway_url.to_s + "/api/update_membership_customer".to_s
-      
+
         response        = HTTParty.post(url, :body => { name: name,phone: phone,email: email,
                                                         date_of_birth: date_of_birth,
                                                         id: id}.to_json,
@@ -136,7 +133,7 @@ class Crm::CustomersController < BaseCrmController
                                                       'Accept'       => 'application/json'
                                               }
                                         )
-        
+
         format.html { redirect_to crm_customers_path, notice: 'Customer was successfully updated.' }
         format.json { render :show, status: :ok, location: @crm_customer }
 
@@ -162,7 +159,7 @@ class Crm::CustomersController < BaseCrmController
  # DELETE /crm/customers/1
   # DELETE /crm/customers/1.json
   def get_sale_id
-    
+
     @sale_id        = params[:sale_id]
     @crm_customers  = Customer.all
     @crm_customer   = Customer.new
@@ -188,5 +185,3 @@ class Crm::CustomersController < BaseCrmController
       params.require(:customer).permit(:name, :company, :contact_no, :email, :date_of_birth, :membership_type, :membership_authentication_code)
     end
 end
-
-

app/controllers/origami/payments_controller.rb

@@ -18,6 +18,11 @@ class Origami::PaymentsController < BaseOrigamiController
     sale_id = params[:sale_id]
     if Sale.exists?(sale_id)
       @sale_data = Sale.find_by_sale_id(sale_id)
+        @sale_data.sale_payments.each do |spay|
+         if spay.payment_method == "cash"
+           @cash = spay.payment_amount
+         end
+      end
     end
   end