comee_core 0.2.25 → 0.2.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1349e288ad5c494bb02eacc26f9ae41d34803dba3691efd4ee17fc9f205d270e
-  data.tar.gz: 8058d4750f90ebe16eb96aa9116ec18373008988c573e5224fca9a3799e78c70
+  metadata.gz: 554e23beac0f968e8aa1572e65e59a91bcec42638cf9eaab1745ecaff39dfd05
+  data.tar.gz: 25fc62b8e0ed99fcef2234904bb81dc98a1b871d8edfd272967de6e2847d7027
 SHA512:
-  metadata.gz: 16502279c6b4150241e2fcb5efaf2c3f60f6ee8ffa3103c8621b35905eecb1d72269db19a1d02d97bbfab56d9d1f91974fd662745f69bf40a4c7122290282c91
-  data.tar.gz: 36b57583bcc494a3a0c404336cf87259508fed69ad749646333ef8c5b53c084a3f9cd3163fce940436a567879880c04e69f23dc6b9899ffb9202de9f29582261
+  metadata.gz: c0a23a96da3cbb4b7fe77668e5bcec37b62530a82f1a93cebb82d0fc12d3725b4b8bd01e1dd3460ec6e3caef3dbedf3b1de58d5785a2ae9c19cb3f93c2325b38
+  data.tar.gz: 2e443a00fbed3aea1f5bd1f7327dc7e21f79ed697e62c07a8892a63de50a0c5bdd17c2a947cb6c28ae0a63e4c7a5b492f24e6e68ffe54afc998e1a64a892e8e8

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

@@ -15,6 +15,7 @@ module Comee
       validates :invoice_no, presence: true, uniqueness: true
       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}
 
       delegate(:order_number, to: :sales_order, prefix: false)
       delegate(:reference_no, to: :pod, prefix: true)

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

@@ -2,6 +2,7 @@ module Comee
   module Core
     class InvoiceItem < ApplicationRecord
       before_save { self.total_price = unit_price * quantity }
+      after_save :update_invoice_price
 
       belongs_to :shipment_instruction_item
       belongs_to :invoice
@@ -9,6 +10,11 @@ module Comee
 
       validates :quantity, :unit_price, presence: true, numericality: {greater_than: 0}
       validates :total_price, numericality: {greater_than_or_equal_to: 0, allow_nil: true}
+
+      def update_invoice_price
+        invoice.total_price = invoice.invoice_items.sum(:total_price)
+        invoice.save!
+      end
     end
   end
 end

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

@@ -5,6 +5,7 @@ module Comee
       belongs_to :payment_deposit
 
       validates :amount, presence: true, numericality: {greater_than: 0}
+      validate :validate_amount
 
       def self.ransackable_attributes(_auth_object = nil)
         %w[id created_at updated_at]
@@ -13,6 +14,16 @@ module Comee
       def self.ransackable_associations(_auth_object = nil)
         %w[payment_deposit invoice]
       end
+
+      def validate_amount
+        return unless amount && payment_deposit
+
+        running_total = payment_deposit.payments.sum(:amount)
+        running_total -= amount_was if id
+        remaining = payment_deposit.amount - running_total
+        error = "Amount exceeded. The maximum amount you can set is #{remaining}"
+        errors.add(:base, error) if amount > remaining
+      end
     end
   end
 end

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

@@ -5,11 +5,12 @@ module Comee
       belongs_to :currency
       has_many :payments
 
-      validates :reference_no, :date_issued, presence: true
+      enum :status, {pending: 0, processed: 1}
+      validates :reference_no, :date_issued, :status, presence: true
       validates :amount, presence: true, numericality: {greater_than: 0}
 
       def self.ransackable_attributes(_auth_object = nil)
-        %w[id reference_no bank_reference date_issued]
+        %w[id reference_no bank_reference date_issued status]
       end
 
       def self.ransackable_associations(_auth_object = nil)

data/app/services/comee/core/token_service.rb

@@ -2,11 +2,15 @@ module Comee
   module Core
     class TokenService
       def self.issue(payload)
-        JWT.encode(payload, ENV["SECRET_KEY"], "HS256")
+        JWT.encode(payload, key, "HS256")
       end
 
       def self.decode(token)
-        JWT.decode(token, ENV["SECRET_KEY"], true, algorithm: "HS256").first
+        JWT.decode(token, key, true, algorithm: "HS256").first
+      end
+
+      def self.key
+        ENV["SECRET_KEY"] || Rails.application.credentials.secret_key_base
       end
     end
   end

data/db/migrate/20240125003634_create_comee_core_payment_deposits.rb

@@ -13,6 +13,7 @@ class CreateComeeCorePaymentDeposits < ActiveRecord::Migration[7.1]
                    foreign_key: {to_table: :comee_core_currencies}
       t.date :date_issued, null: false
       t.float :amount, null: false
+      t.integer :status, null: false, default: 0
 
       t.timestamps
     end

data/db/migrate/20240303191625_add_amount_paid_field_to_invoice.rb

@@ -0,0 +1,5 @@
+class AddAmountPaidFieldToInvoice < ActiveRecord::Migration[7.1]
+  def change
+    add_column :comee_core_invoices, :amount_paid, :integer, default: 0
+  end
+end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.2.25".freeze
+    VERSION = "0.2.27".freeze
   end
 end

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

@@ -6,6 +6,7 @@ FactoryBot.define do
     date_issued { Date.current }
     due_date { Date.current.advance(days: 10) }
     total_price { 0 }
+    amount_paid { 0 }
     payment_term { Faker::Lorem.sentence }
     notifications_sent { 0 }
     status { Comee::Core::Invoice.statuses[:draft] }

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

@@ -5,6 +5,7 @@ FactoryBot.define do
     bank_reference { Faker::Alphanumeric.alpha(number: 10) }
     currency
     date_issued { Date.current }
-    amount { 100.5 }
+    amount { 100 }
+    status { Comee::Core::PaymentDeposit.statuses[:pending] }
   end
 end

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

@@ -2,7 +2,7 @@ FactoryBot.define do
   factory :payment, class: "Comee::Core::Payment" do
     payment_deposit
     invoice
-    amount { 100 }
+    amount { 30 }
     remark { Faker::Lorem.sentence }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.2.25
+  version: 0.2.27
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-28 00:00:00.000000000 Z
+date: 2024-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -437,6 +437,7 @@ files:
 - db/migrate/20240124161320_create_comee_core_additional_items.rb
 - db/migrate/20240125003634_create_comee_core_payment_deposits.rb
 - db/migrate/20240125044630_create_comee_core_payments.rb
+- db/migrate/20240303191625_add_amount_paid_field_to_invoice.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb