diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 0fd7fa89..d18e0c8f 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -374,14 +374,14 @@
<% end %>
<% if @status_sale == 'sale' %>
-
+
-
+
<% end %>
@@ -617,7 +617,12 @@
$('#edit').on('click', function () {
var dining_id = "<%= @dining.id %>"
var sale_id = "<%= @obj_sale.sale_id rescue "" %>"
- window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/edit";
+ if ($(this).attr('active')=== "true") {
+ window.location.href = '/origami/table/' + dining_id + "/sale/" + sale_id + "/edit";
+ }else{
+ swal("Opps","You are not authorized for void","warning")
+ }
+
});
$('#commissions').on('click', function () {
@@ -632,6 +637,7 @@
});
$('#void').on('click', function () {
+ if ($(this).attr('active')=== "true") {
swal({
title: "Alert",
text: "Are you sure want to Void?",
@@ -652,7 +658,10 @@
}
});
}
- });
+ });
+ }else{
+ swal("Opps","You are not authorized for void","warning")
+ }
});
$('#add_order').on('click', function () {
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 291060de..db23f9ba 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -276,8 +276,8 @@
reply
Back
-
-
+
+
@@ -431,20 +431,25 @@
});
$('#void').on('click',function () {
- swal({
- title: "Information!",
- text: 'Are you sure want to Void !',
- }, function () {
- var sale_id = $('#sale_id').text();
- var ajax_url = "/origami/sale/" + sale_id + '/void';
- $.ajax({
- type: 'POST',
- url: ajax_url,
- success: function () {
- window.location.href = '/origami/';
- }
- })
- });
+ if ($(this).attr('active') === "true") {
+ swal({
+ title: "Information!",
+ text: 'Are you sure want to Void !',
+ }, function () {
+ var sale_id = $('#sale_id').text();
+ var ajax_url = "/origami/sale/" + sale_id + '/void';
+ $.ajax({
+ type: 'POST',
+ url: ajax_url,
+ success: function () {
+ window.location.href = '/origami/';
+ }
+ })
+ });
+ }else{
+ swal("Opps","You are not authorized for void","warning")
+ }
+
});
});
@@ -463,19 +468,21 @@
}
$('#foc').click(function() {
- $( "#loading_wrapper" ).show();
+ //$( "#loading_wrapper" ).show();
// payment
var cash = $('#amount_due').text();
var sub_total = $('#sub-total').text();
var sale_id = $('#sale_id').text();
var params = { 'cash':cash,'sale_id':sale_id,'sub_total':sub_total };
- $.ajax({type: "POST",
+ if ($(this).attr('active')=== "true") {
+ $.ajax({
+ type: "POST",
url: "<%= origami_payment_foc_path %>",
data: params,
success:function(result){
- $( "#loading_wrapper" ).hide();
+ //$( "#loading_wrapper" ).hide();
if (cash > 0) {
swal({
@@ -488,6 +495,9 @@
}
});
+ }else{
+ swal("Opps","You are not authorized for foc","warning")
+ }
});
function calculate_member_discount(sale_id) {