comee_core 0.2.62 → 0.2.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3647a23605f256be409ffe92d604c6c3cf2145c59973380f73d38ac866b5249
-  data.tar.gz: e8ddef5687858b3b4c4f443e5f1f8235e7c3bf11c90b9b2270589855106a13e5
+  metadata.gz: 36796a6606f2d0516da94431c5165d8449b9b21a5a9e02b12b94a2ba58c9bde5
+  data.tar.gz: 85afb2f2bbc84f87dc49601f5b2fe6b281015ff8b53fe194eaef4fb7da9e40e0
 SHA512:
-  metadata.gz: 29924b04d90bbd2daa6d4e59077713c42491b94dceaf98a351c94ea433f06af36e582600a775580cee02ba55d99f019d4a20ccec6eaf0fd3125a9f7cd40cc7c9
-  data.tar.gz: 91469b52049d64914608cd1b73e1ea2a0026a1b16486f7ba01691bbe6715e7a3b94eee935ef5a930b0fe4f5b97c92626e69b216875ba07fedcbeeb87d1fb4fc9
+  metadata.gz: 5c6498bfb8766b7bcea41ac295bff64100973220c495fcc13aea50a5ccf17038b6767c5dd1df6a123d8cf1b24ab4c9e348050137edfbf6fc4dc161f1888558d2
+  data.tar.gz: 8adac38add7f7532b7f487b36c057dd578856bf186e54c7d0db00d06479bf4bbc7adf0924b606ae618668e68cdef5024ffd90f83a494e3808ce032b8d633b2b3

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

@@ -6,9 +6,10 @@ module Comee
       has_many :purchase_requisition_items
 
       enum :status, {draft: 0, submitted: 1, approved: 2, rejected: 3}
+      enum :purchase_status, {unprocessed: 0, processed: 1}
 
       validates :requisition_no, presence: true, uniqueness: true
-      validates :requisition_date, :status, presence: true
+      validates :requisition_date, :status, :purchase_status, presence: true
 
       def self.ransackable_attributes(_auth_object = nil)
         %w[created_at id remark requisition_date requisition_no status total_price updated_at]

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

@@ -3,6 +3,7 @@ module Comee
     class PurchaseRequisitionItem < ApplicationRecord
       before_save :calculate_total_price
       after_save :calculate_requisition_price
+      after_save :update_requisition_purchase_status, if: proc { |item| item.fully_processed? }
 
       enum processing_status: {unprocessed: 0, partially_processed: 1, fully_processed: 2}
 
@@ -24,6 +25,13 @@ module Comee
         purchase_requisition.save!
       end
 
+      def update_requisition_purchase_status
+        return unless purchase_requisition.purchase_requisition_items.all.all?(&:fully_processed?)
+
+        purchase_requisition.purchase_status = PurchaseRequisition.purchase_statuses[:processed]
+        purchase_requisition.save!
+      end
+
       def self.ransackable_attributes(_auth_object = nil)
         %w[
           delivery_date

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

@@ -12,9 +12,10 @@ module Comee
       has_one :customs_detail
 
       enum :status, {draft: 0, submitted: 1, confirmed: 2, accepted: 3, canceled: 4}
+      enum :purchase_status, {unprocessed: 0, processed: 1}
 
       validates :order_number, presence: true, uniqueness: true
-      validates :order_date, :status, presence: true
+      validates :order_date, :status, :purchase_status, presence: true
       validates :payment_penalty, numericality: {greater_than_or_equal_to: 0, less_than_or_equal_to: 100}, allow_nil: true
 
       validates :amount_paid,

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

@@ -2,6 +2,7 @@ module Comee
   module Core
     class SalesOrderItem < ApplicationRecord
       before_save :calculate_total_price
+      after_save :update_sales_order_purchase_status, if: proc { |item| item.fully_processed? }
 
       enum processing_status: {unprocessed: 0, partially_processed: 1, fully_processed: 2}
 
@@ -27,6 +28,13 @@ module Comee
         quantity - (quantity_delivered + quantity_canceled)
       end
 
+      def update_sales_order_purchase_status
+        return unless sales_order.sales_order_items.all.all?(&:fully_processed?)
+
+        sales_order.purchase_status = SalesOrder.purchase_statuses[:processed]
+        sales_order.save!
+      end
+
       def self.ransackable_attributes(_auth_object = nil)
         %w[
           id

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

@@ -2,7 +2,7 @@ module Comee
   module Core
     class ProductSerializer < ActiveModel::Serializer
       attributes :id, :code, :name, :description, :thumbnail_image_url, :images_url, :preferred_units, :weight,
-                 :dimensions, :hs_code, :hs_description
+                 :dimensions, :hs_code, :hs_description, :parent_id
       belongs_to :source
       belongs_to :weight_unit
     end

data/db/migrate/20240425121701_add_purchase_status_to_sales_order_and_purchase_requisition.rb

@@ -0,0 +1,6 @@
+class AddPurchaseStatusToSalesOrderAndPurchaseRequisition < ActiveRecord::Migration[7.1]
+  def change
+    add_column :comee_core_sales_orders, :purchase_status, :integer, default: 0
+    add_column :comee_core_purchase_requisitions, :purchase_status, :integer, default: 0
+  end
+end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.2.62".freeze
+    VERSION = "0.2.63".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.2.62
+  version: 0.2.63
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-24 00:00:00.000000000 Z
+date: 2024-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -458,6 +458,7 @@ files:
 - db/migrate/20240328132713_create_comee_core_payment_orders.rb
 - db/migrate/20240328132921_create_comee_core_supplier_payments.rb
 - db/migrate/20240407083617_create_comee_core_email_settings.rb
+- db/migrate/20240425121701_add_purchase_status_to_sales_order_and_purchase_requisition.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb