From 7b90acd2c19d25ed824f65a917cc833ccc273d53 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 24 Aug 2017 11:29:04 +0630
Subject: [PATCH] update jade integration card use for all shop

---
 app/controllers/crm/customers_controller.rb     |  2 --
 app/controllers/origami/customers_controller.rb |  5 +++--
 app/models/customer.rb                          |  8 ++------
 app/views/origami/customers/index.html.erb      | 16 ++++++++--------
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index 93d2f95b..2a0626dd 100644
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -33,8 +33,6 @@ class Crm::CustomersController < BaseCrmController
         end
       end
     end
-    puts @crm_customers
-    #@crm_customers  = Customer.all
     @crm_customers  = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(50)
     @crm_customer   = Customer.new
     @count_customer = Customer.count_customer
diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb
index 9dfae470..72597613 100644
--- a/app/controllers/origami/customers_controller.rb
+++ b/app/controllers/origami/customers_controller.rb
@@ -36,12 +36,13 @@ class Origami::CustomersController < BaseOrigamiController
           @crm_customers.customer_type     = "Dinein"
           @crm_customers.tax_profiles      = ["1", "2"]
           @crm_customers.save
+          @crm_customers = Customer.search(filter)
         else
-           @crm_customers = {:status=> response["status"],:message=>response["message"] }
+           @crm_customers = [{"customer_id": response["status"],"message": response["message"] }]
         end
       end
     end
-    puts @crm_customers
+
     render :json => @crm_customers.to_json
   end
 
diff --git a/app/models/customer.rb b/app/models/customer.rb
index 75978056..83a5e543 100644
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -129,8 +129,7 @@ class Customer < ApplicationRecord
     sales    = Sale.where("rebate_status = 'false'")
     sales.each do |sale|
       if sale.customer.membership_id
-          response = self.rebat(Sale.find(sale.sale_id))
-           puts response.to_json
+          response = self.rebat(Sale.find(sale.sale_id))           
            if response["status"] == true
              status   = sale.update_attributes(rebate_status: "true")
            end
@@ -188,8 +187,7 @@ class Customer < ApplicationRecord
            response = { "status": false, "message": "Can't connect server"}
           
         end
-        return response
-         puts response.to_json
+        return response         
         end
     end
   end
@@ -224,8 +222,6 @@ class Customer < ApplicationRecord
     rescue SocketError
       response = { status: false, message: "Can't connect server"}
     end
-    puts "sssssssssssss"
-    puts response.to_json
     return response
   end
 
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index 04b5225f..e0921f29 100644
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -261,21 +261,21 @@
               url: "get_customer" ,
               data: { filter : customer_mamber_card_no ,type :"card"},
               dataType: "json",
-              success: function(data) { 
-                if (data.status == false) {
+              success: function(data) {
+                if (data[0].customer_id == false) {
                   $.alert({
                      title: 'Alert!',
-                     content: data.message,
+                     content: data[0].message,
                      type: 'red',
                      typeAnimated: true,
                      btnClass: 'btn-danger',
                  });
+                }else{
+                  customer_id = data[0].customer_id;
+                  customer_name = data[0].name;
+                  update_sale(customer_id, customer_name,sale_id);
                 }
-                if (data.status == undefined) {
-                customer_id = data[0].customer_id;
-                customer_name = data[0].name;
-                update_sale(customer_id, customer_name,sale_id);
-                }
+                
               }
           });                
         }