comee_core 0.2.24 → 0.2.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0808a830ec2c6e06def05ff3e9cefce6723564ea3f0e66c41076e2f87dbf689f'
-  data.tar.gz: 8a7effb277abed7b985e574315d81dbb3ba45d528e91d4fd3d8fc7a6fba1e94e
+  metadata.gz: 8cab65061584474d2bff1d09b4615f74c6755284c5870b624fa06407660f9816
+  data.tar.gz: 9572b9050b8d0d0df0116c57e70f0804244592c0ea3b88d8cbc2185390c6a164
 SHA512:
-  metadata.gz: 9c0443e3fe4a09e0da5744254449606a0788dfe971424221c2e7b0a773a3da589523b9ccfb24ee00d877316a51cf5a41030a07478965bc679f4af5d452eb2b37
-  data.tar.gz: 3b1f0680b99e0228494eca14c604484b510955242795dce718e98dec3d21a2a221e6886925df3a33c56f8c49defa50bc34dcf9ec58bde8fa730385403ab6f297
+  metadata.gz: 16fa96b65ac32cbcad028f5cc489c3f607507bfe9fdeee2c036bc824dac5df46e8b6754d058439f8e510a9e56545a5cad63f54ac65ccbb063b691c49cecefd70
+  data.tar.gz: 1a041a308a441889bb5360f36b36fa6991d47032bea60960f19b26320511b0c17f73daa8a091ffd0df3b55a26081d3aed3cc3232d9bc035b1227a03e9062b6e6

data/app/controllers/concerns/comee/core/common.rb

@@ -46,6 +46,7 @@ module Comee
           if incoming.instance_of?(Array)
             data, options = incoming
           elsif incoming.instance_of?(Hash)
+            data = @obj
             options = incoming
           else
             data = incoming

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/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/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.2.24".freeze
+    VERSION = "0.2.26".freeze
   end
 end

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.24
+  version: 0.2.26
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-24 00:00:00.000000000 Z
+date: 2024-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers