comee_core 0.1.90 → 0.1.92

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 756042163169e327bbf9e028c6666dbec6f9c52e907cf5d35b210ca37b310533
-  data.tar.gz: 9c3f9bee0f3b28e6988c490babdb6e56329fe546300920d1d287eb917fca1554
+  metadata.gz: 99b4856ac17d221660c2a0af2589f3e26d5f40930097788982e327bf3f9daa1e
+  data.tar.gz: e81f18ec5013e7c4aa47a815c2f607d1b6398fc0c616975932c5ed9bad8f7903
 SHA512:
-  metadata.gz: 757759703fb6cf5f2dac0e7c9dadb29a7c7317c53f788d9a6993cd2ea49cad72c80727ec7d643c2259f5acc21a90aad0e12ce4d27292209429b202af3dbf23db
-  data.tar.gz: 95a9135eb3ad74e2a8666cbcbd8c151f2a19dc801f9249110f01bd1137e664a138958bad4038a309130428296742930f2f73efd4b46369fbded65bd7e280f006
+  metadata.gz: 40e5ad66e287dde54881d839c4c6d9074c5ef0f7429073615faee3c9a4c2fdfa05eb29b1945747797564a407b253a348f5ce9846414c690ca2d9ca2547b7c21e
+  data.tar.gz: ce2a3221e2cd6bd668145a50afc0d765c92846f3447322ab33c2c4bc3475b6c6a5631d48c8f07535b8e7d6c1b0c354c73f96e91dad0ed5f048a61af073fe2d73

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

@@ -1,7 +1,7 @@
 module Comee
   module Core
     class ApplicationController < ActionController::API
-      include Comee::Core::Pagination
+      include Pagination
 
       before_action :authenticate
 

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

@@ -1,20 +1,20 @@
 module Comee
   module Core
     class ClientPricesController < ApplicationController
-      include Comee::Core::Common
+      include Common
 
       def index
         super do
-          client_prices = Comee::Core::ClientPrice.all
+          client_prices = ClientPrice.all
           client_prices.then(&paginate)
         end
       end
 
       def fetch_for_client
-        client = Comee::Core::Client.find(params[:id])
+        client = Client.find(params[:id])
         client_id = client.parent_id || client.id
-        prices = Comee::Core::ClientPrice.includes(:client, :product, :unit, :product_lookup)
-                                         .where(client_id: client_id)
+        prices = ClientPrice.includes(:client, :product, :unit, :product_lookup)
+                            .where(client_id: client_id)
         total = prices.count
         prices = prices.then(&paginate)
 
@@ -22,8 +22,8 @@ module Comee
       end
 
       def filter
-        prices = Comee::Core::ClientPrice.includes(:client, :product, :unit, :product_lookup)
-                                         .ransack(params[:q]).result
+        prices = ClientPrice.includes(:client, :product, :unit, :product_lookup)
+                            .ransack(params[:q]).result
         total = prices.count
         prices = prices.then(&paginate)
 

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

@@ -8,10 +8,24 @@ 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
+
+      def shipment_addresses
+        client = Comee::Core::Client.find(params[:id])
+        render json: {success: true, data: client.shipment_addresses}
+      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: [], shipment_addresses: [])
       end
     end
   end

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

@@ -25,7 +25,7 @@ module Comee
       end
 
       def accept
-        order = @service.accept(params[:id])
+        order = @service.accept(params[:id], current_user.name)
         render json: {success: true, data: serialize(order)}
       rescue StandardError => e
         render json: {success: false, error: e.message}
@@ -46,13 +46,21 @@ 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, :shipment_address, :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, :shipment_address, :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/controllers/comee/core/suppliers_controller.rb

@@ -3,9 +3,17 @@ module Comee
     class SuppliersController < ApplicationController
       include Common
 
+      def index
+        super do
+          Supplier.all.then(&paginate)
+        end
+      end
+
       def filter
-        @supplier = Comee::Core::Supplier.ransack(params[:q]).result
-        render json: {success: true, data: serialize(@supplier)}
+        suppliers = Comee::Core::Supplier.ransack(params[:q]).result
+        total = suppliers.count
+        suppliers = suppliers.then(&paginate)
+        render json: {success: true, data: serialize(suppliers), page: params[:page], total: total}
       end
 
       private

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

@@ -8,7 +8,7 @@ module Comee
       validates :status, presence: true
 
       def self.ransackable_attributes(_auth_object = nil)
-        %w[driver_license_no plate_no pod_id status time_slot_id truck_no]
+        %w[id driver_license_no plate_no pod_id status time_slot_id truck_no]
       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

@@ -2,9 +2,11 @@ module Comee
   module Core
     class SalesOrder < ApplicationRecord
       before_save :total_price
+      before_save :set_parent_client_name
 
       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
@@ -28,8 +30,13 @@ module Comee
         self.total_price = total_price
       end
 
+      def set_parent_client_name
+        self.parent_client_name = client.parent&.name
+      end
+
       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,8 @@
 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, :consignees, :shipment_addresses
+      belongs_to :parent
     end
   end
 end

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

@@ -1,7 +1,11 @@
 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, :shipment_address, :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

@@ -2,8 +2,9 @@ module Comee
   module Core
     class SalesOrderSerializer < ActiveModel::Serializer
       attributes :id, :order_number, :payment_penalty, :status, :total_price, :payment_term, :delivery_term, :amount_paid, :pallete_note,
-                 :handover_date, :remark, :files_url, :customs_detail
+                 :handover_date, :remark, :parent_client_name, :created_by, :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

@@ -112,7 +112,7 @@ module Comee
         order
       end
 
-      def accept(id)
+      def accept(id, accepted_by = nil)
         order = CustomerOrder.find_by(id: id)
         raise(StandardError, "Customer order with id `#{id}` not found.") unless order
 
@@ -135,7 +135,9 @@ 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,
+            created_by: accepted_by || ""
           )
           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,9 @@ 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_addresses"
+      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,8 @@ 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.string :shipment_addresses, array: true, default: []
 
       t.timestamps
     end

data/db/migrate/20230811083239_create_comee_core_customer_orders.rb

@@ -8,6 +8,12 @@ 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 :shipment_address
+      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,11 @@ 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 :parent_client_name
       t.string :payment_term
       t.string :delivery_term
       t.float :payment_penalty, null: false, default: 0.0
@@ -19,6 +24,7 @@ class CreateComeeCoreSalesOrders < ActiveRecord::Migration[7.0]
       t.string :pallete_note
       t.date :handover_date
       t.string :remark
+      t.string :created_by
 
       t.timestamps
     end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.90".freeze
+    VERSION = "0.1.92".freeze
   end
 end

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

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

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

@@ -4,6 +4,12 @@ FactoryBot.define do
     order_date { Date.current }
     client
     order_terms { Faker::Lorem.sentence }
+    consignee { Faker::Name.name }
+    shipment_address { Faker::Address.full_address }
+    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 }
@@ -11,5 +12,7 @@ FactoryBot.define do
     status { Comee::Core::SalesOrder.statuses[:draft] }
     pallete_note { Faker::Lorem.sentence }
     remark { Faker::Lorem.sentence }
+    parent_client_name { Faker::Name.name }
+    created_by { Faker::Name.name }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.90
+  version: 0.1.92
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-14 00:00:00.000000000 Z
+date: 2024-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers