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

fixed payment methods & license

Browse Source
This commit is contained in:
NyanLinHtut
2020-06-10 18:12:15 +06:30
parent f9db23b500
commit f6a35d214f
23 changed files with 187 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/views/reports/receipt_no_detail/_shift_sale_report_filter.html.erb
View File

@@ -18,17 +18,14 @@
<option value="9">Last year</option>
</select>
</div>
<% if defined? payments %>
<% if defined? @payment_methods %>
<div class="col-lg-2 col-md-2 col-sm-2 mbl-style">
<label class="font-14 mbl_lbl"><%= t("views.right_panel.detail.select_payments") %></label>
<select name="payment_type" id="payment_type" class="form-control">
<% @payments.each do |pm| %>
<option class="<%=pm[1].downcase%>" value="<%=pm[1].downcase%>"><%=pm[0]%></option>
<%end %>
<% @payment_method.each do |pm| %>
<option value="<%=pm.payment_method%>" class="<%=pm.payment_method%>" > <%=pm.payment_method%></option>
<% @payment_methods.each do |pm| %>
<option value="<%=pm[1].downcase%>"><%=pm[0]%></option>
<%end %>
</select>
</div>

2
app/views/reports/waste_and_spoilage/index.html.erb
View File

@@ -55,7 +55,7 @@
<% @sale_data.each do |sale| %>
<% if !sale.item_instance_code.nil?%>
<% waste_and_spoil_item_count += sale.qty.to_i %>
<% grand_total += sale.grand_total.to_i %>
<% grand_total += sale.price.to_i %>
<% end %>
<tr>
<% if !menu_cat_arr.include?(sale.name) %>