Merge pull request #604 from sparc-request/sj-invoiced_notes

SJ - Invoice Toggle Notes

app/assets/javascripts/study_level_activities.js.coffee

@@ -24,12 +24,14 @@ $ ->
   # Line Item Bindings
 
   $(document).on 'change', 'input.invoice_toggle', ->
-    data = invoiced: $(this).prop('checked')
+    invoiced = $(this).prop('checked')
     fulfillment_id = $(this).data('id')
     $.ajax
       type: 'PUT'
       url: "/fulfillments/toggle_invoiced/#{fulfillment_id}"
-      data: data
+      data:
+        fulfillment:
+          invoiced: invoiced
 
   $(document).on 'click', ".otf_service_new", ->
     protocol_id = $('#protocol_id').val()

app/controllers/fulfillments_controller.rb

@@ -72,7 +72,9 @@ def update
   end
 
   def toggle_invoiced
-    @fulfillment.update_attributes(invoiced: params[:invoiced])
+    persist_original_attributes_to_track_changes
+    @fulfillment.update_attributes(invoiced: fulfillment_params[:invoiced])
+    detect_changes_and_create_notes
   end
 
   def destroy
@@ -90,7 +92,7 @@ def persist_original_attributes_to_track_changes
   end
 
   def detect_changes_and_create_notes
-    tracked_fields = [:fulfilled_at, :account_number, :quantity, :performer_id]
+    tracked_fields = [:fulfilled_at, :account_number, :quantity, :performer_id, :invoiced]
     tracked_fields.each do |field|
       current_field = @original_attributes[field.to_s]
       new_field = fulfillment_params[field]
@@ -141,10 +143,10 @@ def update_components_and_create_notes(action='update')
   end
 
   def fulfillment_params
-    params.require(:fulfillment).permit(:line_item_id, :fulfilled_at, :quantity, :performer_id)
+    params.require(:fulfillment).permit(:line_item_id, :fulfilled_at, :quantity, :performer_id, :invoiced)
   end
 
   def find_fulfillment
-    @fulfillment = Fulfillment.find params[:id]
+    @fulfillment = Fulfillment.find(params[:id])
   end
 end

config/locales/en.yml

@@ -163,6 +163,7 @@ en:
       fulfilled_at: "Fulfillment Date changed to "
       quantity: "Quantity changed to "
       performer_id: "Performed By changed to "
+      invoiced: "Invoiced changed to "
     no_components: "Fulfillment Has No Components"
     performed_by: "Performed By"
     qty_type: "Quantity Type"