update WeightsAndMeasures#scales_for_variant_unit to ignore available…

… untis when needed

app/services/weights_and_measures.rb

@@ -14,7 +14,7 @@ def scale_for_unit_value
   end
 
   def system
-    return "custom" unless scales = scales_for_variant_unit
+    return "custom" unless scales = scales_for_variant_unit(ignore_available_units: true)
     return "custom" unless product_scale = @variant.product.variant_unit_scale
 
     scales[product_scale.to_f]['system']
@@ -45,8 +45,10 @@ def system
     }
   }.freeze
 
-  def scales_for_variant_unit
-    @scales_for_variant_unit ||= @units[@variant.product.variant_unit]&.reject { |_scale, unit_info|
+  def scales_for_variant_unit(ignore_available_units: false)
+    return @units[@variant.product.variant_unit] if ignore_available_units
+
+    @units[@variant.product.variant_unit]&.reject { |_scale, unit_info|
       available_units.exclude?(unit_info['name'])
     }
   end

spec/controllers/api/v0/order_cycles_controller_spec.rb

@@ -38,6 +38,18 @@ module Api
         expect(product_ids).to include product1.id, product2.id, product3.id
       end
 
+      context "when product's variant unit scale is not in the available units list" do
+        before do
+          allow(Spree::Config).to receive(:available_units).and_return("lb,oz,kg,T,mL,L,kL")
+        end
+
+        it "loads products for distributed products in the order cycle" do
+          api_get :products, id: order_cycle.id, distributor: distributor.id
+
+          expect(product_ids).to include product1.id, product2.id, product3.id
+        end
+      end
+
       it "returns products that were searched for" do
         ransack_param = "name_or_meta_keywords_or_variants_display_as_or_" \
                         "variants_display_name_or_supplier_name_cont"