diff --git a/app/controllers/invoice_items_controller.rb b/app/controllers/invoice_items_controller.rb index 0e866d3d..fd830a19 100644 --- a/app/controllers/invoice_items_controller.rb +++ b/app/controllers/invoice_items_controller.rb @@ -45,6 +45,6 @@ def destroy private def ii_params - params.require(:invoice_item).permit(:memo, :category, :price, :line_no) + params.require(:invoice_item).permit(:memo, :category, :price, :notes, :line_no) end end diff --git a/app/javascript/src/invoices.coffee b/app/javascript/src/invoices.coffee index a9e2c175..76f70d90 100644 --- a/app/javascript/src/invoices.coffee +++ b/app/javascript/src/invoices.coffee @@ -17,8 +17,11 @@ $ -> window.chooseLinePreset = (id) -> if $("#invoice-line-preset-" + id).val() != "" selected = $("#invoice-line-preset-" + id + " option:selected").first() + if(selected.data('notes')) + showNotes(id) $("#invoice_invoice_lines_attributes_" + id + "_category").val(selected.data('category')) $("#invoice_invoice_lines_attributes_" + id + "_memo").val(selected.data('memo')) + $("#invoice_invoice_lines_attributes_" + id + "_notes").val(selected.data('notes')) $("#invoice_invoice_lines_attributes_" + id + "_quantity").val("1") $("#invoice_invoice_lines_attributes_" + id + "_price").val(selected.data('price')) @@ -32,6 +35,13 @@ window.toggleNotes = (id) -> note.css("display","none") link.html("V") +window.showNotes = (id) -> + note = $("#notes" + id) + link = $("#notesToggle" + id) + if note.css("display") == "none" + note.css("display","block") + link.html("^") + window.indexList = () -> $('input.index').each( (i) -> $(this).val(i)) @@ -46,4 +56,4 @@ $ -> $("a.replace_field").click -> new_id = new Date().getTime() regexp = new RegExp("new_" + $(this).data("association"), "g") - $("#" + $(this).data("repid")).html($(this).data("content").replace(regexp, new_id)) \ No newline at end of file + $("#" + $(this).data("repid")).html($(this).data("content").replace(regexp, new_id)) diff --git a/app/views/invoice_items/_form.html.erb b/app/views/invoice_items/_form.html.erb index 53b0f880..5735a164 100644 --- a/app/views/invoice_items/_form.html.erb +++ b/app/views/invoice_items/_form.html.erb @@ -23,6 +23,10 @@