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

update transaction

Browse Source
This commit is contained in:
Aung Myo
2017-11-06 09:45:44 +06:30
parent ebb2114243
commit 8f13403fab
3 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/transactions/sales_controller.rb
View File

@@ -7,8 +7,8 @@ class Transactions::SalesController < ApplicationController
def index def index
receipt_no = params[:receipt_no] receipt_no = params[:receipt_no]
from = params[:from] from = params[:from]
to = params[:to] to = params[:to]
if receipt_no.nil? && from.nil? && to.nil? if receipt_no.nil? && from.nil? && to.nil?
@sales = Sale.where("NOT sale_status = 'void' " ).order("sale_id desc").limit(500) @sales = Sale.where("NOT sale_status = 'void' " ).order("sale_id desc").limit(500)

12
app/views/transactions/orders/index.html.erb
View File

@@ -28,11 +28,11 @@
</div> --> </div> -->
<div class="col-lg-2 col-md-2 col-sm-2 col-xs-2"> <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
<label class="form-control-label"><%= t("views.right_panel.detail.from") %></label> <label class="form-control-label"><%= t("views.right_panel.detail.from") %></label>
<input class="form-control datepicker" name="from" id="date" type="text" placeholder="From date"> <input class="form-control datepicker" name="from" id="date from" type="text" placeholder="From date">
</div> </div>
<div class="col-lg-2 col-md-2 col-sm-2 col-xs-2"> <div class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
<label class="form-control-label"><%= t("views.right_panel.detail.to") %></label> <label class="form-control-label"><%= t("views.right_panel.detail.to") %></label>
<input class="form-control datepicker" name="to" id="date" type="text" placeholder="To date"> <input class="form-control datepicker" name="to" id="date to" type="text" placeholder="To date">
</div> </div>
<div class="form-group col-lg-1 col-md-1 col-sm-1 col-xs-1"> <div class="form-group col-lg-1 col-md-1 col-sm-1 col-xs-1">
@@ -83,6 +83,14 @@
</div> </div>
</div> </div>
<script type="text/javascript">
$(function(){
$("#from").val("<%=params[:from] rescue '-'%>");
$("#to").val("<%=params[:to] rescue '-'%>");
});
</script>
<!-- <style type="text/css"> <!-- <style type="text/css">

19
app/views/transactions/sales/index.html.erb
View File

@@ -23,11 +23,11 @@
</div> </div>
<div class="col-lg-3 col-md-3 col-sm-3 col-xs-3"> <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
<label class=""><%= t("views.right_panel.detail.from") %></label> <label class=""><%= t("views.right_panel.detail.from") %></label>
<input class="form-control datepicker" name="from" id="date" type="text" placeholder="From date"> <input class="form-control datepicker" name="from" id="from date" type="text" placeholder="From date">
</div> </div>
<div class="col-lg-3 col-md-3 col-sm-3 col-xs-3"> <div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
<label class=""><%= t("views.right_panel.detail.to") %></label> <label class=""><%= t("views.right_panel.detail.to") %></label>
<input class="form-control datepicker" name="to" id="date" type="text" placeholder="To date"> <input class="form-control datepicker" name="to" id="to date" type="text" placeholder="To date">
</div> </div>
<div class="col-lg-1 col-md-1 col-sm-1 col-xs-1"> <div class="col-lg-1 col-md-1 col-sm-1 col-xs-1">
@@ -90,18 +90,13 @@
</div> </div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
$(function () { $(function(){
$("#from").val("<%=params[:from] rescue '-'%>");
$("#to").val("<%=params[:to] rescue '-'%>");
});
$('.datepicker').datepicker({
format : 'dd-mm-yyyy',
autoclose: true
});
$('.datepicker').attr('ReadOnly','true');
$('.datepicker').css('cursor','pointer');
});
</script> </script>