comee_core 0.3.48 → 0.3.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00f03dece5e306a3223e1f8d3b4f2bff270bca417d6d0acdc26e41f1f158b8bf
-  data.tar.gz: dc7de7a9f4e7c54211b0bfd80787c27459c945181a8936f651aa763f8645491d
+  metadata.gz: ca617ef814088107f21ec7f2a8d541db9a58f2f8d60576aea6ef20370328a820
+  data.tar.gz: db91bf688f9d5a3479934a0839a3843e927a6b4a2b34e21ce11df5489478af37
 SHA512:
-  metadata.gz: f40f1786625685b59dd60cb79cd9535dc6f72ee5eccbee66606424a7c60cb532aca082b78f2c742165957f79a69821378d9cf09c02bad540f3b6d8cfcd52633c
-  data.tar.gz: 8492dc6005f3f19af459a0ddbe14b0943c5a395cfd24274e871088d5aa7a4b0ce65d39eb9d7263583f693d3c3b46700d9ecf6086c66c83fc813b83379d43a86a
+  metadata.gz: 60df1dd5ca85c8ae6b27e75d1aa5d3e30327b7366ad925a7c1443bc54e6e017064a88372d599e2d3b300c1cb17f10a8415c20dcbdb9823cb5e423792f2cda8c3
+  data.tar.gz: 8e696cdba2b0ead77fc9ecbb74c3bd1acf118b0221eee54cb047adbb4f272fbef6708857e8268c5dd5b83d1b501c3f5873bb8f3a5607f7efa90f24f69841a01c

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,7 @@
 module Comee
   module Core
     class PurchaseOrderItemSerializer < ActiveModel::Serializer
-      attributes :id, :serial_no, :quantity, :confirmed_quantity, :price, :details
+      attributes :id, :serial_no, :quantity, :confirmed_quantity, :price, :details, :remark
 
       belongs_to :purchase_order
     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.48".freeze
+    VERSION = "0.3.50".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.3.48
+  version: 0.3.50
 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