update bugs
This commit is contained in:
@@ -55,9 +55,11 @@ class Origami::WasteSpoileController < BaseOrigamiController
|
||||
|
||||
# FOr Sale Audit
|
||||
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}"
|
||||
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
|
||||
|
||||
|
||||
@@ -248,6 +248,7 @@ class Ability
|
||||
can :reprint, :payment
|
||||
can :rounding_adj, :payment
|
||||
can :print, :payment
|
||||
can :foc, :payment
|
||||
|
||||
can :manage, Commission
|
||||
can :manage, Commissioner
|
||||
|
||||
@@ -710,7 +710,7 @@
|
||||
|
||||
$(document).on('click', '#clear_all', function(event){
|
||||
$(".summary-items tbody").empty();
|
||||
$('#sub_total').text(0.00);
|
||||
$('#sub_total').text("0.00");
|
||||
$(".create").attr("disabled","disabled");
|
||||
});
|
||||
|
||||
|
||||
@@ -199,12 +199,14 @@
|
||||
<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>
|
||||
<% if @sale.sale_status != 'void' %>
|
||||
<% if @sale.sale_status != "waste" || @sale.sale_status != "spoile"%>
|
||||
<% if current_login_employee.role == "cashier" %>
|
||||
<a class="btn btn-block bg-blue waves-effect access_modal" data-toggle="modal" data-type="void"> Void</a>
|
||||
<% else %>
|
||||
<button type="button" id="void" class="btn bg-danger btn-block">VOID</button>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<button type="button" id="re-print" class="btn bg-blue btn-block">Re.Print</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user