comee_core 0.3.43 → 0.3.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ff7350423a4f7d4bfbab481f69a78c1526754c515c6f58ccfd31f5e77b4eb60
-  data.tar.gz: 15b0575c52dcc8994efdba583b2455fa2375f1b87612e5fab71c765bdfe0f376
+  metadata.gz: 1cdf83e72f0053b9db40024b34cc8ec6a9e801503882b53aa18cf471f4fbd4e9
+  data.tar.gz: cd461f1b90d26b2cd310b880740e041eeac305916a028a0f0cabee1889e192e8
 SHA512:
-  metadata.gz: 85e67b19d45298a5da7fce3a0337516242fb073b05255836b313d9bacad96909b72582485b91f57d471de60e7756952cc025f22a95b77b599954215b185c08dc
-  data.tar.gz: a7b7c841130e5760d30b44ee997f4a275e1e28504cc84733b9c4fa228b2c905705e820fda9785c50ff67f99c88044026ecb68d9dcb5a61d93d66e91b1e858f15
+  metadata.gz: '09c222ad1003b4c1b78dcb312c86b7972e7d15d2dbe5053acdcb82bc65944b0a551f23cd00c1b16a0a85438a4fcc602e606447113398cacdaa9998c48aaa2343'
+  data.tar.gz: e48fe3fa4a1930568b5b29fc0b40a78c9b4fca15b878b68e5ba2cad80db67734842a60e3342507faf0391c781e13e84cf1302486c6b858221bae46c0bd76723b

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

@@ -2,6 +2,7 @@ module Comee
   module Core
     class CreditNote < ApplicationRecord
       before_validation :generate_credit_note_no, if: proc { |note| note.credit_note_no.nil? }
+      after_save :update_amount_credited, if: proc { |note| note.approved? }
 
       belongs_to :invoice
       has_many :credit_note_items
@@ -29,6 +30,11 @@ module Comee
         self.credit_note_no = Util.generate_number("CreditNote", "credit_note_no", year, "-", 100001)
       end
 
+      def update_amount_credited
+        invoice.amount_credited = invoice.calculate_amount_credited
+        invoice.save!
+      end
+
       def validate_total_price
         return unless total_price && invoice
 

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

@@ -28,6 +28,7 @@ module Comee
       validates :status, :payment_status, presence: true
       validates :total_price, numericality: {greater_than_or_equal_to: 0, allow_nil: true}
       validates :amount_paid, numericality: {greater_than_or_equal_to: 0, allow_nil: true}
+      validates :amount_credited, numericality: {greater_than_or_equal_to: 0, allow_nil: true}
 
       validates :pct_advanced,
                 presence: true,
@@ -44,7 +45,7 @@ module Comee
                 if: -> { advance? }
 
       delegate(:order_number, to: :sales_order, prefix: false)
-      delegate(:reference_no, to: :pod, prefix: true)
+      delegate(:reference_no, to: :pod, prefix: true, allow_nil: true)
 
       def delivery?
         invoice_type == DELIVERY
@@ -85,6 +86,12 @@ module Comee
         payments.sum(:amount)
       end
 
+      def calculate_amount_credited
+        credited = CreditNote.where(invoice_id: id, status: CreditNote.statuses[:approved])
+        total = credited.sum(:total_price) + credited.sum(:vat)
+        total.round(2)
+      end
+
       def self.ransackable_attributes(_auth_object = nil)
         %w[
           id

data/db/migrate/20240807050230_add_amount_credited_to_invoice.rb

@@ -0,0 +1,5 @@
+class AddAmountCreditedToInvoice < ActiveRecord::Migration[7.1]
+  def change
+    add_column :comee_core_invoices, :amount_credited, :float, default: 0
+  end
+end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.3.43".freeze
+    VERSION = "0.3.45".freeze
   end
 end

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

@@ -8,6 +8,7 @@ FactoryBot.define do
     due_date { Date.current.advance(days: 10) }
     total_price { 0 }
     amount_paid { 0 }
+    amount_credited { 0 }
     payment_term { Faker::Lorem.sentence }
     pct_advanced { nil }
     notifications_sent { 0 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.3.43
+  version: 0.3.45
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-05 00:00:00.000000000 Z
+date: 2024-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -538,6 +538,7 @@ files:
 - db/migrate/20240803231700_update_invoice_fields.rb
 - db/migrate/20240805085256_add_details_to_shipment_instruction_item.rb
 - db/migrate/20240805093326_update_details_column_in_shipment_instruction_items.rb
+- db/migrate/20240807050230_add_amount_credited_to_invoice.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb