comee_core 0.1.96 → 0.1.97

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

@@ -3,7 +3,10 @@ module Comee
     class Client < ApplicationRecord
       belongs_to :user, optional: true
       belongs_to :parent, class_name: "Comee::Core::Client", optional: true
-      has_many :warehouse_shipments
+      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
+      has_many :client_warehouses
 
       validates :code, :name, :address, :locale, presence: true
       validates :code, uniqueness: true

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

@@ -0,0 +1,8 @@
+module Comee
+  module Core
+    class ClientWarehouse < ApplicationRecord
+      belongs_to :client
+      validates :name, :address, presence: true
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+module Comee
+  module Core
+    class Contact < ApplicationRecord
+      validates :first_name, :last_name, :email, :telephone, presence: true
+    end
+  end
+end

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

@@ -1,12 +1,18 @@
 module Comee
   module Core
     class CustomerOrderItem < ApplicationRecord
+      before_save :calculate_total_price, unless: proc { |item| item.total_price }
+
       belongs_to :customer_order
       belongs_to :product
       belongs_to :unit
 
       validates :customer_item_no, :quantity, :price, :delivery_date, presence: true
 
+      def calculate_total_price
+        self.total_price = price * quantity
+      end
+
       def self.ransackable_attributes(_auth_object = nil)
         %w[id customer_order_id product_id unit_id]
       end

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

@@ -1,12 +1,13 @@
 module Comee
   module Core
     class MasterPrice < Price
+      enum :price_status, {draft: 0, approved: 1}
       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 :product_lookup, optional: true
 
-      validates :purchase_price, :selling_price, presence: true
+      validates :price_status, :purchase_price, :selling_price, presence: true
       validates :margin, presence: true, numericality: {greater_than_or_equal_to: 0, less_than_or_equal_to: 100}
       validates :product_id, uniqueness: {scope: %i[supplier_id previous_price_id next_price_id status]}
       validate :validate_primary_price, :validate_product_lookup

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

@@ -26,8 +26,7 @@ module Comee
 
       def total_price
         sales_order_items = SalesOrderItem.where(sales_order_id: id)
-        total_price = sales_order_items.sum(&:price)
-        self.total_price = total_price
+        self.total_price = sales_order_items.sum(&:total_price)
       end
 
       def set_parent_client_name

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

@@ -1,18 +1,23 @@
 module Comee
   module Core
     class SalesOrderItem < ApplicationRecord
+      before_save :calculate_total_price
+
       belongs_to :sales_order
       belongs_to :customer_order_item
       belongs_to :product
       belongs_to :unit
       belongs_to :source, class_name: "Comee::Core::FulfillmentCenter", optional: true
-      # has_many :warehouse_shipment_items
       has_many :shipment_items
 
       validates :customer_item_no, :delivery_date, presence: true
       validates :quantity, :price, presence: true, numericality: {greater_than: 0}
       validates :quantity_delivered, numericality: {greater_than_or_equal_to: 0}
 
+      def calculate_total_price
+        self.total_price = price * quantity
+      end
+
       def self.ransackable_attributes(_auth_object = nil)
         %w[
           id

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

@@ -2,6 +2,8 @@ module Comee
   module Core
     class Supplier < ApplicationRecord
       belongs_to :user, optional: true
+      belongs_to :currency, optional: true
+      has_and_belongs_to_many :contacts, join_table: :comee_core_suppliers_contacts
 
       validates :code, presence: true, uniqueness: true
       validates :name, :address, :locale, presence: true

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

@@ -0,0 +1,7 @@
+module Comee
+  module Core
+    class AgentSerializer < ActiveModel::Serializer
+      attributes :id, :name, :address, :email, :telephone
+    end
+  end
+end

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

@@ -1,8 +1,11 @@
 module Comee
   module Core
     class ClientSerializer < ActiveModel::Serializer
-      attributes :id, :code, :name, :address, :locale, :user_id, :user_name, :consignees, :shipment_addresses
+      attributes :id, :code, :name, :address, :locale, :user_id, :user_name, :consignees, :shipment_addresses, :currency
       belongs_to :parent
+      has_many :agents
+      has_many :contacts
+      has_many :client_warehouses
     end
   end
 end

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

@@ -0,0 +1,8 @@
+module Comee
+  module Core
+    class ClientWarehouseSerializer < ActiveModel::Serializer
+      attributes :id, :name, :description, :address
+      belongs_to :client
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+module Comee
+  module Core
+    class ContactSerializer < ActiveModel::Serializer
+      attributes :id, :first_name, :last_name, :email, :telephone
+    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
+      attributes :id, :code, :name, :description, :thumbnail_image_url, :images_url, :preferred_units, :weight,
+                 :dimensions, :hs_code, :hs_description
       belongs_to :source
       belongs_to :weight_unit
     end

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

@@ -2,7 +2,7 @@ module Comee
   module Core
     class SalesOrderItemSerializer < ActiveModel::Serializer
       attributes :id, :customer_item_no, :quantity, :quantity_delivered, :price, :handover_date, :delivery_date, :eb_number,
-                 :lead_time, :comment, :action_note, :po_reference
+                 :lead_time, :comment, :action_note, :po_reference, :total_price
 
       belongs_to :sales_order
       belongs_to :customer_order_item

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

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

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

@@ -8,7 +8,11 @@ module Comee
           order_params = params.except(:items)
           order = Comee::Core::CustomerOrder.create(**order_params)
           items = params.slice(:items)[:items]
-          items.each { |item| item[:customer_order_id] = order.id }
+          items.each do |item|
+            item[:customer_order_id] = order.id
+            item[:total_price] = item[:quantity] * item[:price] unless item.key?(:total_price) && !item[:total_price].nil?
+          end
+
           Comee::Core::CustomerOrderItem.insert_all!(items)
         end
         order
@@ -81,7 +85,7 @@ module Comee
 
           price = convert_price(master_price.selling_price, master_price.unit_id, new_unit_id)
         end
-        {quantity: quantity, price: price}
+        {quantity: quantity, price: price, total_price: quantity * price}
       end
 
       def submit(id)
@@ -171,6 +175,7 @@ module Comee
               customer_item_no: item.product.code,
               quantity: quantity,
               price: price,
+              total_price: quantity * price,
               delivery_date: item.delivery_date,
               lead_time: master_price&.lead_time
             }

data/config/routes.rb

@@ -8,6 +8,7 @@ Comee::Core::Engine.routes.draw do
       post "mark_as_unread", controller: :notifications, action: :mark_as_unread
     end
   end
+  resources :contacts
   resources :suppliers do
     collection do
       post "filter"
@@ -82,13 +83,16 @@ Comee::Core::Engine.routes.draw do
       get "rfq_products", controller: :quotation_requests, action: :rfq_products_for_client
       get "prices", controller: :client_prices, action: :fetch_for_client
       get "consignees"
-      get "shipment_addresses"
+      get "agents"
       get "shipment_items", controller: :shipment_items, action: :filter_for_client
+      post "create_agent"
+      post "create_contact"
     end
     collection do
       post "filter"
     end
   end
+  resources :agents
   post "/client_prices/filter", controller: :client_prices, action: :filter
   resources :client_prices
   post "/back_orders/filter", controller: :back_orders, action: :filter
@@ -127,4 +131,6 @@ Comee::Core::Engine.routes.draw do
     end
   end
   resources :fulfillment_centers
+
+  resources :client_warehouses
 end

data/db/migrate/20230728122618_create_comee_core_suppliers.rb

@@ -5,6 +5,10 @@ class CreateComeeCoreSuppliers < ActiveRecord::Migration[7.0]
       t.string :name, null: false
       t.string :address, null: false
       t.string :locale, null: false, default: "en"
+      t.references :currency,
+                   null: true,
+                   index: {name: "currency_on_ccs_indx"},
+                   foreign_key: {to_table: :comee_core_currencies}
       t.references :user,
                    null: true,
                    index: {name: "user_on_ccs_indx"},

data/db/migrate/20230728123039_create_comee_core_clients.rb

@@ -15,6 +15,10 @@ class CreateComeeCoreClients < ActiveRecord::Migration[7.0]
                    foreign_key: {to_table: :comee_core_clients}
       t.string :consignees, array: true, default: []
       t.string :shipment_addresses, array: true, default: []
+      t.references :currency,
+                   null: true,
+                   index: {name: "currency_on_ccc_indx"},
+                   foreign_key: {to_table: :comee_core_currencies}
 
       t.timestamps
     end

data/db/migrate/20230728123458_create_comee_core_agents.rb

@@ -0,0 +1,23 @@
+class CreateComeeCoreAgents < ActiveRecord::Migration[7.1]
+  def change
+    create_table :comee_core_agents do |t|
+      t.string :name, null: false
+      t.string :address
+      t.string :email, null: false
+      t.string :telephone, null: false
+
+      t.timestamps
+    end
+
+    create_table :comee_core_clients_agents, id: false do |t|
+      t.references :client,
+                   null: false,
+                   index: {name: "client_on_ccca_indx"},
+                   foreign_key: {to_table: :comee_core_clients}
+      t.references :agent,
+                   null: false,
+                   index: {name: "agent_on_ccca_indx"},
+                   foreign_key: {to_table: :comee_core_agents}
+    end
+  end
+end

data/db/migrate/20230728123559_create_comee_core_contacts.rb

@@ -0,0 +1,34 @@
+class CreateComeeCoreContacts < ActiveRecord::Migration[7.1]
+  def change
+    create_table :comee_core_contacts do |t|
+      t.string :first_name, null: false
+      t.string :last_name, null: false
+      t.string :email, null: false
+      t.string :telephone, null: false
+
+      t.timestamps
+    end
+
+    create_table :comee_core_suppliers_contacts, id: false do |t|
+      t.references :supplier,
+                   null: false,
+                   index: {name: "supplier_on_ccsc_indx"},
+                   foreign_key: {to_table: :comee_core_suppliers}
+      t.references :contact,
+                   null: false,
+                   index: {name: "sc_on_ccsc_indx"},
+                   foreign_key: {to_table: :comee_core_contacts}
+    end
+
+    create_table :comee_core_clients_contacts, id: false do |t|
+      t.references :client,
+                   null: false,
+                   index: {name: "client_on_ccsc_indx"},
+                   foreign_key: {to_table: :comee_core_clients}
+      t.references :contact,
+                   null: false,
+                   index: {name: "cc_on_ccsc_indx"},
+                   foreign_key: {to_table: :comee_core_contacts}
+    end
+  end
+end

data/db/migrate/20230811102708_create_comee_core_customer_order_items.rb

@@ -16,6 +16,7 @@ class CreateComeeCoreCustomerOrderItems < ActiveRecord::Migration[7.1]
       t.string :customer_item_no, null: false
       t.float :quantity, null: false, default: 0
       t.float :price, null: false, default: 0
+      t.float :total_price, null: false, default: 0
       t.date :delivery_date, null: false
       t.boolean :canceled, default: false
 

data/db/migrate/20230812212844_create_comee_core_sales_order_items.rb

@@ -25,6 +25,7 @@ class CreateComeeCoreSalesOrderItems < ActiveRecord::Migration[7.0]
       t.float :quantity, null: false
       t.float :quantity_delivered, null: false, default: 0
       t.float :price, null: false
+      t.float :total_price, null: false
       t.date :delivery_date, null: false
       t.boolean :canceled, default: false
       t.date :handover_date

data/db/migrate/20230813235946_create_comee_core_master_prices.rb

@@ -9,6 +9,7 @@ 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.integer :price_status, null: false, default: 0
       t.references :product,
                    null: false,
                    index: {name: "product_on_ccmp_indx"},

data/db/migrate/20240119100125_create_comee_core_client_warehouses.rb

@@ -0,0 +1,15 @@
+class CreateComeeCoreClientWarehouses < ActiveRecord::Migration[7.1]
+  def change
+    create_table :comee_core_client_warehouses do |t|
+      t.string :name, null: false
+      t.string :description
+      t.string :address, null: false
+      t.references :client,
+                   null: false,
+                   index: {name: "client_on_cccw_indx"},
+                   foreign_key: {to_table: :comee_core_clients}
+
+      t.timestamps
+    end
+  end
+end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.96".freeze
+    VERSION = "0.1.97".freeze
   end
 end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :agent, class: "Comee::Core::Agent" do
+    name { Faker::Name.name }
+    address { Faker::Address.full_address }
+    email { Faker::Internet.email }
+    telephone { Faker::PhoneNumber.phone_number }
+  end
+end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :client_warehouse, class: "Comee::Core::ClientWarehouse" do
+    name { Faker::Lorem.word }
+    description { Faker::Lorem.sentence }
+    address { Faker::Address.full_address }
+    client
+  end
+end

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

@@ -1,12 +1,13 @@
 FactoryBot.define do
   factory :client, class: "Comee::Core::Client" do
     user
-    code { Faker::Alphanumeric.unique.alpha(number: 8) }
+    sequence(:code) { |n| "#{Faker::Alphanumeric.unique.alpha(number: 8)}-#{n}" }
     name { Faker::Name.name }
     address { Faker::Address.full_address }
     locale { "en" }
     parent { nil }
     consignees { [] }
     shipment_addresses { [] }
+    currency
   end
 end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :contact, class: "Comee::Core::Contact" do
+    first_name { Faker::Name.first_name }
+    last_name { Faker::Name.last_name }
+    email { Faker::Internet.email }
+    telephone { Faker::PhoneNumber.phone_number }
+  end
+end

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

@@ -6,6 +6,7 @@ FactoryBot.define do
     customer_item_no { Faker::Alphanumeric.alpha(number: 10) }
     quantity { 1 }
     price { 1.5 }
+    total_price { quantity * price }
     delivery_date { Date.current }
     canceled { false }
 

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

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :fulfillment_center, class: "Comee::Core::FulfillmentCenter" do
-    code { Faker::Alphanumeric.alpha(number: 10) }
+    sequence(:code) { |n| "#{Faker::Alphanumeric.unique.alpha(number: 10)}-#{n}" }
     name { Faker::Name.name }
     address { Faker::Address.street_address }
     email { Faker::Internet.email }

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

@@ -7,6 +7,7 @@ FactoryBot.define do
     primary { false }
     margin { 10.0 }
     lead_time { nil }
+    status { Comee::Core::MasterPrice.statuses[:draft] }
     product
     supplier
     unit

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

@@ -9,6 +9,7 @@ FactoryBot.define do
     quantity { 100 }
     quantity_delivered { 0 }
     price { 50 }
+    total_price { quantity * price }
     delivery_date { Date.current.advance(months: 1) }
     handover_date { Date.current }
     eb_number { Faker::Lorem.word }

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

@@ -5,5 +5,6 @@ FactoryBot.define do
     address { Faker::Address.full_address }
     locale { "en" }
     user
+    currency
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.96
+  version: 0.1.97
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-17 00:00:00.000000000 Z
+date: 2024-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -128,6 +128,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner-active_record
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -185,7 +199,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: rspec-retry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -199,7 +213,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda-matchers
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -213,7 +227,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -227,7 +241,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: solargraph
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -251,10 +265,13 @@ files:
 - README.md
 - Rakefile
 - app/controllers/comee/core/access_controller.rb
+- app/controllers/comee/core/agents_controller.rb
 - app/controllers/comee/core/application_controller.rb
 - app/controllers/comee/core/back_orders_controller.rb
 - app/controllers/comee/core/client_prices_controller.rb
+- app/controllers/comee/core/client_warehouses_controller.rb
 - app/controllers/comee/core/clients_controller.rb
+- app/controllers/comee/core/contacts_controller.rb
 - app/controllers/comee/core/currencies_controller.rb
 - app/controllers/comee/core/customer_order_items_controller.rb
 - app/controllers/comee/core/customer_orders_controller.rb
@@ -282,12 +299,15 @@ files:
 - app/jobs/comee_core/application_job.rb
 - app/mailers/comee/core/application_mailer.rb
 - app/mailers/comee/core/supplier_mailer.rb
+- app/models/comee/core/agent.rb
 - app/models/comee/core/application_record.rb
 - app/models/comee/core/back_order.rb
 - app/models/comee/core/back_order_item.rb
 - app/models/comee/core/client.rb
 - app/models/comee/core/client_order.rb
 - app/models/comee/core/client_price.rb
+- app/models/comee/core/client_warehouse.rb
+- app/models/comee/core/contact.rb
 - app/models/comee/core/currency.rb
 - app/models/comee/core/customer_order.rb
 - app/models/comee/core/customer_order_item.rb
@@ -323,11 +343,12 @@ files:
 - app/models/comee/core/unit.rb
 - app/models/comee/core/unit_conversion.rb
 - app/models/comee/core/user.rb
-- app/models/comee/core/warehouse_shipment.rb
-- app/models/comee/core/warehouse_shipment_item.rb
 - app/notifications/comee/core/back_order_notification.rb
+- app/serializers/comee/core/agent_serializer.rb
 - app/serializers/comee/core/client_price_serializer.rb
 - app/serializers/comee/core/client_serializer.rb
+- app/serializers/comee/core/client_warehouse_serializer.rb
+- app/serializers/comee/core/contact_serializer.rb
 - app/serializers/comee/core/currency_serializer.rb
 - app/serializers/comee/core/customer_order_item_serializer.rb
 - app/serializers/comee/core/customer_order_serializer.rb
@@ -372,6 +393,8 @@ files:
 - db/migrate/20230728014330_create_comee_core_users.rb
 - db/migrate/20230728122618_create_comee_core_suppliers.rb
 - db/migrate/20230728123039_create_comee_core_clients.rb
+- db/migrate/20230728123458_create_comee_core_agents.rb
+- db/migrate/20230728123559_create_comee_core_contacts.rb
 - db/migrate/20230728123928_create_comee_core_back_orders.rb
 - db/migrate/20230728125723_create_comee_core_back_order_items.rb
 - db/migrate/20230730061225_create_comee_core_notifications.rb
@@ -387,8 +410,6 @@ files:
 - db/migrate/20230929115336_create_comee_core_order_sources.rb
 - db/migrate/20230929130910_create_comee_core_client_orders.rb
 - db/migrate/20231003073316_create_comee_core_inventories.rb
-- db/migrate/20231003080017_create_comee_core_warehouse_shipments.rb
-- db/migrate/20231004105455_create_comee_core_warehouse_shipment_items.rb
 - db/migrate/20231101113358_create_comee_core_edi_orders.rb
 - db/migrate/20231121094339_create_comee_core_quotation_requests.rb
 - db/migrate/20231121132709_create_comee_core_quotation_request_items.rb
@@ -407,16 +428,20 @@ files:
 - db/migrate/20240109185749_create_comee_core_transport_availability.rb
 - db/migrate/20240109185931_create_comee_core_time_slots.rb
 - db/migrate/20240111112140_create_comee_core_pickup_schedules.rb
+- db/migrate/20240119100125_create_comee_core_client_warehouses.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb
 - lib/comee_core.rb
 - lib/tasks/comee_core_tasks.rake
+- spec/factories/comee/core/agents.rb
 - spec/factories/comee/core/back_order_items.rb
 - spec/factories/comee/core/back_orders.rb
 - spec/factories/comee/core/client_orders.rb
 - spec/factories/comee/core/client_prices.rb
+- spec/factories/comee/core/client_warehouses.rb
 - spec/factories/comee/core/clients.rb
+- spec/factories/comee/core/contacts.rb
 - spec/factories/comee/core/currencies.rb
 - spec/factories/comee/core/customer_order_items.rb
 - spec/factories/comee/core/customer_orders.rb
@@ -451,8 +476,6 @@ files:
 - spec/factories/comee/core/unit_conversions.rb
 - spec/factories/comee/core/units.rb
 - spec/factories/comee/core/users.rb
-- spec/factories/comee/core/warehouse_shipment_items.rb
-- spec/factories/comee/core/warehouse_shipments.rb
 homepage: https://www.mks.com
 licenses:
 - MIT