comee_core 0.2.11 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9ecb44f38bb1bbc8fe8accb8d1df84c10de099038728c077948c25584770250
-  data.tar.gz: 46c2e7d55a8ad2dd8abbc414f595a1128566c48d6c9e053bcdd849f9a32d4242
+  metadata.gz: 5a4ecd52efb335b2688fb0fd381163d594b81de592ed48dcd5701ee28c00d10f
+  data.tar.gz: 53ef139383420c858b4ce5afcb52974af1051cdb2086a83bcd28256311724a76
 SHA512:
-  metadata.gz: 86f577f8514711c9d0c32e81ce657016fc36b0d95b13f4e4e2953f9ff696688f6ffd5bd7cf9ed20df3b51349668f552df34bd7dc03fffb476ced35523e61b1c0
-  data.tar.gz: 9a65691ef5ba903d3ef4f501ba7f698608db2e01b5510693a238f944745e295374ac4b47288f3a337116ac6f14b14c4d13174bfe62c3b7cfcd7cb6b20343a006
+  metadata.gz: aea590ef7c2567f4f8014bd7d18f4e77e81b735afb9fb64444d680b419d0548d20edbf62308d7f3bd5904fa4a225cabaf5b47649955934976183e6ffcb9a63e2
+  data.tar.gz: 1a44e91626c5e3c1b3d5d37574bea1ab19fbf10c2993a31436bede678660d96862f6029735b70988eebbb39107039fb843b0a1c58f29045b983a733eee4c4386

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

@@ -39,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

@@ -8,7 +8,16 @@ module Comee
       def index
         super do
           [
-            CustomerOrder.includes(:client, :customer_order_items).all,
+            CustomerOrder.includes(:client, customer_order_items: :unit).order(:created_at),
+            fields: ["client", "customer_order_items.unit"]
+          ]
+        end
+      end
+
+      def show
+        super do
+          [
+            CustomerOrder.includes(:client, customer_order_items: :unit).find(params[:id]),
             fields: ["client", "customer_order_items.unit"]
           ]
         end
@@ -68,7 +77,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

@@ -20,7 +20,7 @@ module Comee
       end
 
       def filter
-        data = ProductLookup.ransack(params[:q]).result
+        data = ProductLookup.includes(:product).ransack(params[:q]).result
         render_content(data)
       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

@@ -20,6 +20,12 @@ module Comee
         render json: {success: true, data: result}
       end
 
+      def cancel
+        item = set_object
+        item.update(canceled: true)
+        render_content(item)
+      end
+
       def destroy
         Comee::Core::SalesOrderItem.destroy(params[:id])
         render json: {success: true}
@@ -29,8 +35,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, :delivery_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

@@ -1,20 +1,22 @@
 module Comee
   module Core
     class CustomerOrderItem < ApplicationRecord
-      before_save :calculate_total_price, unless: proc { |item| item.total_price }
+      before_save :calculate_total_price
 
       belongs_to :customer_order
       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,8 +1,8 @@
 module Comee
   module Core
     class CustomerOrderItemSerializer < ActiveModel::Serializer
-      attributes :id, :customer_item_no, :quantity, :price, :total_price, :delivery_date, :canceled, :customer_order_id,
-                 :product_id, :unit_id
+      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, :canceled
 
       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

@@ -113,6 +113,7 @@ Comee::Core::Engine.routes.draw do
   resources :sales_order_items, except: [:index] do
     member do
       get "suggest", controller: :sales_order_items, action: :suggest_values
+      post "cancel"
     end
   end
   resources :shipment_items do

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.11".freeze
+    VERSION = "0.2.13".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 }
@@ -17,5 +18,6 @@ FactoryBot.define do
     comment { Faker::Lorem.sentence }
     action_note { Faker::Lorem.sentence }
     po_reference { Faker::Alphanumeric.alpha(number: 10) }
+    canceled { false }
   end
 end

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.11
+  version: 0.2.13
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-05 00:00:00.000000000 Z
+date: 2024-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers