comee_core 0.2.10 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 275dd64cebdedf362d37f4693eaeb8ced27c3569cdb3c90dbc37f0ae6d47e726
-  data.tar.gz: 16518da0b9c9bc06440d511b3aca1faca8e2bb820b919b9446ebfa66c89bc870
+  metadata.gz: 854004edc559daff1dd6605fc7b95b1f83602629d2e59771a487226c95833350
+  data.tar.gz: 48fe39dcd8d5867fb4abff691bd615f1eb434b7e01cc31771bb0a1a57765af09
 SHA512:
-  metadata.gz: 00ddf02a0dba120f9d9d406002cdf20f1fbb81b2810b0e25bb67a6bec4dce6826c72fefec945980e098bde0c0ea7f5a51d8955d0756d01dfea959af9fd31c199
-  data.tar.gz: 25dcc78f332c7946e8271e71ae44c6c89f7900522a6ce45fc1695f78ceab2e832d69ff0908c60a0fcb45a7a16d298632f2deeb8fe9ae4b5bcc5970bf3717928e
+  metadata.gz: d47550e712d840c8b1d62fd3b0a7b5a34b5bd8aaf71e6fbbc48cede293d9192d0a2d6801f9176c5d09d5d42b688c28cbb7b468ea035253131f4bb049d55ffb03
+  data.tar.gz: 743df5145f4670590dbeeb08c36d32a9fea41a465ae05e8594230c554e76abb9e540122c57455a1744a8f7fd575b08ee93802c695f336188cba9dc1b773d9daf

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

@@ -65,7 +65,11 @@ module Comee
 
       def fetch_one
         price = ClientPrice.includes(:client, :product, :unit, :product_lookup)
-                           .find_by(client_id: params[:id], product_id: fetch_one_params[:product_id])
+                           .find_by(
+                             client_id: params[:id],
+                             product_id: fetch_one_params[:product_id],
+                             status: Price.statuses[:current]
+                           )
         render_content(price)
       end
 

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

@@ -3,8 +3,14 @@ module Comee
     class ClientsController < ApplicationController
       include Common
 
+      def index
+        super do
+          Client.includes(:parent, :agents, :contacts, :client_warehouses, :user, :currency).all
+        end
+      end
+
       def filter
-        clients = Client.includes(:parent, :agents, :contacts, :client_warehouses).ransack(params[:q]).result
+        clients = Client.includes(:parent, :agents, :contacts, :client_warehouses, :user, :currency).ransack(params[:q]).result
         render_content(clients)
       end
 

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

@@ -3,6 +3,15 @@ module Comee
     class CustomerOrderItemsController < ApplicationController
       include Common
 
+      def index
+        super do
+          [
+            CustomerOrderItem.includes(:product, :unit).all,
+            fields: ["unit"]
+          ]
+        end
+      end
+
       def cancel
         CustomerOrderItem.where(id: params[:ids]).update_all(canceled: true)
         render json: {success: true}
@@ -10,7 +19,7 @@ module Comee
 
       def filter
         data = CustomerOrderItem.includes(:product, :unit).ransack(params[:q]).result
-        render_content(data)
+        render_content(data, {fields: ["unit"]})
       end
 
       def destroy
@@ -30,6 +39,7 @@ module Comee
         params.require(:payload)
               .permit(
                 :customer_item_no,
+                :customer_item_description,
                 :quantity,
                 :price,
                 :total_price,

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

@@ -5,6 +5,15 @@ module Comee
 
       before_action :set_service, only: %i[create_with_items submit submit_for_confirmation accept cancel]
 
+      def index
+        super do
+          [
+            CustomerOrder.includes(:client, :customer_order_items).all,
+            fields: ["client", "customer_order_items.unit"]
+          ]
+        end
+      end
+
       def create_with_items
         order = @service.create(create_with_item_params)
         render json: {success: true, data: serialize(order)}
@@ -59,7 +68,7 @@ module Comee
               .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 total_price unit_id delivery_date]
+                items: %i[customer_item_no customer_item_description product_id quantity price total_price unit_id delivery_date]
               )
       end
 

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

@@ -9,13 +9,27 @@ module Comee
         end
       end
 
+      def fetch_one
+        lookup = ProductLookup.includes(:product)
+                              .find_by(
+                                itemable_id: params[:id],
+                                itemable_type: "Comee::Core::Client",
+                                product_id: fetch_one_params[:product_id]
+                              )
+        render_content(lookup)
+      end
+
       def filter
-        data = ProductLookup.ransack(params[:q]).result
+        data = ProductLookup.includes(:product).ransack(params[:q]).result
         render_content(data)
       end
 
       private
 
+      def fetch_one_params
+        params.permit(:product_id)
+      end
+
       def model_params
         params.required(:payload).permit(:code, :itemable_id, :itemable_type, :item_description, :product_id)
       end

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

@@ -30,6 +30,7 @@ module Comee
         params.require(:payload)
               .permit(
                 :customer_item_no,
+                :customer_item_description,
                 :price,
                 :quantity,
                 :margin,

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

@@ -29,8 +29,8 @@ module Comee
 
       def model_params
         params.require(:payload).permit(:sales_order_id, :customer_order_item_id, :product_id, :unit_id, :quantity, :quantity_delivered,
-                                        :customer_item_no, :price, :handover_date, :delivery_date, :eb_number, :lead_time, :comment,
-                                        :action_note, :po_reference, :pallet_no, :source_id)
+                                        :customer_item_no, :customer_item_description, :price, :handover_date, :delivery_date,
+                                        :eb_number, :lead_time, :comment, :action_note, :po_reference, :pallet_no, :source_id)
       end
     end
   end

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

@@ -58,9 +58,11 @@ module Comee
       private
 
       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,
-                                        :consignee, :client_id, files: [])
+        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, :deivery_term,
+                                        :payment_penalty, :status, :total_price, :amount_paid, :pallete_note, :remark,
+                                        files: [])
       end
 
       def back_order_params

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

@@ -7,14 +7,16 @@ module Comee
       belongs_to :product
       belongs_to :unit
 
-      validates :customer_item_no, :quantity, :price, :delivery_date, presence: true
+      validates :customer_item_no, :customer_item_description, :quantity, :price, :delivery_date, presence: true
+      validates :quantity, :price, numericality: {greater_than_or_equal_to: 0}
+      validates :total_price, numericality: {greater_than_or_equal_to: 0}, allow_nil: 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]
+        %w[id customer_order_id product_id unit_id customer_item_no customer_item_description delivery_date]
       end
 
       def self.ransackable_associations(_auth_object = nil)

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

@@ -14,15 +14,13 @@ module Comee
       enum :status, {draft: 0, submitted: 1, confirmed: 2, canceled: 3}
 
       validates :order_number, presence: true, uniqueness: true
-      validates :status, presence: true
-      validates :payment_penalty,
-                presence: true,
-                numericality: {greater_than_or_equal_to: 0, less_than_or_equal_to: 100}
+      validates :order_date, :status, presence: true
+      validates :payment_penalty, numericality: {greater_than_or_equal_to: 0, less_than_or_equal_to: 100}, allow_nil: true
 
-      validates :total_price,
-                :amount_paid,
+      validates :amount_paid,
                 presence: true,
-                numericality: {greater_than_or_equal_to: 0}
+                numericality: {greater_than_or_equal_to: 0},
+                allow_nil: true
 
       def total_price
         sales_order_items = SalesOrderItem.where(sales_order_id: id)

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

@@ -10,7 +10,7 @@ module Comee
       belongs_to :source, class_name: "Comee::Core::FulfillmentCenter", optional: true
       has_many :shipment_items
 
-      validates :customer_item_no, :delivery_date, presence: true
+      validates :customer_item_no, :customer_item_description, :delivery_date, presence: true
       validates :quantity, :price, presence: true, numericality: {greater_than: 0}
       validates :quantity_delivered, numericality: {greater_than_or_equal_to: 0}
 
@@ -22,6 +22,7 @@ module Comee
         %w[
           id
           customer_item_no
+          customer_item_description
           customer_order_item_id
           delivery_date
           eb_number

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

@@ -1,7 +1,8 @@
 module Comee
   module Core
     class CustomerOrderItemSerializer < ActiveModel::Serializer
-      attributes :id, :customer_item_no, :quantity, :price, :total_price, :delivery_date, :canceled
+      attributes :id, :customer_item_no, :customer_item_description, :quantity, :price, :total_price, :delivery_date,
+                 :canceled, :customer_order_id, :product_id, :unit_id
       belongs_to :product
       belongs_to :unit
       belongs_to :customer_order

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

@@ -1,7 +1,8 @@
 module Comee
   module Core
     class QuotationRequestItemSerializer < ActiveModel::Serializer
-      attributes :id, :customer_item_no, :price, :margin, :margin_type, :valid_from, :valid_to, :quantity, :expected_delivery_date
+      attributes :id, :customer_item_no, :customer_item_description, :price, :margin, :margin_type, :valid_from, :valid_to,
+                 :quantity, :expected_delivery_date
       belongs_to :product
       belongs_to :quotation_request
       belongs_to :unit

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

@@ -1,8 +1,8 @@
 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, :total_price
+      attributes :id, :customer_item_no, :customer_item_description, :quantity, :quantity_delivered, :price, :handover_date,
+                 :delivery_date, :eb_number, :lead_time, :comment, :action_note, :po_reference, :total_price
 
       belongs_to :sales_order
       belongs_to :customer_order_item

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

@@ -1,12 +1,15 @@
 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, :parent_client_name, :created_by, :files_url, :customs_detail, :consignee
+      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
       belongs_to :customer_order
       belongs_to :client
       belongs_to :fulfillment_center
       has_many :sales_order_items
+      has_one :customs_detail
     end
   end
 end

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

@@ -138,9 +138,18 @@ module Comee
         CustomerOrder.transaction do
           sales_order = SalesOrder.create!(
             order_number: order.order_number,
+            order_date: order.order_date,
             customer_order: order,
             status: SalesOrder.statuses[:draft],
             client: order.client,
+            order_terms: order.order_terms,
+            shipment_address: order.shipment_address,
+            invoice_address: order.invoice_address,
+            delivery_address: order.delivery_address,
+            destination: order.final_destination,
+            handover_date: order.handover_date,
+            shipping_date: order.shipping_date,
+            delivery_date: order.final_delivery_date,
             consignee: order.consignee,
             created_by: accepted_by || ""
           )
@@ -173,7 +182,8 @@ module Comee
               customer_order_item_id: item.id,
               product_id: item.product_id,
               unit_id: unit_id,
-              customer_item_no: item.product.code,
+              customer_item_no: item.customer_item_no,
+              customer_item_description: item.customer_item_description,
               quantity: quantity,
               price: price,
               total_price: quantity * price,

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

@@ -118,6 +118,7 @@ module Comee
               product_id: item.product_id,
               unit_id: item.unit_id,
               customer_item_no: item.customer_item_no,
+              customer_item_description: item.customer_item_description,
               quantity: item.quantity,
               price: item.price,
               delivery_date: item.expected_delivery_date,

data/config/routes.rb

@@ -88,6 +88,7 @@ Comee::Core::Engine.routes.draw do
       post "create_agent"
       post "create_contact"
       post "price", controller: :client_prices, action: :fetch_one
+      post "product_lookup", controller: :product_lookups, action: :fetch_one
     end
     collection do
       post "filter"

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.string :customer_item_description, null: false
       t.float :quantity, null: false, default: 0
       t.float :price, null: false, default: 0
       t.float :total_price, null: false, default: 0

data/db/migrate/20230812190652_create_comee_core_sales_orders.rb

@@ -2,6 +2,7 @@ class CreateComeeCoreSalesOrders < ActiveRecord::Migration[7.0]
   def change
     create_table :comee_core_sales_orders do |t|
       t.string :order_number, null: false
+      t.date :order_date, null: false
       t.references :customer_order,
                    null: false,
                    index: {name: "co_on_ccso_indx"},
@@ -14,16 +15,23 @@ class CreateComeeCoreSalesOrders < ActiveRecord::Migration[7.0]
                    null: false,
                    index: {name: "client_on_ccso_indx"},
                    foreign_key: {to_table: :comee_core_clients}
+      t.string :order_terms
+      t.string :shipment_address
+      t.string :delivery_address
+      t.string :invoice_address
+      t.string :destination
+      t.date :shipping_date
+      t.date :delivery_date
+      t.date :handover_date
       t.string :consignee
       t.string :parent_client_name
       t.string :payment_term
       t.string :delivery_term
-      t.float :payment_penalty, null: false, default: 0.0
+      t.float :payment_penalty, default: 0
       t.integer :status, null: false, default: 0
-      t.float :total_price, null: false, default: 0
-      t.float :amount_paid, null: false, default: 0
+      t.float :total_price, default: 0.0
+      t.float :amount_paid, default: 0.0
       t.string :pallete_note
-      t.date :handover_date
       t.string :remark
       t.string :created_by
 

data/db/migrate/20230812212844_create_comee_core_sales_order_items.rb

@@ -22,6 +22,7 @@ class CreateComeeCoreSalesOrderItems < ActiveRecord::Migration[7.0]
                    index: {name: "source_on_ccsoi_indx"},
                    foreign_key: {to_table: :comee_core_fulfillment_centers}
       t.string :customer_item_no, null: false
+      t.string :customer_item_description, null: false
       t.float :quantity, null: false
       t.float :quantity_delivered, null: false, default: 0
       t.float :price, null: false

data/db/migrate/20231121132709_create_comee_core_quotation_request_items.rb

@@ -10,6 +10,7 @@ class CreateComeeCoreQuotationRequestItems < ActiveRecord::Migration[7.1]
                    index: {name: "rfq_on_ccrfqi_indx"},
                    foreign_key: {to_table: :comee_core_quotation_requests}
       t.string :customer_item_no
+      t.string :customer_item_description
       t.float :quantity, null: false
       t.float :price, null: false, default: 0
       t.float :margin, null: false, default: 0

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.2.10".freeze
+    VERSION = "0.2.12".freeze
   end
 end

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

@@ -4,6 +4,7 @@ FactoryBot.define do
     product
     unit
     customer_item_no { Faker::Alphanumeric.alpha(number: 10) }
+    customer_item_description { Faker::Lorem.sentence }
     quantity { 1 }
     price { 1.5 }
     total_price { quantity * price }

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

@@ -4,6 +4,7 @@ FactoryBot.define do
     quotation_request
     unit
     customer_item_no { Faker::Alphanumeric.alpha(number: 10) }
+    customer_item_description { Faker::Lorem.sentence }
     quantity { 10 }
     price { 0 }
     margin { 0 }

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

@@ -6,6 +6,7 @@ FactoryBot.define do
     product
     unit
     customer_item_no { Faker::Alphanumeric.alpha(number: 10) }
+    customer_item_description { Faker::Lorem.sentence }
     quantity { 100 }
     quantity_delivered { 0 }
     price { 50 }

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

@@ -1,19 +1,28 @@
 FactoryBot.define do
   factory :sales_order, class: "Comee::Core::SalesOrder" do
     order_number { Faker::Alphanumeric.alpha(number: 10) }
+    order_date { Date.current }
     customer_order
     fulfillment_center
     client
+    order_terms { Faker::Lorem.sentence }
+    shipment_address { Faker::Address.full_address }
+    delivery_address { Faker::Address.full_address }
+    invoice_address { Faker::Address.full_address }
+    destination { Faker::Address.city }
+    handover_date { Date.current.advance(weeks: 1) }
+    shipping_date { Date.current.advance(days: 10) }
+    delivery_date { Date.current.advance(days: 15) }
+    consignee { Faker::Name.name }
+    parent_client_name { Faker::Name.name }
     payment_term { Faker::Lorem.sentence }
     delivery_term { Faker::Lorem.sentence }
     payment_penalty { 0 }
+    status { Comee::Core::SalesOrder.statuses[:draft] }
     total_price { 0 }
     amount_paid { 0 }
-    status { Comee::Core::SalesOrder.statuses[:draft] }
     pallete_note { Faker::Lorem.sentence }
-    consignee { Faker::Name.name }
     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.2.10
+  version: 0.2.12
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-04 00:00:00.000000000 Z
+date: 2024-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers