comee_core 0.3.18 → 0.3.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7b45dd03c08ff2f2aaecfa3bb2b4c48c0640240ccc8f2988311754ff25e031a
-  data.tar.gz: f992aef504e763d0583ecaecdc1744dede77600bcfcdf2530e21c6da0f14bf27
+  metadata.gz: 5800c13672eb17e44ca33d72b8793090222e15e35a1b3b006fcdbb8394e1440c
+  data.tar.gz: d3c846baacc27f192b2bc54cb009b98bccdc9958dc3e1a617bcbf8476c6d54c5
 SHA512:
-  metadata.gz: 99585c3f085b3a361c9cf06b04aa5dca4a5273093457e3f80c2abcb6c139fdb1e49f088db13aa9c02df1a75c8897239aa8d90216acc9e6d6d18a0024b0fc1930
-  data.tar.gz: 9a63b2fa0373ee075bb40b16786ba3926c40559410475f11c12bed3b235726c760d196b152a42620e056458f890706439f67d6d97f075b4eda371187c53e1b99
+  metadata.gz: 6c2a9a3381044970f4bc3a23459d3bb5438e226e8ff0265de16a952c9939dd6e88f369a453ab54d8398301d464b305500b4cc1c6405553437a4dd0514751ef5c
+  data.tar.gz: 2f18c9811f6165ce75f2bfd6cd06f300043e9699ad56b282ca5c3f87e10f83f5df7bf1d1d98a00e909462fca97547a5dd27e72c5a12b358cd04948a15c6f1948

data/app/serializers/comee/core/supplier_serializer.rb

@@ -1,7 +1,7 @@
 module Comee
   module Core
     class SupplierSerializer < ActiveModel::Serializer
-      attributes :id, :code, :name, :locale, :user_id, :payment_terms, :tax_code, :vat_number
+      attributes :id, :code, :name, :locale, :user_id, :payment_terms, :tax_code, :vat_number, :currency_id
       belongs_to :currency
       has_many :supplier_addresses
     end

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

@@ -175,17 +175,7 @@ module Comee
           )
           master_prices = MasterPrice.includes(:supplier).where(primary: true, status: Price.statuses[:current],
                                                                 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(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?
 
@@ -194,9 +184,9 @@ 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 { |lookup| lookup.product_id == item.product_id }
             raise(StandardError, "No primary supplier found for product #{item.customer_item_no}") unless master_price
 
+            product_lookup = master_price.product_lookup
             price = if client_price
                       convert_price(client_price.price, client_price.unit_id, unit_id)
                     else

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.3.18".freeze
+    VERSION = "0.3.20".freeze
   end
 end

metadata

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