order quries update

app/controllers/api/bill_controller.rb

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

app/controllers/crm/customers_controller.rb

@@ -5,7 +5,7 @@ class Crm::CustomersController < BaseCrmController
   # GET /crm/customers.json
   def index
     filter = params[:filter]
-    
+
     if filter.nil?
       @crm_customers = Customer.order("customer_id").page(params[:page])
       #@products = Product.order("name").page(params[:page]).per(5)
@@ -31,7 +31,7 @@ class Crm::CustomersController < BaseCrmController
   # GET /crm/customers/1.json
   def show
     @orders = Order.where("customer_id=?", params[:id])
-  
+
     if @orders
       @order_items = []
       @orders.each do |bo|
@@ -57,13 +57,13 @@ 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]
         email           = customer_params[:email]
-        date_of_birth   = customer_params[:date_of_birth]
+        dob             = customer_params[:date_of_birth]
         member_group_id   = params[:member_group_id]
 
         membership      = MembershipSetting.find_by_membership_type("paypar_url")
@@ -72,7 +72,9 @@ class Crm::CustomersController < BaseCrmController
         url             = membership.gateway_url.to_s + memberaction.gateway_url.to_s
 
         response        = HTTParty.post(url, :body => { name: name,phone: phone,email: email,
-                                                        date_of_birth: date_of_birth,
+
+                                                        dob: dob,
+
                                                         member_group_id: member_group_id,merchant_uid:merchant_uid}.to_json,
                                              :headers => {
                                                       'Content-Type' => 'application/json',
@@ -81,18 +83,18 @@ class Crm::CustomersController < BaseCrmController
                                         )
 
           if response["status"] == true
-          
+
               customer = Customer.find(@crm_customers.customer_id)
               status   = customer.update_attributes(membership_id: response["customer_datas"]["id"])
-              
+
                if params[:sale_id]
                  format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer', notice: 'Customer was successfully created.' }
                else
                  format.html { redirect_to crm_customers_path, notice: 'Customer was successfully created'}
-               end              
+               end
               # format.json { render :index, status: :created, location: @crm_customers }
           else
-              
+
               @crm_customers.destroy
               if params[:sale_id]
                 format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer'}
@@ -103,7 +105,7 @@ class Crm::CustomersController < BaseCrmController
       else
 
           if params[:sale_id]
-            format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer'} 
+            format.html { redirect_to '/origami/'+params[:sale_id]+'/add_customer'}
           else
             format.html { redirect_to crm_customers_path}
             format.json { render json: @crm_customers.errors, status: :unprocessable_entity }
@@ -123,8 +125,8 @@ end
         name            = customer_params[:name]
         phone           = customer_params[:contact_no]
         email           = customer_params[:email]
-        date_of_birth   = customer_params[:date_of_birth]
-        id              = customer_params[:membership_id]
+        dob             = customer_params[:date_of_birth]
+        id              = @crm_customer.membership_id
         member_group_id = params[:member_group_id]
 
         membership      = MembershipSetting.find_by_membership_type("paypar_url")
@@ -133,7 +135,7 @@ end
         url             = membership.gateway_url.to_s + memberaction.gateway_url.to_s
 
         response        = HTTParty.post(url, :body => { name: name,phone: phone,email: email,
-                                                        date_of_birth: date_of_birth,
+                                                        dob: dob,
                                                         id: id,member_group_id:member_group_id,merchant_uid:merchant_uid}.to_json,
                                              :headers => {
                                                       'Content-Type' => 'application/json',

app/controllers/origami/customers_controller.rb

@@ -28,8 +28,8 @@ class Origami::CustomersController < BaseOrigamiController
     #  if @membership["status"] == true
     #    @member_group = @membership["data"]
     #  end
-    puts "Errrrrrrrrrrrrrrrrr"
-   puts  @crm_customer.new_record?
+    # puts "Errrrrrrrrrrrrrrrrr"
+    # puts  @crm_customer.valid?
   
    
     respond_to do |format|

app/controllers/origami/payments_controller.rb

@@ -24,8 +24,8 @@ class Origami::PaymentsController < BaseOrigamiController
          if spay.payment_method == "cash"
            @cash = spay.payment_amount
          end
-         if spay.payment_method == "mpu"
-           @other = spay.payment_amount
+         if spay.payment_method == "mpu" || spay.payment_method == "paypar"
+           @other += spay.payment_amount
          end
       end
     end