bscf-core 0.4.4 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d2ee830f85ef9f5228849abb55453b48936fc798b6bb0eb0788669702ad3cd5
-  data.tar.gz: a61db4e5869f1905fe5afbc8644e1be3308be94bd9c613357c1a2d2abb7c60fa
+  metadata.gz: 2c6e2053e54d2b2ae6e952231cf581d58fb6f1e84676c9eb189f78c4ae4b33ab
+  data.tar.gz: 331bc05bbc374e9071df5a295cd331de880fd96a9f40c93b18bbfcfb07b79c4c
 SHA512:
-  metadata.gz: a6276a4c9e805e5042fbbcde086e19391b00033d5226d152b228ddd450a1ff72d5eeb305925d95032a534fc07face0029ef09f3295be453ad2500bd73cae54b8
-  data.tar.gz: c82a5c67f84012e027e43469df1bce6fa0e52b0f3298e1d0e44da2684c8a1e2f4c461fc9095ef5865631b47f84400c5b41857bb33f046565fa1ef4650c096c44
+  metadata.gz: b537681b9c1e6139ea892b6ee0b257f9ad1b275242de7dab8900be18a91856fe086160d35bc9c77cfc183c1a92356fa51751ff32c71bf22c3b59b583723ee142
+  data.tar.gz: 3f4b626c0da8627935484f5e399a2468ae5badaf2dbcf8dc3e6d90726d42f9fedc3d0aef22ed5e92b5398a0ab4dcc75f8009bbf59188c936610e50f3383ee3c6

data/app/models/bscf/core/address.rb

@@ -5,7 +5,6 @@ module Bscf
 
       # Add associations for delivery orders and items
       has_many :delivery_order_pickups, class_name: "Bscf::Core::DeliveryOrder", foreign_key: "pickup_address_id"
-      has_many :delivery_order_dropoffs, class_name: "Bscf::Core::DeliveryOrder", foreign_key: "dropoff_address_id"
       has_many :delivery_order_item_pickups, class_name: "Bscf::Core::DeliveryOrderItem", foreign_key: "pickup_address_id"
       has_many :delivery_order_item_dropoffs, class_name: "Bscf::Core::DeliveryOrderItem", foreign_key: "dropoff_address_id"
 
@@ -24,8 +23,7 @@ module Bscf
       def requires_coordinates?
         # Determine when coordinates are required
         # For delivery addresses, they should always be required
-        delivery_order_pickups.any? || delivery_order_dropoffs.any? ||
-        delivery_order_item_pickups.any? || delivery_order_item_dropoffs.any?
+        delivery_order_pickups.any? || delivery_order_item_pickups.any? || delivery_order_item_dropoffs.any?
       end
     end
   end

data/app/models/bscf/core/delivery_order.rb

@@ -3,7 +3,6 @@ module Bscf
     class DeliveryOrder < ApplicationRecord
       has_many :orders
       belongs_to :pickup_address, class_name: "Bscf::Core::Address"
-      belongs_to :dropoff_address, class_name: "Bscf::Core::Address"
       belongs_to :driver, class_name: "Bscf::Core::User", optional: true
 
       has_many :delivery_order_items, dependent: :destroy

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

@@ -0,0 +1,34 @@
+module Bscf
+  module Core
+    class Invoice < ApplicationRecord
+      belongs_to :order
+      has_many :payments, dependent: :destroy
+
+      validates :invoice_number, presence: true, uniqueness: true
+      validates :amount, :tax_amount, :discount_amount, :total_amount, presence: true,
+                numericality: { greater_than_or_equal_to: 0 }
+      validates :status, presence: true
+
+      enum :status, {
+        draft: 0,
+        issued: 1,
+        paid: 2,
+        partially_paid: 3,
+        overdue: 4,
+        cancelled: 5
+      }
+
+      before_validation :generate_invoice_number, on: :create
+
+      private
+
+      def generate_invoice_number
+        return if invoice_number.present?
+
+        timestamp = Time.current.strftime("%Y%m%d%H%M%S")
+        random_suffix = SecureRandom.hex(3)
+        self.invoice_number = "INV#{timestamp}#{random_suffix}"
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module Bscf
+  module Core
+    class InvoiceItem < ApplicationRecord
+      belongs_to :invoice, class_name: "Bscf::Core::Invoice"
+      belongs_to :order_item, class_name: "Bscf::Core::OrderItem"
+
+      validates :description, :quantity, :unit_price, :subtotal, presence: true
+      validates :quantity, numericality: { greater_than: 0 }
+      validates :unit_price, :subtotal, numericality: { greater_than_or_equal_to: 0 }
+
+      before_save :calculate_subtotal
+
+      private
+
+      def calculate_subtotal
+        self.unit_price = order_item.unit_price
+        self.subtotal = quantity * unit_price if quantity.present? && unit_price.present?
+      end
+    end
+  end
+end

data/app/models/bscf/core/order.rb

@@ -5,6 +5,7 @@ module Bscf
       belongs_to :ordered_to, class_name: "Bscf::Core::User", optional: true
       belongs_to :quotation, optional: true
       belongs_to :delivery_order, optional: true
+      belongs_to :drop_off_address, class_name: "Bscf::Core::Address", optional: true
       has_many :order_items, dependent: :destroy
       validates :order_type, :status, presence: true
 

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

@@ -0,0 +1,47 @@
+module Bscf
+  module Core
+    class Payment < ApplicationRecord
+      belongs_to :invoice
+      belongs_to :virtual_account_transaction, class_name: "Bscf::Core::VirtualAccountTransaction", optional: true
+
+      validates :amount, presence: true, numericality: { greater_than: 0 }
+      validates :payment_method, :status, presence: true
+      validates :reference_number, presence: true, uniqueness: true
+
+      enum :payment_method, {
+        cash: 0,
+        virtual_account: 1
+      }
+
+      enum :status, {
+        pending: 0,
+        completed: 1,
+        failed: 2,
+        refunded: 3
+      }
+
+      before_validation :generate_reference_number, on: :create
+      after_save :update_invoice_status, if: -> { saved_change_to_status? && status == "completed" }
+
+      private
+
+      def generate_reference_number
+        return if reference_number.present?
+
+        timestamp = Time.current.strftime("%Y%m%d%H%M%S")
+        random_suffix = SecureRandom.hex(3)
+        self.reference_number = "PAY#{timestamp}#{random_suffix}"
+      end
+
+      def update_invoice_status
+        total_paid = invoice.payments.completed.sum(:amount)
+
+        if total_paid >= invoice.total_amount
+          invoice.update(status: :paid)
+        elsif total_paid > 0
+          invoice.update(status: :partially_paid)
+        end
+      end
+    end
+  end
+end

data/db/migrate/20250616121538_create_bscf_core_invoices.rb

@@ -0,0 +1,17 @@
+class CreateBscfCoreInvoices < ActiveRecord::Migration[8.0]
+  def change
+    create_table :bscf_core_invoices do |t|
+      t.references :order, null: false, foreign_key: { to_table: :bscf_core_orders }
+      t.string :invoice_number, null: false, index: { unique: true }
+      t.decimal :amount, precision: 10, scale: 2, null: false
+      t.decimal :tax_amount, precision: 10, scale: 2, null: false
+      t.decimal :discount_amount, precision: 10, scale: 2, null: false
+      t.decimal :total_amount, precision: 10, scale: 2, null: false
+      t.datetime :due_date
+      t.integer :status, null: false, default: 0
+      t.text :notes
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250616123937_create_bscf_core_invoice_items.rb

@@ -0,0 +1,17 @@
+class CreateBscfCoreInvoiceItems < ActiveRecord::Migration[8.0]
+  def change
+    create_table :bscf_core_invoice_items do |t|
+      t.references :invoice, null: false, foreign_key: { to_table: :bscf_core_invoices }
+      t.references :order_item, null: false, foreign_key: { to_table: :bscf_core_order_items }
+      t.string :description
+      t.integer :quantity, null: false
+      t.decimal :unit_price, null: false, precision: 10, scale: 2
+      t.decimal :tax_rate, precision: 10, scale: 2
+      t.decimal :tax_amount, precision: 10, scale: 2
+      t.decimal :discount_amount, precision: 10, scale: 2
+      t.decimal :subtotal, null: false, precision: 10, scale: 2, default: 0
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250616131835_create_bscf_core_payments.rb

@@ -0,0 +1,16 @@
+class CreateBscfCorePayments < ActiveRecord::Migration[8.0]
+  def change
+    create_table :bscf_core_payments do |t|
+      t.references :invoice, null: false, foreign_key: { to_table: :bscf_core_invoices }
+      t.references :virtual_account_transaction, null: true, foreign_key: { to_table: :bscf_core_virtual_account_transactions }
+      t.decimal :amount, precision: 10, scale: 2, null: false
+      t.integer :payment_method, null: false, default: 0
+      t.datetime :payment_date
+      t.string :reference_number, null: false
+      t.integer :status, null: false, default: 0
+      t.text :notes
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250623113112_add_drop_off_adress_to_orders.rb

@@ -0,0 +1,8 @@
+class AddDropOffAdressToOrders < ActiveRecord::Migration[8.0]
+  def change
+    add_column :bscf_core_orders, :drop_off_address_id, :bigint
+    add_foreign_key :bscf_core_orders, :bscf_core_addresses, column: :drop_off_address_id
+    change_column_null :bscf_core_orders, :drop_off_address_id, true
+    add_index :bscf_core_orders, :drop_off_address_id, name: "a_on_bscf_core_ord_index"
+  end
+end

data/db/migrate/20250623115615_remove_dropoff_address_from_delivery_orders.rb

@@ -0,0 +1,7 @@
+class RemoveDropoffAddressFromDeliveryOrders < ActiveRecord::Migration[8.0]
+  def change
+    remove_foreign_key :bscf_core_delivery_orders, column: :dropoff_address_id
+    remove_index :bscf_core_delivery_orders, :dropoff_address_id
+    remove_column :bscf_core_delivery_orders, :dropoff_address_id
+  end
+end

data/lib/bscf/core/version.rb

@@ -1,5 +1,5 @@
 module Bscf
   module Core
-    VERSION = "0.4.4"
+    VERSION = "0.4.6"
   end
 end

data/spec/factories/bscf/core/delivery_orders.rb

@@ -1,7 +1,6 @@
 FactoryBot.define do
   factory :delivery_order, class: 'Bscf::Core::DeliveryOrder' do
     association :pickup_address, factory: :address
-    association :dropoff_address, factory: :address
     association :driver, factory: :user
 
     driver_phone { Faker::PhoneNumber.phone_number }

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

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :invoice_item, class: 'Bscf::Core::InvoiceItem' do
+    invoice
+    order_item
+    description { Faker::Commerce.product_name }
+    quantity { Faker::Number.between(from: 1, to: 10) }
+    unit_price { Faker::Number.decimal(l_digits: 2, r_digits: 2) }
+  end
+end

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

@@ -0,0 +1,12 @@
+FactoryBot.define do
+  factory :invoice, class: 'Bscf::Core::Invoice' do
+    order
+    amount { Faker::Number.decimal(l_digits: 3, r_digits: 2) }
+    tax_amount { Faker::Number.decimal(l_digits: 2, r_digits: 2) }
+    discount_amount { Faker::Number.decimal(l_digits: 1, r_digits: 2) }
+    total_amount { amount + tax_amount - discount_amount }
+    due_date { Time.current + 30.days }
+    status { :draft }
+    notes { Faker::Lorem.paragraph }
+  end
+end

data/spec/factories/bscf/core/orders.rb

@@ -7,5 +7,6 @@ FactoryBot.define do
     status { :draft }
     total_amount { Faker::Number.between(from: 100, to: 1000) }
     delivery_order { nil }
+    association :drop_off_address, factory: :address
   end
 end

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

@@ -0,0 +1,12 @@
+FactoryBot.define do
+  factory :payment, class: 'Bscf::Core::Payment' do
+    invoice
+    virtual_account_transaction { nil }
+    amount { Faker::Number.decimal(l_digits: 3, r_digits: 2) }
+    payment_method { :virtual_account }
+    status { :pending }
+    reference_number { "PAY#{Time.current.strftime('%Y%m%d%H%M%S')}#{SecureRandom.hex(3)}" }
+    payment_date { Time.current }
+    notes { Faker::Lorem.sentence }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bscf-core
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.6
 platform: ruby
 authors:
 - Asrat
@@ -293,9 +293,12 @@ files:
 - app/models/bscf/core/category.rb
 - app/models/bscf/core/delivery_order.rb
 - app/models/bscf/core/delivery_order_item.rb
+- app/models/bscf/core/invoice.rb
+- app/models/bscf/core/invoice_item.rb
 - app/models/bscf/core/marketplace_listing.rb
 - app/models/bscf/core/order.rb
 - app/models/bscf/core/order_item.rb
+- app/models/bscf/core/payment.rb
 - app/models/bscf/core/product.rb
 - app/models/bscf/core/quotation.rb
 - app/models/bscf/core/quotation_item.rb
@@ -314,7 +317,6 @@ files:
 - app/services/bscf/core/token_service.rb
 - app/services/bscf/core/transaction_service.rb
 - config/database.yml
-- config/master.key
 - config/routes.rb
 - db/migrate/20250326065606_create_bscf_core_users.rb
 - db/migrate/20250326075111_create_bscf_core_roles.rb
@@ -350,8 +352,13 @@ files:
 - db/migrate/20250606100158_add_product_to_market_place_listings.rb
 - db/migrate/20250609180530_add_accounting_fields_to_virtual_account_transactions.rb
 - db/migrate/20250610120351_update_delivery_tables.rb
+- db/migrate/20250616121538_create_bscf_core_invoices.rb
+- db/migrate/20250616123937_create_bscf_core_invoice_items.rb
+- db/migrate/20250616131835_create_bscf_core_payments.rb
 - db/migrate/20250616134209_update_address_coordinates_type.rb
 - db/migrate/20250616145522_add_position_to_delivery_order_items.rb
+- db/migrate/20250623113112_add_drop_off_adress_to_orders.rb
+- db/migrate/20250623115615_remove_dropoff_address_from_delivery_orders.rb
 - lib/bscf/core.rb
 - lib/bscf/core/engine.rb
 - lib/bscf/core/version.rb
@@ -365,9 +372,12 @@ files:
 - spec/factories/bscf/core/categories.rb
 - spec/factories/bscf/core/delivery_order_items.rb
 - spec/factories/bscf/core/delivery_orders.rb
+- spec/factories/bscf/core/invoice_items.rb
+- spec/factories/bscf/core/invoices.rb
 - spec/factories/bscf/core/marketplace_listings.rb
 - spec/factories/bscf/core/order_items.rb
 - spec/factories/bscf/core/orders.rb
+- spec/factories/bscf/core/payments.rb
 - spec/factories/bscf/core/products.rb
 - spec/factories/bscf/core/quotation_items.rb
 - spec/factories/bscf/core/quotations.rb

data/config/master.key

@@ -1 +0,0 @@
-3009aef5af3ca1ddb654f74ad2ac7d5a