comee_core 0.3.40 → 0.3.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 678327a5ca4eac8095260552f753d2e1a7e67bf9f8dc6da4f09647d30dfceb62
-  data.tar.gz: 4a3e117d73a6a1be6a7fe9124abfda613940d9e5b68aef3f83e9f14a9664b5c2
+  metadata.gz: 5543b44e3e8230affe2c45fa5850176535bff3c1e52ae12e7943265db65e840d
+  data.tar.gz: 8a53148bbf0c6a70e1efa88070820b5892bf871d24f8c50b7a2926626f652c04
 SHA512:
-  metadata.gz: bee75f2697ec18163a2e1f98be4be925c0f6693c3fa4e7a8081d1c614d15c03f433face6a2666f4ae704a6fbed7bec88f6da0ed9e709abac04cd3563402e64b6
-  data.tar.gz: 3893670eb9c952b15e3d2aec27d162ae26ba01b4ba527453d305b303e1303e572365c23d99405b63bda719fd6853f6492102e5daa071b1559bdfd03220392081
+  metadata.gz: 2224cc02486c9aa4e57429827fce56803b5ac5a2ef4b5fb28b5e5b464e1f1f4e00694b3be0b03111175a74787f5ccf22373d0c7e3a67441221af2bd3f42b375d
+  data.tar.gz: e636c80554eb4262e96660fae38c767f2052d2553e89815bbc2faf6716eeb66ec56077679c22cb973829dfbf3f947e01c0f0039cab2fb782424f634be53cc355

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

@@ -1,11 +1,17 @@
 module Comee
   module Core
     class Invoice < ApplicationRecord
+      ADVANCE = "Advance".freeze
+      DELIVERY = "Delivery".freeze
+      DIRECT = "Direct".freeze
+
+      INVOICE_TYPES = [ADVANCE, DELIVERY, DIRECT].freeze
+
       before_validation :generate_invoice_no, if: proc { |inv| inv.invoice_no.nil? }
       before_save :calculate_due_date, unless: proc { |inv| inv.date_issued.nil? }
 
       belongs_to :sales_order
-      belongs_to :pod
+      belongs_to :pod, optional: true
       belongs_to :invoice_address,
                  -> { where(address_type: ClientAddress::INVOICING_ADDRESS) },
                  class_name: "Comee::Core::ClientAddress"
@@ -23,9 +29,35 @@ module Comee
       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 :pct_advanced,
+                presence: true,
+                numericality: {greater_than: 0, less_than_or_equal_to: 100},
+                if: -> { advance? }
+      validates :pct_advanced,
+                absence: true,
+                if: -> { delivery? || direct? }
+      validates :pod_id,
+                presence: true,
+                if: -> { delivery? }
+      validates :pod_id,
+                absence: true,
+                if: -> { advance? }
+
       delegate(:order_number, to: :sales_order, prefix: false)
       delegate(:reference_no, to: :pod, prefix: true)
 
+      def delivery?
+        invoice_type == DELIVERY
+      end
+
+      def advance?
+        invoice_type == ADVANCE
+      end
+
+      def direct?
+        invoice_type == DIRECT
+      end
+
       def calculate_total_price
         self.total_price = calculate_total
       end
@@ -56,6 +88,7 @@ module Comee
           id
           sales_order_id
           invoice_no
+          invoice_type
           date_issued
           ship_name
           delivery_date

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

@@ -5,7 +5,7 @@ module Comee
       after_save :update_invoice
       after_destroy :update_invoice
 
-      belongs_to :shipment_instruction_item
+      belongs_to :invoiceable, polymorphic: true
       belongs_to :invoice
       belongs_to :unit
 

data/db/migrate/20240803194006_change_reference_in_invoice_to_polymorphic.rb

@@ -0,0 +1,20 @@
+class ChangeReferenceInInvoiceToPolymorphic < ActiveRecord::Migration[7.1]
+  def change
+    add_reference :comee_core_invoice_items,
+                  :invoiceable,
+                  polymorphic: true,
+                  index: {name: "invoiceable_on_ccii_indx"}
+    reversible do |dir|
+      dir.up do
+        execute <<-SQL.squish
+        UPDATE comee_core_invoice_items
+        SET invoiceable_type = 'Comee::Core::ShipmentInstructionItem',
+            invoiceable_id = shipment_instruction_item_id
+        SQL
+      end
+    end
+    remove_reference :comee_core_invoice_items,
+                     :shipment_instruction_item,
+                     foreign_key: {to_table: :comee_core_shipment_instruction_items}
+  end
+end

data/db/migrate/20240803231700_update_invoice_fields.rb

@@ -0,0 +1,7 @@
+class UpdateInvoiceFields < ActiveRecord::Migration[7.1]
+  def change
+    change_column_null :comee_core_invoices, :pod_id, true
+    add_column :comee_core_invoices, :invoice_type, :string, default: "Delivery"
+    add_column :comee_core_invoices, :pct_advanced, :float, null: true
+  end
+end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.3.40".freeze
+    VERSION = "0.3.42".freeze
   end
 end

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

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :invoice_item, class: "Comee::Core::InvoiceItem" do
-    shipment_instruction_item
+    invoiceable factory: :shipment_instruction_item
     unit
     quantity { 10 }
     unit_price { 5 }

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

@@ -2,12 +2,14 @@ FactoryBot.define do
   factory :invoice, class: "Comee::Core::Invoice" do
     invoice_no { nil }
     sales_order
+    invoice_type { Comee::Core::Invoice::DELIVERY }
     pod
     date_issued { Date.current }
     due_date { Date.current.advance(days: 10) }
     total_price { 0 }
     amount_paid { 0 }
     payment_term { Faker::Lorem.sentence }
+    pct_advanced { nil }
     notifications_sent { 0 }
     status { Comee::Core::Invoice.statuses[:draft] }
     payment_status { Comee::Core::Invoice.payment_statuses[:not_paid] }
@@ -20,5 +22,16 @@ FactoryBot.define do
     trait :issued do
       status { Comee::Core::Invoice.statuses[:issued] }
     end
+
+    trait :advance do
+      invoice_type { Comee::Core::Invoice::ADVANCE }
+      pod { nil }
+      pct_advanced { 25 }
+    end
+
+    trait :direct do
+      invoice_type { Comee::Core::Invoice::DIRECT }
+      pct_advanced { nil }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.3.40
+  version: 0.3.42
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-02 00:00:00.000000000 Z
+date: 2024-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -534,6 +534,8 @@ files:
 - db/migrate/20240731075328_create_comee_core_credit_notes.rb
 - db/migrate/20240731080746_create_comee_core_credit_note_items.rb
 - db/migrate/20240731081502_create_comee_core_credit_note_additional_items.rb
+- db/migrate/20240803194006_change_reference_in_invoice_to_polymorphic.rb
+- db/migrate/20240803231700_update_invoice_fields.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb