Fixed track inventory checkbox on Product > Stock page with regressio…

…n test

Fixes spree#6286

backend/app/assets/javascripts/spree/backend/variant_management.js.coffee

@@ -1,9 +1,10 @@
 jQuery ->
   $('.track_inventory_checkbox').on 'click', ->
-    $(@).parents('form').submit()
+    $(this).siblings('.variant_track_inventory').val($(this).is(':checked'))
+    $(this).parents('form').submit()
   $('.toggle_variant_track_inventory').on 'submit', ->
     $.ajax
       type: @method
       url: @action
-      data: $(@).serialize()
+      data: $(this).serialize()
     false

backend/app/controllers/spree/admin/resource_controller.rb

@@ -33,7 +33,7 @@ def update
       flash[:success] = flash_message_for(@object, :successfully_updated)
       respond_with(@object) do |format|
         format.html { redirect_to location_after_save }
-        format.js   { render :layout => false }
+        format.js { render layout: false }
       end
     else
       invoke_callbacks(:update, :fails)
@@ -125,7 +125,7 @@ def resource
     if parent_data
       parent_model_name = parent_data[:model_name]
     end
-    @resource = Spree::Admin::Resource.new controller_path, controller_name, parent_model_name
+    @resource = Spree::Admin::Resource.new controller_path, controller_name, parent_model_name, object_name
   end
 
   def load_resource
@@ -240,6 +240,10 @@ def collection_url(options = {})
     end
   end
 
+  # This method should be overridden when object_name does not match the controller name
+  def object_name
+  end
+
   # Allow all attributes to be updatable.
   #
   # Other controllers can, should, override it to set custom logic

backend/app/controllers/spree/admin/variants_including_master_controller.rb

@@ -1,6 +1,7 @@
 module Spree
   module Admin
     class VariantsIncludingMasterController < VariantsController
+      belongs_to "spree/product", find_by: :slug
 
       def model_class
         Spree::Variant

backend/app/models/spree/admin/resource.rb

@@ -1,10 +1,11 @@
 module Spree
   module Admin
     class Resource
-      def initialize(controller_path, controller_name, parent_model)
+      def initialize(controller_path, controller_name, parent_model, object_name = nil)
         @controller_path = controller_path
         @controller_name = controller_name
         @parent_model = parent_model
+        @object_name = object_name
       end
 
       def sub_namespace_parts
@@ -24,6 +25,7 @@ def model_name
       end
 
       def object_name
+        return @object_name if @object_name
         sub_namespace = sub_namespace_parts.join('_')
         sub_namespace = "#{sub_namespace}_" if sub_namespace.length > 0
         "#{sub_namespace}#{@controller_name.singularize}"

backend/app/views/spree/admin/products/stock.html.erb

@@ -26,17 +26,17 @@
             </td>
             <td>
               <%= variant.sku_and_options_text %>
-              <%= form_tag admin_product_variants_including_master_path(@product, variant, format: :js), method: :post, class: 'toggle_variant_track_inventory' do %>
+              <%= form_tag admin_product_variants_including_master_path(@product, variant, format: :js), method: :put, class: 'toggle_variant_track_inventory' do %>
                 <div class="checkbox">
                   <%= label_tag :track_inventory do %>
                     <%= check_box_tag 'track_inventory', 1, variant.track_inventory?,
                                       class: 'track_inventory_checkbox' %>
                     <%= Spree.t(:track_inventory) %>
+                    <%= hidden_field_tag 'variant[track_inventory]', variant.track_inventory?,
+			class: 'variant_track_inventory',
+			id: "variant_track_inventory_#{variant.id}" %>
                   <% end %>
                 </div>
-                <%= hidden_field_tag 'variant[track_inventory]', variant.track_inventory?,
-                    class: 'variant_track_inventory',
-                    id: "variant_track_inventory_#{variant.id}" %>
               <% end if can?(:update, @product) && can?(:update, variant) %>
             </td>
 

backend/app/views/spree/admin/variants/update.js.erb

@@ -0,0 +1 @@
+<%= @object.as_json %>

backend/spec/features/admin/products/stock_management_spec.rb

@@ -28,6 +28,21 @@
       end
     end
 
+    context "toggle track inventory for a variant's stock item" do
+      let(:track_inventory) { find ".track_inventory_checkbox" }
+
+      before do
+        expect(track_inventory).to be_checked
+        track_inventory.set(false)
+        wait_for_ajax
+      end
+
+      it "persists the value when page reloaded", js: true do
+        visit current_path
+        expect(track_inventory).not_to be_checked
+      end
+    end
+
     # Regression test for #2896
     # The regression was that unchecking the last checkbox caused a redirect
     # to happen. By ensuring that we're still on an /admin/products URL, we

backend/spec/models/spree/resource_spec.rb

@@ -14,6 +14,7 @@ module Admin
     describe Resource, type: :model do
       let(:resource_base) { Resource.new('spree/admin/test', 'test', 'widget') }
       let(:resource_submodule) { Resource.new('spree/admin/submodule/test', 'test', 'widget') }
+      let(:resource_object_name) { Resource.new('spree/admin/test', 'test', 'gadget', 'widget') }
 
       it "can get base model class" do
         expect(resource_base.model_class).to eq(Spree::Test)
@@ -38,6 +39,10 @@ module Admin
       it "can get submodule object name" do
         expect(resource_submodule.object_name).to eq('submodule_test')
       end
+
+      it "can get overridden object name" do
+        expect(resource_object_name.object_name).to eq('widget')
+      end
     end
   end
 end