comee_core 0.3.20 → 0.3.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5800c13672eb17e44ca33d72b8793090222e15e35a1b3b006fcdbb8394e1440c
-  data.tar.gz: d3c846baacc27f192b2bc54cb009b98bccdc9958dc3e1a617bcbf8476c6d54c5
+  metadata.gz: 4ef62a4650cf347d3276dede12a8c429757c5261df0697d3632a73b907c1c27a
+  data.tar.gz: 30d1511ab8a333c92730ccd98f16ced09d5c29aff58e7692fdbf908475ad2370
 SHA512:
-  metadata.gz: 6c2a9a3381044970f4bc3a23459d3bb5438e226e8ff0265de16a952c9939dd6e88f369a453ab54d8398301d464b305500b4cc1c6405553437a4dd0514751ef5c
-  data.tar.gz: 2f18c9811f6165ce75f2bfd6cd06f300043e9699ad56b282ca5c3f87e10f83f5df7bf1d1d98a00e909462fca97547a5dd27e72c5a12b358cd04948a15c6f1948
+  metadata.gz: e9d3e24823a44a19181692cb570c04bb78e7ff6632022fa1e76fbd5ef330bb06be7770c2589b49d19b6613d406199f81f5e6c4c9359675a18621a719d0b5224e
+  data.tar.gz: 28e92974cd248a841c25dac76b5dd93f89416159b16dde9778a1d51628daece86eb13d332965816e835ffce6550236bd8fc4bfd76b754ea0af43c4669957c099

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

@@ -52,7 +52,12 @@ module Comee
 
       def suggest_values
         service = CustomerOrderService.new
-        result = service.suggest_values(params[:id], suggest_params[:unit_id])
+        result = service.suggest_values(
+          params[:id],
+          suggest_params[:from_id],
+          suggest_params[:to_id],
+          suggest_params[:quantity]
+        )
         render json: {success: true, data: result}
       end
 
@@ -88,7 +93,7 @@ module Comee
       private
 
       def suggest_params
-        params.permit(:unit_id, :quantity)
+        params.permit(:from_id, :to_id, :quantity)
       end
 
       def model_params

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

@@ -79,23 +79,30 @@ module Comee
         (quantity / conversion.factor).round
       end
 
-      def suggest_values(item_id, new_unit_id)
-        item = CustomerOrderItem.includes(:customer_order).find_by(id: item_id)
+      def suggest_values(item_id, from_id, to_id, quantity, old_price = nil)
+        item = SalesOrderItem.includes(:product, sales_order: :client)
+                             .find_by(id: item_id)
         raise(StandardError, "Order item with id `#{item_id}` not found.") unless item
 
-        quantity = convert_quantity(item.quantity, item.unit_id, new_unit_id)
-        client = Client.find(item.customer_order.client_id)
+        client = item.sales_order.client
         client_id = client.parent_id || client.id
-        client_price = ClientPrice.find_by(product_id: item.product_id, client_id: client_id)
-        if client_price
-          price = convert_price(client_price.price, client_price.unit_id, new_unit_id)
-        else
-          master_price = MasterPrice.find_by(product_id: item.product_id, primary: true)
-          raise(StandardError, "No price entry could be found for product `#{item.product.code}`.") unless master_price
-
-          price = convert_price(master_price.selling_price, master_price.unit_id, new_unit_id)
+
+        client_price = old_price
+        unless client_price
+          client_price = ClientPrice.find_by(product_id: item.product_id, client_id: client_id)
+          if client_price
+            client_price = convert_price(client_price.price, client_price.unit_id, from_id)
+          else
+            master_price = MasterPrice.find_by(product_id: item.product_id, primary: true)
+            raise(StandardError, "No price entry could be found for product `#{item.product.code}`.") unless master_price
+
+            client_price = convert_price(master_price.selling_price, master_price.unit_id, from_id)
+          end
         end
-        {quantity: quantity, price: price, total_price: quantity * price}
+
+        price = convert_price(client_price, from_id, to_id)
+        new_quantity = convert_quantity(quantity, from_id, to_id)
+        {quantity: new_quantity, price: price, total_price: (new_quantity * price).round(2)}
       end
 
       def submit(id)

data/lib/comee/core/version.rb

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

metadata

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