comee_core 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6574ea36fe12881077a861e6fb2606b08049a6c45c68777b865b73866a1155c1
-  data.tar.gz: 5829e9439f0796f165e5e065c311147d674314d4e8261162f38bdc7e1f826ce0
+  metadata.gz: 904aacbb433502ee95c7973c9ff1f50d5fe9698998a7600dcb84a038068f5125
+  data.tar.gz: a943ec5bd2893b7d1cff862f12695f193013740ff3c09606320306dbd252e2a6
 SHA512:
-  metadata.gz: a018ba9b48a1e0eb39f2b98cf4a779a495d5b46680e8370dca36c5d9a5aad08f03dd74fe95f23d2ea34669b393500997dded35f3ba3dffdf880378b32f5bba9c
-  data.tar.gz: bbdc8bc1570bfd605b90abcff20d72614ba198ca00180460d935863ffdccef69647f86cbf2c8788021dc8e2765d9028a04cf19d07679f64775b874e07a258c4a
+  metadata.gz: c14eda451d86694be060e733b8fdc3cf903872faf587b9c74349663bf0badb23ae6cb8dfc7103b8109ea5da3e457eb36b1b6a0b7cb4773697899d144ca0abed1
+  data.tar.gz: ad1835d0bf82d0002b9f710b5f7439cb218abf4223cbbfa46229d1793e7f6f806107deb2a8334906ca7e4a5d2259d7c80497ea006f980d2d3c6475db9ecf5e2d

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

@@ -6,7 +6,9 @@ module Comee
       private
 
       def model_params
-        params.require(:payload).permit(:name, :address, :email, :telephone)
+        params.require(:payload).permit(
+          :name, :address_line1, :street, :city, :state, :country_id, :postal_code, :email, :telephone
+        )
       end
     end
   end

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

@@ -14,7 +14,7 @@ module Comee
       def model_params
         params.require(:payload)
               .permit(:client_id, :name, :address_line1, :street, :city, :state, :country_id, :postal_code, :address_type,
-                      :default)
+                      :email, :telephone, :default)
       end
     end
   end

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

@@ -56,12 +56,14 @@ module Comee
       private
 
       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, :print_details, consignees: [])
+        params.require(:payload).permit(:code, :name, :match_code, :locale, :user_id, :parent_id, :currency, :subsidiary,
+                                        :country_id, :tax_code, :vat_number, :print_details, consignees: [])
       end
 
       def agent_params
-        params.require(:payload).permit(:name, :address, :email, :telephone)
+        params.require(:payload).permit(
+          :name, :address_line1, :street, :city, :state, :country_id, :postal_code, :email, :telephone
+        )
       end
 
       def contact_params

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

@@ -68,16 +68,19 @@ module Comee
               .permit(
                 :order_number, :order_date, :order_terms, :consignee, :shipment_address, :final_destination,
                 :final_delivery_date, :handover_date, :shipping_date, :delivery_address, :invoice_address, :status,
-                :client_id, :file
+                :client_id, :consolidator_date, :voyage_no, :shipping_arrangement, :file
               )
       end
 
       def create_with_item_params
         params.require(:payload)
               .permit(
-                :order_number, :order_date, :order_terms, :consignee, :shipment_address, :final_destination,
+                :order_number, :order_date, :order_terms, :consignee, :shipment_address, :final_destination, :voyage_no,
                 :final_delivery_date, :handover_date, :shipping_date, :delivery_address, :invoice_address, :status, :client_id,
-                items: %i[serial_no customer_item_no customer_item_description product_id quantity price total_price unit_id delivery_date]
+                :consolidator_date, :shipping_arrangement,
+                items: %i[
+                  serial_no customer_item_no customer_item_description product_id quantity price total_price unit_id delivery_date
+                ]
               )
       end
 

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

@@ -31,7 +31,7 @@ module Comee
       end
 
       def model_params
-        params.required(:payload).permit(:code, :itemable_id, :itemable_type, :item_description, :product_id)
+        params.required(:payload).permit(:code, :itemable_id, :itemable_type, :item_description, :product_id, :aliases)
       end
     end
   end

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

@@ -0,0 +1,21 @@
+module Comee
+  module Core
+    class SupplierAddressesController < ApplicationController
+      include Common
+
+      def index
+        super do
+          SupplierAddress.where(supplier_id: params[:id])
+        end
+      end
+
+      private
+
+      def model_params
+        params.require(:payload)
+              .permit(:supplier_id, :address_line1, :street, :city, :state, :country_id, :postal_code, :address_type,
+                      :email, :telephone, :default)
+      end
+    end
+  end
+end

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

@@ -17,7 +17,7 @@ module Comee
       private
 
       def model_params
-        params.require(:payload).permit(:code, :name, :address, :locale, :payment_terms, :currency_id, :vat_number, :tax_code)
+        params.require(:payload).permit(:code, :name, :locale, :payment_terms, :currency_id, :vat_number, :tax_code)
       end
     end
   end

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

@@ -0,0 +1,20 @@
+module Comee
+  module Core
+    class Address < ApplicationRecord
+      self.abstract_class = true
+
+      BASIC_ADDRESS = "Basic Address".freeze
+      SHIPPING_ADDRESS = "Shipping Address".freeze
+      DELIVERY_ADDRESS = "Delivery Address".freeze
+      INVOICING_ADDRESS = "Invoicing Address".freeze
+
+      ADDRESS_TYPES = [BASIC_ADDRESS, SHIPPING_ADDRESS, DELIVERY_ADDRESS, INVOICING_ADDRESS].freeze
+
+      belongs_to :country, -> { where(lookup_type: :country) }, class_name: "Comee::Core::Lookup"
+
+      validates :address_line1, :address_type, presence: true
+      validates :address_type, inclusion: {in: ADDRESS_TYPES}
+      validates :email, format: {with: URI::MailTo::EMAIL_REGEXP}
+    end
+  end
+end

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

@@ -1,6 +1,8 @@
 module Comee
   module Core
     class Agent < ApplicationRecord
+      belongs_to :country, -> { where(lookup_type: :country) }, class_name: "Comee::Core::Lookup"
+
       validates :name, :email, :telephone, presence: true
     end
   end

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

@@ -8,8 +8,9 @@ module Comee
       has_and_belongs_to_many :contacts, join_table: :comee_core_clients_contacts
       has_and_belongs_to_many :agents, join_table: :comee_core_clients_agents
       has_many :client_warehouses
+      has_many :client_addresses
 
-      validates :code, :name, :match_code, :address, :locale, presence: true
+      validates :code, :name, :match_code, :locale, presence: true
       validates :code, uniqueness: true
 
       delegate(:name, to: :user, prefix: true, allow_nil: true)

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

@@ -1,17 +1,18 @@
 module Comee
   module Core
-    class ClientAddress < ApplicationRecord
-      SHIPPING_ADDRESS = "Shipping Address".freeze
-      DELIVERY_ADDRESS = "Delivery Address".freeze
-      INVOICING_ADDRESS = "Invoicing Address".freeze
+    class ClientAddress < Address
+      # BASIC_ADDRESS = "Basic Address".freeze
+      # SHIPPING_ADDRESS = "Shipping Address".freeze
+      # DELIVERY_ADDRESS = "Delivery Address".freeze
+      # INVOICING_ADDRESS = "Invoicing Address".freeze
 
-      ADDRESS_TYPES = [SHIPPING_ADDRESS, DELIVERY_ADDRESS, INVOICING_ADDRESS].freeze
+      # ADDRESS_TYPES = [BASIC_ADDRESS, SHIPPING_ADDRESS, DELIVERY_ADDRESS, INVOICING_ADDRESS].freeze
 
       belongs_to :client
-      belongs_to :country, -> { where(lookup_type: :country) }, class_name: "Comee::Core::Lookup"
+      # belongs_to :country, -> { where(lookup_type: :country) }, class_name: "Comee::Core::Lookup"
 
-      validates :name, :address_line1, :address_type, presence: true
-      validates :address_type, inclusion: {in: ADDRESS_TYPES}
+      validates :name, presence: true
+      # validates :address_type, inclusion: {in: ADDRESS_TYPES}
 
       validate :validate_default
 

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

@@ -6,6 +6,7 @@ module Comee
       has_one_attached :file
 
       enum :status, {draft: 0, submitted: 1, awaiting_confirmation: 2, accepted: 3, canceled: 4}
+      enum :shipping_arrangement, {own: 0, agent: 1}
 
       validates :order_number, :order_date, :delivery_address, :invoice_address, :status, presence: true
 

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

@@ -5,6 +5,8 @@ module Comee
 
       belongs_to :pod
       belongs_to :time_slot
+      belongs_to :agent, optional: true
+
       validates :status, presence: true
 
       def self.ransackable_attributes(_auth_object = nil)

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

@@ -9,7 +9,7 @@ module Comee
       validates :code, uniqueness: {scope: %i[product_id itemable_id itemable_type]}
 
       def self.ransackable_attributes(_auth_object = nil)
-        %w[id code item_description itemable_id itemable_type product_id]
+        %w[id code item_description itemable_id itemable_type product_id alias]
       end
 
       def self.ransackable_associations(_auth_object = nil)

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

@@ -3,7 +3,6 @@ module Comee
     class SalesOrder < ApplicationRecord
       before_validation :generate_order_number, if: proc { |so| so.order_number.nil? }
 
-      before_save :total_price
       before_save :set_parent_client_name
 
       belongs_to :customer_order
@@ -15,6 +14,7 @@ module Comee
 
       enum :status, {draft: 0, submitted: 1, confirmed: 2, accepted: 3, canceled: 4}
       enum :purchase_status, {unprocessed: 0, processed: 1}
+      enum :shipping_arrangement, {own: 0, agent: 1}
 
       validates :order_number, presence: true, uniqueness: true
       validates :order_date, :status, :purchase_status, presence: true
@@ -25,11 +25,16 @@ module Comee
                 numericality: {greater_than_or_equal_to: 0},
                 allow_nil: true
 
-      def total_price
+      def calculate_total_price
         sales_order_items = SalesOrderItem.where(sales_order_id: id)
         self.total_price = sales_order_items.sum(&:total_price)
       end
 
+      def calculate_vat
+        total_price = SalesOrderItem.where(sales_order_id: id).sum(&:total_price)
+        self.vat = (total_price * 0.19).round(2) if client.tax_code == "Inland"
+      end
+
       def set_parent_client_name
         self.parent_client_name = client.parent&.name
       end

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

@@ -5,7 +5,9 @@ module Comee
 
       before_save :calculate_total_price
       before_save :calculate_handover_date
+      after_save :update_sales_order
       after_save :update_sales_order_purchase_status, if: proc { |item| item.fully_processed? }
+      after_destroy :update_sales_order
 
       enum processing_status: {unprocessed: 0, partially_processed: 1, fully_processed: 2}
 
@@ -34,6 +36,11 @@ module Comee
         self.total_price = (price * quantity).round(2)
       end
 
+      def update_sales_order
+        sales_order.calculate_total_price
+        sales_order.calculate_vat
+      end
+
       def quantity_remaining
         quantity - (quantity_delivered + quantity_canceled)
       end

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

@@ -3,10 +3,11 @@ module Comee
     class Supplier < ApplicationRecord
       belongs_to :user, optional: true
       belongs_to :currency, optional: true
+      has_many :supplier_addresses
       has_and_belongs_to_many :contacts, join_table: :comee_core_suppliers_contacts
 
       validates :code, presence: true, uniqueness: true
-      validates :name, :address, :locale, :payment_terms, presence: true
+      validates :name, :locale, :payment_terms, presence: true
 
       def self.ransackable_attributes(_auth_object = nil)
         %w[id user_id code name address locale]

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

@@ -0,0 +1,24 @@
+module Comee
+  module Core
+    class SupplierAddress < Address
+      belongs_to :supplier
+
+      validate :validate_default
+
+      def validate_default
+        return unless supplier && address_type && default
+
+        default_count = if new_record?
+                          SupplierAddress.where(address_type: address_type, supplier: supplier, default: true).count
+                        else
+                          SupplierAddress.where(address_type: address_type, supplier: supplier, default: true)
+                                         .where.not(id: id).count
+                        end
+
+        return if default_count.zero?
+
+        errors.add(:default, "cannot be set to true. There is already a default address for this supplier and address type.")
+      end
+    end
+  end
+end

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

@@ -1,7 +1,9 @@
 module Comee
   module Core
     class AgentSerializer < ActiveModel::Serializer
-      attributes :id, :name, :address, :email, :telephone
+      attributes :id, :name, :address_line1, :street, :city, :state, :country_id, :postal_code, :email, :telephone
+
+      belongs_to :country
     end
   end
 end

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

@@ -2,7 +2,7 @@ module Comee
   module Core
     class ClientAddressSerializer < ActiveModel::Serializer
       attributes :id, :name, :address_line1, :street, :city, :state, :country_id, :postal_code, :address_type,
-                 :client_id, :default
+                 :email, :telephone, :client_id, :default
 
       belongs_to :client
       belongs_to :country

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

@@ -1,13 +1,14 @@
 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, :print_details
+      attributes :id, :code, :name, :match_code, :locale, :user_id, :user_name, :parent_id, :consignees, :tax_code,
+                 :vat_number, :currency, :print_details
       belongs_to :parent
       belongs_to :country
       has_many :agents
       has_many :contacts
       has_many :client_warehouses
+      has_many :client_addresses
     end
   end
 end

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

@@ -3,7 +3,7 @@ module Comee
     class CustomerOrderSerializer < ActiveModel::Serializer
       attributes :id, :order_number, :order_date, :order_terms, :consignee, :shipment_address, :final_destination,
                  :final_delivery_date, :handover_date, :shipping_date, :delivery_address, :invoice_address, :status,
-                 :file_url
+                 :consolidator_date, :voyage_no, :shipping_arrangement, :file_url
 
       belongs_to :client
       has_many :customer_order_items

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

@@ -1,7 +1,7 @@
 module Comee
   module Core
     class ProductLookupSerializer < ActiveModel::Serializer
-      attributes :id, :code, :itemable_id, :itemable_type, :item_description
+      attributes :id, :code, :itemable_id, :itemable_type, :item_description, :aliases
       belongs_to :product
     end
   end

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

@@ -4,7 +4,7 @@ module Comee
       attributes :id, :order_number, :order_date, :order_terms, :shipment_address, :delivery_address, :invoice_address,
                  :destination, :handover_date, :shipping_date, :delivery_date, :consignee, :parent_client_name, :payment_term,
                  :delivery_term, :payment_penalty, :status, :purchase_status, :total_price, :amount_paid, :pallete_note,
-                 :remark, :created_by, :files_url, :created_at
+                 :consolidator_date, :voyage_no, :shipping_arrangement, :remark, :created_by, :files_url, :created_at
       belongs_to :customer_order
       belongs_to :client
       belongs_to :fulfillment_center

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

@@ -0,0 +1,11 @@
+module Comee
+  module Core
+    class SupplierAddressSerializer < ActiveModel::Serializer
+      attributes :id, :address_line1, :street, :city, :state, :country_id, :postal_code, :address_type, :email, :telephone,
+                 :supplier_id, :default
+
+      belongs_to :supplier
+      belongs_to :country
+    end
+  end
+end

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

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

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

@@ -42,22 +42,27 @@ module Comee
           @package_type = packaging_types.count == 1 && packaging_types.first == "PX" ? "PX" : "PK"
           @total_weight = @line_items.sum do |line_item|
             if xml
-              (line_item.quantity * line_item.product.weight).round(2)
+              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.shipment_item.sales_order_item.quantity * line_item.shipment_item.sales_order_item.product.weight).round(2)
+              (line_item.quantity * line_item.weight).round(2)
             end
           end
 
           raise(StandardError, "No customs detail filed for sales order") unless @customs_details.present?
 
-          @address = @customs_details[0].sales_order.customer_order.client.address.split(", ")
-          @customs_details[0].transportation_route.each do |tr|
-            @transportation_routes << tr["route"][0, 2]
+          @address = Comee::Core::ClientAddress.find(@customs_details[0].sales_order.delivery_address.to_i)
+          @customs_details[0].transportation_route.each_with_index do |tr, index|
+            if xml
+              @transportation_routes << tr["route"][0, 2]
+            else
+              @transportation_routes << tr["route"][0, 2] unless index.zero?
+            end
           end
 
           @data = xml ? generate_xml : prepare_data
         end
-
         xml ? @data : JSON(@data)
       end
 
@@ -73,10 +78,10 @@ module Comee
           position_items << {
             "warePositionsnummer": index + 1,
             "wareWarennummerKN8": si.sales_order_item.product.hs_code,
-            "wareWarenbezeichnung": si.sales_order_item.product.hs_description,
+            "wareWarenbezeichnung": si.sales_order_item.product.customs_description,
             "wareRegistriernummerFremdsystem": customs_detail.sales_order.customer_order.order_number,
-            "wareUrsprungsbundesland": mp.state_of_origin,
-            "wareEigenmasse": si.sales_order_item.product.weight * si.sales_order_item.quantity,
+            "wareUrsprungsbundesland": mp.state_of_origin.split(" ")[0],
+            "wareEigenmasse": line_item.weight * line_item.quantity,
             "wareRohmasse": index.zero? ? @total_weight : 0,
             "ausfuhrLand": "DE",
             "ursprungsland": mp.country_of_origin.code,
@@ -85,7 +90,7 @@ module Comee
             "zusatzlichesVerfahren": "F61",
             "aussenhandelsstatistikMenge": si.sales_order_item.quantity,
             "aussenhandelsstatistikWert": (si.sales_order_item.quantity *
-                                            si.sales_order_item.price * 1.05).round(2),
+                                            si.sales_order_item.price * 1.05).round(2).to_i,
             "packstuck": [
               {
                 "packstuckNummer": index + 1,
@@ -119,17 +124,17 @@ module Comee
                   "kopf": {
                     "eoriNiederlassungsnummer": "DE47897410000",
                     "artderAnmeldung": @customs_details[0].registration_type.split(" ")[0],
-                    "artderAnmeldungAusfuhr": @customs_details[0].export_declaration_type,
+                    "artderAnmeldungAusfuhr": @customs_details[0].export_declaration_type.split(" ")[0],
                     "ausfuhrLand": "DE",
                     "beteiligtenKonstellation": @customs_details[0].participant_constellation.split(" ")[0],
                     "sicherheit": @customs_details[0].registration_type.split(" ")[0] == "CO" ? 0 : 2,
                     "container": @customs_details[0].containerized == true ? 1 : 0,
-                    "bestimmungsLand": @customs_details[0].destination_country,
+                    "bestimmungsLand": @customs_details[0].destination_country.split(" ")[0],
                     "referenznummerUCR": @customs_details.map(&:sales_order).map(&:customer_order).map(&:consignee).join(" "),
                     "lrn": @customs_details.map(&:sales_order).map(&:customer_order).map(&:order_number).join(" "),
-                    "beforderungsmittelImInlandVerkehrszweig": @customs_details[0].mode_of_transport,
-                    "beforderungsmittelderGrenzeVerkehrszweig": @customs_details[0].mode_of_transport_at_border,
-                    "beforderungsmittelderGrenzeArt": @customs_details[0].mode_of_transport_type,
+                    "beforderungsmittelImInlandVerkehrszweig": @customs_details[0].mode_of_transport.split(" ")[0],
+                    "beforderungsmittelderGrenzeVerkehrszweig": @customs_details[0].mode_of_transport_at_border.split(" ")[0],
+                    "beforderungsmittelderGrenzeArt": @customs_details[0].mode_of_transport_type.split(" ")[0],
                     "beforderungsmittelderGrenzeKennzeichen": "UNBEKANNT",
                     "beforderungsmittelderGrenzeStaatszugehorigkeit": @customs_details[0].mode_of_transport_nationality.split(" ")[0],
                     "gesamtRohmasse": @total_weight,
@@ -137,7 +142,7 @@ module Comee
                       {
                         "sequenznummer": "1",
                         "artderIdentifikation": @customs_details[0].type_of_identification.split(" ")[0],
-                        "kennzeichen": @customs_details[0].additional_identifier.split(" ")[0],
+                        "kennzeichen": "UNBEKANNT",
                         "staatszugehorigkeit": @customs_details[0].nationality.split(" ")[0]
                       }
                     ],
@@ -148,17 +153,17 @@ module Comee
                     "geschaftsvorgangWahrung": "EUR",
                     "beforderungsroute": {
                       "ausgewahlteLander": @transportation_routes,
-                      "beforderungsVon": @customs_details[0].transportation_route[0]["route"].split(" ")[0],
-                      "beforderungsBis": @customs_details[0].transportation_route[-1]["route"].split(" ")[0]
+                      "beforderungsVon": "DE",
+                      "beforderungsBis": @customs_details[0].destination_country.split(" ")[0]
                     },
                     "empfanger": {
                       "tin": "",
                       "niederlassungsNummer": "",
                       "name": @customs_details[0].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]
+                      "strasse": @address.street,
+                      "plz": @address.postal_code,
+                      "ort": @address.city,
+                      "land": @address.country.code
                     },
                     "warenortArtdesOrtes": "B",
                     "warenortArtDerOrtsbestimmung": "Y",
@@ -194,10 +199,10 @@ module Comee
 
           xml.Position do
             xml.Positionsnummer (index + 1).to_s
-            xml.Warenbezeichnung line_item.product.hs_description
+            xml.Warenbezeichnung line_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
+            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.Rohmasse index.zero? ? @total_weight : 0
@@ -212,7 +217,7 @@ module Comee
             xml.Aussenhandelsstatistik do
               xml.Menge line_item.quantity
               xml.Wert (line_item.quantity *
-                                            line_item.price * 1.05).round(2)
+                                            line_item.price * 1.05).round(2).to_i
             end
             xml.Vorpapier do
               xml.Typ
@@ -250,28 +255,28 @@ module Comee
               xml.Nachrichten_Typ "DEXPDF"
               xml.BEO_Atlas_KundenID
               xml.Anwendung
-              xml.Name "Maveko_korrigiert"
+              xml.Name "MAVEKO"
             end
             xml.Kopf do
               xml.EORI_Number "DE47897410000"
-              xml.Art_der_Ausfuhranmeldung @customs_details[0].export_declaration_type
+              xml.Art_der_Ausfuhranmeldung @customs_details[0].export_declaration_type.split(" ")[0]
               xml.Ausfuhrland "DE"
-              xml.Bestimmungsland @customs_details[0].destination_country
+              xml.Bestimmungsland @customs_details[0].destination_country.split(" ")[0]
               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.inlandischerVerkehrszweig @customs_details[0].mode_of_transport.split(" ")[0]
+              xml.verkehrszweigAnDerGrenze @customs_details[0].mode_of_transport_at_border.split(" ")[0]
               xml.Befoerderungsmittel_an_der_Grenze do
-                xml.Art @customs_details[0].mode_of_transport_type
+                xml.Art @customs_details[0].mode_of_transport_type.split(" ")[0]
                 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.Kennzeichen "UNBEKANNT"
                 xml.Staatszugehoerigkeit @customs_details[0].nationality.split(" ")[0]
               end
               xml.Ausfuhrzollstelle do
@@ -295,10 +300,10 @@ module Comee
                 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]
+                xml.Strasse @address.street
+                xml.PLZ @address.postal_code
+                xml.Ort @address.city
+                xml.Land @address.country.code
               end
               xml.Lieferbedingung do
                 xml.send("Incoterm-Code", @customs_details[0].delivery_term_code[0, 3])

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

@@ -218,7 +218,8 @@ module Comee
                 supplier_id: master_price.supplier_id,
                 supplier_name: master_price.supplier.name,
                 supplier_item_no: product_lookup.code,
-                supplier_description: product_lookup.item_description
+                supplier_description: product_lookup.item_description,
+                country_of_origin: master_price.country_of_origin.name
               }
             }
           end

data/config/routes.rb

@@ -12,11 +12,18 @@ Comee::Core::Engine.routes.draw do
     end
   end
   resources :contacts
+
+  resources :supplier_addresses
   resources :suppliers do
     collection do
       post "filter"
     end
+
+    member do
+      get "addresses", controller: :supplier_addresses, action: :index
+    end
   end
+
   resources :products do
     collection do
       post "master_prices"

data/db/migrate/20240629044824_create_comee_core_supplier_addresses.rb

@@ -0,0 +1,23 @@
+class CreateComeeCoreSupplierAddresses < ActiveRecord::Migration[7.1]
+  def change
+    create_table :comee_core_supplier_addresses do |t|
+      t.references :supplier,
+                   null: false,
+                   index: {name: "supplier_on_ccsa_indx"},
+                   foreign_key: {to_table: :comee_core_suppliers}
+      t.string :address_line1, null: false
+      t.string :street
+      t.string :city
+      t.string :state
+      t.references :country,
+                   null: false,
+                   index: {name: "country_on_ccsa_indx"},
+                   foreign_key: {to_table: :comee_core_lookups}
+      t.string :postal_code
+      t.string :address_type, null: false
+      t.boolean :default, default: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20240629065810_remove_address_field_from_supplier_and_client.rb

@@ -0,0 +1,7 @@
+class RemoveAddressFieldFromSupplierAndClient < ActiveRecord::Migration[7.1]
+  def change
+    remove_column :comee_core_clients, :address, :string
+    remove_column :comee_core_suppliers, :address, :string
+    remove_column :comee_core_clients, :shipment_addresses, array: true
+  end
+end

data/db/migrate/20240629135249_add_additional_fields_to_order.rb

@@ -0,0 +1,10 @@
+class AddAdditionalFieldsToOrder < ActiveRecord::Migration[7.1]
+  def change
+    add_column :comee_core_customer_orders, :consolidator_date, :date
+    add_column :comee_core_sales_orders, :consolidator_date, :date
+    add_column :comee_core_customer_orders, :voyage_no, :string
+    add_column :comee_core_sales_orders, :voyage_no, :string
+    add_column :comee_core_customer_orders, :shipping_arrangement, :integer
+    add_column :comee_core_sales_orders, :shipping_arrangement, :integer
+  end
+end

data/db/migrate/20240629145738_add_telephone_and_email_to_address.rb

@@ -0,0 +1,8 @@
+class AddTelephoneAndEmailToAddress < ActiveRecord::Migration[7.1]
+  def change
+    add_column :comee_core_client_addresses, :telephone, :string
+    add_column :comee_core_supplier_addresses, :telephone, :string
+    add_column :comee_core_client_addresses, :email, :string
+    add_column :comee_core_supplier_addresses, :email, :string
+  end
+end

data/db/migrate/20240629160357_add_more_address_fields_to_agent.rb

@@ -0,0 +1,14 @@
+class AddMoreAddressFieldsToAgent < ActiveRecord::Migration[7.1]
+  def change
+    remove_column :comee_core_agents, :address, :string
+    add_column :comee_core_agents, :address_line1, :string
+    add_column :comee_core_agents, :street, :string
+    add_column :comee_core_agents, :city, :string
+    add_column :comee_core_agents, :state, :string
+    add_reference :comee_core_agents,
+                  :country,
+                  index: {name: "country_on_cca_indx"},
+                  foreign_key: {to_table: :comee_core_lookups}
+    add_column :comee_core_agents, :postal_code, :string
+  end
+end

data/db/migrate/20240629170409_add_vat_to_sales_orders.rb

@@ -0,0 +1,5 @@
+class AddVatToSalesOrders < ActiveRecord::Migration[7.1]
+  def change
+    add_column :comee_core_sales_orders, :vat, :float, default: 0
+  end
+end

data/db/migrate/20240630063656_add_aliases_field_to_product_lookup.rb

@@ -0,0 +1,5 @@
+class AddAliasesFieldToProductLookup < ActiveRecord::Migration[7.1]
+  def change
+    add_column :comee_core_product_lookups, :aliases, :string
+  end
+end

data/db/migrate/20240630083042_add_agent_to_pickup_schedule.rb

@@ -0,0 +1,8 @@
+class AddAgentToPickupSchedule < ActiveRecord::Migration[7.1]
+  def change
+    add_reference :comee_core_pickup_schedules,
+                  :agent,
+                  index: {name: "agent_on_ccps_indx"},
+                  foreign_key: {to_table: :comee_core_agents}
+  end
+end

data/lib/comee/core/version.rb

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

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

@@ -1,8 +1,13 @@
 FactoryBot.define do
   factory :agent, class: "Comee::Core::Agent" do
     name { Faker::Name.name }
-    address { Faker::Address.full_address }
-    email { Faker::Internet.email }
+    address_line1 { Faker::Address.street_address }
+    street { Faker::Address.street_name }
+    city { Faker::Address.city }
+    state { Faker::Address.state }
+    country
+    postal_code { Faker::Address.postcode }
     telephone { Faker::PhoneNumber.phone_number }
+    email { Faker::Internet.email }
   end
 end

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

@@ -8,6 +8,8 @@ FactoryBot.define do
     state { Faker::Address.state }
     country
     postal_code { Faker::Address.postcode }
+    telephone { Faker::PhoneNumber.phone_number }
+    email { Faker::Internet.email }
     address_type { Comee::Core::ClientAddress::SHIPPING_ADDRESS }
     default { false }
   end

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

@@ -4,13 +4,12 @@ FactoryBot.define do
     sequence(:code) { |n| "#{Faker::Alphanumeric.unique.alpha(number: 8)}-#{n}" }
     name { Faker::Name.name }
     match_code { Faker::Name.name }
-    address { Faker::Address.full_address }
     locale { "en" }
     parent { nil }
     consignees { [] }
-    shipment_addresses { [] }
     currency
     subsidiary { false }
+    tax_code { "Inland" }
     print_details { false }
   end
 end

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

@@ -13,5 +13,8 @@ FactoryBot.define do
     delivery_address { Faker::Address.full_address }
     invoice_address { Faker::Address.full_address }
     status { 0 }
+    consolidator_date { Date.current }
+    voyage_no { Faker::Alphanumeric.alpha(number: 10) }
+    shipping_arrangement { Comee::Core::CustomerOrder.shipping_arrangements[:own] }
   end
 end

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

@@ -6,5 +6,6 @@ FactoryBot.define do
     truck_no { Faker::Alphanumeric.alpha(number: 10) }
     driver_license_no { Faker::Alphanumeric.alpha(number: 10) }
     plate_no { Faker::Alphanumeric.alpha(number: 10) }
+    agent
   end
 end

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

@@ -4,5 +4,6 @@ FactoryBot.define do
     product
     itemable factory: :supplier
     item_description { Faker::Lorem.sentence }
+    aliases { nil }
   end
 end

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

@@ -19,6 +19,9 @@ FactoryBot.define do
     delivery_term { Faker::Lorem.sentence }
     payment_penalty { 0 }
     status { Comee::Core::SalesOrder.statuses[:draft] }
+    consolidator_date { Date.current }
+    voyage_no { Faker::Alphanumeric.alpha(number: 10) }
+    shipping_arrangement { Comee::Core::SalesOrder.shipping_arrangements[:own] }
     purchase_status { Comee::Core::SalesOrder.purchase_statuses[:unprocessed] }
     total_price { 0 }
     amount_paid { 0 }

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

@@ -0,0 +1,15 @@
+FactoryBot.define do
+  factory :supplier_address, class: "Comee::Core::SupplierAddress" do
+    supplier
+    address_line1 { Faker::Address.street_address }
+    street { Faker::Address.street_name }
+    city { Faker::Address.city }
+    state { Faker::Address.state }
+    country
+    postal_code { Faker::Address.postcode }
+    telephone { Faker::PhoneNumber.phone_number }
+    email { Faker::Internet.email }
+    address_type { Comee::Core::SupplierAddress::BASIC_ADDRESS }
+    default { false }
+  end
+end

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

@@ -2,7 +2,6 @@ FactoryBot.define do
   factory :supplier, class: "Comee::Core::Supplier" do
     sequence(:code) { |n| "#{Faker::Alphanumeric.alpha(number: 8)}-#{n}" }
     name { Faker::Name.name }
-    address { Faker::Address.full_address }
     locale { "en" }
     payment_terms { Faker::Lorem.word }
     vat_number { Faker::Alphanumeric.alpha(number: 8) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-29 00:00:00.000000000 Z
+date: 2024-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -310,6 +310,7 @@ files:
 - app/controllers/comee/core/stock_transfer_requests_controller.rb
 - app/controllers/comee/core/store_items_controller.rb
 - app/controllers/comee/core/stores_controller.rb
+- app/controllers/comee/core/supplier_addresses_controller.rb
 - app/controllers/comee/core/suppliers_controller.rb
 - app/controllers/comee/core/unit_conversions_controller.rb
 - app/controllers/comee/core/units_controller.rb
@@ -322,6 +323,7 @@ files:
 - app/mailers/comee/core/notification_mailer.rb
 - app/mailers/comee/core/supplier_mailer.rb
 - app/models/comee/core/additional_item.rb
+- app/models/comee/core/address.rb
 - app/models/comee/core/agent.rb
 - app/models/comee/core/application_module.rb
 - app/models/comee/core/application_record.rb
@@ -382,6 +384,7 @@ files:
 - app/models/comee/core/store.rb
 - app/models/comee/core/store_item.rb
 - app/models/comee/core/supplier.rb
+- app/models/comee/core/supplier_address.rb
 - app/models/comee/core/supplier_invoice.rb
 - app/models/comee/core/supplier_payment.rb
 - app/models/comee/core/time_slot.rb
@@ -425,6 +428,7 @@ files:
 - app/serializers/comee/core/stock_transfer_request_serializer.rb
 - app/serializers/comee/core/store_item_serializer.rb
 - app/serializers/comee/core/store_serializer.rb
+- app/serializers/comee/core/supplier_address_serializer.rb
 - app/serializers/comee/core/supplier_serializer.rb
 - app/serializers/comee/core/unit_conversion_serializer.rb
 - app/serializers/comee/core/unit_serializer.rb
@@ -516,6 +520,14 @@ files:
 - 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
+- db/migrate/20240629044824_create_comee_core_supplier_addresses.rb
+- db/migrate/20240629065810_remove_address_field_from_supplier_and_client.rb
+- db/migrate/20240629135249_add_additional_fields_to_order.rb
+- db/migrate/20240629145738_add_telephone_and_email_to_address.rb
+- db/migrate/20240629160357_add_more_address_fields_to_agent.rb
+- db/migrate/20240629170409_add_vat_to_sales_orders.rb
+- db/migrate/20240630063656_add_aliases_field_to_product_lookup.rb
+- db/migrate/20240630083042_add_agent_to_pickup_schedule.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb
@@ -579,6 +591,7 @@ files:
 - spec/factories/comee/core/stock_transfer_requests.rb
 - spec/factories/comee/core/store_items.rb
 - spec/factories/comee/core/stores.rb
+- spec/factories/comee/core/supplier_addresses.rb
 - spec/factories/comee/core/supplier_invoices.rb
 - spec/factories/comee/core/supplier_payments.rb
 - spec/factories/comee/core/suppliers.rb