From 7194f0e97136e2020bda74372d64305cbf30cff9 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 13 Jun 2017 15:04:51 +0630
Subject: [PATCH] update sale search

---
 app/controllers/settings/sales_controller.rb | 20 +++++---------------
 app/models/sale.rb                           |  8 ++++++++
 app/views/settings/sales/index.html.erb      |  9 ++++-----
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/app/controllers/settings/sales_controller.rb b/app/controllers/settings/sales_controller.rb
index 6bb58244..aabc2282 100644
--- a/app/controllers/settings/sales_controller.rb
+++ b/app/controllers/settings/sales_controller.rb
@@ -5,23 +5,13 @@ class Settings::SalesController < ApplicationController
     receipt_no  = params[:receipt_no]
     today       = Date.today
     
-    if receipt_no.nil? && search_date.nil?
-       @sales = Sale.where("NOT sale_status = 'void'" ).order("sale_id desc").limit(500) 
+    if receipt_no.nil?
+      @sales = Sale.order("sale_id").page(params[:page])
+      #@products = Product.order("name").page(params[:page]).per(5)
     else
-      if !search_date.blank? && receipt_no.blank?  
-        sale = Sale.where("DATE_FORMAT(receipt_date,'%Y-%b-%d') = ?", search_date).order("sale_id desc").limit(500).page(params[:page])
-      elsif !search_date.blank? && !receipt_no.blank?  
-        sale = Sale.where("receipt_no LIKE ? or DATE_FORMAT(receipt_date,'%Y-%b-%d') = ?", "%#{receipt_no}%", search_date).order("sale_id desc").limit(500).page(params[:page])
-      else  
-        sale = Sale.where("receipt_no LIKE ?", receipt_no).order("sale_id desc").limit(500).page(params[:page]) 
-      end  
-      if sale.count > 0
-        @sales = sale 
-      else
-        @sales = Sale.where("NOT sale_status = 'void'").order("sale_id desc").limit(500)
-      end
+      @sales = Sale.where("receipt_no LIKE ?", "%#{receipt_no}%").order("receipt_no").page(params[:page])    
     end
-    @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(50)
+    #@sales = Kaminari.paginate_array(@sales).page(params[:page]).per(50)
     respond_to do |format|
       format.html # index.html.erb
       format.json { render json: @sales }
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 52625917..b9ce13d2 100644
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -258,6 +258,14 @@ class Sale < ApplicationRecord
     end
   end
 
+  def self.search(search)
+    if search
+      find(:all, :conditions => ['receipt_no LIKE ?', "%#{search}%"])
+    else
+      find(:all)
+    end
+  end
+
   private
 
   def generate_custom_id
diff --git a/app/views/settings/sales/index.html.erb b/app/views/settings/sales/index.html.erb
index c53a6e8d..0909fdef 100644
--- a/app/views/settings/sales/index.html.erb
+++ b/app/views/settings/sales/index.html.erb
@@ -20,9 +20,9 @@
                  <td colspan="8">
                     <%= form_tag settings_sales_path, :method => :get do %>
                       <div class="input-append form-group pull-right">
-                        <input data-behaviour='datepicker' class="datepicker col-md-3 form-control" name="date" id="date" type="text" placeholder="Search by date" style="margin-right: 10px">
+                        <!-- <input data-behaviour='datepicker' class="datepicker col-md-3 form-control" name="date" id="date" type="text" placeholder="Search by date" style="margin-right: 10px"> -->
       
-                         <input type="text" name="receipt_no" class="col-md-4 form-control" placeholder="Receipt No" style="margin-right: 10px">
+                         <input type="text" name="receipt_no" class="col-md-8 form-control" placeholder="Receipt No" style="margin-right: 10px">
                         <button type="submit" class="btn btn-primary btn">Search</button>
                       </div>
                     <% end %>
@@ -58,7 +58,6 @@
           </table>
           <br>
           
-          <%= paginate @sales %>
         </div>
       </div>
 
@@ -67,14 +66,14 @@
 
 <script type="text/javascript">
   $(function () {
-     if (jQuery().datepicker) {
+
             $('.datepicker').datepicker({
                format : 'dd-mm-yyyy',
                autoclose: true
             });
             $('.datepicker').attr('ReadOnly','true');
             $('.datepicker').css('cursor','pointer');
-      }
+
      
   });
 </script>