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

remove item data in inventory

Browse Source
This commit is contained in:
phyusin
2018-10-15 13:05:18 +06:30
parent f31bebdda7
commit e4daecfec7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/inventory_definition.rb
View File

@@ -57,7 +57,7 @@ class InventoryDefinition < ApplicationRecord
data.qty = extra_qty data.qty = extra_qty
StockJournal.add_to_journal(data, 0, "out of stock", inventory_definition) StockJournal.add_to_journal(data, 0, "out of stock", inventory_definition)
else else
StockJournal.add_to_journal(item_data, stock.balance, "out of stock", inventory_definition) StockJournal.add_to_journal(item, stock.balance, "out of stock", inventory_definition)
end end
end end
end end

4
app/views/origami/pending_order/show.html.erb
View File

@@ -282,14 +282,14 @@ $(document).ready(function(){
$('#request_bills').click(function () { $('#request_bills').click(function () {
var order_id = $('#save_order_id').val(); var order_id = $('#save_order_id').val();
var ajax_url = "/origami/" +order_id+ "/request_bills"; var ajax_url = "/origami/" +order_id+ "/request_bills";
console.log(ajax_url) console.log(ajax_url);
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: ajax_url, url: ajax_url,
// data: 'order_id='+ order_id, // data: 'order_id='+ order_id,
success: function (result) { success: function (result) {
if (!result.status) { if (!result.status) {
swal("Information!", result.error_message); swal ( "Oops" , result.error_message , "warning" );
} }
else { else {
window.location.href = '/origami/sale/'+result.data+'/'+cashier_type+'/payment'; window.location.href = '/origami/sale/'+result.data+'/'+cashier_type+'/payment';