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

Merge branch 'r-1902001-01' into foodcourt

Browse Source
This commit is contained in:
Thein Lin Kyaw
2020-08-26 11:39:01 +06:30
parent b492633c2d ffbdcad7de
commit 39871691e9
2 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/origami/home/show.html.erb
View File

@@ -1264,7 +1264,7 @@
closeOnConfirm: false closeOnConfirm: false
}, function (isConfirm) { }, function (isConfirm) {
if (isConfirm) { if (isConfirm) {
$('.confirm').prop("disabled",true); $('.confirm').prop("disabled", true);
var sale_id = $("#sale_id").val();//"<%= @obj_sale.sale_id rescue "" %>" var sale_id = $("#sale_id").val();//"<%= @obj_sale.sale_id rescue "" %>"
var ajax_url = "/origami/sale/" + sale_id + '/cashier/void'; var ajax_url = "/origami/sale/" + sale_id + '/cashier/void';
var remark = $("#remark").val(); var remark = $("#remark").val();

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

@@ -478,35 +478,37 @@ $('#back').on('click',function(){
// }); // });
$(document).on('click', '.access_modal', function(event){ $(document).on('click', '.access_modal', function(event){
type = $(this).data("type"); type = $(this).data("type");
$(".ok").attr("data-action",type); $(".ok").attr("data-action",type);
$('#AccessCodeModal').modal('show'); $('#AccessCodeModal').modal('show');
}); });
$('#void').on('click', function () {
$('#void').on('click', function () {
var access_code = localStorage.getItem("access_code"); var access_code = localStorage.getItem("access_code");
swal({ swal({
title: "Alert", title: "Alert",
text: "Are you sure want to Void?", text: "Are you sure want to Void?",
type: "warning", type: "warning",
showCancelButton: true, showCancelButton: true,
confirmButtonColor: "#DD6B55", confirmButtonColor: "#DD6B55",
confirmButtonText: "Yes, void it!", confirmButtonText: "Yes, void it!",
closeOnConfirm: false closeOnConfirm: false
}, function (isConfirm) { }, function (isConfirm) {
if (isConfirm) { if (isConfirm) {
var sale_id = $('#sale_id').val(); $('.confirm').prop("disabled", true);
var ajax_url = "/origami/sale/" + sale_id +'/'+'cashier'+ '/void'; var sale_id = $('#sale_id').val();
$.ajax({ var ajax_url = "/origami/sale/" + sale_id +'/'+'cashier'+ '/void';
type: 'POST', $.ajax({
url: ajax_url, type: 'POST',
data: {'access_code':access_code}, url: ajax_url,
success: function () { data: {'access_code':access_code},
window.location.href = '/origami/sale/'+sale_id; success: function () {
} window.location.href = '/origami/sale/'+sale_id;
});
} }
}); });
}); }
});
});
function check_emp_access_code(access_code,type) { function check_emp_access_code(access_code,type) {
var url = "/origami/check_emp_access_code/" + access_code ; var url = "/origami/check_emp_access_code/" + access_code ;