comee_core 0.2.85 → 0.2.87

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92597cfcc6201f0e7735375e52b22e490ceb637cc76e519ead74d70c359cb55d
-  data.tar.gz: a864b62cffa69931e1b340949d362217c0e2ea258eb6c6762987473962ce68c8
+  metadata.gz: 8087c47cfff3765329e378c4f90dc44a0a12d14335fe551d6a0822de437b9b13
+  data.tar.gz: cae23b72d5f323a8cdc53e60ca4834d1017afbad1a6902e6cc0e70d1d23c2047
 SHA512:
-  metadata.gz: 4f287fb11f55ebe66f58fa03203ecf4b52920472bbd44c75298f56f682a5fa1e2e9e7c18072408f88bb1223706c5c1249438e60660fc433f229bc78f5f36cbfa
-  data.tar.gz: ddaef63048d9f052b39143d2e04ff53e0de57ce9c777238701935b53490879f6f57d9448bb0756e7f41cbd431fa2f2c5d9048e45fd8c69a409f82b981bf6f00e
+  metadata.gz: 5585235c8cf45b06f896babb9b0d6e4f958c0b4cc8ed22887d637ddcca1592b40ace4bb0a28e9b143d5b37bc201c77c86ead2730198defd41d497eb8c68f97d3
+  data.tar.gz: 328f1153595fe03a94db8fab8a961bc42c7e998ea68e50ccda75423b86439f4bec8303205c0afd25b1c92371b3a928cf990df146448d2bd0e531e1e63b59267c

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

@@ -3,6 +3,19 @@ module Comee
     class CustomsDetailsController < ApplicationController
       include Common
 
+      def filter
+        customs_details = Comee::Core::CustomsDetail.includes(:sales_order).ransack(params[:q]).result
+        render_content(customs_details)
+      end
+
+      def send_customs_details
+        service = BeoService.new(params[:id])
+        data = service.send_customs_details
+        render json: {success: true, data: data}
+      rescue StandardError => e
+        render json: {success: false, error: e.message}, status: :unprocessable_entity
+      end
+
       private
 
       def model_params
@@ -32,8 +45,8 @@ module Comee
           :closure_mark3,
           :closure_mark4,
           :closure_mark5,
-          :transportation_route,
-          :sales_order_id
+          :sales_order_id,
+          transportation_route: %i[order route value]
         )
       end
     end

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

@@ -60,7 +60,7 @@ module Comee
 
       def model_params
         params.require(:payload).permit(:sales_order_item_id, :quantity, :shipment_status, :status, :handover_date, :delivery_date,
-                                        :pallet_no, :consignee, :order_number)
+                                        :pallet_no, :consignee, :order_number, :package_type)
       end
     end
   end

data/app/models/comee/core/customs_detail.rb

@@ -3,6 +3,14 @@ module Comee
     class CustomsDetail < ApplicationRecord
       belongs_to :sales_order
 
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[id sales_order_id]
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[sales_order]
+      end
+
       validates :registration_type, :export_declaration_type, :participant_constellation, :mode_of_transport_type, :destination_country,
                 :additional_identifier, :packaging_type, :export_customs_office, :customs_office_of_exit, :mode_of_transport,
                 :delivery_term_code, presence: true

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

@@ -1,7 +1,7 @@
 module Comee
   module Core
     class PurchaseOrderItemSerializer < ActiveModel::Serializer
-      attributes :id, :quantity, :confirmed_quantity, :price
+      attributes :id, :serial_no, :quantity, :confirmed_quantity, :price
 
       belongs_to :purchase_order
     end

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

@@ -2,7 +2,7 @@ module Comee
   module Core
     class ShipmentItemSerializer < ActiveModel::Serializer
       attributes :id, :quantity, :shipment_status, :status, :handover_date, :delivery_date, :pallet_no, :consignee,
-                 :order_number
+                 :order_number, :package_type
       belongs_to :sales_order_item
       has_many :item_statuses
       has_many :shipment_instruction_items

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

@@ -0,0 +1,154 @@
+require "httparty"
+
+module Comee
+  module Core
+    class BeoService
+      def initialize(id)
+        @atlas_token = ENV.fetch("ATLAS_TOKEN")
+        @atlas_base_url = ENV.fetch("ATLAS_BASE_URL")
+        @encoded_auth = ENV.fetch("ENCODED_AUTH")
+        @customs_detail = Comee::Core::CustomsDetail.includes(sales_order: :customer_order).find_by(sales_order_id: id)
+        @line_items = Comee::Core::SalesOrderItem.includes(:product, :unit, :customer_order_item, :source,
+                                                           :purchase_order_item).where(sales_order_id: id)
+        @transportation_routes = []
+        @position_data = []
+        raise(StandardError, "No customs detail filed for sales order") unless @customs_detail.present?
+
+        @address = @customs_detail.sales_order.customer_order.client.address.split(", ")
+        @customs_detail.transportation_route.each do |tr|
+          @transportation_routes << tr["route"][0, 2]
+        end
+      end
+
+      def prepare_data
+        @line_items.each do |line_item, index|
+          mp = Comee::Core::MasterPrice.includes(:country_of_origin).find_by(primary: true, product_id: line_item.product.id)
+          sii = Comee::Core::ShipmentItem.find_by(sales_order_item_id: line_item.id)
+          @position_data << {
+            "warePositionsnummer": index,
+            "wareWarennummerKN8": line_item.product.hs_code,
+            "wareWarenbezeichnung": line_item.product.hs_description,
+            "wareRegistriernummerFremdsystem": @customs_detail.sales_order.order_number,
+            "wareUrsprungsbundesland": mp.state_of_origin,
+            "wareEigenmasse": line_item.product.weight * line_item.quantity,
+            "wareRohmasse": line_item.product.weight * line_item.quantity,
+            "ausfuhrLand": "DE",
+            "ursprungsland": mp.country_of_origin.code,
+            "beantragtesVerfahren": "10",
+            "vorhergehendesVerfahren": "00",
+            "zusatzlichesVerfahren": "F61",
+            "aussenhandelsstatistikMenge": line_item.quantity,
+            "aussenhandelsstatistikWert": line_item.quantity * line_item.price,
+            "packstuck": [
+              {
+                "packstuckNummer": "1",
+                "packstuckAnzahl": sii.pallet_no,
+                "packstuckVerpackungsart": sii.package_type.split(" ")[0],
+                "packstuckZeichenNummern": @customs_detail.sales_order.order_number
+              }
+            ]
+          }
+        end
+
+        data = {
+          "dataIdentifier": "",
+          "kundenNumber": "",
+          "mandantId": "",
+          "module": {
+            "ausfuhr": {
+              "data": "true",
+              "email": "",
+              "autosend": "false"
+            }
+          },
+          "messageData": {
+            "ausfuhr": {
+              "expdat": [
+                {
+                  "kopf": {
+                    "eoriNiederlassungsnummer": "DE47897410000",
+                    "dienststellennummer": "DE014851",
+                    "artderAnmeldung": @customs_detail.registration_type.split(" ")[0],
+                    "artderAnmeldungAusfuhr": @customs_detail.export_declaration_type,
+                    "ausfuhrLand": "DE",
+                    "beteiligtenKonstellation": @customs_detail.participant_constellation.split(" ")[0],
+                    "sicherheit": @customs_detail.registration_type.split(" ")[0] == "CO" ? 0 : 2,
+                    "container": @customs_detail.containerized == true ? 1 : 0,
+                    "bestimmungsLand": @customs_detail.destination_country,
+                    "referenznummerUCR": @customs_detail.sales_order.customer_order.consignee,
+                    "lrn": @customs_detail.sales_order.order_number,
+                    "beforderungsmittelImInlandVerkehrszweig": @customs_detail.mode_of_transport,
+                    "beforderungsmittelderGrenzeVerkehrszweig": @customs_detail.mode_of_transport_at_border,
+                    "beforderungsmittelderGrenzeArt": @customs_detail.mode_of_transport_type,
+                    "beforderungsmittelderGrenzeKennzeichen": "UNBEKANNT",
+                    "beforderungsmittelderGrenzeStaatszugehorigkeit": @customs_detail.mode_of_transport_nationality.split(" ")[0],
+                    "beforderungsmittelBeimAbgang": [
+                      {
+                        "sequenznummer": "1",
+                        "artderIdentifikation": @customs_detail.type_of_identification.split(" ")[0],
+                        "kennzeichen": @customs_detail.additional_identifier.split(" ")[0],
+                        "staatszugehorigkeit": @customs_detail.nationality.split(" ")[0]
+                      }
+                    ],
+                    "ausfuhrzollstelleDienststellennummer": @customs_detail.export_customs_office.split(" ")[0],
+                    "vorgeseheneAusgangszollstelleDienststellennummer": @customs_detail.customs_office_of_exit.split(" ")[0],
+                    "geschaftsvorgangArt": "11",
+                    "geschaftsvorgangRechnungspreis": @customs_detail.sales_order.total_price,
+                    "geschaftsvorgangWahrung": "EUR",
+                    "beforderungsroute": {
+                      "ausgewahlteLander": @transportation_routes,
+                      "beforderungsVon": @customs_detail.transportation_route[0]["route"].split(" ")[0],
+                      "beforderungsBis": @customs_detail.transportation_route[-1]["route"].split(" ")[0]
+                    },
+                    "empfanger": {
+                      "tin": "",
+                      "niederlassungsNummer": "",
+                      "name": @customs_detail.sales_order.customer_order.client.name,
+                      "strasse": @address[0],
+                      "plz": @address[-1],
+                      "ort": "#{@address[1].split(' ')[-3]} #{@address[1].split(' ')[-2]}",
+                      "land": @address[1].split(" ")[-1]
+                    },
+                    "warenortArtdesOrtes": "B",
+                    "warenortArtDerOrtsbestimmung": "Y",
+                    "warenortZusatzlicheKennung": @customs_detail.additional_identifier.split(" ")[0],
+                    "lieferbedingungIncotermCode": @customs_detail.delivery_term_code[0, 3],
+                    "lieferbedingungOrt": "Hamburg"
+                  },
+                  "position": @position_data
+                }
+              ]
+            }
+          }
+        }
+
+        JSON(data)
+      end
+
+      def send_customs_details
+        response = HTTParty.post("#{@atlas_base_url}/PutData", headers: {'Content-Type': "application/json",
+                                                                         'token': @atlas_token,
+                                                                         'bearertoken': bearer_token}, body: prepare_data)
+        unless [200, 201].include?(response.code)
+          raise(StandardError,
+                "Failed to send POST request with token: #{response.code} - #{response.body}")
+        end
+
+        JSON.parse(response.body)
+      end
+
+      private
+
+      def bearer_token
+        response = HTTParty.post("#{@atlas_base_url}/authenticate", headers: {
+                                   'Authorization': "Basic #{@encoded_auth}",
+                                   'Accept': "application/json"
+                                 })
+
+        raise(StandardError, "Failed to obtain bearer token: #{response.code} - #{response.body}") unless response.code == 200
+
+        JSON.parse(response.body)["accessToken"]
+      end
+    end
+  end
+end

data/config/routes.rb

@@ -149,12 +149,23 @@ Comee::Core::Engine.routes.draw do
       post "cancel"
     end
   end
-  resources :customs_details
+
+  resources :customs_details do
+    collection do
+      post "filter"
+    end
+
+    member do
+      post "send", action: :send_customs_details
+    end
+  end
+
   resources :item_statuses do
     collection do
       post "filter"
     end
   end
+
   resources :fulfillment_centers
 
   resources :client_warehouses

data/db/migrate/20240608094721_add_package_type_to_shipment_item.rb

@@ -0,0 +1,5 @@
+class AddPackageTypeToShipmentItem < ActiveRecord::Migration[7.1]
+  def change
+    add_column :comee_core_shipment_items, :package_type, :string, default: "PX - Palette"
+  end
+end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.2.85".freeze
+    VERSION = "0.2.87".freeze
   end
 end

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

@@ -9,5 +9,6 @@ FactoryBot.define do
     pallet_no { Faker::Alphanumeric.alpha(number: 10) }
     consignee { Faker::Name.name }
     order_number { sales_order_item.sales_order.order_number }
+    package_type { "PX - Palette" }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.2.85
+  version: 0.2.87
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-05 00:00:00.000000000 Z
+date: 2024-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: image_processing
   requirement: !ruby/object:Gem::Requirement
@@ -396,6 +410,7 @@ files:
 - app/serializers/comee/core/unit_serializer.rb
 - app/serializers/comee/core/user_application_role_serializer.rb
 - app/serializers/comee/core/user_serializer.rb
+- app/services/comee/core/beo_service.rb
 - app/services/comee/core/customer_order_service.rb
 - app/services/comee/core/product_lookup_service.rb
 - app/services/comee/core/quotation_request_service.rb
@@ -475,6 +490,7 @@ files:
 - db/migrate/20240602171355_add_order_reference_to_purchase_order.rb
 - db/migrate/20240604142805_add_serial_no_to_purchase_order_items.rb
 - db/migrate/20240604155157_add_fields_to_customs_details.rb
+- db/migrate/20240608094721_add_package_type_to_shipment_item.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb