comee_core 0.2.66 → 0.2.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08eafbd527a2e26dd5f2bbd1adf4b6193acd3db3d9e8a711c096569e250e53eb'
-  data.tar.gz: 24fd5cc126138d563474c3496a0288f9fcea8e340c7dff77128727d8fcba9543
+  metadata.gz: ab2d82a34a3aad80165cbc56181be22e2715c189f1d6aecf3c474ca6110f458c
+  data.tar.gz: 4e0afeec82d9fb90448af1f50549ba94ea61c9dd6dc00484a55ab298f0194a0c
 SHA512:
-  metadata.gz: 93639ac659fba9efd15d4f937d47a2eac80ad168766b6f9d64b9d6714dbe38f46102aa046557f319feaa417aecd3099adcae3a9917bfeeb22f2f01de7364a619
-  data.tar.gz: b6247c68c810447b8780f3410ca71f0c019876637f22e1606ac681a1568ee56d102c5b99e383650a756ef86d65a8dadd69295333fafc78000d89ab4216f240c7
+  metadata.gz: b77c2dcbf7768677a83f38fc8008b4f85a3d7bab5491c78bfdffcfe3656adc6979c23ac1dd9700f96200832d52ed9991699f77a87f86da7af0396cb285764732
+  data.tar.gz: 4114959e1d7f60e86bd0abe1285448ba97f75e341185ba5db66cd4a26d405092afbe65815cb480205d718d5f05c209381e282d4167060168c448a59a8e39e4ac

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

@@ -0,0 +1,19 @@
+module Comee
+  module Core
+    class ClientAddressesController < ApplicationController
+      include Common
+
+      def index
+        super do
+          ClientAddress.where(client_id: params[:id])
+        end
+      end
+
+      private
+
+      def model_params
+        params.require(:payload).permit(:client_id, :address_line1, :street, :city, :state, :country_id, :postal_code, :address_type)
+      end
+    end
+  end
+end

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

@@ -3,6 +3,11 @@ module Comee
     class LookupsController < ApplicationController
       include Common
 
+      def filter
+        lookups = Lookup.ransack(params[:q]).result
+        render_content(lookups)
+      end
+
       private
 
       def model_params

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

@@ -123,7 +123,7 @@ module Comee
         params.require(:payload).permit(:order_number, :order_date, :customer_order_id, :fulfillment_center_id, :client_id,
                                         :order_terms, :shipment_address, :delivery_address, :invoice_address, :destination,
                                         :handover_date, :shipping_date, :delivery_date, :consignee, :payment_term, :delivery_term,
-                                        :payment_penalty, :status, :total_price, :amount_paid, :pallete_note, :remark,
+                                        :payment_penalty, :status, :purchase_status, :total_price, :amount_paid, :pallete_note, :remark,
                                         files: [])
       end
 

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

@@ -1,8 +1,6 @@
 module Comee
   module Core
     class Client < ApplicationRecord
-      before_save -> { self.subsidiary = !parent.nil? }
-
       belongs_to :user, optional: true
       belongs_to :parent, class_name: "Comee::Core::Client", optional: true
       belongs_to :currency, optional: true

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

@@ -0,0 +1,17 @@
+module Comee
+  module Core
+    class ClientAddress < ApplicationRecord
+      SHIPPING_ADDRESS = "Shipping Address".freeze
+      DELIVERY_ADDRESS = "Delivery Address".freeze
+      INVOICING_ADDRESS = "Invoicing Address".freeze
+
+      ADDRESS_TYPES = [SHIPPING_ADDRESS, DELIVERY_ADDRESS, INVOICING_ADDRESS].freeze
+
+      belongs_to :client
+      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}
+    end
+  end
+end

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

@@ -3,6 +3,19 @@ module Comee
     class Lookup < ApplicationRecord
       validates :code, :name, :lookup_type, presence: true
       validates :code, uniqueness: {scope: :lookup_type}
+
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[
+          id
+          code
+          name
+          lookup_type
+        ]
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        []
+      end
     end
   end
 end

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

@@ -2,6 +2,7 @@ module Comee
   module Core
     class SalesOrderItem < ApplicationRecord
       before_save :calculate_total_price
+      before_save :calculate_handover_date
       after_save :update_sales_order_purchase_status, if: proc { |item| item.fully_processed? }
 
       enum processing_status: {unprocessed: 0, partially_processed: 1, fully_processed: 2}
@@ -20,6 +21,12 @@ module Comee
 
       delegate(:po_number, to: :purchase_order_item, prefix: false, allow_nil: true)
 
+      def calculate_handover_date
+        return if handover_date
+
+        self.handover_date = sales_order.handover_date
+      end
+
       def calculate_total_price
         self.total_price = price * quantity
       end

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

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

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

@@ -3,8 +3,8 @@ module Comee
     class SalesOrderSerializer < ActiveModel::Serializer
       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, :total_price, :amount_paid, :pallete_note, :remark, :created_by,
-                 :files_url
+                 :delivery_term, :payment_penalty, :status, :purchase_status, :total_price, :amount_paid, :pallete_note,
+                 :remark, :created_by, :files_url
       belongs_to :customer_order
       belongs_to :client
       belongs_to :fulfillment_center

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

@@ -190,6 +190,7 @@ module Comee
               price: price,
               total_price: quantity * price,
               delivery_date: item.delivery_date,
+              handover_date: order.handover_date,
               lead_time: master_price&.lead_time
             }
           end

data/config/routes.rb

@@ -31,7 +31,11 @@ Comee::Core::Engine.routes.draw do
     end
   end
 
-  resources :lookups
+  resources :lookups do
+    collection do
+      post "filter"
+    end
+  end
   resources :quotation_requests do
     collection do
       post "filter"
@@ -77,6 +81,7 @@ Comee::Core::Engine.routes.draw do
   end
   resources :unit_conversions
   resources :users
+  resources :client_addresses
   resources :clients do
     member do
       get "rfq_products", controller: :quotation_requests, action: :rfq_products_for_client
@@ -84,6 +89,7 @@ Comee::Core::Engine.routes.draw do
       get "consignees"
       get "agents"
       get "shipment_items", controller: :shipment_items, action: :filter_for_client
+      get "addresses", controller: :client_addresses, action: :index
       post "create_agent"
       post "create_contact"
       post "price", controller: :client_prices, action: :fetch_one

data/db/migrate/20240503040722_create_comee_core_client_addresses.rb

@@ -0,0 +1,22 @@
+class CreateComeeCoreClientAddresses < ActiveRecord::Migration[7.1]
+  def change
+    create_table :comee_core_client_addresses do |t|
+      t.references :client,
+                   null: false,
+                   index: {name: "cl_on_ccca_indx"},
+                   foreign_key: {to_table: :comee_core_clients}
+      t.string :address_line1, null: false
+      t.string :street
+      t.string :city
+      t.string :state
+      t.references :country,
+                   null: false,
+                   index: {name: "country_on_ccca_indx"},
+                   foreign_key: {to_table: :comee_core_lookups}
+      t.string :postal_code
+      t.string :address_type, null: false
+
+      t.timestamps
+    end
+  end
+end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.2.66".freeze
+    VERSION = "0.2.68".freeze
   end
 end

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

@@ -0,0 +1,12 @@
+FactoryBot.define do
+  factory :client_address, class: "Comee::Core::ClientAddress" do
+    client
+    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 }
+    address_type { Comee::Core::ClientAddress::SHIPPING_ADDRESS }
+  end
+end

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

@@ -4,4 +4,8 @@ FactoryBot.define do
     name { Faker::Lorem.word }
     lookup_type { Faker::Alphanumeric.alpha(number: 8) }
   end
+
+  factory :country, parent: :lookup do
+    lookup_type { :country }
+  end
 end

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

@@ -5,5 +5,6 @@ FactoryBot.define do
     delivery_date { Date.current.advance(days: 10) }
     remark { Faker::Lorem.sentence }
     status { Comee::Core::PurchaseRequisition.statuses[:draft] }
+    purchase_status { Comee::Core::PurchaseRequisition.purchase_statuses[:unprocessed] }
   end
 end

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

@@ -19,6 +19,7 @@ FactoryBot.define do
     delivery_term { Faker::Lorem.sentence }
     payment_penalty { 0 }
     status { Comee::Core::SalesOrder.statuses[:draft] }
+    purchase_status { Comee::Core::SalesOrder.purchase_statuses[:unprocessed] }
     total_price { 0 }
     amount_paid { 0 }
     pallete_note { Faker::Lorem.sentence }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.2.66
+  version: 0.2.68
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-01 00:00:00.000000000 Z
+date: 2024-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -268,6 +268,7 @@ files:
 - 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_addresses_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
@@ -305,6 +306,7 @@ files:
 - 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_address.rb
 - app/models/comee/core/client_order.rb
 - app/models/comee/core/client_price.rb
 - app/models/comee/core/client_warehouse.rb
@@ -358,6 +360,7 @@ files:
 - app/models/comee/core/user_application_role.rb
 - app/notifications/comee/core/back_order_notification.rb
 - app/serializers/comee/core/agent_serializer.rb
+- app/serializers/comee/core/client_address_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
@@ -459,6 +462,7 @@ files:
 - 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
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb
@@ -469,6 +473,7 @@ files:
 - spec/factories/comee/core/application_modules.rb
 - spec/factories/comee/core/back_order_items.rb
 - spec/factories/comee/core/back_orders.rb
+- spec/factories/comee/core/client_addresses.rb
 - spec/factories/comee/core/client_orders.rb
 - spec/factories/comee/core/client_prices.rb
 - spec/factories/comee/core/client_warehouses.rb