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

merge with aung myo

Browse Source
This commit is contained in:
Yan
2017-11-06 13:45:26 +06:30
parent 2e0b2b823a ce49f81440
commit 7e19dbc1b6
6 changed files with 60 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/settings/cashier_terminals/index.html.erb
View File

@@ -17,6 +17,7 @@
<thead>
<tr>
<th><%= t("views.right_panel.detail.name") %></th>
<th><%= t("views.right_panel.detail.printer_name") %></th>
<th><%= t("views.right_panel.detail.active") %></th>
<th><%= t("views.right_panel.detail.login") %>?</th>
<th><%= t("views.right_panel.detail.auto_print") %></th>
@@ -32,6 +33,7 @@
<% @settings_cashier_terminals.each do |settings_cashier_terminal| %>
<tr>
<td><%= settings_cashier_terminal.name%></td>
<td><%= settings_cashier_terminal.printer_name%></td>
<td><%= settings_cashier_terminal.is_active %></td>
<td><%= settings_cashier_terminal.is_currently_login %></td>
<td><%= settings_cashier_terminal.auto_print_receipt %></td>

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

@@ -28,11 +28,11 @@
</div> -->
<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>
<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 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>
<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 class="form-group col-lg-1 col-md-1 col-sm-1 col-xs-1">
@@ -83,6 +83,14 @@
</div>
</div>
<script type="text/javascript">
$(function(){
$("#from").val("<%=params[:from] rescue '-'%>");
$("#to").val("<%=params[:to] rescue '-'%>");
});
</script>
<!-- <style type="text/css">

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

@@ -23,11 +23,11 @@
</div>
<div class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
<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 class="col-lg-3 col-md-3 col-sm-3 col-xs-3">
<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 class="col-lg-1 col-md-1 col-sm-1 col-xs-1">
@@ -90,18 +90,13 @@
</div>
</div>
<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>