comee_core 0.3.12 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11abaf99b54ed5dc68ee24e0c8cca26b6f09fbeee078607a230cde36c0696706
-  data.tar.gz: 42041d9a0b6092395e88f6b74548df48fa43f2fbb196bf26a62d0dbcea061f26
+  metadata.gz: 37e018316397b9835966d15f409f2884a9e1cc3749eef845f92f36a4ab72ecad
+  data.tar.gz: 5bf530dcf32e3567c152ff57ba3d339a4f0f0feae80581d85215daa3c124d77a
 SHA512:
-  metadata.gz: 8ea45c1b3a673f69c1a7e21ef9e2d0d4c6a47c7e5ab76ed417288385170a183d417268e70dbd15139f6e12b5ce16ceba307cbd18e17f1eac5f27edce7d8ad5a4
-  data.tar.gz: 0d92e66de89adf54f1eea5d81d448a54a1015a3c19130fdbb8c07fbbc3a9fb02ceaa13ad11f13a83192cf30b0cddbddfe816dce9205fab8ad80405ca424c0089
+  metadata.gz: 102bc7736fb711184cc69fc515df446b4c850eeab201a3eb8449b524b5fa2c780f74208489732a4f111dcb3f92609db9b980298e3f20275bd6ef7aa09fbe16c1
+  data.tar.gz: 1d3c76695cadb18c210e59084e0e350f865d86a4a5d1c0df4b7eec91eca7cf4cacf8d9cc650ccab00f959c0eb8673f6ee39d9ca72987f498344fd329eba52627

data/app/services/comee/core/customer_order_service.rb

@@ -160,27 +160,32 @@ module Comee
             shipping_date: order.shipping_date,
             delivery_date: order.final_delivery_date,
             consignee: order.consignee,
-            created_by: accepted_by || ""
+            created_by: accepted_by || "",
+            consolidator_date: order.consolidator_date,
+            voyage_no: order.voyage_no,
+            shipping_arrangement: order.shipping_arrangement
           )
           order_items = order.customer_order_items.includes(:product, :unit)
           client_id = order.client.parent_id || order.client_id
+          product_ids = order_items.map(&:product_id).uniq
           client_prices = ClientPrice.where(
             client_id: client_id,
-            product_id: order_items.map(&:product_id),
+            product_id: product_ids,
             status: ClientPrice.statuses[:current]
           )
           master_prices = MasterPrice.includes(:supplier).where(primary: true, status: Price.statuses[:current],
-                                                                product: order_items.map(&:product))
-          main_query = ProductLookup.includes(:itemable).where(itemable_type: "Comee::Core::Supplier")
+                                                                product_id: product_ids)
           queries = master_prices.each_with_object([]) do |obj, res|
             res << {
               product_id: obj.product_id,
               itemable_id: obj.supplier_id
             }
           end
-          product_lookups = queries.inject(main_query) do |conditions, condition|
+
+          product_lookups = queries.inject(ProductLookup.none) do |conditions, condition|
             conditions.or(ProductLookup.where(condition))
           end
+          product_lookups = product_lookups.includes(:itemable).where(itemable_type: "Comee::Core::Supplier")
           items = order_items.each_with_object([]) do |item, res|
             next if item.canceled?
 
@@ -189,9 +194,7 @@ module Comee
             quantity = convert_quantity(item.quantity, item.unit_id, unit_id)
             client_price = client_prices.find { |price| price.product_id == item.product_id }
             master_price = master_prices.find { |price| price.product_id == item.product_id }
-            product_lookup = product_lookups.find do |lookup|
-              lookup.product_id == master_price.product_id && lookup.itemable_id == master_price.supplier_id
-            end
+            product_lookup = product_lookups.find { |lookup| lookup.product_id == item.product_id }
             raise(StandardError, "No primary supplier found for product #{item.customer_item_no}") unless master_price
 
             price = if client_price

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.3.12".freeze
+    VERSION = "0.3.13".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-01 00:00:00.000000000 Z
+date: 2024-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers