item_builder_mwh 0.1.29 → 0.1.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b78cf06c6468a43cb0276bce86475e9e26225998a51a07ebc0f5abcccbb275a
-  data.tar.gz: 26f16ef4c2b1e4c0d27ba8f1da2817b1c185713c0fa64af76f440ce9ec218eec
+  metadata.gz: c282ebc9226e7ecefba32a5b1b090497d55d2ae0348e4bce59fd85778f5b86bd
+  data.tar.gz: 39e5261db0a0b8db5d273e6c51e00263a6653784c040ee8535c68a19d7212d1e
 SHA512:
-  metadata.gz: 5db1144fc273bb1861c8477a72dfc9d119c98e6c0fddb9befc07d13b431bfe116075ec0c70b315de618b2d7ddc35f9c8d8e4b241f8e26421d15b8a3ec502ac55
-  data.tar.gz: 0a02b711a5dd12ebd751ffa106f786949456c25b555638962a102fbee3ef57c9ee5bb34e34e37d9af6ba673c357b8be82f88b88d21895293a4bbed43ef79bff4
+  metadata.gz: bc90d9146267c005d720d6b3fc5e17253d3fa0021577476ece017baed78105c68173167859a30722b2bec3137dbc150bb2abfdf53ef822dda3807259e728dda6
+  data.tar.gz: a1b92a340806454c47d766c8008861cd5d53fb0d58ac46f0cd39d20a7d29745d4890f116c1c8397117923083a486023a5a998f0b79df5a5f94980680dafff2bc

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,8 +98,11 @@ 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('warehouses.consignment = 0')
     end
 
     def pca

data/lib/item_builder_mwh/version.rb

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

data/lib/item_builder_mwh.rb

@@ -40,29 +40,23 @@ class ItemBuilderMwh
     listings.map do |listing|
       next unless listing.local_id.present?
 
-      if listing.channel_id == 18
-        new_param = qty_simple_params(listing)
-                    .merge({zilingo_quantity: zilingo_quantity})
-
-        modes[mode].new(new_param).perform
-      elsif listing.channel_id == 13
-        new_param = qty_simple_params(listing)
-                    .merge({zalora_reserved_stock: zalora_reserved_stock})
-
-        modes[mode].new(new_param).perform
-      elsif listing.channel_id == 2
-        new_param = qty_simple_params(listing)
-                    .merge({shopify_inventory_location: shopify_inventory_location})
-
-        modes[mode].new(new_param).perform
-      elsif listing.channel_id == 3
-        new_param = qty_simple_params(listing)
-                    .merge({lazada_quantity: lazada_quantity})
-
-        modes[mode].new(new_param).perform
-      else
-        modes[mode].new(qty_simple_params(listing)).perform
-      end
+      param =
+        if listing.channel_id == 18
+          qty_simple_params(listing)
+            .merge(zilingo_quantity: zilingo_quantity)
+        elsif listing.channel_id == 13
+          qty_simple_params(listing)
+            .merge(zalora_reserved_stock: zalora_reserved_stock)
+        elsif listing.channel_id == 2
+          qty_simple_params(listing)
+            .merge({shopify_inventory_location: shopify_inventory_location})
+        elsif listing.channel_id == 3
+          qty_simple_params(listing)
+            .merge({lazada_quantity: lazada_quantity})
+        else
+          qty_simple_params(listing)
+        end
+      modes[mode].new(param).perform
     end.compact
   end
 

metadata

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