comee_core 0.2.33 → 0.2.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6619eb773ad35fccfea933cf7770f0a4b24ebf46a3f2874d7c75153d5b9cb41c
-  data.tar.gz: b3821a41b7a0275d4b4647dae8a712334a2a04625405f86365d773843ba8cdac
+  metadata.gz: bf6fc63ad754f4758f41618ce9466a608116d8e38c3c8cfe938a87cbcd2ac97a
+  data.tar.gz: 5c12cc3e700a0c6f8e0c35a649f438cd8f512c680b094943fd35285fb9d3a347
 SHA512:
-  metadata.gz: 1216ca3faffbc0fda6176d90195819549a905d2d2984f63f90a1af61d270f17b78f9c5a67a46c5ead7ba35a1a64a993fc02ff99e430063aa4b366c1dd83075c4
-  data.tar.gz: 5641da7714023cd6d6c8673e95a6fe262e3c2726a80f392ff6c0c0783c2f15f2f63da085e61902f81b6253c529af32abec51cfba6bc59b0b1061195bf6d482d0
+  metadata.gz: 429787daf6e1d36ee7091c4620ed014cddbe2b9a312d30b6b414f46a2add9057fee1ec11112730b6f8d17b78ea5747affbbe24ae62b6c2eed6533f39c11fe6c2
+  data.tar.gz: e0f204ae7f90d4844ac35cd5bfa27128e5aa26ff42c3efdf16eb01bfdafa71a035f0d5121ed2e815770bfd30835075f835e730f41169d338a2268ed37bdc0792

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

@@ -47,7 +47,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, :customer_item_description, :price, :handover_date, :delivery_date,
-                                        :eb_number, :lead_time, :comment, :action_note, :po_reference, :pallet_no, :source_id)
+                                        :eb_number, :lead_time, :comment, :action_note, :po_reference, :pallet_no, :source_id,
+                                        :processing_status)
       end
     end
   end

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

@@ -2,22 +2,29 @@ module Comee
   module Core
     class PurchaseOrder < ApplicationRecord
       belongs_to :supplier
-      validates :order_date, :delivery_address, presence: true
+      validates :order_date, :delivery_address, :status, :delivery_date, presence: true
       enum status: {
         draft: 0,
-        pending_approval: 1,
+        submitted: 1,
         approved: 2,
-        submitted_to_supplier: 3
+        confirmed: 3,
+        canceled: 4
       }
       def self.ransackable_attributes(_auth_object = nil)
         %w[
           id
           supplier_id
+          unit_id
           order_date
           status
           delivery_address
+          delivery_date
         ]
       end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[supplier unit]
+      end
     end
   end
 end

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

@@ -1,31 +1,38 @@
 module Comee
   module Core
     class PurchaseOrderItem < ApplicationRecord
+      enum status: {active: 0, canceled: 1}
+
       belongs_to :purchase_order
-      belongs_to :sales_order_item
-      validates :status, :quantity, :delivery_date, presence: true
-      validate :sales_order_item_must_have_eb_number
-      enum status: {
-        active: 0,
-        canceled: 1
-      }
-      def sales_order_item_must_have_eb_number
-        return unless sales_order_item
-        return if sales_order_item.eb_number
+      belongs_to :unit
+      belongs_to :source, polymorphic: true
 
-        errors.add(:sales_order_item, "must have an EB number.")
-      end
+      validates :quantity, :confirmed_quantity, presence: true, numericality: {greater_than: 0}
+      validates :price, :confirmed_price, presence: true, numericality: {greater_than_or_equal_to: 0}
+      validates :status, :delivery_date, :confirmed_delivery_date, presence: true
 
       def self.ransackable_attributes(_auth_object = nil)
         %w[
           id
           purchase_order_id
-          sales_order_item_id
+          unit_id
           quantity
+          confirmed_quantity
+          price
+          confirmed_price
           delivery_date
+          confirmed_delivery_date
           status
         ]
       end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[
+          purchase_order
+          source
+          unit
+        ]
+      end
     end
   end
 end

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

@@ -5,11 +5,15 @@ module Comee
 
       has_many :purchase_requisition_items
 
-      enum :status, {draft: 0, approved: 1}
+      enum :status, {draft: 0, submitted: 1, approved: 2, rejected: 3}
 
       validates :requisition_no, presence: true, uniqueness: true
       validates :requisition_date, :status, presence: true
 
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[created_at id remark requisition_date requisition_no status total_price updated_at]
+      end
+
       def calculate_total_price
         items = PurchaseRequisitionItem.where(purchase_requisition_id: id)
         self.total_price = items.sum(&:total_price)

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

@@ -4,11 +4,14 @@ module Comee
       before_save :calculate_total_price
       after_save :calculate_requisition_price
 
+      enum processing_status: {unprocessed: 0, partially_processed: 1, fully_processed: 2}
+
       belongs_to :product
       belongs_to :unit
       belongs_to :supplier
       belongs_to :purchase_requisition
 
+      validates :processing_status, presence: true
       validates :quantity, :price, presence: true, numericality: {greater_than_or_equal_to: 0}
 
       def calculate_total_price

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

@@ -3,6 +3,8 @@ module Comee
     class SalesOrderItem < ApplicationRecord
       before_save :calculate_total_price
 
+      enum processing_status: {unprocessed: 0, partially_processed: 1, fully_processed: 2}
+
       belongs_to :sales_order
       belongs_to :customer_order_item
       belongs_to :product
@@ -10,7 +12,7 @@ module Comee
       belongs_to :source, class_name: "Comee::Core::FulfillmentCenter", optional: true
       has_many :shipment_items
 
-      validates :customer_item_no, :customer_item_description, :delivery_date, presence: true
+      validates :customer_item_no, :customer_item_description, :delivery_date, :processing_status, presence: true
       validates :quantity, :price, presence: true, numericality: {greater_than: 0}
       validates :quantity_delivered, numericality: {greater_than_or_equal_to: 0}
 
@@ -33,6 +35,7 @@ module Comee
           sales_order_id
           source_id
           unit_id
+          processing_status
         ]
       end
 

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

@@ -2,7 +2,8 @@ module Comee
   module Core
     class SalesOrderItemSerializer < ActiveModel::Serializer
       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
+                 :delivery_date, :eb_number, :lead_time, :comment, :action_note, :po_reference, :total_price, :canceled,
+                 :processing_status
 
       belongs_to :sales_order
       belongs_to :customer_order_item

data/db/migrate/20230812212844_create_comee_core_sales_order_items.rb

@@ -35,6 +35,7 @@ class CreateComeeCoreSalesOrderItems < ActiveRecord::Migration[7.0]
       t.string :comment
       t.string :action_note
       t.string :po_reference
+      t.integer :processing_status, null: false, default: 0
 
       t.timestamps
     end

data/db/migrate/20240314111307_create_comee_core_purchase_requisition_items.rb

@@ -20,6 +20,7 @@ class CreateComeeCorePurchaseRequisitionItems < ActiveRecord::Migration[7.1]
       t.float :quantity, null: false
       t.float :price, null: false
       t.float :total_price, null: false
+      t.integer :processing_status, null: false, default: 0
 
       t.timestamps
     end

data/db/migrate/{20231125122723_create_comee_core_purchase_orders.rb → 20240325122723_create_comee_core_purchase_orders.rb}

@@ -8,6 +8,7 @@ class CreateComeeCorePurchaseOrders < ActiveRecord::Migration[7.1]
       t.date :order_date, default: Date.today
       t.integer :status, default: 0
       t.string :delivery_address, null: false
+      t.date :delivery_date, null: false
 
       t.timestamps
     end

data/db/migrate/{20231126082907_create_comee_core_purchase_order_items.rb → 20240326082907_create_comee_core_purchase_order_items.rb}

@@ -6,12 +6,17 @@ class CreateComeeCorePurchaseOrderItems < ActiveRecord::Migration[7.1]
                    index: {name: "pos_on_ccpoitm_indx"},
                    foreign_key: {to_table: :comee_core_purchase_orders}
 
-      t.references :sales_order_item,
-                   null: false,
-                   index: {name: "soi_on_ccpoitm_indx"},
-                   foreign_key: {to_table: :comee_core_sales_order_items}
+      t.references :source, polymorphic: true, null: false
       t.float :quantity, null: false
+      t.float :confirmed_quantity, null: false
+      t.references :unit,
+                   null: false,
+                   index: {name: "unit_on_ccpoitm_indx"},
+                   foreign_key: {to_table: :comee_core_units}
+      t.float :price, null: false
+      t.float :confirmed_price, null: false
       t.date :delivery_date, null: false
+      t.date :confirmed_delivery_date, null: false
       t.integer :status, null: false, default: 0
 
       t.timestamps

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.2.33".freeze
+    VERSION = "0.2.35".freeze
   end
 end

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

@@ -1,9 +1,14 @@
 FactoryBot.define do
   factory :purchase_order_item, class: "Comee::Core::PurchaseOrderItem" do
     purchase_order
-    sales_order_item
+    unit
+    source factory: :purchase_requisition_item
     quantity { 10 }
+    confirmed_quantity { quantity }
+    price { 100 }
+    confirmed_price { price }
     delivery_date { Date.current.advance(days: 7) }
+    confirmed_delivery_date { delivery_date }
     status { 0 }
   end
 end

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

@@ -4,5 +4,6 @@ FactoryBot.define do
     order_date { Date.current }
     status { 0 }
     delivery_address { "Korsu warehouse address" }
+    delivery_date { Date.current.advance(days: 10) }
   end
 end

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

@@ -6,5 +6,6 @@ FactoryBot.define do
     purchase_requisition
     quantity { 10 }
     price { 15 }
+    processing_status { Comee::Core::PurchaseRequisitionItem.processing_statuses[:unprocessed] }
   end
 end

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

@@ -19,5 +19,6 @@ FactoryBot.define do
     action_note { Faker::Lorem.sentence }
     po_reference { Faker::Alphanumeric.alpha(number: 10) }
     canceled { false }
+    processing_status { Comee::Core::SalesOrderItem.processing_statuses[:unprocessed] }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.2.33
+  version: 0.2.35
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-18 00:00:00.000000000 Z
+date: 2024-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -283,8 +283,6 @@ files:
 - app/controllers/comee/core/notifications_controller.rb
 - app/controllers/comee/core/product_lookups_controller.rb
 - app/controllers/comee/core/products_controller.rb
-- app/controllers/comee/core/purchase_order_items_controller.rb
-- app/controllers/comee/core/purchase_orders_controller.rb
 - app/controllers/comee/core/quotation_request_items_controller.rb
 - app/controllers/comee/core/quotation_requests_controller.rb
 - app/controllers/comee/core/sales_order_items_controller.rb
@@ -421,8 +419,6 @@ files:
 - db/migrate/20231124120907_create_active_storage_tables.active_storage.rb
 - db/migrate/20231125111539_create_comee_core_lookups.rb
 - db/migrate/20231125115522_create_comee_core_customs_details.rb
-- db/migrate/20231125122723_create_comee_core_purchase_orders.rb
-- db/migrate/20231126082907_create_comee_core_purchase_order_items.rb
 - db/migrate/20231206082503_create_comee_core_unit_conversions.rb
 - db/migrate/20231207153420_create_comee_core_shipment_items.rb
 - db/migrate/20231207235542_create_comee_core_item_statuses.rb
@@ -443,6 +439,8 @@ files:
 - db/migrate/20240314111117_create_comee_core_purchase_requisitions.rb
 - db/migrate/20240314111307_create_comee_core_purchase_requisition_items.rb
 - db/migrate/20240315163900_add_subsidiary_to_client.rb
+- db/migrate/20240325122723_create_comee_core_purchase_orders.rb
+- db/migrate/20240326082907_create_comee_core_purchase_order_items.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb

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

@@ -1,18 +0,0 @@
-module Comee
-  module Core
-    class PurchaseOrderItemsController < ApplicationController
-      include Common
-
-      def filter
-        data = PurchaseOrderItem.ransack(params[:q]).result
-        render_content(data)
-      end
-
-      private
-
-      def model_params
-        params.required(:payload).permit(:purchase_order_id, :sales_order_item_id, :quantity, :delivery_date, :status)
-      end
-    end
-  end
-end

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

@@ -1,18 +0,0 @@
-module Comee
-  module Core
-    class PurchaseOrdersController < ApplicationController
-      include Common
-
-      def filter
-        data = Comee::Core::PurchaseOrder.ransack(params[:q]).result
-        render_content(data)
-      end
-
-      private
-
-      def model_params
-        params.required(:payload).permit(:supplier_id, :order_date, :status, :delivery_address)
-      end
-    end
-  end
-end