comee_core 0.1.89 → 0.1.91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2215fbbb3c1a9e0c836eb20902ea9c9871e473d08bb17c0659ca6c20236daeb
-  data.tar.gz: a546d3c21ef0b354c9ff61159309919145de3335e16639d9674a6ae1f2414824
+  metadata.gz: 14e262013c470d553126a6ecad9eb449dc01732b39cf3b683b4b7e6089f6cea4
+  data.tar.gz: bf5cca3975a004dbea56eab907497cc6d1006a7ae941ff0a9d7e4bd5578f8e79
 SHA512:
-  metadata.gz: e00d19d0c5d47518505c4a4b5f7ef3a336807966795d933cff8ce7f133dfe32aebc50d76cb2d8dbd78b1010e89d271be9cf3dd6d1b30175b1405f50024108559
-  data.tar.gz: 5a9d63dd29c4ec4ed87b555dc7cb7b316d1fb69f97dbbc59f14dbc6cc638fd34ca0291103cb355078903276963911bd7953be094daeb3be86fd91157c7fc4039
+  metadata.gz: 49c812d17aaee3068d9b677f814cc1b3d5b8da0f6e5313e6289a7942f6ea040a8a012d477fc9ed9d540aead752c3bfe650a29b110c2af30b7c6ea0fcf3cf5e0e
+  data.tar.gz: 5886c9b99451ba968ac667d77d130ea25740c57149edc9b28a3591eb8d2841bc963a97aa118257013e4a954ef608431c53a4b67e530173e19e63afab706300ff

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

@@ -8,10 +8,17 @@ module Comee
         render json: {success: true, data: serialize(@clients)}
       end
 
+      def consignees
+        client = Comee::Core::Client.find(params[:id])
+        render json: {success: true, data: client.consignees}
+      rescue StandardError => e
+        render json: {success: false, error: e.message}
+      end
+
       private
 
       def model_params
-        params.require(:payload).permit(:code, :name, :address, :locale, :user_id, :parent_id)
+        params.require(:payload).permit(:code, :name, :address, :locale, :user_id, :parent_id, consignees: [])
       end
     end
   end

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

@@ -46,13 +46,20 @@ module Comee
       private
 
       def model_params
-        params.require(:payload).permit(:order_number, :order_date, :order_terms, :delivery_address, :invoice_address, :status, :client_id,
-                                        :file)
+        params.require(:payload)
+              .permit(
+                :order_number, :order_date, :order_terms, :consignee, :final_destination, :final_delivery_date, :handover_date,
+                :shipping_date, :delivery_address, :invoice_address, :status, :client_id, :file
+              )
       end
 
       def create_with_item_params
-        params.require(:payload).permit(:order_number, :order_date, :order_terms, :delivery_address, :invoice_address, :status, :client_id,
-                                        items: %i[customer_item_no product_id quantity price unit_id delivery_date])
+        params.require(:payload)
+              .permit(
+                :order_number, :order_date, :order_terms, :consignee, :final_destination, :final_delivery_date, :handover_date,
+                :shipping_date, :delivery_address, :invoice_address, :status, :client_id,
+                items: %i[customer_item_no product_id quantity price unit_id delivery_date]
+              )
       end
 
       def set_service

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

@@ -54,7 +54,7 @@ module Comee
       def model_params
         params.require(:payload).permit(:order_number, :customer_order_id, :payment_penalty, :payment_term, :delivery_term, :status,
                                         :fulfillment_center_id, :total_price, :amount_paid, :pallete_note, :handover_date, :remark,
-                                        files: [])
+                                        :client_id, files: [])
       end
 
       def back_order_params

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

@@ -8,6 +8,18 @@ module Comee
         render json: {success: true, data: serialize(@shipment_item)}
       end
 
+      def filter_for_client
+        shipment_items = Comee::Core::ShipmentItem.joins(sales_order_item: :sales_order)
+                                                  .where(
+                                                    comee_core_sales_order_items: {
+                                                      comee_core_sales_orders: {
+                                                        client_id: params[:id]
+                                                      }
+                                                    }
+                                                  )
+        render json: {success: true, data: serialize(shipment_items)}
+      end
+
       def filter_with_status
         items = ShipmentItem.includes(sales_order_item: %i[sales_order product unit])
                             .ransack(params[:q]).result

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

@@ -14,7 +14,7 @@ module Comee
       delegate(:name, to: :supplier, prefix: true)
 
       def self.ransackable_attributes(_auth_object = nil)
-        %w[delivery_address delivery_date invoice_address order_date order_number status supplier_id]
+        %w[id delivery_address delivery_date invoice_address order_date order_number status supplier_id]
       end
 
       def self.ransackable_associations(_auth_object = nil)

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

@@ -12,6 +12,7 @@ module Comee
 
       def self.ransackable_attributes(_auth_object = nil)
         %w[
+          id
           user_id
           address
           code

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

@@ -25,6 +25,7 @@ module Comee
 
       def self.ransackable_attributes(_auth_object = nil)
         %w[
+          id
           valid_from
           valid_to
           price

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

@@ -10,7 +10,7 @@ module Comee
       validates :order_number, :order_date, :delivery_address, :invoice_address, :status, presence: true
 
       def self.ransackable_attributes(_auth_object = nil)
-        %w[client_id delivery_address invoice_address order_number status]
+        %w[id client_id delivery_address invoice_address order_number status]
       end
 
       def self.ransackable_associations(_auth_object = nil)

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

@@ -8,7 +8,7 @@ module Comee
       validates :customer_item_no, :quantity, :price, :delivery_date, presence: true
 
       def self.ransackable_attributes(_auth_object = nil)
-        %w[customer_order_id product_id unit_id]
+        %w[id customer_order_id product_id unit_id]
       end
 
       def self.ransackable_associations(_auth_object = nil)

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

@@ -25,6 +25,7 @@ module Comee
 
       def self.ransackable_attributes(_auth_object = nil)
         %w[
+          id
           sales_order_id
           invoice_no
           date_issued

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

@@ -14,7 +14,7 @@ module Comee
       validates :status, inclusion: {in: STATUSES}
 
       def self.ransackable_attributes(_auth_object = nil)
-        %w[hash_code status status_date sales_order_item_id]
+        %w[id hash_code status status_date sales_order_item_id]
       end
 
       def self.ransackable_associations(_auth_object = nil)

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

@@ -43,6 +43,7 @@ module Comee
 
       def self.ransackable_attributes(_auth_object = nil)
         %w[
+          id
           valid_from
           valid_to
           purchase_price

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

@@ -6,6 +6,10 @@ module Comee
       belongs_to :pod
       belongs_to :time_slot
       validates :status, presence: true
+
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[id driver_license_no plate_no pod_id status time_slot_id truck_no]
+      end
     end
   end
 end

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

@@ -30,7 +30,7 @@ module Comee
       end
 
       def self.ransackable_attributes(_auth_object = nil)
-        %w[code name description]
+        %w[id code name description]
       end
 
       def self.ransackable_associations(_auth_object = nil)

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

@@ -7,7 +7,7 @@ module Comee
       validates :code, :item_description, presence: true
 
       def self.ransackable_attributes(_auth_object = nil)
-        %w[code item_description itemable_id itemable_type product_id]
+        %w[id code item_description itemable_id itemable_type product_id]
       end
 
       def self.ransackable_associations(_auth_object = nil)

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

@@ -11,6 +11,7 @@ module Comee
       }
       def self.ransackable_attributes(_auth_object = nil)
         %w[
+          id
           supplier_id
           order_date
           status

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

@@ -18,6 +18,7 @@ module Comee
 
       def self.ransackable_attributes(_auth_object = nil)
         %w[
+          id
           purchase_order_id
           sales_order_item_id
           quantity

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

@@ -11,7 +11,7 @@ module Comee
       validates :status, presence: true
 
       def self.ransackable_attributes(_auth_object = nil)
-        %w[client_id reference_no status]
+        %w[id client_id reference_no status]
       end
 
       private

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

@@ -11,7 +11,7 @@ module Comee
       validates :margin, presence: true, numericality: {greater_than_or_equal_to: 0, less_than_or_equal_to: 100}
 
       def self.ransackable_attributes(_auth_object = nil)
-        %w[quotation_request_id product_id unit_id quantity price margin margin_type expected_delivery_date]
+        %w[id quotation_request_id product_id unit_id quantity price margin margin_type expected_delivery_date]
       end
     end
   end

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

@@ -5,6 +5,7 @@ module Comee
 
       belongs_to :customer_order
       belongs_to :fulfillment_center, optional: true
+      belongs_to :client
       has_many :sales_order_items
       has_many_attached :files
       has_one :customs_detail
@@ -30,6 +31,7 @@ module Comee
 
       def self.ransackable_attributes(_auth_object = nil)
         %w[
+          id
           order_number
           status
           customer_order_id

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

@@ -15,6 +15,7 @@ module Comee
 
       def self.ransackable_attributes(_auth_object = nil)
         %w[
+          id
           customer_item_no
           customer_order_item_id
           delivery_date
@@ -28,6 +29,10 @@ module Comee
           unit_id
         ]
       end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[customer_order_item product sales_order source unit]
+      end
     end
   end
 end

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

@@ -10,7 +10,7 @@ module Comee
       validates :status, presence: true
 
       def self.ransackable_attributes(_auth_object = nil)
-        %w[client_id reference_no status]
+        %w[id client_id reference_no status]
       end
     end
   end

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

@@ -10,7 +10,7 @@ module Comee
       validates :quantity, presence: true, numericality: {greater_than: 0}
 
       def self.ransackable_attributes(_auth_object = nil)
-        %w[delivery_date handover_date pallet_no quantity sales_order_item_id shipment_status]
+        %w[id delivery_date handover_date pallet_no quantity sales_order_item_id shipment_status]
       end
 
       def self.ransackable_associations(_auth_object = nil)

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

@@ -7,7 +7,7 @@ module Comee
       validates :name, :address, :locale, presence: true
 
       def self.ransackable_attributes(_auth_object = nil)
-        %w[user_id code address locale]
+        %w[id user_id code address locale]
       end
 
       def self.ransackable_associations(_auth_object = nil)

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

@@ -13,7 +13,7 @@ module Comee
       end
 
       def self.ransackable_attributes(_auth_object = nil)
-        %w[availability_date weekday weekday_short]
+        %w[id availability_date weekday weekday_short]
       end
     end
   end

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

@@ -15,7 +15,7 @@ module Comee
       end
 
       def self.ransackable_attributes(_auth_object = nil)
-        %w[code name unit_type]
+        %w[id code name unit_type]
       end
     end
   end

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

@@ -10,7 +10,7 @@ module Comee
       validates :destination, :delivery_date, :status, presence: true
 
       def self.ransackable_attributes(_auth_object = nil)
-        %w[client_id delivery_date destination id reference_number status]
+        %w[id client_id delivery_date destination id reference_number status]
       end
 
       def self.ransackable_associations(_auth_object = nil)

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

@@ -1,7 +1,7 @@
 module Comee
   module Core
     class ClientSerializer < ActiveModel::Serializer
-      attributes :id, :code, :name, :address, :locale, :user_id, :user_name, :parent_id
+      attributes :id, :code, :name, :address, :locale, :user_id, :user_name, :parent_id, :consignees
     end
   end
 end

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

@@ -1,7 +1,10 @@
 module Comee
   module Core
     class CustomerOrderSerializer < ActiveModel::Serializer
-      attributes :id, :order_number, :order_date, :order_terms, :delivery_address, :invoice_address, :status, :file_url, :client
+      attributes :id, :order_number, :order_date, :order_terms, :consignee, :final_destination, :final_delivery_date, :handover_date,
+                 :shipping_date, :delivery_address, :invoice_address, :status, :file_url
+
+      belongs_to :client
       has_many :customer_order_items
     end
   end

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

@@ -4,6 +4,7 @@ module Comee
       attributes :id, :order_number, :payment_penalty, :status, :total_price, :payment_term, :delivery_term, :amount_paid, :pallete_note,
                  :handover_date, :remark, :files_url, :customs_detail
       belongs_to :customer_order
+      belongs_to :client
       belongs_to :fulfillment_center
       has_many :sales_order_items
     end

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

@@ -135,7 +135,8 @@ module Comee
           sales_order = SalesOrder.create!(
             order_number: order.order_number,
             customer_order: order,
-            status: SalesOrder.statuses[:draft]
+            status: SalesOrder.statuses[:draft],
+            client: order.client
           )
           order_items = order.customer_order_items.includes(:product, :unit)
           client_id = order.client.parent_id || order.client_id

data/config/routes.rb

@@ -81,6 +81,8 @@ Comee::Core::Engine.routes.draw do
     member 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_items", controller: :shipment_items, action: :filter_for_client
     end
     collection do
       post "filter"

data/db/migrate/20230728123039_create_comee_core_clients.rb

@@ -13,6 +13,7 @@ class CreateComeeCoreClients < ActiveRecord::Migration[7.0]
                    null: true,
                    index: {name: "so_on_ccc_indx"},
                    foreign_key: {to_table: :comee_core_clients}
+      t.string :consignees, array: true, default: []
 
       t.timestamps
     end

data/db/migrate/20230811083239_create_comee_core_customer_orders.rb

@@ -8,6 +8,11 @@ class CreateComeeCoreCustomerOrders < ActiveRecord::Migration[7.1]
                    index: {name: "client_on_cccuo_indx"},
                    foreign_key: {to_table: :comee_core_clients}
       t.string :order_terms
+      t.string :consignee
+      t.string :final_destination
+      t.date :final_delivery_date
+      t.date :handover_date
+      t.date :shipping_date
       t.string :delivery_address, null: false
       t.string :invoice_address, null: false
       t.integer :status, null: false, default: 0

data/db/migrate/20230812190652_create_comee_core_sales_orders.rb

@@ -10,6 +10,10 @@ class CreateComeeCoreSalesOrders < ActiveRecord::Migration[7.0]
                    null: true,
                    index: {name: "fc_on_ccso_indx"},
                    foreign_key: {to_table: :comee_core_fulfillment_centers}
+      t.references :client,
+                   null: false,
+                   index: {name: "client_on_ccso_indx"},
+                   foreign_key: {to_table: :comee_core_clients}
       t.string :payment_term
       t.string :delivery_term
       t.float :payment_penalty, null: false, default: 0.0

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.89".freeze
+    VERSION = "0.1.91".freeze
   end
 end

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

@@ -6,5 +6,6 @@ FactoryBot.define do
     address { Faker::Address.full_address }
     locale { "en" }
     parent { nil }
+    consignees { [] }
   end
 end

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

@@ -4,6 +4,11 @@ FactoryBot.define do
     order_date { Date.current }
     client
     order_terms { Faker::Lorem.sentence }
+    consignee { Faker::Name.name }
+    final_destination { Faker::Address.full_address }
+    final_delivery_date { Faker::Date.between(from: Date.current.advance(days: 20), to: Date.current.advance(months: 2)) }
+    handover_date { final_delivery_date.advance(days: -10) }
+    shipping_date { handover_date.advance(days: 10) }
     delivery_address { Faker::Address.full_address }
     invoice_address { Faker::Address.full_address }
     status { 0 }

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

@@ -3,6 +3,7 @@ FactoryBot.define do
     order_number { Faker::Alphanumeric.alpha(number: 10) }
     customer_order
     fulfillment_center
+    client
     payment_term { Faker::Lorem.sentence }
     delivery_term { Faker::Lorem.sentence }
     payment_penalty { 0 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.89
+  version: 0.1.91
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-13 00:00:00.000000000 Z
+date: 2024-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -240,34 +240,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: spring
-  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: spring-commands-rspec
-  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'
 description: An engine which contains core models and end-points for the COMee ERP.
 email:
 - henockl@live.com