comee_core 0.3.19 → 0.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a167a9d01cd03be307e0f99d440d4edfe98a86a8d3e84b9571b3c19b9389657
-  data.tar.gz: 429b64c12e99c22246678db52440ec59ef926217b51374e31bba5e9b8c166f6c
+  metadata.gz: 1fab2298e1068d07c363f1b68294580c1083674dd2b8e39c138a9915a66e95c5
+  data.tar.gz: 28eee2c59364a03df98d8e8dcf64f5cd1077f6b1c3bd787a27c668ead48bbda2
 SHA512:
-  metadata.gz: 3b64d2413b3325dd5d0d10b831b56bb2caba6068111c25c4cd581260a45b5ec9522c7e7ce221d806daed864893f7e1fdc205999aae9b511174cf18dc0a60423d
-  data.tar.gz: e57f98846dc9bdb9ace8478c206d11858938e0126ec86bc4ca9fb3b24b462c4b1109e4bf6031fc360932afd395a17fd7bed7ec058100a5fe7f7d2417e75e41b4
+  metadata.gz: 786348f507b5a0c8ac4908c07fa36d946dbd938a56fdca4e2f197677532b8ceca183b8228d004ba2c43c825261542439921f26bb05b8221d63b7930fbd20ebb3
+  data.tar.gz: 3fe9e3c69f795418bcc608571c0ef8ea1270e0154d43dd7cf88481d00a527883786f8fe58d5ba3c05fd83fb5193251f5e91d5b51068bae3cded9e31c6d4d01f7

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

@@ -13,41 +13,26 @@ module Comee
       def preprocess_data(xml: false)
         @ids.each do |id|
           @line_items = if xml
-                          shipment_items = Comee::Core::ShipmentItem.includes(sales_order_item: :sales_order)
-                                                                    .where(sales_order_item: {sales_order_id: id})
-                          sales_order_item_ids = shipment_items.map { |item| item.sales_order_item_id }
-                          Comee::Core::SalesOrderItem.where(id: sales_order_item_ids)
+                          Comee::Core::ShipmentInstructionItem.includes(shipment_item: {sales_order_item: :sales_order})
+                                                              .where(delivery_note_id: id)
                         else
                           Comee::Core::ShipmentInstructionItem.includes(shipment_item: {sales_order_item: :sales_order})
                                                               .where(shipment_instruction_id: id)
                         end
-          sales_order_ids = if xml
-                              @line_items.map(&:sales_order_id)
-                            else
-                              @line_items.map { |item| item.shipment_item.sales_order_item.sales_order.id }
-                            end
+          sales_order_ids = @line_items.map { |item| item.shipment_item.sales_order_item.sales_order.id }
+
           @customs_details = Comee::Core::CustomsDetail.includes(sales_order: :customer_order).where(sales_order_id: sales_order_ids)
           @transportation_routes = []
           @position_data = []
 
           packaging_types = @line_items.map do |line_item|
-            if xml
-              Comee::Core::ShipmentItem.find_by(sales_order_item_id: line_item.id).package_type.split(" ")[0]
-            else
-              line_item.shipment_item.package_type.split(" ")[0]
-            end
+            line_item.shipment_item.package_type.split(" ")[0]
           end.uniq
 
           @no_of_packages = packaging_types.count
           @package_type = packaging_types.count == 1 && packaging_types.first == "PX" ? "PX" : "PK"
           @total_weight = @line_items.sum do |line_item|
-            if xml
-              xml_line = Comee::Core::ShipmentInstructionItem.where(shipment_item_id: Comee::Core::ShipmentItem
-                            .find_by(sales_order_item_id: line_item.id).id).first
-              (xml_line.quantity * xml_line.weight).round(2)
-            else
-              (line_item.quantity * line_item.weight).round(2)
-            end
+            (line_item.quantity * line_item.weight).round(2)
           end
 
           raise(StandardError, "No customs detail filed for sales order") unless @customs_details.present?
@@ -63,7 +48,11 @@ module Comee
 
           @data = xml ? generate_xml : prepare_data
         end
-        xml ? @data : JSON(@data)
+        if xml
+          {xml_data: @data, file_name: "#{@customs_details[0].sales_order.customer_order.order_number}_Ausfuhr"}
+        else
+          JSON(@data)
+        end
       end
 
       def position_data
@@ -81,7 +70,7 @@ module Comee
             "wareWarenbezeichnung": si.sales_order_item.product.customs_description,
             "wareRegistriernummerFremdsystem": customs_detail.sales_order.customer_order.order_number,
             "wareUrsprungsbundesland": mp.state_of_origin.split(" ")[0],
-            "wareEigenmasse": line_item.weight * line_item.quantity,
+            "wareEigenmasse": (line_item.weight * line_item.quantity).round(2),
             "wareRohmasse": index.zero? ? @total_weight : 0,
             "ausfuhrLand": "DE",
             "ursprungsland": mp.country_of_origin.code,
@@ -193,21 +182,22 @@ module Comee
 
       def xml_position_data(xml)
         @line_items.each_with_index do |line_item, index|
-          customs_detail = @customs_details.find_by(sales_order_id: line_item.sales_order_id)
+          sales_order_item = line_item.shipment_item.sales_order_item
+          customs_detail = @customs_details.find_by(sales_order_id: sales_order_item.sales_order_id)
           mp = Comee::Core::MasterPrice.includes(:country_of_origin).find_by(primary: true,
-                                                                             product_id: line_item.product.id)
+                                                                             product_id: sales_order_item.product.id)
 
           xml.Position do
             xml.Positionsnummer (index + 1).to_s
-            xml.Warenbezeichnung line_item.product.customs_description
+            xml.Warenbezeichnung sales_order_item.product.customs_description
             xml.Registriernummer_Fremdsystem customs_detail.sales_order.customer_order.order_number
             xml.Kennnummer_der_Sendung @customs_details.map(&:sales_order).map(&:customer_order).map(&:consignee).join(" ")
             xml.Ursprungsbundesland mp.state_of_origin.split(" ")[0]
             xml.Ursprungsland mp.country_of_origin.code
-            xml.Eigenmasse line_item.product.weight * line_item.quantity
+            xml.Eigenmasse (sales_order_item.product.weight * sales_order_item.quantity).round(2)
             xml.Rohmasse index.zero? ? @total_weight : 0
             xml.Gefahrgutnummer_UNDG
-            xml.Warennummer_KN8 line_item.product.hs_code
+            xml.Warennummer_KN8 sales_order_item.product.hs_code
             xml.Verfahren do
               xml.angemeldetes "10"
               xml.vorangegangenes "00"
@@ -215,9 +205,9 @@ module Comee
               xml.Ausfuhrerstattung
             end
             xml.Aussenhandelsstatistik do
-              xml.Menge line_item.quantity
-              xml.Wert (line_item.quantity *
-                                            line_item.price * 1.05).round(2).to_i
+              xml.Menge sales_order_item.quantity
+              xml.Wert (sales_order_item.quantity *
+                                            sales_order_item.price * 1.05).round(2).to_i
             end
             xml.Vorpapier do
               xml.Typ

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.19".freeze
+    VERSION = "0.3.21".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.3.19
+  version: 0.3.21
 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