comee_core 0.2.35 → 0.2.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf6fc63ad754f4758f41618ce9466a608116d8e38c3c8cfe938a87cbcd2ac97a
-  data.tar.gz: 5c12cc3e700a0c6f8e0c35a649f438cd8f512c680b094943fd35285fb9d3a347
+  metadata.gz: 9e9e650443cc408aaf5be8f1ecb6838100af7f2a51ea36b1dbf6c9a63154e30d
+  data.tar.gz: 5030a418187ced18a1afd12ec36127858d02461c7dd796889c6dca205664f2e2
 SHA512:
-  metadata.gz: 429787daf6e1d36ee7091c4620ed014cddbe2b9a312d30b6b414f46a2add9057fee1ec11112730b6f8d17b78ea5747affbbe24ae62b6c2eed6533f39c11fe6c2
-  data.tar.gz: e0f204ae7f90d4844ac35cd5bfa27128e5aa26ff42c3efdf16eb01bfdafa71a035f0d5121ed2e815770bfd30835075f835e730f41169d338a2268ed37bdc0792
+  metadata.gz: e49268b1d68d607ef6a1c284f8d21c77e2dfdf84986d13299b522faf64c9dc55f188ac9481623cabccd790778c110f9ee8bf21c60b7906d0893a6cd5113dc8a9
+  data.tar.gz: 25262be73c2e10219a3c74769f8356a0e0026ba7edc324425c8f96c24d4ce678a3812e843c76e78f24e58cb60a05af7225c7cc8e644f8f98b2868c03f00358eb

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

@@ -47,7 +47,7 @@ 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, :purchase_order_item_id, :pallet_no, :source_id,
                                         :processing_status)
       end
     end

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

@@ -49,7 +49,6 @@ module Comee
             quantity: item.sales_order_item.quantity,
             delivery_date: item.sales_order_item.delivery_date,
             handover_date: item.sales_order_item.sales_order.handover_date,
-            po_reference: item.sales_order_item.po_reference,
             status: status&.status
           }
           res << data.merge(status&.details)

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

@@ -1,16 +1,30 @@
 module Comee
   module Core
     class PurchaseOrderItem < ApplicationRecord
+      before_save :calculate_total_price, :calculate_confirmation_values
+
       enum status: {active: 0, canceled: 1}
 
       belongs_to :purchase_order
       belongs_to :unit
       belongs_to :source, polymorphic: true
 
-      validates :quantity, :confirmed_quantity, presence: true, numericality: {greater_than: 0}
-      validates :price, :confirmed_price, presence: true, numericality: {greater_than_or_equal_to: 0}
+      validates :quantity, presence: true, numericality: {greater_than: 0}
+      validates :price, presence: true, numericality: {greater_than_or_equal_to: 0}
       validates :status, :delivery_date, :confirmed_delivery_date, presence: true
 
+      def calculate_total_price
+        self.total_price = price * quantity
+      end
+
+      def calculate_confirmation_values
+        self.confirmed_price = price unless confirmed_price
+
+        self.confirmed_quantity = quantity unless confirmed_quantity
+
+        self.confirmed_total_price = confirmed_price * confirmed_quantity
+      end
+
       def self.ransackable_attributes(_auth_object = nil)
         %w[
           id

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

@@ -10,6 +10,7 @@ module Comee
       belongs_to :unit
       belongs_to :supplier
       belongs_to :purchase_requisition
+      belongs_to :purchase_order_item, optional: true
 
       validates :processing_status, presence: true
       validates :quantity, :price, presence: true, numericality: {greater_than_or_equal_to: 0}

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

@@ -10,6 +10,7 @@ module Comee
       belongs_to :product
       belongs_to :unit
       belongs_to :source, class_name: "Comee::Core::FulfillmentCenter", optional: true
+      belongs_to :purchase_order_item, optional: true
       has_many :shipment_items
 
       validates :customer_item_no, :customer_item_description, :delivery_date, :processing_status, presence: true
@@ -30,9 +31,9 @@ module Comee
           eb_number
           handover_date
           lead_time
-          po_reference
           product_id
           sales_order_id
+          purchase_order_item_id
           source_id
           unit_id
           processing_status
@@ -40,7 +41,7 @@ module Comee
       end
 
       def self.ransackable_associations(_auth_object = nil)
-        %w[customer_order_item product sales_order source unit]
+        %w[customer_order_item product sales_order purchase_order_item source unit]
       end
     end
   end

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

@@ -2,7 +2,7 @@ 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, :purchase_order_item_id, :total_price, :canceled,
                  :processing_status
 
       belongs_to :sales_order

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

@@ -15,6 +15,8 @@ class CreateComeeCorePurchaseOrderItems < ActiveRecord::Migration[7.1]
                    foreign_key: {to_table: :comee_core_units}
       t.float :price, null: false
       t.float :confirmed_price, null: false
+      t.float :total_price, null: false
+      t.float :confirmed_total_price, null: false
       t.date :delivery_date, null: false
       t.date :confirmed_delivery_date, null: false
       t.integer :status, null: false, default: 0

data/db/migrate/20230812212844_create_comee_core_sales_order_items.rb

@@ -21,6 +21,10 @@ class CreateComeeCoreSalesOrderItems < ActiveRecord::Migration[7.0]
                    null: true,
                    index: {name: "source_on_ccsoi_indx"},
                    foreign_key: {to_table: :comee_core_fulfillment_centers}
+      t.references :purchase_order_item,
+                   null: true,
+                   index: {name: "poi_on_ccsoi_indx"},
+                   foreign_key: {to_table: :comee_core_purchase_order_items}
       t.string :customer_item_no, null: false
       t.string :customer_item_description, null: false
       t.float :quantity, null: false
@@ -34,7 +38,6 @@ class CreateComeeCoreSalesOrderItems < ActiveRecord::Migration[7.0]
       t.integer :lead_time
       t.string :comment
       t.string :action_note
-      t.string :po_reference
       t.integer :processing_status, null: false, default: 0
 
       t.timestamps

data/db/migrate/20240314111307_create_comee_core_purchase_requisition_items.rb

@@ -17,6 +17,10 @@ class CreateComeeCorePurchaseRequisitionItems < ActiveRecord::Migration[7.1]
                    null: false,
                    index: {name: "pr_on_ccpri_indx"},
                    foreign_key: {to_table: :comee_core_purchase_requisitions}
+      t.references :purchase_order_item,
+                   null: true,
+                   index: {name: "poi_on_ccpri_indx"},
+                   foreign_key: {to_table: :comee_core_purchase_order_items}
       t.float :quantity, null: false
       t.float :price, null: false
       t.float :total_price, null: false

data/lib/comee/core/version.rb

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

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

@@ -7,6 +7,8 @@ FactoryBot.define do
     confirmed_quantity { quantity }
     price { 100 }
     confirmed_price { price }
+    total_price { price * quantity }
+    confirmed_total_price { confirmed_price && confirmed_quantity ? confirmed_price * confirmed_quantity : 0 }
     delivery_date { Date.current.advance(days: 7) }
     confirmed_delivery_date { delivery_date }
     status { 0 }

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

@@ -4,6 +4,7 @@ FactoryBot.define do
     unit
     supplier
     purchase_requisition
+    purchase_order_item { nil }
     quantity { 10 }
     price { 15 }
     processing_status { Comee::Core::PurchaseRequisitionItem.processing_statuses[:unprocessed] }

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

@@ -5,6 +5,7 @@ FactoryBot.define do
     source factory: :fulfillment_center
     product
     unit
+    purchase_order_item { nil }
     customer_item_no { Faker::Alphanumeric.alpha(number: 10) }
     customer_item_description { Faker::Lorem.sentence }
     quantity { 100 }
@@ -17,7 +18,6 @@ FactoryBot.define do
     lead_time { nil }
     comment { Faker::Lorem.sentence }
     action_note { Faker::Lorem.sentence }
-    po_reference { Faker::Alphanumeric.alpha(number: 10) }
     canceled { false }
     processing_status { Comee::Core::SalesOrderItem.processing_statuses[:unprocessed] }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.2.35
+  version: 0.2.36
 platform: ruby
 authors:
 - Henock L.
@@ -399,6 +399,8 @@ files:
 - db/migrate/20230728123039_create_comee_core_clients.rb
 - db/migrate/20230728123458_create_comee_core_agents.rb
 - db/migrate/20230728123559_create_comee_core_contacts.rb
+- db/migrate/20230728123823_create_comee_core_purchase_orders.rb
+- db/migrate/20230728123827_create_comee_core_purchase_order_items.rb
 - db/migrate/20230728123928_create_comee_core_back_orders.rb
 - db/migrate/20230728125723_create_comee_core_back_order_items.rb
 - db/migrate/20230730061225_create_comee_core_notifications.rb
@@ -439,8 +441,6 @@ 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