diff --git a/app/models/inventory_definition.rb b/app/models/inventory_definition.rb index 13d295a1..1a9dec8f 100755 --- a/app/models/inventory_definition.rb +++ b/app/models/inventory_definition.rb @@ -57,7 +57,7 @@ class InventoryDefinition < ApplicationRecord data.qty = extra_qty StockJournal.add_to_journal(data, 0, "out of stock", inventory_definition) 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 diff --git a/app/views/origami/pending_order/show.html.erb b/app/views/origami/pending_order/show.html.erb index b4f71e8d..73ee0040 100644 --- a/app/views/origami/pending_order/show.html.erb +++ b/app/views/origami/pending_order/show.html.erb @@ -282,14 +282,14 @@ $(document).ready(function(){ $('#request_bills').click(function () { var order_id = $('#save_order_id').val(); var ajax_url = "/origami/" +order_id+ "/request_bills"; - console.log(ajax_url) + console.log(ajax_url); $.ajax({ type: "GET", url: ajax_url, // data: 'order_id='+ order_id, success: function (result) { if (!result.status) { - swal("Information!", result.error_message); + swal ( "Oops" , result.error_message , "warning" ); } else { window.location.href = '/origami/sale/'+result.data+'/'+cashier_type+'/payment';