Fix issue when user cancels the cancellation. #449

This commit is contained in:
Korina Cordero 2020-08-04 02:27:44 +00:00
parent 2e9a5585d4
commit a526b7bee5
2 changed files with 17 additions and 16 deletions

View file

@ -1181,7 +1181,6 @@ class JobOrderController extends Controller
// ajax call // ajax call
public function cancelReasons() public function cancelReasons()
{ {
error_log('start cancel_reasons');
return $this->json([ return $this->json([
'cancel_reasons' => JOCancelReasons::getCollection(), 'cancel_reasons' => JOCancelReasons::getCollection(),
]); ]);

View file

@ -1764,30 +1764,32 @@ $(function() {
inputOptions: inputOptionsPromise, inputOptions: inputOptionsPromise,
type: 'warning', type: 'warning',
showCancelButton: true, showCancelButton: true,
closeOnCancel: true,
width: '40rem', width: '40rem',
inputValidator: (value) => { inputValidator: (value) => {
return new Promise((resolve) => { return new Promise((resolve) => {
console.log(value)
resolve() resolve()
}) })
} }
}).then((result) => { }).then((result) => {
$.ajax({ if (result.value) {
method: "DELETE", $.ajax({
url: url, method: "DELETE",
data: { url: url,
'cancel_reason': result.value data: {
} 'cancel_reason': result.value
}).done(function(response) {
swal({
title: 'Done!',
text: response.success,
type: 'success',
onClose: function() {
window.location.href = "{{ return_url }}";
} }
}).done(function(response) {
swal({
title: 'Done!',
text: response.success,
type: 'success',
onClose: function() {
window.location.href = "{{ return_url }}";
}
});
}); });
}); }
}); });
}); });