comee_core 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 533b12b534893ae3a9ab0fe5976dfa979948f08d81d4d9f0358198b2f4107cc5
-  data.tar.gz: bddaa2611d2356cd19a8baad4aa6a4ef43166ffb88ac3d5bbba0a13638f769a1
+  metadata.gz: 96fca3f74e6642e5c3724443f279cdeb58217aa89d6aef57f9a67f6fde3757c4
+  data.tar.gz: dc819ee771048da328d51512915be23ea2b433432fdaee9fe988109fe2698a14
 SHA512:
-  metadata.gz: 9398df564bb22dd6bf7be8e9951d0c3889c398557e674087a61594dd3c166c553b56527fa70ef0abc735c7edcf837b2211ea222c62fa4578631e96f40b3581f6
-  data.tar.gz: 84b0d8c2415dc761605629ba662722f09789c13a1dda2c77d8966677427b5dd674e50a81990bb4fc71f26a8a271f928da4df8a443800ae72dc7114817d17d092
+  metadata.gz: 38f4ec48d09c65eba8b4e4a7bdb6cede0279ceeac08a97358125860c5cf49ed2564cb03366aaccb8b8c4f47e8df900f2ffeb819e4112e5b1721a2104cffbe143
+  data.tar.gz: a75a0a0b023ce9971086f81ca4b6f030a008d018abe048bb67cd0efdd25a88f6c2f9d2a0609cc061f9063cb4e994ddcddd1a996ed5d6de5b26fa9b1be9a322c7

data/app/controllers/comee/core/application_controller.rb

@@ -18,6 +18,10 @@ module Comee
         render json: result
       end
 
+      def render_error(error)
+        render json: {success: false, error: error.message}, status: :unprocessable_entity
+      end
+
       def current_user
         return if token.nil?
 

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

@@ -0,0 +1,9 @@
+module Comee
+  module Core
+    class AdditionalItem < ApplicationRecord
+      belongs_to :invoice
+
+      validates :quantity, :unit_price, presence: true, numericality: {greater_than: 0}
+    end
+  end
+end

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

@@ -4,10 +4,11 @@ module Comee
       belongs_to :sales_order
       belongs_to :pod
       has_many :invoice_items
+      has_many :additional_items
 
       has_noticed_notifications model_name: "Comee::Core::Notification"
 
-      enum :status, {draft: 0, approved: 1}
+      enum :status, {draft: 0, approved: 1, issued: 2}
       enum :payment_status, {not_paid: 0, partially_paid: 1, fully_paid: 2, overpaid: 3}
 
       validates :invoice_no, presence: true, uniqueness: true

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

@@ -0,0 +1,11 @@
+module Comee
+  module Core
+    class Payment < ApplicationRecord
+      belongs_to :invoice
+      belongs_to :currency
+
+      validates :reference_no, :payment_date, :amount, presence: true
+      validates :amount, numericality: {greater_than: 0}
+    end
+  end
+end

data/db/migrate/20240124161320_create_comee_core_additional_items.rb

@@ -0,0 +1,15 @@
+class CreateComeeCoreAdditionalItems < ActiveRecord::Migration[7.1]
+  def change
+    create_table :comee_core_additional_items do |t|
+      t.references :invoice,
+                   null: false,
+                   index: {name: "invoice_on_ccai_indx"},
+                   foreign_key: {to_table: :comee_core_invoices}
+      t.float :quantity, null: false, default: 1
+      t.float :unit_price, null: false
+      t.float :total_price, null: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20240125044630_create_comee_core_payments.rb

@@ -0,0 +1,20 @@
+class CreateComeeCorePayments < ActiveRecord::Migration[7.1]
+  def change
+    create_table :comee_core_payments do |t|
+      t.string :reference_no, null: false
+      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.timestamps
+    end
+  end
+end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.2.4".freeze
+    VERSION = "0.2.6".freeze
   end
 end

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

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :additional_item, class: "Comee::Core::AdditionalItem" do
+    invoice
+    quantity { 1 }
+    unit_price { 1.5 }
+    total_price { quantity * unit_price }
+  end
+end

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

@@ -10,5 +10,13 @@ FactoryBot.define do
     notifications_sent { 0 }
     status { Comee::Core::Invoice.statuses[:draft] }
     payment_status { Comee::Core::Invoice.payment_statuses[:not_paid] }
+
+    trait :approved do
+      status { Comee::Core::Invoice.statuses[:approved] }
+    end
+
+    trait :issued do
+      status { Comee::Core::Invoice.statuses[:issued] }
+    end
   end
 end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-24 00:00:00.000000000 Z
+date: 2024-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -299,6 +299,7 @@ files:
 - app/jobs/comee_core/application_job.rb
 - app/mailers/comee/core/application_mailer.rb
 - app/mailers/comee/core/supplier_mailer.rb
+- app/models/comee/core/additional_item.rb
 - app/models/comee/core/agent.rb
 - app/models/comee/core/application_record.rb
 - app/models/comee/core/back_order.rb
@@ -323,6 +324,7 @@ files:
 - app/models/comee/core/master_price.rb
 - app/models/comee/core/notification.rb
 - app/models/comee/core/order_source.rb
+- app/models/comee/core/payment.rb
 - app/models/comee/core/pickup_schedule.rb
 - app/models/comee/core/pod.rb
 - app/models/comee/core/price.rb
@@ -429,11 +431,14 @@ files:
 - db/migrate/20240109185931_create_comee_core_time_slots.rb
 - 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/20240125044630_create_comee_core_payments.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb
 - lib/comee_core.rb
 - lib/tasks/comee_core_tasks.rake
+- spec/factories/comee/core/additional_items.rb
 - spec/factories/comee/core/agents.rb
 - spec/factories/comee/core/back_order_items.rb
 - spec/factories/comee/core/back_orders.rb
@@ -457,6 +462,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/payments.rb
 - spec/factories/comee/core/pickup_schedules.rb
 - spec/factories/comee/core/pods.rb
 - spec/factories/comee/core/product_lookups.rb