comee_core 0.2.75 → 0.2.77

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b084265603916c466600ccc3fff6d9ef6ff4cf1f1b99c0737f73b3bcce1fba9f
-  data.tar.gz: da7a721c46628d8431e6c50805bb492ff4549c820545e3c0530b6c117dd0f3ff
+  metadata.gz: 67f60892b641a96e68c79d6abad6c4a2d22c6d1f0f8b5f146868045b25dc854d
+  data.tar.gz: eb47395320794e11719f4ade052386c16c4f860c2ee963a80afb92f995ca5314
 SHA512:
-  metadata.gz: 1f0687b490d5f5edb11b517ef53ab9f54e8257fcda886dc4e38aa95cad7760d404e4c1d12188eaa90ed1a46b384ef57a8f0269acf8f5921e496d6dee5d27912b
-  data.tar.gz: 918d7e7b9212b734d530064c34a974b986645593414d7dd9f6282c6a2e0f1d6c477862c1cd0526faf1faae262b56ea4363f4f13627254f9a3de51681f24c40a3
+  metadata.gz: 93a6951c69e987c7c7fde0a7468e159dba7e2dae57890a899d998b90fe1809e8a7e372f0360cc08b1b8ff02316d3e2e628fa7e3ce7ae8b8cca009a5ef5542394
+  data.tar.gz: 8b16d2e2b22c9e7b76a799d6404a5378f6992aede3fdb025be7daf8622d3045149aef7a7812e11b2dffc17b727a15bd1d950e0982612c2236c69d5e4631d3951

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

@@ -5,12 +5,13 @@ module Comee
 
       def index
         super do
-          Client.includes(:parent, :agents, :contacts, :client_warehouses, :user, :currency).all
+          Client.includes(:parent, :agents, :contacts, :client_warehouses, :country, :user, :currency).all
         end
       end
 
       def filter
-        clients = Client.includes(:parent, :agents, :contacts, :client_warehouses, :user, :currency).ransack(params[:q]).result
+        clients = Client.includes(:parent, :agents, :contacts, :client_warehouses, :country, :user, :currency)
+                        .ransack(params[:q]).result
         render_content(clients)
       end
 
@@ -56,7 +57,7 @@ module Comee
 
       def model_params
         params.require(:payload).permit(:code, :name, :address, :locale, :user_id, :parent_id, :currency, :subsidiary,
-                                        consignees: [])
+                                        :country_id, :tax_code, :vat_number, consignees: [])
       end
 
       def agent_params

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

@@ -45,9 +45,9 @@ module Comee
       private
 
       def model_params
-        params.required(:payload).permit(:code, :name, :description, :parent_id, :thumbnail_image, :source_id, :weight,
-                                         :weight_unit_id, :dimensions, :hs_code, :hs_description, images: [],
-                                                                                                  preferred_units: %i[id code label])
+        params.required(:payload)
+              .permit(:code, :name, :description, :customs_description, :parent_id, :thumbnail_image, :source_id, :weight,
+                      :weight_unit_id, :dimensions, :hs_code, :hs_description, images: [], preferred_units: %i[id code label])
       end
 
       def price_params

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, :currency_id)
+        params.require(:payload).permit(:code, :name, :address, :locale, :payment_terms, :currency_id)
       end
     end
   end

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

@@ -3,6 +3,7 @@ module Comee
     class Client < ApplicationRecord
       belongs_to :user, optional: true
       belongs_to :parent, class_name: "Comee::Core::Client", optional: true
+      belongs_to :country, -> { where(lookup_type: :country) }, class_name: "Comee::Core::Lookup", optional: true
       belongs_to :currency, optional: true
       has_and_belongs_to_many :contacts, join_table: :comee_core_clients_contacts
       has_and_belongs_to_many :agents, join_table: :comee_core_clients_agents

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

@@ -10,7 +10,7 @@ module Comee
       belongs_to :client
       belongs_to :country, -> { where(lookup_type: :country) }, class_name: "Comee::Core::Lookup"
 
-      validates :address_line1, :address_type, presence: true
+      validates :name, :address_line1, :address_type, presence: true
       validates :address_type, inclusion: {in: ADDRESS_TYPES}
     end
   end

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

@@ -5,6 +5,7 @@ module Comee
       belongs_to :supplier
       belongs_to :previous_price, class_name: "Comee::Core::MasterPrice", optional: true
       belongs_to :next_price, class_name: "Comee::Core::MasterPrice", optional: true
+      belongs_to :country_of_origin, -> { where(lookup_type: :country) }, class_name: "Comee::Core::Lookup", optional: true
       belongs_to :product_lookup, optional: true
 
       validates :purchase_price, :selling_price, presence: true

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

@@ -11,7 +11,7 @@ module Comee
       belongs_to :weight_unit, class_name: "Comee::Core::Unit", optional: true
 
       validates :code, presence: true, uniqueness: true
-      validates :name, presence: true
+      validates :name, :customs_description, presence: true
 
       scope :leafs, -> { where(leaf: true) }
 
@@ -30,7 +30,7 @@ module Comee
       end
 
       def self.ransackable_attributes(_auth_object = nil)
-        %w[id code name description leaf]
+        %w[id code name description customs_description leaf]
       end
 
       def self.ransackable_associations(_auth_object = nil)

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

@@ -6,7 +6,7 @@ module Comee
       has_and_belongs_to_many :contacts, join_table: :comee_core_suppliers_contacts
 
       validates :code, presence: true, uniqueness: true
-      validates :name, :address, :locale, presence: true
+      validates :name, :address, :locale, :payment_terms, presence: true
 
       def self.ransackable_attributes(_auth_object = nil)
         %w[id user_id code address locale]

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

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

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

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

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

@@ -2,11 +2,12 @@ module Comee
   module Core
     class MasterPriceSerializer < ActiveModel::Serializer
       attributes :id, :purchase_price, :selling_price, :valid_from, :valid_to, :primary, :margin, :lead_time, :status,
-                 :price_status
+                 :price_status, :state_of_origin
       belongs_to :product
       belongs_to :supplier
       belongs_to :product_lookup
       belongs_to :unit
+      belongs_to :country_of_origin
     end
   end
 end

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

@@ -1,8 +1,8 @@
 module Comee
   module Core
     class ProductSerializer < ActiveModel::Serializer
-      attributes :id, :code, :name, :description, :thumbnail_image_url, :images_url, :preferred_units, :weight,
-                 :dimensions, :hs_code, :hs_description, :parent_id
+      attributes :id, :code, :name, :description, :customs_description, :thumbnail_image_url, :images_url, :preferred_units,
+                 :weight, :dimensions, :hs_code, :hs_description, :parent_id
       belongs_to :source
       belongs_to :weight_unit
     end

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

@@ -1,7 +1,7 @@
 module Comee
   module Core
     class SupplierSerializer < ActiveModel::Serializer
-      attributes :id, :code, :name, :address, :locale, :user_id
+      attributes :id, :code, :name, :address, :locale, :user_id, :payment_terms
       belongs_to :currency
     end
   end

data/db/migrate/20240601094028_add_additional_fields.rb

@@ -0,0 +1,32 @@
+class AddAdditionalFields < ActiveRecord::Migration[7.1]
+  def change
+    add_column :comee_core_client_addresses, :name, :string, null: false, default: "Default"
+    add_column :comee_core_products, :customs_description, :string, null: true
+    add_column :comee_core_suppliers, :payment_terms, :string, null: false, default: "30 Days Net"
+    add_column :comee_core_suppliers, :vat_number, :string, null: true
+    add_column :comee_core_suppliers, :tax_code, :string, null: true
+    add_column :comee_core_clients, :tax_code, :string, null: true
+    add_column :comee_core_clients, :vat_number, :string, null: true
+    add_column :comee_core_master_prices, :state_of_origin, :string, null: true
+    add_reference :comee_core_master_prices,
+                  :country_of_origin,
+                  null: true,
+                  index: {name: "coo_on_ccmp_indx"},
+                  foreign_key: {to_table: :comee_core_lookups}
+    add_reference :comee_core_clients,
+                  :country,
+                  null: true,
+                  index: {name: "country_on_ccc_indx"},
+                  foreign_key: {to_table: :comee_core_lookups}
+    reversible do |dir|
+      dir.up do
+        execute <<-SQL
+          UPDATE comee_core_products
+          SET customs_description = description
+        SQL
+      end
+    end
+
+    change_column_null :comee_core_products, :customs_description, false
+  end
+end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.2.75".freeze
+    VERSION = "0.2.77".freeze
   end
 end

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

@@ -1,6 +1,7 @@
 FactoryBot.define do
   factory :client_address, class: "Comee::Core::ClientAddress" do
     client
+    name { Faker::Name.name }
     address_line1 { Faker::Address.street_address }
     street { Faker::Address.street_name }
     city { Faker::Address.city }

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

@@ -15,6 +15,8 @@ FactoryBot.define do
     next_price { nil }
     product_lookup { nil }
     propagated_to_client { false }
+    country_of_origin factory: :country
+    state_of_origin { "02 - Hamburg" }
 
     trait :approved do
       price_status { Comee::Core::Price.price_statuses[:approved] }

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

@@ -1,11 +1,12 @@
 FactoryBot.define do
   factory :product, class: "Comee::Core::Product" do
     transient do
-      root { Comee::Core::Product.where(code: "ROOT", name: "Products", leaf: false).first_or_create }
+      root { Comee::Core::Product.where(code: "ROOT", name: "Products", customs_description: "Products", leaf: false).first_or_create }
     end
     sequence(:code) { |n| "#{Faker::Alphanumeric.unique.alpha(number: 6)}-#{n}" }
     name { Faker::Name.name }
     description { Faker::Lorem.sentence }
+    customs_description { Faker::Lorem.sentence }
     leaf { true }
     ancestry { root.id.to_s }
     preferred_units { [] }

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

@@ -4,6 +4,9 @@ FactoryBot.define do
     name { Faker::Name.name }
     address { Faker::Address.full_address }
     locale { "en" }
+    payment_terms { Faker::Lorem.word }
+    vat_number { Faker::Alphanumeric.alpha(number: 8) }
+    tax_code { Faker::Alphanumeric.alpha(number: 8) }
     user
     currency
   end

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

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :time_slot, class: "Comee::Core::TimeSlot" do
     transport_availability
-    from { Time.current.strftime("%H:%M") }
-    to { Time.current.advance(hours: 1).strftime("%H:%M") }
+    from { "01:00" }
+    to { "02:00" }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.2.75
+  version: 0.2.77
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-29 00:00:00.000000000 Z
+date: 2024-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -470,6 +470,7 @@ files:
 - db/migrate/20240425121701_add_purchase_status_to_sales_order_and_purchase_requisition.rb
 - db/migrate/20240503040722_create_comee_core_client_addresses.rb
 - db/migrate/20240515173010_add_serial_no_to_line_items.rb
+- db/migrate/20240601094028_add_additional_fields.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb