From 78d383f5ece590c3737b4c47d9d6c91b8ec5369a Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 28 Jul 2017 18:08:11 +0630
Subject: [PATCH] update customer validation messages

---
 app/models/customer.rb                     |  4 ++--
 app/models/sale.rb                         |  8 +++++++-
 app/views/crm/customers/_new_form.html.erb | 11 ++++++-----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/models/customer.rb b/app/models/customer.rb
index 06f7f1d1..c1751104 100644
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -7,8 +7,8 @@ class Customer < ApplicationRecord
   has_many :sales
 
   validates_presence_of :name, :contact_no, :email,:card_no
-  validates :contact_no, uniqueness: true
-  validates :email, uniqueness: true
+  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
 
diff --git a/app/models/sale.rb b/app/models/sale.rb
index fc064b96..82b9b781 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -666,7 +666,13 @@ end
                          .joins("INNER JOIN shift_sales sh ON sh.id = sales.shift_sale_id")
                          .where("sales.sale_status = 'void' and (sh.shift_started_at between ? and ? 
                           OR sh.shift_closed_at between ? and ? )", from ,to, from, to)
-                            
+    
+    if shift.present?
+      query = query.where("sales.sale_status = 'void' and s.shift_sale_id in (?)",shift.to_a)
+    else
+      query = query.where("payment_method='creditnote' and s.sale_status = 'completed' and s.receipt_date between ? and ? ",from,to)
+    end
+
      out = {:items => account}
      sale_arr.push(out)
      return sale_arr
diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb
index b99c25a3..5ec0b903 100644
--- a/app/views/crm/customers/_new_form.html.erb
+++ b/app/views/crm/customers/_new_form.html.erb
@@ -6,7 +6,7 @@
     <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
       <%= f.input :card_no, :class => "form-control col-md-6 card_no"%>
       <% flash.each do |name, msg| %>
-         <% str="[\"#{msg['name']}\"]"
+         <% str="[\"#{msg['card_no']}\"]"
          str.gsub!('["', '')
          str.gsub!('"]', '') %>
          <span class="help-block" style="margin-top:-6px"><%= str %></span>
@@ -32,11 +32,12 @@
         <label>Mdm</label>
         <%= f.radio_button :salutation,"Mdm", :class => "salutation mdm", :value=>"Mdm", :style=>"width: 30px"%>    
    </div>
-    
+  
     <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
       <%= f.input :name, :class => "form-control col-md-6 name", :required => true %>
-      <% flash.each do |name, msg| %>
-         <% str="[\"#{msg['name']}\"]"
+      <% flash.each do |test, msg| %>
+         <% 
+         str="[\"#{msg['name']}\"]"
          str.gsub!('["', '')
          str.gsub!('"]', '') %>
          <span class="help-block" style="margin-top:-6px"><%= str %></span>
@@ -80,7 +81,7 @@
       <%= f.input :email, :class => "form-control col-md-6 email" ,:required => true%>
    
       <% flash.each do |name, msg| %>
-         <% str="[\"#{msg['contact_no']}\"]"
+         <% str="[\"#{msg['email']}\"]"
             str.gsub!('["', '')
             str.gsub!('"]', '') %>
          <span class="help-block" style="margin-top:-6px"><%= str %></span>