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

Merge branch 'ui_ux_changes'

Browse Source
This commit is contained in:
Aung Myo
2018-07-10 15:24:31 +06:30
parent 5c8fd3666d 6891756ae8
commit 8307dea14b
6 changed files with 50 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/views/reports/saleitem/_shift_sale_report_filter.html.erb
View File

@@ -32,6 +32,16 @@
<option value="other">Other Amount Only</option>
</select>
</div>
<div class="col-lg-2 col-md-2 col-sm-2">
<label class="font-14"><%= t("views.right_panel.detail.select_account") %></label>
<select name="account_type" id="account_type" class="form-control">
<option value = "">Select Account</option>
<% @account.each do |acc| %>
<option value="<%=acc.title%>" class="<%=acc.title%>" > <%=acc.title%></option>
<%end %>
</select>
</div>
<div class="col-lg-2 col-md-2 col-sm-2">
<!-- <label class="">Select Shift Period</label> -->
<label class="font-14"><%= t("views.right_panel.detail.from") %></label>
@@ -46,9 +56,9 @@
<select class="form-control select" name="shift_name" id="shift_name" >
</select>
</div>
<div class="col-lg-2 col-md-2 col-sm-2 margin-top-20">
<div class="col-lg-12 col-md-12 col-sm-12 margin-top-20">
<br>
<input type="submit" value="Generate Report" class='btn btn-primary'>
<input type="submit" value="Generate Report" class='btn btn-primary float_right'>
</div>
</div>
<% end %>
@@ -70,6 +80,8 @@
var item = $('#item').val();
var payment_type = $('#payment_type');
$("#account_type").val("<%=params[:account_type]%>");
if(item == 'order'){
$('#cashier').hide();
$('#waiter').show();