From fa901806d4c58682584f860d9d9eaf8a4f4340ec Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 1 Aug 2017 11:50:41 +0630
Subject: [PATCH] bugs fix for crm

---
 app/controllers/crm/customers_controller.rb |  3 +--
 app/models/customer.rb                      |  2 +-
 app/models/sale_payment.rb                  | 13 ++++++++-----
 app/views/crm/customers/_new_form.html.erb  |  6 +++---
 lib/tasks/menu_osaka.rake                   |  6 +++---
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index ba451027..d314222b 100644
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -67,8 +67,7 @@ class Crm::CustomersController < BaseCrmController
 
     # POST /crm/customers
   # POST /crm/customers.json
-   def create
-
+   def create    
     @crm_customers = Customer.new(customer_params)
 
     respond_to do |format|
diff --git a/app/models/customer.rb b/app/models/customer.rb
index c1751104..dff92ba2 100644
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -10,7 +10,7 @@ class Customer < ApplicationRecord
   validates :contact_no, uniqueness: true, numericality: true
   validates :email, uniqueness: true,format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, on: :create }
   validates :card_no, uniqueness: true
-  validates :paypar_account_no, uniqueness: true
+  # validates :paypar_account_no, uniqueness: true
 
   paginates_per 50
 
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 69aa2143..ff2f6e2f 100644
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -390,11 +390,14 @@ class SalePayment < ApplicationRecord
       total_percentage = 0
 
       type_arr = []
-      response["membership_campaign_data"].each do |a|
-        data = {:type => a["rules_type"], :percentage => a["change_unit"].to_i * a["base_unit"].to_i}
-        total_percentage = total_percentage + a["change_unit"].to_i * a["base_unit"].to_i
-      
-        type_arr.push(data)
+      # Check for present response fields
+      if response["membership_campaign_data"].present?
+        response["membership_campaign_data"].each do |a|
+          data = {:type => a["rules_type"], :percentage => a["change_unit"].to_i * a["base_unit"].to_i}
+          total_percentage = total_percentage + a["change_unit"].to_i * a["base_unit"].to_i
+        
+          type_arr.push(data)
+        end
       end
 
       rebate_arr =[]
diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb
index 5ec0b903..1eda0bec 100644
--- a/app/views/crm/customers/_new_form.html.erb
+++ b/app/views/crm/customers/_new_form.html.erb
@@ -10,7 +10,7 @@
          str.gsub!('["', '')
          str.gsub!('"]', '') %>
          <span class="help-block" style="margin-top:-6px"><%= str %></span>
-      <% end -%>
+      <% end %>
     </div>
 
     <div class="form-group">
@@ -74,7 +74,7 @@
          str.gsub!('["', '')
          str.gsub!('"]', '') %>
         <span class="help-block" style="margin-top:-6px"><%= str %></span>
-      <% end -%>
+      <% end %>
     </div>
 
     <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
@@ -85,7 +85,7 @@
             str.gsub!('["', '')
             str.gsub!('"]', '') %>
          <span class="help-block" style="margin-top:-6px"><%= str %></span>
-      <% end -%>
+      <% end %>
     </div>
 
     <div class="form-group">
diff --git a/lib/tasks/menu_osaka.rake b/lib/tasks/menu_osaka.rake
index 5363e97f..f2125332 100644
--- a/lib/tasks/menu_osaka.rake
+++ b/lib/tasks/menu_osaka.rake
@@ -51,9 +51,9 @@ menu_category1 = MenuCategory.create({menu: menu, name: "Gyoza", alt_name: "Gyoz
   # Gyoza dumpling soup with Udon
   menu_category1_menu_item21 = SimpleMenuItem.create({name: "Gyoza dumpling soup with Udon", alt_name: "Gyoza dumpling soup with Udon",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item21, price:3000.0, is_on_promotion:false}])    
-  # Gyoza dumpling soup with Udon
-  menu_category1_menu_item21 = SimpleMenuItem.create({name: "Gyoza dumpling soup with Udon", alt_name: "Gyoza dumpling soup with Udon",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food })
-    menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item21, price:3000.0, is_on_promotion:false}])    
+  # # Gyoza dumpling soup with Udon
+  # menu_category1_menu_item21 = SimpleMenuItem.create({name: "Gyoza dumpling soup with Udon", alt_name: "Gyoza dumpling soup with Udon",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food })
+  #   menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item21, price:3000.0, is_on_promotion:false}])    
   # Gyoza dumpling soup
   menu_category1_menu_item22 = SimpleMenuItem.create({name: "Gyoza dumpling soup", alt_name: "Gyoza dumpling soup",menu_category: menu_category1 , min_selectable_item: 2, max_selectable_item:2, account: food })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"", menu_item: menu_category1_menu_item22, price:2500.0, is_on_promotion:false}])