comee_core 0.3.49 → 0.3.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ee5aa8d7b6d61bb8af51da85a51ba665afb0514afa5368a7d694555d6fca5d4
-  data.tar.gz: 4f8532f6d053cf07deecfaaea04b905562c2ba6f31f8c11b50ab60a9f1baba05
+  metadata.gz: 7eb8daaf5bd10966f39faab024fbac053cceea0b8975cc62f529340daba65bad
+  data.tar.gz: f82a270166be12621e18d5834aad45224bc2a1e0c7eb6464f668855e87792846
 SHA512:
-  metadata.gz: 7c4a4a8ff3dfc63ddc159a0ddaae7b556fbed4fa306a4a5372a0f1e95163f49f1f711ca4fc4105f16f8a65033ecabc8ec0c6e36d6ff4fa46988eb6166806b380
-  data.tar.gz: 9520888d27d0f66b985514f5499f0aa9dd70240aae8356088fb04bb515e93fdcd008b93afcf6636a4e65d398749c2c120b550ae3e45fe3f4e611ad6808aa7555
+  metadata.gz: cba8ba7756560f47bec8270a9e6b269ac4f106946589a8255d67be7e26e0f736fb1686c9d122c629c038950d254b840ffa7cfb45e11740ccdd29a36e028cc7f6
+  data.tar.gz: 99771a09d9f65b282a532c1691beb57d11d846c2c8c37e5fae5b6b7089db64b57e3b67721fb82c3eb1ed0d924499ec542afbb535884b51fd7f61c1eba15d7707

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

@@ -23,6 +23,11 @@ module Comee
         self.total_price = items.sum(&:total_price).round(2)
       end
 
+      def calculate_confirmed_total_price
+        items = PurchaseOrderItem.where(purchase_order_id: id)
+        self.confirmed_total_price = items.sum(&:confirmed_total_price).round(2)
+      end
+
       def calculate_vat
         return unless supplier.tax_code == "Inland"
 
@@ -31,6 +36,14 @@ module Comee
         self.vat = (total_price * 0.19).round(2)
       end
 
+      def calculate_confirmed_vat
+        return unless supplier.tax_code == "Inland"
+
+        items = PurchaseOrderItem.where(purchase_order_id: id)
+        confirmed_total_price = items.sum(&:confirmed_total_price)
+        self.confirmed_vat = (confirmed_total_price * 0.19).round(2)
+      end
+
       def self.ransackable_attributes(_auth_object = nil)
         %w[
           id

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

@@ -39,6 +39,8 @@ module Comee
       def update_purchase_order
         purchase_order.calculate_total_price
         purchase_order.calculate_vat
+        purchase_order.calculate_confirmed_total_price
+        purchase_order.calculate_confirmed_vat
         purchase_order.save!
       end
 

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

@@ -1,7 +1,8 @@
 module Comee
   module Core
     class PurchaseOrderItemSerializer < ActiveModel::Serializer
-      attributes :id, :serial_no, :quantity, :confirmed_quantity, :price, :details, :remark
+      attributes :id, :serial_no, :purchase_order_id, :unit_id, :quantity, :confirmed_quantity, :price, :confirmed_price,
+                 :total_price, :delivery_date, :confirmed_total_price, :confirmed_delivery_date, :status, :details, :remark
 
       belongs_to :purchase_order
     end

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

@@ -2,7 +2,7 @@ module Comee
   module Core
     class PurchaseOrderSerializer < ActiveModel::Serializer
       attributes :id, :po_number, :supplier_id, :order_date, :status, :delivery_address, :delivery_date, :terms, :total_price,
-                 :vat, :order_reference, :created_at, :updated_at
+                 :vat, :order_reference, :created_at, :updated_at, :confirmed_total_price, :confirmed_vat
       belongs_to :supplier
     end
   end

data/db/migrate/20240815080137_add_confirmed_field_values_to_purchase_order.rb

@@ -0,0 +1,6 @@
+class AddConfirmedFieldValuesToPurchaseOrder < ActiveRecord::Migration[7.1]
+  def change
+    add_column :comee_core_purchase_orders, :confirmed_total_price, :float, default: 0
+    add_column :comee_core_purchase_orders, :confirmed_vat, :float, default: 0
+  end
+end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.3.49".freeze
+    VERSION = "0.3.51".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.3.49
+  version: 0.3.51
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-14 00:00:00.000000000 Z
+date: 2024-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -540,6 +540,7 @@ files:
 - db/migrate/20240805093326_update_details_column_in_shipment_instruction_items.rb
 - db/migrate/20240807050230_add_amount_credited_to_invoice.rb
 - db/migrate/20240814125757_add_details_field_to_purchase_order_item.rb
+- db/migrate/20240815080137_add_confirmed_field_values_to_purchase_order.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb