comee_core 0.2.20 → 0.2.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd5a61071fed8aec936c2a3882f36b62a02bae34abe80720293183d60a243a01
-  data.tar.gz: abf68d74d99823aab6cb3722f037bf13ce510487e5e36b7741e662a96f7c2d8a
+  metadata.gz: ae46cce31673594b37399a30c2bd292bb8882c97bb9603dd620aa1d688c8574c
+  data.tar.gz: 8506ceae22d9c9c9fac7ba8aa9b475caaf99d2e889def7867bf5491dc84105da
 SHA512:
-  metadata.gz: 1d4ac0017f06f64305e930e64d4f6c6524919687d51a4b40726ddc843eb28abecde02cfee2e5cb6d056aa1610058cae1badfee06203a70632d5753864a8c7f67
-  data.tar.gz: 5fd24135f222997802eb12224da1007b041d6a47f19ab6e44683c2e1cb65756d72552b461cf1b30f20b445acf31d67d4e013141481c228aee0edab8345e19b59
+  metadata.gz: c3b4c46af2f09b80c452dfc0d038f2ee6b7002060369b521b3df3903be045a2242dc24a809086c55267d639adc946d7aa604553ede88aecacfe269e5ce70187f
+  data.tar.gz: 472b9600197161ee21eb22e51a2474525160cdaad11111672bfe49b722e549335837101db064d558bb851e95d750f2f8e3a66548b104a5dde3ef48d4be9d1486

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

@@ -4,6 +4,7 @@ module Comee
       before_save { self.total_price = unit_price * quantity }
       belongs_to :invoice
 
+      validates :description, presence: true
       validates :quantity, :unit_price, presence: true, numericality: {greater_than: 0}
     end
   end

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

@@ -2,10 +2,17 @@ module Comee
   module Core
     class Payment < ApplicationRecord
       belongs_to :invoice
-      belongs_to :currency
+      belongs_to :payment_deposit
 
-      validates :reference_no, :payment_date, :amount, presence: true
-      validates :amount, numericality: {greater_than: 0}
+      validates :amount, presence: true, numericality: {greater_than: 0}
+
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[id created_at updated_at]
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[payment_deposit invoice]
+      end
     end
   end
 end

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

@@ -0,0 +1,19 @@
+module Comee
+  module Core
+    class PaymentDeposit < ApplicationRecord
+      belongs_to :client
+      belongs_to :currency
+
+      validates :reference_no, :date_issued, 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]
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[client currency]
+      end
+    end
+  end
+end

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

@@ -10,6 +10,10 @@ module Comee
       def self.ransackable_attributes(_auth_object = nil)
         %w[id driver_license_no plate_no pod_id status time_slot_id truck_no]
       end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[pod time_slot]
+      end
     end
   end
 end

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

@@ -11,6 +11,14 @@ module Comee
 
         errors.add(:base, "From must be before to.") if from >= to
       end
+
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[from id to transport_availability_id created_at updated_at]
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        ["transport_availability"]
+      end
     end
   end
 end

data/db/migrate/20240124161320_create_comee_core_additional_items.rb

@@ -5,6 +5,7 @@ class CreateComeeCoreAdditionalItems < ActiveRecord::Migration[7.1]
                    null: false,
                    index: {name: "invoice_on_ccai_indx"},
                    foreign_key: {to_table: :comee_core_invoices}
+      t.string :description, null: false
       t.float :quantity, null: false, default: 1
       t.float :unit_price, null: false
       t.float :total_price, null: false

data/db/migrate/20240125003634_create_comee_core_payment_deposits.rb

@@ -0,0 +1,20 @@
+class CreateComeeCorePaymentDeposits < ActiveRecord::Migration[7.1]
+  def change
+    create_table :comee_core_payment_deposits do |t|
+      t.references :client,
+                   null: false,
+                   index: {name: "client_on_ccpd_indx"},
+                   foreign_key: {to_table: :comee_core_clients}
+      t.string :reference_no, null: false
+      t.string :bank_reference
+      t.references :currency,
+                   null: false,
+                   index: {name: "currency_on_ccpd_indx"},
+                   foreign_key: {to_table: :comee_core_currencies}
+      t.date :date_issued, null: false
+      t.float :amount, null: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20240125044630_create_comee_core_payments.rb

@@ -1,18 +1,16 @@
 class CreateComeeCorePayments < ActiveRecord::Migration[7.1]
   def change
     create_table :comee_core_payments do |t|
-      t.string :reference_no, null: false
+      t.references :payment_deposit,
+                   null: false,
+                   index: {name: "pd_on_ccp_indx"},
+                   foreign_key: {to_table: :comee_core_payment_deposits}
       t.references :invoice,
                    null: false,
                    index: {name: "invoice_on_ccp_indx"},
                    foreign_key: {to_table: :comee_core_invoices}
-      t.date :payment_date, null: false
       t.float :amount, null: false
-      t.references :currency,
-                   null: false,
-                   index: {name: "currency_on_ccp_indx"},
-                   foreign_key: {to_table: :comee_core_currencies}
-      t.string :bank_reference
+      t.string :remark
 
       t.timestamps
     end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.2.20".freeze
+    VERSION = "0.2.22".freeze
   end
 end

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

@@ -1,6 +1,7 @@
 FactoryBot.define do
   factory :additional_item, class: "Comee::Core::AdditionalItem" do
     invoice
+    description { Faker::Lorem.sentence }
     quantity { 1 }
     unit_price { 1.5 }
     total_price { quantity * unit_price }

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

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :currency, class: "Comee::Core::Currency" do
-    code { Faker::Alphanumeric.alpha(number: 2) }
+    sequence(:code) { |n| "#{Faker::Alphanumeric.alpha(number: 8)}-#{n}" }
     name { Faker::Name.name }
   end
 end

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

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :payment_deposit, class: "Comee::Core::PaymentDeposit" do
+    client
+    reference_no { Faker::Alphanumeric.alpha(number: 10) }
+    bank_reference { Faker::Alphanumeric.alpha(number: 10) }
+    currency
+    date_issued { Date.current }
+    amount { 100.5 }
+  end
+end

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

@@ -1,10 +1,8 @@
 FactoryBot.define do
   factory :payment, class: "Comee::Core::Payment" do
-    reference_no { Faker::Alphanumeric.alpha(number: 10) }
+    payment_deposit
     invoice
-    payment_date { Date.current }
     amount { 100 }
-    currency
-    bank_reference { Faker::Alphanumeric.alpha(number: 10) }
+    remark { Faker::Lorem.sentence }
   end
 end

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

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :unit, class: "Comee::Core::Unit" do
-    sequence(:code) { |n| "#{Faker::Alphanumeric.alpha(number: 2)}-#{n}" }
+    sequence(:code) { |n| "#{Faker::Alphanumeric.alpha(number: 8)}-#{n}" }
     name { Faker::Name.name }
     unit_type { Comee::Core::Unit.unit_types[:weight] }
     aliases { [] }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.2.20
+  version: 0.2.22
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-19 00:00:00.000000000 Z
+date: 2024-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -326,6 +326,7 @@ files:
 - app/models/comee/core/notification.rb
 - app/models/comee/core/order_source.rb
 - app/models/comee/core/payment.rb
+- app/models/comee/core/payment_deposit.rb
 - app/models/comee/core/pickup_schedule.rb
 - app/models/comee/core/pod.rb
 - app/models/comee/core/price.rb
@@ -434,6 +435,7 @@ files:
 - db/migrate/20240111112140_create_comee_core_pickup_schedules.rb
 - db/migrate/20240119100125_create_comee_core_client_warehouses.rb
 - 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
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
@@ -465,6 +467,7 @@ files:
 - spec/factories/comee/core/master_prices.rb
 - spec/factories/comee/core/notifications.rb
 - spec/factories/comee/core/order_sources.rb
+- spec/factories/comee/core/payment_deposits.rb
 - spec/factories/comee/core/payments.rb
 - spec/factories/comee/core/pickup_schedules.rb
 - spec/factories/comee/core/pods.rb