comee_core 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5679f8f8d4ed8da5747d3f1f63e4b9b0621d5204e821241ed126ed4148701d7
-  data.tar.gz: 007bd33cf75d023854a2b4b35974065bee2e405f1c7d9830413b5c57fbe061f5
+  metadata.gz: 6574ea36fe12881077a861e6fb2606b08049a6c45c68777b865b73866a1155c1
+  data.tar.gz: 5829e9439f0796f165e5e065c311147d674314d4e8261162f38bdc7e1f826ce0
 SHA512:
-  metadata.gz: 84538ddee22dcff3353d894c017f812d7b5beb4e7c81bbf532f0b558f1071350ef71b4b3ce698bc07e905195668166b49e9497c0e485f5b458b26a407e066ea4
-  data.tar.gz: 20a4c722dcdd2bc4a6d075c0f0c886ae810f3977950236c069d4af995b629ab7011eea011ef359e8d8fbeae155b81e6da9a468e908830471dd217aeeebd87482
+  metadata.gz: a018ba9b48a1e0eb39f2b98cf4a779a495d5b46680e8370dca36c5d9a5aad08f03dd74fe95f23d2ea34669b393500997dded35f3ba3dffdf880378b32f5bba9c
+  data.tar.gz: bbdc8bc1570bfd605b90abcff20d72614ba198ca00180460d935863ffdccef69647f86cbf2c8788021dc8e2765d9028a04cf19d07679f64775b874e07a258c4a

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

@@ -57,7 +57,7 @@ module Comee
 
       def model_params
         params.require(:payload).permit(:code, :name, :match_code, :address, :locale, :user_id, :parent_id, :currency,
-                                        :subsidiary, :country_id, :tax_code, :vat_number, consignees: [])
+                                        :subsidiary, :country_id, :tax_code, :vat_number, :print_details, consignees: [])
       end
 
       def agent_params

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

@@ -16,6 +16,14 @@ module Comee
         render json: {success: false, error: e.message}, status: 422
       end
 
+      def generate_beo_xml
+        service = BeoService.new(publish_params[:ids])
+        data = service.preprocess_data(xml: true)
+        render json: {success: true, data: data}
+      rescue StandardError => e
+        render json: {success: false, error: e.message}, status: 422
+      end
+
       private
 
       def publish_params

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

@@ -8,12 +8,12 @@ module Comee
         if @user.authenticate(change_password_params[:old_password])
           if @user.update(password: change_password_params[:new_password],
                           password_confirmation: change_password_params[:new_password_confirmation])
-            render json: @user, serializer: UserSerializer, status: :ok
+            render json: {success: true, data: serialize(@user)}
           else
-            render json: {errors: @user.errors.full_messages}, status: 422
+            render json: {success: false, error: @user.errors.full_messages[0]}, status: 422
           end
         else
-          render json: {error: "Old password is incorrect"}, status: :unauthorized
+          render json: {success: false, error: "Old password doesn't match!"}, status: 422
         end
       end
 

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

@@ -2,7 +2,7 @@ module Comee
   module Core
     class ClientSerializer < ActiveModel::Serializer
       attributes :id, :code, :name, :match_code, :address, :locale, :user_id, :user_name, :parent_id, :consignees,
-                 :shipment_addresses, :tax_code, :vat_number, :currency
+                 :shipment_addresses, :tax_code, :vat_number, :currency, :print_details
       belongs_to :parent
       belongs_to :country
       has_many :agents

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

@@ -10,21 +10,42 @@ module Comee
         @ids = ids
       end
 
-      def pre_process_data
+      def preprocess_data(xml: false)
         @ids.each do |id|
-          @line_items = Comee::Core::ShipmentInstructionItem.includes(shipment_item: {sales_order_item: :sales_order})
-                                                            .where(shipment_instruction_id: id)
-          sales_order_ids = @line_items.map(&:shipment_item).map(&:sales_order_item).map(&:sales_order).map(&: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)
+                        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
           @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 { |line_item| line_item.shipment_item.package_type.split(" ")[0] }.uniq
+          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
+          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|
-            line_item.shipment_item.sales_order_item.quantity * line_item.shipment_item.sales_order_item.product.weight
+            if xml
+              (line_item.quantity * line_item.product.weight).round(2)
+            else
+              (line_item.shipment_item.sales_order_item.quantity * line_item.shipment_item.sales_order_item.product.weight).round(2)
+            end
           end
 
           raise(StandardError, "No customs detail filed for sales order") unless @customs_details.present?
@@ -34,36 +55,37 @@ module Comee
             @transportation_routes << tr["route"][0, 2]
           end
 
-          prepare_data
+          @data = xml ? generate_xml : prepare_data
         end
 
-        JSON(@data)
+        xml ? @data : JSON(@data)
       end
 
       def position_data
         position_items = []
         @line_items.each_with_index do |line_item, index|
-          customs_detail = @customs_details.find_by(sales_order_id: line_item.shipment_item.sales_order_item.sales_order_id)
+          si = line_item.shipment_item
+          customs_detail = @customs_details.find_by(sales_order_id: si.sales_order_item.sales_order_id)
           mp = Comee::Core::MasterPrice.includes(:country_of_origin).find_by(primary: true,
-                                                                             product_id: line_item.shipment_item
+                                                                             product_id: si
                                                                              .sales_order_item.product.id)
-          line_item.shipment_item
+
           position_items << {
             "warePositionsnummer": index + 1,
-            "wareWarennummerKN8": line_item.shipment_item.sales_order_item.product.hs_code,
-            "wareWarenbezeichnung": line_item.shipment_item.sales_order_item.product.hs_description,
+            "wareWarennummerKN8": si.sales_order_item.product.hs_code,
+            "wareWarenbezeichnung": si.sales_order_item.product.hs_description,
             "wareRegistriernummerFremdsystem": customs_detail.sales_order.customer_order.order_number,
             "wareUrsprungsbundesland": mp.state_of_origin,
-            "wareEigenmasse": line_item.shipment_item.sales_order_item.product.weight * line_item.shipment_item.sales_order_item.quantity,
+            "wareEigenmasse": si.sales_order_item.product.weight * si.sales_order_item.quantity,
             "wareRohmasse": index.zero? ? @total_weight : 0,
             "ausfuhrLand": "DE",
             "ursprungsland": mp.country_of_origin.code,
             "beantragtesVerfahren": "10",
             "vorhergehendesVerfahren": "00",
             "zusatzlichesVerfahren": "F61",
-            "aussenhandelsstatistikMenge": line_item.shipment_item.sales_order_item.quantity,
-            "aussenhandelsstatistikWert": (line_item.shipment_item.sales_order_item.quantity *
-                                            line_item.shipment_item.sales_order_item.price * 1.05).round(2),
+            "aussenhandelsstatistikMenge": si.sales_order_item.quantity,
+            "aussenhandelsstatistikWert": (si.sales_order_item.quantity *
+                                            si.sales_order_item.price * 1.05).round(2),
             "packstuck": [
               {
                 "packstuckNummer": index + 1,
@@ -79,7 +101,7 @@ module Comee
       end
 
       def prepare_data
-        @data = {
+        {
           "dataIdentifier": "",
           "kundenNumber": "",
           "mandantId": "",
@@ -155,7 +177,7 @@ module Comee
       def send_customs_details
         response = HTTParty.post("#{@atlas_base_url}/PutData", headers: {'Content-Type': "application/json",
                                                                          'token': @atlas_token,
-                                                                         'bearertoken': bearer_token}, body: pre_process_data)
+                                                                         'bearertoken': bearer_token}, body: preprocess_data)
         unless [200, 201].include?(response.code)
           raise(StandardError,
                 "Failed to send POST request with token: #{response.code} - #{response.body}")
@@ -164,6 +186,133 @@ module Comee
         JSON.parse(response.body)
       end
 
+      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)
+          mp = Comee::Core::MasterPrice.includes(:country_of_origin).find_by(primary: true,
+                                                                             product_id: line_item.product.id)
+
+          xml.Position do
+            xml.Positionsnummer (index + 1).to_s
+            xml.Warenbezeichnung line_item.product.hs_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
+            xml.Ursprungsland mp.country_of_origin.code
+            xml.Eigenmasse line_item.product.weight * line_item.quantity
+            xml.Rohmasse index.zero? ? @total_weight : 0
+            xml.Gefahrgutnummer_UNDG
+            xml.Warennummer_KN8 line_item.product.hs_code
+            xml.Verfahren do
+              xml.angemeldetes "10"
+              xml.vorangegangenes "00"
+              xml.weiteres "F61"
+              xml.Ausfuhrerstattung
+            end
+            xml.Aussenhandelsstatistik do
+              xml.Menge line_item.quantity
+              xml.Wert (line_item.quantity *
+                                            line_item.price * 1.05).round(2)
+            end
+            xml.Vorpapier do
+              xml.Typ
+              xml.Referenz
+              xml.Zusatz
+            end
+            xml.Packstuecke do
+              xml.Anzahl index.zero? ? @no_of_packages : 0
+              xml.Nummer index + 1
+              xml.Verpackungsart @package_type
+              xml.Zeichen_Nummern customs_detail.sales_order.customer_order.order_number
+            end
+            xml.Unterlage do
+              xml.Qualifizierung
+              xml.Typ
+              xml.Referenz
+              xml.Zusatz
+              xml.Detail
+              xml.Datum_der_Ausstellung
+              xml.Datum_des_Gueltigkeitsendes
+              xml.Wert
+              xml.Masseinheit
+              xml.Aschreibungsmenge
+            end
+          end
+        end
+      end
+
+      def generate_xml
+        Nokogiri::XML::Builder.new(encoding: "Windows-1252") do |xml|
+          xml.BEO_ATLAS("xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance",
+                        "xmlns:xsd" => "http://www.w3.org/2001/XMLSchema") do
+            xml.Nachricht do
+              xml.Zollnummer_Sender "4789741"
+              xml.Nachrichten_Typ "DEXPDF"
+              xml.BEO_Atlas_KundenID
+              xml.Anwendung
+              xml.Name "Maveko_korrigiert"
+            end
+            xml.Kopf do
+              xml.EORI_Number "DE47897410000"
+              xml.Art_der_Ausfuhranmeldung @customs_details[0].export_declaration_type
+              xml.Ausfuhrland "DE"
+              xml.Bestimmungsland @customs_details[0].destination_country
+              xml.Container @customs_details[0].containerized == true ? 1 : 0
+              xml.send("Beteiligten-Konstellation", @customs_details[0].participant_constellation.split(" ")[0])
+              xml.send("Gesamt-Rohmasse", @total_weight)
+              xml.Kennnummer_der_Sendung @customs_details.map(&:sales_order).map(&:customer_order).map(&:consignee).join(" ")
+              xml.Bezugsnummer @customs_details.map(&:sales_order).map(&:customer_order).map(&:order_number).join(" ")
+              xml.inlandischerVerkehrszweig @customs_details[0].mode_of_transport
+              xml.verkehrszweigAnDerGrenze @customs_details[0].mode_of_transport_at_border
+              xml.Befoerderungsmittel_an_der_Grenze do
+                xml.Art @customs_details[0].mode_of_transport_type
+                xml.Kennzeichen "UNBEKANNT"
+              end
+              xml.Befoerderungsmittel_am_Abgang do
+                xml.sequenznummer "1"
+                xml.Art @customs_details[0].type_of_identification.split(" ")[0]
+                xml.Kennzeichen @customs_details[0].additional_identifier.split(" ")[0]
+                xml.Staatszugehoerigkeit @customs_details[0].nationality.split(" ")[0]
+              end
+              xml.Ausfuhrzollstelle do
+                xml.Dienststellennummer @customs_details[0].export_customs_office.split(" ")[0]
+              end
+              xml.Vorgesehene_Ausgangszollstelle do
+                xml.Dienststellennummer @customs_details[0].customs_office_of_exit.split(" ")[0]
+              end
+              xml.Geschaeftsvorgang do
+                xml.Art "11"
+                xml.Rechnungspreis @customs_details[0].sales_order.total_price.round(2)
+                xml.Waehrung "EUR"
+              end
+              xml.Befoerderungsroute do
+                @transportation_routes.each do |tr|
+                  xml.Land tr
+                end
+              end
+              xml.Empfaenger do
+                xml.Identifikationsart
+                xml.TIN
+                xml.Niederlassungsnummer
+                xml.Name @customs_details[0].sales_order.customer_order.client.name
+                xml.Strasse @address[0]
+                xml.PLZ @address[-1]
+                xml.Ort "#{@address[1].split(' ')[-3]} #{@address[1].split(' ')[-2]}"
+                xml.Land @address[1].split(" ")[-1]
+              end
+              xml.Lieferbedingung do
+                xml.send("Incoterm-Code", @customs_details[0].delivery_term_code[0, 3])
+                xml.Ort "Hamburg"
+                xml.Land "DE"
+              end
+            end
+            xml.Waren do
+              xml_position_data(xml)
+            end
+          end
+        end.to_xml
+      end
+
       private
 
       def bearer_token

data/config/routes.rb

@@ -158,6 +158,7 @@ Comee::Core::Engine.routes.draw do
     collection do
       post "filter"
       post "send", action: :send_customs_details
+      post "generate_beo_xml", action: :generate_beo_xml
     end
   end
 

data/db/migrate/20240628205454_add_print_details_field_to_customer.rb

@@ -0,0 +1,5 @@
+class AddPrintDetailsFieldToCustomer < ActiveRecord::Migration[7.1]
+  def change
+    add_column :comee_core_clients, :print_details, :boolean, null: false, default: false
+  end
+end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.3.2".freeze
+    VERSION = "0.3.4".freeze
   end
 end

data/spec/factories/comee/core/clients.rb

@@ -11,5 +11,6 @@ FactoryBot.define do
     shipment_addresses { [] }
     currency
     subsidiary { false }
+    print_details { false }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-24 00:00:00.000000000 Z
+date: 2024-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -515,6 +515,7 @@ files:
 - db/migrate/20240406162711_create_comee_core_goods_issued_items.rb
 - db/migrate/20240407083617_create_comee_core_email_settings.rb
 - db/migrate/20240503040722_create_comee_core_client_addresses.rb
+- db/migrate/20240628205454_add_print_details_field_to_customer.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb