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

Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant

Browse Source
This commit is contained in:
Aung Myo
2018-09-27 16:30:59 +06:30
parent 6632caa4f4 449404d9cf
commit 967ffdb56e
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/views/inventory/stock_checks/index.html.erb
View File

@@ -264,7 +264,29 @@
url: '<%= inventory_stock_check_save_path %>', url: '<%= inventory_stock_check_save_path %>',
data: 'stock_item=' + jsonStr + '&reason=' + reason, data: 'stock_item=' + jsonStr + '&reason=' + reason,
success: function (data) { success: function (data) {
window.location.href = '/inventory/stock_checks/' + data['stock_id']; if (data['stock_id']) {
check_id = data['stock_id'];
$.ajax({
type: 'post',
url: '<%= inventory_save_to_journal_path %>',
data: 'data=' + check_id,
success: function () {
swal({
title: "Information!",
text: "Successfully saved to journal",
html: true,
closeOnConfirm: false,
closeOnCancel: false,
allowOutsideClick: false
}, function () {
// window.location.href = '/inventory';
window.location.href = '/inventory/stock_checks/' + check_id;
});
}
})
// window.location.href = '/inventory/stock_checks/' + data['stock_id'];
}
} }
}) })
}else{ }else{

2
app/views/inventory/stock_checks/show.html.erb
View File

@@ -79,7 +79,7 @@
<div class="col-xs-12 col-sm-12 col-md-2 col-lg-2"> <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2">
<div class="body"> <div class="body">
<button id="save_to_journal" type="button" class="btn btn-block btn-primary"> <%= t("views.right_panel.button.save_to_journal") %></button> <!-- <button id="save_to_journal" type="button" class="btn btn-block btn-primary"> <%= t("views.right_panel.button.save_to_journal") %></button> -->
<button id="print" type="button" class="btn btn-block btn-primary"> <%= t :print %></button> <button id="print" type="button" class="btn btn-block btn-primary"> <%= t :print %></button>
</div> </div>