comee_core 0.3.12 → 0.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11abaf99b54ed5dc68ee24e0c8cca26b6f09fbeee078607a230cde36c0696706
-  data.tar.gz: 42041d9a0b6092395e88f6b74548df48fa43f2fbb196bf26a62d0dbcea061f26
+  metadata.gz: 07ea8b2d38974e5d0c2bc42dbd9a9242ede67b2a9a18e7f8101e68db2a0f2f55
+  data.tar.gz: 532f72af1b4e969c73b155ca975b3dd3b72b3a63e1eadc147e5eec1f9d0bf6d9
 SHA512:
-  metadata.gz: 8ea45c1b3a673f69c1a7e21ef9e2d0d4c6a47c7e5ab76ed417288385170a183d417268e70dbd15139f6e12b5ce16ceba307cbd18e17f1eac5f27edce7d8ad5a4
-  data.tar.gz: 0d92e66de89adf54f1eea5d81d448a54a1015a3c19130fdbb8c07fbbc3a9fb02ceaa13ad11f13a83192cf30b0cddbddfe816dce9205fab8ad80405ca424c0089
+  metadata.gz: 0b2069cc8af72a264e78738a6d0ec44868d543126384ea67fc32c041da0fafdc3625f9bf15465462fc3f9846c10576018bef95e7696e2d8606c3bb99c5f82fab
+  data.tar.gz: cb950057668a419cfac9b0b266512594db85b15eea6696a9f37bdb6a40d57dad909a8ee0213851e8ea9cb03c3f8f5323d8920e3bdaca9d97a51eca8d86c5412c

data/app/controllers/comee/core/clients_controller.rb

@@ -5,13 +5,16 @@ module Comee
 
       def index
         super do
-          Client.includes(:parent, :agents, :contacts, :client_warehouses, :country, :user, :currency).all
+          Client.includes(
+            :parent, :agents, :contacts, :client_warehouses, :client_addresses, :country, :user, :currency
+          ).all
         end
       end
 
       def filter
-        clients = Client.includes(:parent, :agents, :contacts, :client_warehouses, :country, :user, :currency)
-                        .ransack(params[:q]).result
+        clients = Client.includes(
+          :parent, :agents, :contacts, :client_warehouses, :client_addresses, :country, :user, :currency
+        ).ransack(params[:q]).result
         render_content(clients)
       end
 

data/app/controllers/comee/core/shipment_items_controller.rb

@@ -13,7 +13,8 @@ module Comee
       end
 
       def filter
-        shipment_item = ShipmentItem.includes(:sales_order_item).ransack(params[:q]).result
+        shipment_item = ShipmentItem.includes(sales_order_item: [:unit, :product, sales_order: :client])
+                                    .ransack(params[:q]).result
         options = {include: ["sales_order_item.sales_order.client", "sales_order_item.product", "sales_order_item.unit"]}
         render_content(shipment_item, options)
       end

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.14".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.14
 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