rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Fix issue when user cancels the cancellation. #449

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Controller/JobOrderController.php
View file

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

32
templates/job-order/form.html.twig
View file

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