comee_core 0.2.88 → 0.2.89

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0130a43666a70736bf713ceca90adf41dc646683367083cb39923aeb9deefa7c
-  data.tar.gz: 1817df779fd04f49e533a4c6c1ce444396a501a30a9a825e84026a36bd890ccf
+  metadata.gz: 666b82ff696734f80ccde6a6b51557e9df23afa60db6af636f6eca114fc49780
+  data.tar.gz: 46ff70008ebec1049c4e2d6867ca21fcb09c63089f02818574746a1f78ff4942
 SHA512:
-  metadata.gz: 93ec1272995413a3ed4629ca0c30fb2870c19c524660534f20616942abc3b531696c947ab2a82ebe065684f68c0073c21ad37fdce39ac331cd213f04648a9ed0
-  data.tar.gz: ef32d4bc6d8ffabe0295516f5585908be70bb54078db6169f12867a1007040ed8315c87aa94de294528c658c32786e7a76620642ea1870ce205f4aba8f4b26cb
+  metadata.gz: b25259eb51765fedd7e9067bd5466456f1e85c2dd5baee69def285442ae59aa7779449fa533e0e757390a0a7536e783a2e6ce5c41b95fa6a41b35b0f242822bc
+  data.tar.gz: bc02daf64bea899ca7462b29ad47bd6001c919b00e67949774eb928db309c84b154e70e4dd3a46022c4bbd47fbbf53d298a8e1af0f65b3f9818275b2a8abe123

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

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

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

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

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

@@ -12,6 +12,17 @@ module Comee
 
       validates :name, :address_line1, :address_type, presence: true
       validates :address_type, inclusion: {in: ADDRESS_TYPES}
+
+      validate :validate_default
+
+      def validate_default
+        return unless client && address_type
+
+        default_count = ClientAddress.where(address_type: address_type, client: client, default: true).count
+        return if default_count.zero?
+
+        errors.add(:default, "cannot be set to true. There is already a default address for this client and address type.")
+      end
     end
   end
 end

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

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

data/db/migrate/20230728014322_create_comee_core_products.rb

@@ -4,6 +4,7 @@ class CreateComeeCoreProducts < ActiveRecord::Migration[7.0]
       t.string :code, null: false
       t.string :name, null: false
       t.string :description
+      t.string :customs_description, null: false
       t.boolean :leaf, null: false, default: true
       t.string :ancestry
       t.jsonb :preferred_units, null: false, default: []

data/db/migrate/20230728122618_create_comee_core_suppliers.rb

@@ -5,6 +5,9 @@ class CreateComeeCoreSuppliers < ActiveRecord::Migration[7.0]
       t.string :name, null: false
       t.string :address, null: false
       t.string :locale, null: false, default: "en"
+      t.string :payment_terms, null: false, default: "30 Days Net"
+      t.string :vat_number
+      t.string :tax_code
       t.references :currency,
                    null: true,
                    index: {name: "currency_on_ccs_indx"},

data/db/migrate/20230728123039_create_comee_core_clients.rb

@@ -7,8 +7,11 @@ class CreateComeeCoreClients < ActiveRecord::Migration[7.0]
                    foreign_key: {to_table: :comee_core_users}
       t.string :code, null: false
       t.string :name, null: false
+      t.string :match_code, null: false
       t.string :address, null: false
       t.string :locale, null: false, default: "en"
+      t.string :tax_code
+      t.string :vat_number
       t.references :parent,
                    null: true,
                    index: {name: "so_on_ccc_indx"},
@@ -19,6 +22,10 @@ class CreateComeeCoreClients < ActiveRecord::Migration[7.0]
                    null: true,
                    index: {name: "currency_on_ccc_indx"},
                    foreign_key: {to_table: :comee_core_currencies}
+      t.references :country,
+                   null: true,
+                   index: {name: "country_on_ccc_indx"},
+                   foreign_key: {to_table: :comee_core_lookups}
 
       t.boolean :subsidiary, default: false
       t.timestamps

data/db/migrate/20230728123823_create_comee_core_purchase_orders.rb

@@ -2,6 +2,7 @@ class CreateComeeCorePurchaseOrders < ActiveRecord::Migration[7.1]
   def change
     create_table :comee_core_purchase_orders do |t|
       t.string :po_number, null: false
+      t.string :order_reference
       t.references :supplier,
                    null: false,
                    index: {name: "suppliers_on_ccpo_indx"},

data/db/migrate/20230728123827_create_comee_core_purchase_order_items.rb

@@ -1,6 +1,7 @@
 class CreateComeeCorePurchaseOrderItems < ActiveRecord::Migration[7.1]
   def change
     create_table :comee_core_purchase_order_items do |t|
+      t.integer :serial_no, null: false, default: 1
       t.references :purchase_order,
                    null: false,
                    index: {name: "pos_on_ccpoitm_indx"},

data/db/migrate/20230811102708_create_comee_core_customer_order_items.rb

@@ -14,6 +14,7 @@ class CreateComeeCoreCustomerOrderItems < ActiveRecord::Migration[7.1]
                    index: {name: "unit_on_cccuoi_indx"},
                    foreign_key: {to_table: :comee_core_units}
       t.string :customer_item_no, null: false
+      t.integer :serial_no, null: false, default: 1
       t.string :customer_item_description, null: false
       t.float :quantity, null: false, default: 0
       t.float :price, null: false, default: 0

data/db/migrate/20230812190652_create_comee_core_sales_orders.rb

@@ -29,6 +29,7 @@ class CreateComeeCoreSalesOrders < ActiveRecord::Migration[7.0]
       t.string :delivery_term
       t.float :payment_penalty, default: 0
       t.integer :status, null: false, default: 0
+      t.integer :purchase_status, null: false, default: 0
       t.float :total_price, default: 0.0
       t.float :amount_paid, default: 0.0
       t.string :pallete_note

data/db/migrate/20230812212844_create_comee_core_sales_order_items.rb

@@ -26,6 +26,7 @@ class CreateComeeCoreSalesOrderItems < ActiveRecord::Migration[7.0]
                    index: {name: "poi_on_ccsoi_indx"},
                    foreign_key: {to_table: :comee_core_purchase_order_items}
       t.string :customer_item_no, null: false
+      t.integer :serial_no, null: false, default: 1
       t.string :customer_item_description, null: false
       t.float :quantity, null: false
       t.float :quantity_delivered, null: false, default: 0

data/db/migrate/20230813235946_create_comee_core_master_prices.rb

@@ -10,6 +10,11 @@ class CreateComeeCoreMasterPrices < ActiveRecord::Migration[7.0]
       t.boolean :primary, null: false, default: false
       t.float :margin, null: false, default: 0
       t.integer :lead_time
+      t.string :state_of_origin
+      t.references :country_of_origin,
+                   null: true,
+                   index: {name: "coo_on_ccmp_indx"},
+                   foreign_key: {to_table: :comee_core_lookups}
       t.references :product,
                    null: false,
                    index: {name: "product_on_ccmp_indx"},

data/db/migrate/20231125115522_create_comee_core_customs_details.rb

@@ -27,6 +27,10 @@ class CreateComeeCoreCustomsDetails < ActiveRecord::Migration[7.1]
       t.string :closure_mark4
       t.string :closure_mark5
       t.jsonb :transportation_route
+      t.string :mode_of_transport_at_border
+      t.string :mode_of_transport_nationality
+      t.string :type_of_identification
+      t.string :nationality
 
       t.timestamps
     end

data/db/migrate/20231207153420_create_comee_core_shipment_items.rb

@@ -13,6 +13,7 @@ class CreateComeeCoreShipmentItems < ActiveRecord::Migration[7.1]
       t.string :pallet_no
       t.string :consignee
       t.string :order_number, null: false
+      t.string :package_type, default: "PX - Palette"
 
       t.timestamps
     end

data/db/migrate/20240314111117_create_comee_core_purchase_requisitions.rb

@@ -6,6 +6,7 @@ class CreateComeeCorePurchaseRequisitions < ActiveRecord::Migration[7.1]
       t.date :delivery_date
       t.string :remark
       t.integer :status, null: false, default: 0
+      t.integer :purchase_status, null: false, default: 0
       t.float :total_price, null: false, default: 0
 
       t.timestamps

data/db/migrate/20240503040722_create_comee_core_client_addresses.rb

@@ -5,6 +5,7 @@ class CreateComeeCoreClientAddresses < ActiveRecord::Migration[7.1]
                    null: false,
                    index: {name: "cl_on_ccca_indx"},
                    foreign_key: {to_table: :comee_core_clients}
+      t.string :name, null: false
       t.string :address_line1, null: false
       t.string :street
       t.string :city
@@ -15,6 +16,7 @@ class CreateComeeCoreClientAddresses < ActiveRecord::Migration[7.1]
                    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

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.2.88".freeze
+    VERSION = "0.2.89".freeze
   end
 end

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

@@ -9,5 +9,6 @@ FactoryBot.define do
     country
     postal_code { Faker::Address.postcode }
     address_type { Comee::Core::ClientAddress::SHIPPING_ADDRESS }
+    default { false }
   end
 end

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

@@ -3,6 +3,7 @@ FactoryBot.define do
     user
     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 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.2.88
+  version: 0.2.89
 platform: ruby
 authors:
 - Henock L.
@@ -433,6 +433,7 @@ files:
 - db/migrate/20230727091518_create_comee_core_fulfillment_centers.rb
 - db/migrate/20230727153013_create_comee_core_units.rb
 - db/migrate/20230728011037_create_comee_core_currencies.rb
+- db/migrate/20230728011539_create_comee_core_lookups.rb
 - db/migrate/20230728014322_create_comee_core_products.rb
 - db/migrate/20230728122618_create_comee_core_suppliers.rb
 - db/migrate/20230728123039_create_comee_core_clients.rb
@@ -458,7 +459,6 @@ files:
 - db/migrate/20231121132709_create_comee_core_quotation_request_items.rb
 - db/migrate/20231122094424_create_comee_core_external_rfqs.rb
 - db/migrate/20231124120907_create_active_storage_tables.active_storage.rb
-- db/migrate/20231125111539_create_comee_core_lookups.rb
 - db/migrate/20231125115522_create_comee_core_customs_details.rb
 - db/migrate/20231206082503_create_comee_core_unit_conversions.rb
 - db/migrate/20231207153420_create_comee_core_shipment_items.rb
@@ -483,14 +483,7 @@ files:
 - db/migrate/20240328132713_create_comee_core_payment_orders.rb
 - db/migrate/20240328132921_create_comee_core_supplier_payments.rb
 - db/migrate/20240407083617_create_comee_core_email_settings.rb
-- 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
-- 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

data/db/migrate/20240425121701_add_purchase_status_to_sales_order_and_purchase_requisition.rb

@@ -1,6 +0,0 @@
-class AddPurchaseStatusToSalesOrderAndPurchaseRequisition < ActiveRecord::Migration[7.1]
-  def change
-    add_column :comee_core_sales_orders, :purchase_status, :integer, default: 0
-    add_column :comee_core_purchase_requisitions, :purchase_status, :integer, default: 0
-  end
-end

data/db/migrate/20240515173010_add_serial_no_to_line_items.rb

@@ -1,6 +0,0 @@
-class AddSerialNoToLineItems < ActiveRecord::Migration[7.1]
-  def change
-    add_column :comee_core_customer_order_items, :serial_no, :integer, null: false, default: 1
-    add_column :comee_core_sales_order_items, :serial_no, :integer, null: false, default: 1
-  end
-end

data/db/migrate/20240601094028_add_additional_fields.rb

@@ -1,32 +0,0 @@
-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/db/migrate/20240602171355_add_order_reference_to_purchase_order.rb

@@ -1,5 +0,0 @@
-class AddOrderReferenceToPurchaseOrder < ActiveRecord::Migration[7.1]
-  def change
-    add_column :comee_core_purchase_orders, :order_reference, :string, null: true
-  end
-end

data/db/migrate/20240604142805_add_serial_no_to_purchase_order_items.rb

@@ -1,5 +0,0 @@
-class AddSerialNoToPurchaseOrderItems < ActiveRecord::Migration[7.1]
-  def change
-    add_column :comee_core_purchase_order_items, :serial_no, :integer, null: false, default: 1
-  end
-end

data/db/migrate/20240604155157_add_fields_to_customs_details.rb

@@ -1,8 +0,0 @@
-class AddFieldsToCustomsDetails < ActiveRecord::Migration[7.1]
-  def change
-    add_column :comee_core_customs_details, :mode_of_transport_at_border, :string
-    add_column :comee_core_customs_details, :mode_of_transport_nationality, :string
-    add_column :comee_core_customs_details, :type_of_identification, :string
-    add_column :comee_core_customs_details, :nationality, :string
-  end
-end

data/db/migrate/20240608094721_add_package_type_to_shipment_item.rb

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