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

app/controllers/crm/customers_controller.rb

@@ -72,7 +72,9 @@ class Crm::CustomersController < BaseCrmController
     #get customer amount
       @customer        = Customer.find(params[:id])
       @response        = Customer.get_membership_transactions(@customer)
- puts @response.to_json
+
+      Rails.logger.debug "get membership transactions response"
+      Rails.logger.debug response.to_json
       # @response = ""
       #end customer amount
 
@@ -156,7 +158,8 @@ class Crm::CustomersController < BaseCrmController
                  rescue SocketError
                    response = {"status" => false, "message" => "Can't open membership server "}
               end
-
+              Rails.logger.debug "--------------Create Member---------"
+              Rails.logger.debug response.to_json
               if response["status"] == true
                   customer = Customer.find(@crm_customers.customer_id)
                   status   = customer.update_attributes(membership_id: response["customer_datas"]["id"],membership_type:member_group_id )
@@ -278,7 +281,8 @@ end
               response = { status: false}
             end
             customer = Customer.find(@crm_customer.customer_id)
-
+            Rails.logger.debug "--------Update Member response -------"
+            Rails.logger.debug response.to_json
             if response["status"] == true
               
               status   = customer.update_attributes(membership_id: response["customer_datas"]["id"],membership_type:member_group_id )
@@ -335,7 +339,8 @@ end
             rescue SocketError
               response = { status: false}
             end
-            
+            Rails.logger.debug "--------Update Member response -------"
+            Rails.logger.debug response.to_json
             if response["status"] == true
               customer = Customer.find(@crm_customer.customer_id)
               # Check membership id and bind to user

app/models/customer.rb

@@ -46,7 +46,8 @@ class Customer < ApplicationRecord
     rescue SocketError
       response = { status: false, message: "Can't connect server"}
     end
-
+    Rails.logger.debug "--------Get Member Account response -------"
+    Rails.logger.debug response.to_json
     return response;
 
   end
@@ -131,6 +132,8 @@ class Customer < ApplicationRecord
       rescue SocketError
         response = { status: false, message: "Can't connect server"}
       end
+      Rails.logger.debug "--------Update Membership response -------"
+      Rails.logger.debug response.to_json
       if response["status"] == true
         status   = customer.update_attributes(membership_id: response["customer_datas"]["id"])
       end
@@ -207,8 +210,8 @@ class Customer < ApplicationRecord
           
         end
         return response    
-        puts response.to_json
-        puts "ttttttttttttttttttttttt"     
+        Rails.logger.debug "--------Update Rebate response -------"
+        Rails.logger.debug response.to_json  
         end
     end
   end
@@ -243,6 +246,8 @@ class Customer < ApplicationRecord
     rescue SocketError
       response = { status: false, message: "Can't connect server"}
     end
+    Rails.logger.debug "--------Search Paypar Account No response -------"
+    Rails.logger.debug response.to_json
     return response
   end
 

app/models/sale_payment.rb

@@ -97,6 +97,8 @@ class SalePayment < ApplicationRecord
     rescue SocketError
       response = { status: false}
     end
+    Rails.logger.debug "Get Paypar Account "
+    Rails.logger.debug response.to_json
     return response;
   end
 
@@ -151,6 +153,10 @@ class SalePayment < ApplicationRecord
       else
         response =false;
       end
+
+      Rails.logger.debug "Redeem response"
+      Rails.logger.debug response.to_json
+
       return response;
 
   end
@@ -429,6 +435,8 @@ class SalePayment < ApplicationRecord
       total_percentage = 0
 
       type_arr = []
+      Rails.logger.debug "Get Member Campaign"
+      Rails.logger.debug response.to_json
       # Check for present response fields
       if response["membership_campaign_data"].present?
         response["membership_campaign_data"].each do |a|
@@ -496,6 +504,8 @@ class SalePayment < ApplicationRecord
         rescue SocketError
            response = { "status": false, "message": "Can't connect server"}
         end
+        Rails.logger.debug "Rebage Response"
+        Rails.logger.debug response.to_json
         return response
       end
     else

app/views/reports/shiftsale/_shift_sale_report_filter.html.erb

@@ -5,6 +5,7 @@
 				<div class="col-lg-2 col-md-2 col-sm-2">
 					<label class="font-14"><%= t("views.right_panel.detail.select_period") %></label>
 					<select name="period" id="sel_period" class="form-control">
+					<option value=""><%= t("views.right_panel.detail.select_period") %></option>
 						<option value="0">Today</option>
 						<option value="1">Yesterday</option>
 						<option value="2">This week</option>