comee_core 0.3.44 → 0.3.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90b9fd38243f244ee92d50b0f697840aa98dca81e68255ec87553f711436d462
-  data.tar.gz: 8301b49b91fadb81b7b47136ca8293e8427768952a0e2ffca87cab96f8bb8ecf
+  metadata.gz: ba758dcd6e3e198f9bce176c3068a6c551b3268be25f8d02f6f07dfae89d2338
+  data.tar.gz: c52bebae8f6f5ba36544242c6988a796fd84909fbadc568f669926e11dbd944a
 SHA512:
-  metadata.gz: aeb36d887f7074afc497dc4a8e1e5567a008d35aba4046aea6b9de14beee1771786221aec51ea4045dd927c7719cf7fccbbed8768932a9c2fd5f5888feb4437d
-  data.tar.gz: 1d39c2bc2298531800e5183aa745ddbaf959f92e00a2a223e2d9b770e114b31adca2e9bb40b1f0649f180de68d31cecb906608b6a36768e7dcbdb8ed26e552e6
+  metadata.gz: 3bbce625a264c90c8fedafdb4a7fd6528ff89e3a63b78a0321a7d0ef53e77227142bb6a50f03b7357ceddfd0eead9e3736ae364f672e28313e63b57ab719d935
+  data.tar.gz: 16eaadf9d4e751ed618e9eca798593d70c8474b16caf36cfd3972b8dfe70abdc1366cc2af458c59e8a775c5073e74a65ccdcb24482b9ca6ecc5f826bc1b31c29

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,
@@ -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/app/utils/comee/core/period.rb

@@ -71,7 +71,10 @@ module Comee
 
         return nil if period1 > period2 || period1.contains?(period2)
 
-        Period.new(period1.finish.advance(days: 1), period2.finish)
+        period = Period.new(period1.finish.advance(days: 1), period2.finish)
+        return nil unless period.valid?
+
+        period
       end
     end
   end

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.44".freeze
+    VERSION = "0.3.46".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.44
+  version: 0.3.46
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-05 00:00:00.000000000 Z
+date: 2024-08-09 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