diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb index 00631cae..dedfc728 100755 --- a/app/views/origami/home/show.html.erb +++ b/app/views/origami/home/show.html.erb @@ -379,7 +379,11 @@ No Tax <% end %>
<%if !@webview && @changable_tax %> - + <% if @current_user.role == 'cashier' %> + + <% else %> + + <% end %> <% end %> <%= number_format(@obj_sale.total_tax, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i )%> @@ -1382,7 +1386,7 @@ }); } }); - } + } function check_emp_access_code(access_code,type) { var url = "/origami/check_emp_access_code/" + access_code ; @@ -1405,6 +1409,9 @@ // overall_void(); }else if(type == "waste_and_spoilage"){ + }else if(type == "change_tax"){ + $('#AccessCodeModal').modal('hide'); + $('#change_taxModal').modal('show'); } }else{ swal("Opps",result.message,"warning") diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 42152e20..346db018 100755 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -105,8 +105,12 @@ No Tax <% end %>
<%if @sale_payment.nil? && @changable_tax %> + <% if @current_user.role == 'cashier' %> + + <% else %> <% end %> + <% end %> <%= number_format(@sale_data.total_tax, precision: precision.to_i ) rescue number_format(0, precision: precision.to_i )%> @@ -1472,6 +1476,9 @@ $(document).ready(function(){ $('#AccessCodeModal').modal('hide'); $('#focModal').modal('show'); // overall_foc(); + }else if(type == "change_tax"){ + $('#AccessCodeModal').modal('hide'); + $('#change_taxModal').modal('show'); } }else{ swal("Oops",result.message,"warning");