item_builder_mwh 0.1.30 → 0.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7d9cbd0ff16d3f1b3ff9f1eec6bbe89304e1445fe3d2cd9ed0fa07e3884c6b1
-  data.tar.gz: 874ff15f589f0b9de12af48badaabfc16dba5087796143f2b548080498f2c91f
+  metadata.gz: 590c9e095a3e20f271a30683c2c6c11201a024c5b17e03dda9c2691b13939d3d
+  data.tar.gz: 28d7ea34be369d2248aa59c9513e90ccb8c4e967723baf08d65b26f82acfa4dc
 SHA512:
-  metadata.gz: 556eb6eeb96fb7df53e15a03526de0a6f77377a6cd69c96e8bcc14e71491c863f16bf8ea8949eb61237d7ecf48f348156b1d495535de7d15cc6aba0914841928
-  data.tar.gz: ba4db1fbf9de3ce57a444ee75d0b157093a85df642869e89094f78f3b7d0c41e7890149ca97e44d87a4bba5b9ca1e1d8a9b29f97fb6bc00ae7449678c7b3bc4f
+  metadata.gz: 6f1039e8d235e08659f70c600f87dd9260a643603e8f0d0bf39e4656bf120085084e276093050bc768fe95e599b45a2ee3c77e265aa67e6872897848568db798
+  data.tar.gz: '09a04734bfdcf9779f7fd84c8d79155a3c4c5058f18fe85a76552678a6980d74610b26719ec47f57f893d1ed4c3c041b822c1f6571d4553ff87d672ee602cc39'

data/lib/item_builder_mwh/get_quantity_service.rb

@@ -13,6 +13,7 @@ class ItemBuilderMwh
       @existing_allocated_stock = args.fetch(:existing_allocated_stock)
       @listing_wh_sp_quantity = args.fetch(:listing_wh_sp_quantity)
       @wh_routing = args.fetch(:wh_routing, 0)
+      @selected_warehouse_space = args.fetch(:selected_warehouse_space)
     end
 
     def perform
@@ -96,9 +97,8 @@ class ItemBuilderMwh
       if @bundle_variants.present?
         qty_list = []
         @bundle_variants.each do |bvr|
-          warehouse_space = wh_space.select {|ws| ws.item_variant_id == bvr.variant_id }.first
-          qty = warehouse_space.quantity if warehouse_space.present?
-          qty ||= 0
+          qty_wh_spaces = wh_space.select {|ws| ws.item_variant_id == bvr.variant_id }
+          qty = qty_wh_spaces.sum(&:quantity)
           qty = qty / bvr.unit
           qty_list.push(qty)
         end
@@ -109,7 +109,7 @@ class ItemBuilderMwh
     end
 
     def wh_space
-      @wh_space ||= WarehouseSpace.where(item_variant_id: variant_ids)
+      @wh_space ||= WarehouseSpace.where(item_variant_id: variant_ids, warehouse_id: @selected_warehouse_space.warehouse_id)
     end
 
     def variant_ids

data/lib/item_builder_mwh/modes/quantity_service.rb

@@ -43,24 +43,24 @@ class ItemBuilderMwh
 
       def real_quantity(warehouse_space)
         if channel_name == 'Zilingo'
-          qty(warehouse_space.quantity)
+          qty(warehouse_space)
         else
-          [qty(warehouse_space.quantity), 0].sort[1]
+          [qty(warehouse_space), 0].sort[1]
         end
       end
 
-      def qty(qty)
+      def qty(warehouse_space)
         if channel_name.empty? || channel_name == "Shopify"
-          available_quantity(qty)
+          available_quantity(warehouse_space)
         else
-          qty_channel(qty)
+          qty_channel(warehouse_space)
         end
       end
 
-      def qty_channel(qty)
+      def qty_channel(warehouse_space)
         class_name = "ItemBuilderMwh::Modes::Quantity::#{channel_name}Service"
         qty_channel_service = class_name.constantize
-        qty_channel_service.new(listing, available_quantity(qty), local_qty.to_i).perform
+        qty_channel_service.new(listing, available_quantity(warehouse_space), local_qty.to_i).perform
       end
 
       def channel_name
@@ -95,12 +95,13 @@ class ItemBuilderMwh
         0
       end
 
-      def available_quantity(qty)
+      def available_quantity(warehouse_space)
         ItemBuilderMwh::GetQuantityService.new(
           listing: listing, stock_alloc: stock_alloc,
           variant: variant, bundle_variants: bundle_variants,
           existing_allocated_stock: existing_allocated_stock,
-          listing_wh_sp_quantity: qty, wh_routing: wh_routing
+          listing_wh_sp_quantity: warehouse_space.quantity, wh_routing: wh_routing,
+          selected_warehouse_space: warehouse_space
         ).perform
       end
     end

data/lib/item_builder_mwh/modes.rb

@@ -98,14 +98,21 @@ class ItemBuilderMwh
       WarehouseSpace
         .joins('JOIN warehouse_mappings ON
           warehouse_spaces.warehouse_id = warehouse_mappings.warehouse_id')
+        .joins('JOIN warehouses ON
+          warehouse_spaces.warehouse_id = warehouses.id')
         .where("warehouse_mappings.profile_channel_association_id=#{pca}")
-        .where("warehouse_spaces.item_variant_id=#{listing.variant_id}")
+        .where("warehouse_spaces.item_variant_id=#{variant_id}")
+        .where('warehouses.consignment = 0')
     end
 
     def pca
       listing.profile_channel_association_id.to_s
     end
 
+    def variant_id
+      bundle_variants&.first&.variant_id || listing.variant_id
+    end
+
     def warehouse_mapping(warehouse_id)
       WarehouseMapping
         .where(profile_channel_association_id:

data/lib/item_builder_mwh/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class ItemBuilderMwh
-  VERSION = '0.1.30'
+  VERSION = '0.1.34'
 end

data/lib/item_builder_mwh.rb

@@ -43,16 +43,16 @@ class ItemBuilderMwh
       param =
         if listing.channel_id == 18
           qty_simple_params(listing)
-            .merge(zilingo_quantity: @zilingo_quantity)
+            .merge(zilingo_quantity: zilingo_quantity)
         elsif listing.channel_id == 13
           qty_simple_params(listing)
-            .merge(zalora_reserved_stock: @zalora_reserved_stock)
+            .merge(zalora_reserved_stock: zalora_reserved_stock)
         elsif listing.channel_id == 2
           qty_simple_params(listing)
-            .merge({shopify_inventory_location: @shopify_inventory_location})
+            .merge({shopify_inventory_location: shopify_inventory_location})
         elsif listing.channel_id == 3
           qty_simple_params(listing)
-            .merge({lazada_quantity: @lazada_quantity})
+            .merge({lazada_quantity: lazada_quantity})
         else
           qty_simple_params(listing)
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: item_builder_mwh
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.1.34
 platform: ruby
 authors:
 - Kevin Ivander
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2021-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler