git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update sale search

Browse Source
This commit is contained in:
Aung Myo
2017-06-13 15:04:51 +06:30
parent 03b839fc07
commit 7194f0e971
3 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/controllers/settings/sales_controller.rb
View File

@@ -5,23 +5,13 @@ class Settings::SalesController < ApplicationController
receipt_no = params[:receipt_no] receipt_no = params[:receipt_no]
today = Date.today today = Date.today
if receipt_no.nil? && search_date.nil? if receipt_no.nil?
@sales = Sale.where("NOT sale_status = 'void'" ).order("sale_id desc").limit(500) @sales = Sale.order("sale_id").page(params[:page])
#@products = Product.order("name").page(params[:page]).per(5)
else else
if !search_date.blank? && receipt_no.blank? @sales = Sale.where("receipt_no LIKE ?", "%#{receipt_no}%").order("receipt_no").page(params[:page])
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
end 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| respond_to do |format|
format.html # index.html.erb format.html # index.html.erb
format.json { render json: @sales } format.json { render json: @sales }

8
app/models/sale.rb
View File

@@ -258,6 +258,14 @@ class Sale < ApplicationRecord
end end
end end
def self.search(search)
if search
find(:all, :conditions => ['receipt_no LIKE ?', "%#{search}%"])
else
find(:all)
end
end
private private
def generate_custom_id def generate_custom_id

9
app/views/settings/sales/index.html.erb
View File

@@ -20,9 +20,9 @@
<td colspan="8"> <td colspan="8">
<%= form_tag settings_sales_path, :method => :get do %> <%= form_tag settings_sales_path, :method => :get do %>
<div class="input-append form-group pull-right"> <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> <button type="submit" class="btn btn-primary btn">Search</button>
</div> </div>
<% end %> <% end %>
@@ -58,7 +58,6 @@
</table> </table>
<br> <br>
<%= paginate @sales %>
</div> </div>
</div> </div>
@@ -67,14 +66,14 @@
<script type="text/javascript"> <script type="text/javascript">
$(function () { $(function () {
if (jQuery().datepicker) {
$('.datepicker').datepicker({ $('.datepicker').datepicker({
format : 'dd-mm-yyyy', format : 'dd-mm-yyyy',
autoclose: true autoclose: true
}); });
$('.datepicker').attr('ReadOnly','true'); $('.datepicker').attr('ReadOnly','true');
$('.datepicker').css('cursor','pointer'); $('.datepicker').css('cursor','pointer');
}
}); });
</script> </script>