item_builder_mwh 0.1.31 → 0.1.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '05372970b369a4a3600e27649c65c533c3234ab4be22f6626ee54661bedcd148'
-  data.tar.gz: 32b67a281c340c239e6a6f2e2ec4a9906bab6bd1fd5d44661fc95691fa365277
+  metadata.gz: e6e3082e38984413f2942fed08a34c618c7e339370ec2588d9ea77f10d87bd73
+  data.tar.gz: f9fb2aaaac8d9f04fa96bf4789c36deace83b951a48dec0c5699120f583c4e0a
 SHA512:
-  metadata.gz: d9ccaca56ca1183b1bfa1943e88e0e14d5343949bd03004bb12f33533be31b1393b76594b64ad44cbd6b24a44622f7ba8978a6d07cd0709d94c7aa01d3b9f279
-  data.tar.gz: 77fecc6feb7ff0e039a7cdf5fd7f389d79defa10d956d7a6df93702f5ca4707478ecce991ca1683a3a124eb1f61f8d0af8ff787812f72bdb8854ac23c9f15c22
+  metadata.gz: 91b379fbfa791e74b353c47551c4b9ed2082a2134396298a189370fcbdb75f8be0dba771ba6bd52e1f95620ad9c3f7d47b18fd5d11cb0aba009f334f3d827612
+  data.tar.gz: 227e620bcc4b847bdf0ffd3626e82192c0356d098585634a893fb5626b5b7a68ce5c550b27438d84927535fb5882699767a1659ab8059a53ca60f86d3821f3f8

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/lazada_service.rb

@@ -6,7 +6,7 @@ class ItemBuilderMwh
     module Quantity
       class LazadaService < Base
         def perform
-          available_quantity + local_qty
+          available_quantity
         end
       end
     end

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.31'
+  VERSION = '0.1.35'
 end

metadata

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