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

update bugs

Browse Source
This commit is contained in:
Aung Myo
2018-05-11 09:57:26 +06:30
parent 80f353ba3c
commit 5e0bdf1e36
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/origami/waste_spoile_controller.rb
View File

@@ -55,9 +55,11 @@ class Origami::WasteSpoileController < BaseOrigamiController
# FOr Sale Audit # FOr Sale Audit
action_by = current_user.name action_by = current_user.name
approved_by = Employee.find_by_emp_id(access_code) if access_code != "null"
action_by = Employee.find_by_emp_id(access_code).name
end
# remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table ->#{table.name}" # remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table ->#{table.name}"
sale_audit = SaleAudit.record_audit_for_edit(sale_id,sale.cashier_id, approved_by.name,remark,remark ) sale_audit = SaleAudit.record_audit_for_edit(sale_id,sale.cashier_id, action_by,remark,remark )
# For Print # For Print

1
app/models/ability.rb
View File

@@ -248,6 +248,7 @@ class Ability
can :reprint, :payment can :reprint, :payment
can :rounding_adj, :payment can :rounding_adj, :payment
can :print, :payment can :print, :payment
can :foc, :payment
can :manage, Commission can :manage, Commission
can :manage, Commissioner can :manage, Commissioner

2
app/views/origami/addorders/detail.html.erb
View File

@@ -710,7 +710,7 @@
$(document).on('click', '#clear_all', function(event){ $(document).on('click', '#clear_all', function(event){
$(".summary-items tbody").empty(); $(".summary-items tbody").empty();
$('#sub_total').text(0.00); $('#sub_total').text("0.00");
$(".create").attr("disabled","disabled"); $(".create").attr("disabled","disabled");
}); });

12
app/views/origami/sales/show.html.erb
View File

@@ -199,11 +199,13 @@
<div class="col-lg-1 col-md-1 col-sm-1"> <div class="col-lg-1 col-md-1 col-sm-1">
<button type="button" class="btn btn-default btn-block" id='back'><i class="material-icons">reply</i>Back</button> <button type="button" class="btn btn-default btn-block" id='back'><i class="material-icons">reply</i>Back</button>
<% if @sale.sale_status != 'void' %> <% if @sale.sale_status != 'void' %>
<% if current_login_employee.role == "cashier" %> <% if @sale.sale_status != "waste" || @sale.sale_status != "spoile"%>
<a class="btn btn-block bg-blue waves-effect access_modal" data-toggle="modal" data-type="void"> Void</a> <% if current_login_employee.role == "cashier" %>
<% else %> <a class="btn btn-block bg-blue waves-effect access_modal" data-toggle="modal" data-type="void"> Void</a>
<button type="button" id="void" class="btn bg-danger btn-block">VOID</button> <% else %>
<% end %> <button type="button" id="void" class="btn bg-danger btn-block">VOID</button>
<% end %>
<% end %>
<% end %> <% end %>
<button type="button" id="re-print" class="btn bg-blue btn-block">Re.Print</button> <button type="button" id="re-print" class="btn bg-blue btn-block">Re.Print</button>
</div> </div>