comee_core 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 521259eb0c767a6dddab837b5d613c06cb8acb2fd5ce3ad6db25baab15699d63
-  data.tar.gz: a8de0c041aac3c4f9e45edd953d4d88ace6867a7f15e3a9c8b5217f6542387e4
+  metadata.gz: b5679f8f8d4ed8da5747d3f1f63e4b9b0621d5204e821241ed126ed4148701d7
+  data.tar.gz: 007bd33cf75d023854a2b4b35974065bee2e405f1c7d9830413b5c57fbe061f5
 SHA512:
-  metadata.gz: 7f3df1fafcd3c7284ea6854b88edb63c3a8c8ae4b6d1ce01059e9c3599c6e76c153eeed696f13450b754e13d3f7d9b2c04b1ac87eed61bd9cefacde55ee0666c
-  data.tar.gz: c68b224fc40c934f93c8ae85c84f40de3d71a32d1f7f0b9f89ccb737fbb37576b0df39f51bbfa93e7da705623d224e006fe39061fb5b66af8a7c54deb021a8f8
+  metadata.gz: 84538ddee22dcff3353d894c017f812d7b5beb4e7c81bbf532f0b558f1071350ef71b4b3ce698bc07e905195668166b49e9497c0e485f5b458b26a407e066ea4
+  data.tar.gz: 20a4c722dcdd2bc4a6d075c0f0c886ae810f3977950236c069d4af995b629ab7011eea011ef359e8d8fbeae155b81e6da9a468e908830471dd217aeeebd87482

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

@@ -9,7 +9,7 @@ module Comee
       end
 
       def send_customs_details
-        service = BeoService.new(params[:id])
+        service = BeoService.new(publish_params[:ids])
         data = service.send_customs_details
         render json: {success: true, data: data}
       rescue StandardError => e
@@ -18,6 +18,12 @@ module Comee
 
       private
 
+      def publish_params
+        params.require(:payload).permit(
+          ids: []
+        )
+      end
+
       def model_params
         params.require(:payload).permit(
           :registration_type,

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

@@ -3,8 +3,26 @@ module Comee
     class UsersController < ApplicationController
       include Common
 
+      def change_password
+        @user = current_user
+        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
+          else
+            render json: {errors: @user.errors.full_messages}, status: 422
+          end
+        else
+          render json: {error: "Old password is incorrect"}, status: :unauthorized
+        end
+      end
+
       private
 
+      def change_password_params
+        params.require(:payload).permit(:old_password, :new_password, :new_password_confirmation)
+      end
+
       def model_params
         params.require(:payload).permit(:name, :email, :active, :password, :password_confirmation)
       end

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

@@ -10,10 +10,6 @@ module Comee
       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
     end
   end
 end

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

@@ -6,6 +6,14 @@ module Comee
 
       validates :gin_number, :stock_transfer_request, uniqueness: true
       validates :date_issued, :gin_number, presence: true
+
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[gin_number date_issued stock_transfer_request_id]
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[stock_transfer_request]
+      end
     end
   end
 end

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

@@ -8,6 +8,14 @@ module Comee
       validates :report_date, presence: true
       validates :reference_number, uniqueness: true
 
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[reference_number report_date store_id]
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[store]
+      end
+
       private
 
       def set_reference_number

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

@@ -3,7 +3,7 @@ module Comee
     class SalesOrderItemSerializer < ActiveModel::Serializer
       attributes :id, :serial_no, :customer_item_no, :customer_item_description, :quantity, :quantity_delivered, :quantity_canceled,
                  :price, :handover_date, :delivery_date, :eb_number, :lead_time, :comment, :action_note, :purchase_order_item_id,
-                 :total_price, :canceled, :processing_status
+                 :total_price, :canceled, :processing_status, :additional_details, :created_at
       belongs_to :sales_order
       belongs_to :customer_order_item
       belongs_to :source

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
+                 :remark, :created_by, :files_url, :created_at
       belongs_to :customer_order
       belongs_to :client
       belongs_to :fulfillment_center

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

@@ -3,54 +3,83 @@ require "httparty"
 module Comee
   module Core
     class BeoService
-      def initialize(id)
+      def initialize(ids)
         @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]
+        @ids = ids
+      end
+
+      def pre_process_data
+        @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)
+          @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
+
+          @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
+          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]
+          end
+
+          prepare_data
         end
+
+        JSON(@data)
       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,
+      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)
+          mp = Comee::Core::MasterPrice.includes(:country_of_origin).find_by(primary: true,
+                                                                             product_id: line_item.shipment_item
+                                                                             .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,
+            "wareRegistriernummerFremdsystem": customs_detail.sales_order.customer_order.order_number,
             "wareUrsprungsbundesland": mp.state_of_origin,
-            "wareEigenmasse": line_item.product.weight * line_item.quantity,
-            "wareRohmasse": line_item.product.weight * line_item.quantity,
+            "wareEigenmasse": line_item.shipment_item.sales_order_item.product.weight * line_item.shipment_item.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.quantity,
-            "aussenhandelsstatistikWert": line_item.quantity * line_item.price,
+            "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),
             "packstuck": [
               {
-                "packstuckNummer": "1",
-                "packstuckAnzahl": sii.pallet_no,
-                "packstuckVerpackungsart": sii.package_type.split(" ")[0],
-                "packstuckZeichenNummern": @customs_detail.sales_order.order_number
+                "packstuckNummer": index + 1,
+                "packstuckAnzahl": index.zero? ? @no_of_packages : 0,
+                "packstuckVerpackungsart": @package_type,
+                "packstuckZeichenNummern": customs_detail.sales_order.customer_order.order_number
               }
             ]
           }
         end
 
-        data = {
+        position_items
+      end
+
+      def prepare_data
+        @data = {
           "dataIdentifier": "",
           "kundenNumber": "",
           "mandantId": "",
@@ -67,43 +96,43 @@ module Comee
                 {
                   "kopf": {
                     "eoriNiederlassungsnummer": "DE47897410000",
-                    "dienststellennummer": "DE014851",
-                    "artderAnmeldung": @customs_detail.registration_type.split(" ")[0],
-                    "artderAnmeldungAusfuhr": @customs_detail.export_declaration_type,
+                    "artderAnmeldung": @customs_details[0].registration_type.split(" ")[0],
+                    "artderAnmeldungAusfuhr": @customs_details[0].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,
+                    "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,
+                    "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,
                     "beforderungsmittelderGrenzeKennzeichen": "UNBEKANNT",
-                    "beforderungsmittelderGrenzeStaatszugehorigkeit": @customs_detail.mode_of_transport_nationality.split(" ")[0],
+                    "beforderungsmittelderGrenzeStaatszugehorigkeit": @customs_details[0].mode_of_transport_nationality.split(" ")[0],
+                    "gesamtRohmasse": @total_weight,
                     "beforderungsmittelBeimAbgang": [
                       {
                         "sequenznummer": "1",
-                        "artderIdentifikation": @customs_detail.type_of_identification.split(" ")[0],
-                        "kennzeichen": @customs_detail.additional_identifier.split(" ")[0],
-                        "staatszugehorigkeit": @customs_detail.nationality.split(" ")[0]
+                        "artderIdentifikation": @customs_details[0].type_of_identification.split(" ")[0],
+                        "kennzeichen": @customs_details[0].additional_identifier.split(" ")[0],
+                        "staatszugehorigkeit": @customs_details[0].nationality.split(" ")[0]
                       }
                     ],
-                    "ausfuhrzollstelleDienststellennummer": @customs_detail.export_customs_office.split(" ")[0],
-                    "vorgeseheneAusgangszollstelleDienststellennummer": @customs_detail.customs_office_of_exit.split(" ")[0],
+                    "ausfuhrzollstelleDienststellennummer": @customs_details[0].export_customs_office.split(" ")[0],
+                    "vorgeseheneAusgangszollstelleDienststellennummer": @customs_details[0].customs_office_of_exit.split(" ")[0],
                     "geschaftsvorgangArt": "11",
-                    "geschaftsvorgangRechnungspreis": @customs_detail.sales_order.total_price,
+                    "geschaftsvorgangRechnungspreis": @customs_details[0].sales_order.total_price.round(2),
                     "geschaftsvorgangWahrung": "EUR",
                     "beforderungsroute": {
                       "ausgewahlteLander": @transportation_routes,
-                      "beforderungsVon": @customs_detail.transportation_route[0]["route"].split(" ")[0],
-                      "beforderungsBis": @customs_detail.transportation_route[-1]["route"].split(" ")[0]
+                      "beforderungsVon": @customs_details[0].transportation_route[0]["route"].split(" ")[0],
+                      "beforderungsBis": @customs_details[0].transportation_route[-1]["route"].split(" ")[0]
                     },
                     "empfanger": {
                       "tin": "",
                       "niederlassungsNummer": "",
-                      "name": @customs_detail.sales_order.customer_order.client.name,
+                      "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]}",
@@ -111,24 +140,22 @@ module Comee
                     },
                     "warenortArtdesOrtes": "B",
                     "warenortArtDerOrtsbestimmung": "Y",
-                    "warenortZusatzlicheKennung": @customs_detail.additional_identifier.split(" ")[0],
-                    "lieferbedingungIncotermCode": @customs_detail.delivery_term_code[0, 3],
+                    "warenortZusatzlicheKennung": @customs_details[0].additional_identifier.split(" ")[0],
+                    "lieferbedingungIncotermCode": @customs_details[0].delivery_term_code[0, 3],
                     "lieferbedingungOrt": "Hamburg"
                   },
-                  "position": @position_data
+                  "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)
+                                                                         'bearertoken': bearer_token}, body: pre_process_data)
         unless [200, 201].include?(response.code)
           raise(StandardError,
                 "Failed to send POST request with token: #{response.code} - #{response.body}")

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

@@ -169,7 +169,18 @@ module Comee
             product_id: order_items.map(&:product_id),
             status: ClientPrice.statuses[:current]
           )
-          master_prices = MasterPrice.where(primary: true, status: Price.statuses[:current], product: order_items.map(&:product))
+          master_prices = MasterPrice.includes(:supplier).where(primary: true, status: Price.statuses[:current],
+                                                                product: order_items.map(&:product))
+          main_query = ProductLookup.includes(:itemable).where(itemable_type: "Comee::Core::Supplier")
+          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(main_query) do |conditions, condition|
+            conditions.or(ProductLookup.where(condition))
+          end
           items = order_items.each_with_object([]) do |item, res|
             next if item.canceled?
 
@@ -178,13 +189,16 @@ 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 }
-            if client_price
-              price = convert_price(client_price.price, client_price.unit_id, unit_id)
-            else
-              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, unit_id)
+            product_lookup = product_lookups.find do |lookup|
+              lookup.product_id == master_price.product_id && lookup.itemable_id == master_price.supplier_id
             end
+            raise(StandardError, "No primary supplier found for product #{item.customer_item_no}") unless master_price
+
+            price = if client_price
+                      convert_price(client_price.price, client_price.unit_id, unit_id)
+                    else
+                      convert_price(master_price.selling_price, master_price.unit_id, unit_id)
+                    end
 
             res << {
               sales_order_id: sales_order.id,
@@ -199,7 +213,13 @@ module Comee
               total_price: quantity * price,
               delivery_date: item.delivery_date,
               handover_date: order.handover_date,
-              lead_time: master_price&.lead_time
+              lead_time: master_price&.lead_time,
+              additional_details: {
+                supplier_id: master_price.supplier_id,
+                supplier_name: master_price.supplier.name,
+                supplier_item_no: product_lookup.code,
+                supplier_description: product_lookup.item_description
+              }
             }
           end
           SalesOrderItem.insert_all!(items)

data/config/routes.rb

@@ -83,7 +83,11 @@ Comee::Core::Engine.routes.draw do
     end
   end
   resources :unit_conversions
-  resources :users
+  resources :users do
+    member do
+      patch "change_password"
+    end
+  end
   resources :client_addresses
   resources :clients do
     member do
@@ -153,9 +157,6 @@ Comee::Core::Engine.routes.draw do
   resources :customs_details do
     collection do
       post "filter"
-    end
-
-    member do
       post "send", action: :send_customs_details
     end
   end

data/db/migrate/20230812212844_create_comee_core_sales_order_items.rb

@@ -41,6 +41,7 @@ class CreateComeeCoreSalesOrderItems < ActiveRecord::Migration[7.0]
       t.string :comment
       t.string :action_note
       t.integer :processing_status, null: false, default: 0
+      t.jsonb :additional_details, default: {}
 
       t.timestamps
     end

data/db/migrate/20231125115522_create_comee_core_customs_details.rb

@@ -5,18 +5,18 @@ class CreateComeeCoreCustomsDetails < ActiveRecord::Migration[7.1]
                    null: false,
                    index: {name: "soi_on_cccd_indx"},
                    foreign_key: {to_table: :comee_core_sales_orders}
-      t.string :registration_type, null: false
-      t.string :export_declaration_type, null: false
-      t.string :participant_constellation, null: false
-      t.string :mode_of_transport_type, null: false
-      t.string :destination_country, null: false
-      t.boolean :containerized, null: false, default: false
-      t.string :additional_identifier, null: false
-      t.string :packaging_type, null: false
-      t.string :export_customs_office, null: false
-      t.string :customs_office_of_exit, null: false
-      t.string :mode_of_transport, null: false
-      t.string :delivery_term_code, null: false
+      t.string :registration_type
+      t.string :export_declaration_type
+      t.string :participant_constellation
+      t.string :mode_of_transport_type
+      t.string :destination_country
+      t.boolean :containerized, default: false
+      t.string :additional_identifier
+      t.string :packaging_type
+      t.string :export_customs_office
+      t.string :customs_office_of_exit
+      t.string :mode_of_transport
+      t.string :delivery_term_code
       t.string :mrn
       t.string :office_number
       t.float :quantity

data/lib/comee/core/version.rb

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

metadata

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