dscf-marketplace 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6b077453f450386b96a2df3aac342c13fe4ec2bc97d4e34fa48b1e4918df3ed
-  data.tar.gz: 837589f60812fcf77b8a9958b344ec274458434ba63e695538746165349af8dd
+  metadata.gz: 60c2cbf7461bd253837b481338ec8105fc47e5ff3927855341efc9261bf193f5
+  data.tar.gz: 3d10a078bab90804d176823e1cf0e44ed74f617ca3f0adeff657339438404642
 SHA512:
-  metadata.gz: f864dfe924f7002b4edc7686e3f227bfbf500ed63a1ecc67b3aa0d34fc76123d0b0d900495644da1552bd28539f7ec56db6fff44aa4c4e4320e8f72f741619a8
-  data.tar.gz: 5a5aae5e8036726d534492e592a984e2185eb8e4f4102596c7d918c61fb8c293e8b2da1c60954dbd200c5f88d709d3267fe9b523634938b91fb8137e8f162fc2
+  metadata.gz: 96051d9c835dc17d0f8c7b495c28dd48b2b45a9690711be8d9a5650f6f36643498605d4d8bfdeaf6df6a7cea2f04567b6aff8479a444c525fb68ddbc60ebf41b
+  data.tar.gz: 6e35c21f3b43d962d838b1f5bbfb577db65e2c004c0665e340356994a93fb1e89d594d02358209af2670a6ea8638fc909347f80a8cbdd470e40d975520433af1

data/app/models/dscf/marketplace/order.rb

@@ -0,0 +1,105 @@
+module Dscf::Marketplace
+  class Order < ApplicationRecord
+    enum :order_type, {rfq_based: 0, direct_listing: 1}
+    enum :status, {pending: 0, confirmed: 1, processing: 2, completed: 3, cancelled: 4}
+
+    belongs_to :quotation, optional: true
+    belongs_to :listing, optional: true
+    belongs_to :user, class_name: "Dscf::Core::User"
+    has_many :order_items, dependent: :destroy
+
+    validates :order_type, presence: true
+    validates :status, presence: true
+    validates :user, presence: true
+    validate :quotation_or_listing_present
+
+    before_save :calculate_total_amount
+
+    def self.create_from_quotation(quotation)
+      return nil unless quotation.accepted?
+
+      order = create!(
+        order_type: :rfq_based,
+        status: :pending,
+        quotation: quotation,
+        user: quotation.request_for_quotation.user,
+        total_amount: quotation.total_price
+      )
+
+      quotation.quotation_items.each do |item|
+        order.order_items.create!(
+          quotation_item: item,
+          product: item.product,
+          unit: item.unit,
+          quantity: item.quantity,
+          unit_price: item.unit_price,
+          status: :pending
+        )
+      end
+
+      order
+    end
+
+    def self.create_from_listing(listing, user, quantity)
+      return nil unless listing.status == "active" && quantity <= listing.quantity
+
+      order = create!(
+        order_type: :direct_listing,
+        status: :pending,
+        listing: listing,
+        user: user,
+        total_amount: listing.price * quantity
+      )
+
+      order.order_items.create!(
+        listing: listing,
+        product: listing.supplier_product.product,
+        unit: listing.supplier_product.product.unit,
+        quantity: quantity,
+        unit_price: listing.price,
+        status: :pending
+      )
+
+      order
+    end
+
+    def total_amount
+      # Return stored value if it exists and is greater than 0, otherwise calculate
+      stored_value = super
+      calculated_value = order_items.sum { |item| item.quantity * item.unit_price }
+
+      # Return stored value if it's set and valid, otherwise return calculated value
+      return stored_value if stored_value.present? && stored_value > 0
+      calculated_value
+    end
+
+    def supplier
+      if rfq_based?
+        quotation&.business
+      elsif direct_listing?
+        listing&.business
+      end
+    end
+
+    def confirm!
+      return false unless pending?
+
+      update!(status: :confirmed)
+      # Update order items without reloading to avoid association issues
+      order_items.update_all(status: OrderItem.statuses[:confirmed])
+      true
+    end
+
+    def calculate_total_amount
+      self.total_amount = order_items.sum { |item| item.quantity * item.unit_price }
+    end
+
+    private
+
+    def quotation_or_listing_present
+      unless quotation.present? || listing.present?
+        errors.add(:base, "Either quotation or listing must be present")
+      end
+    end
+  end
+end

data/app/models/dscf/marketplace/order_item.rb

@@ -0,0 +1,30 @@
+module Dscf::Marketplace
+  class OrderItem < ApplicationRecord
+    enum :status, {pending: 0, confirmed: 1, processing: 2, fulfilled: 3, cancelled: 4}
+
+    belongs_to :order, optional: true
+    belongs_to :quotation_item, optional: true
+    belongs_to :listing, optional: true
+    belongs_to :product
+    belongs_to :unit
+
+    validates :quantity, presence: true, numericality: {greater_than: 0}
+    validates :unit_price, presence: true, numericality: {greater_than_or_equal_to: 0}
+    validates :status, presence: true
+    validates :product, presence: true
+    validates :unit, presence: true
+    validate :quotation_item_or_listing_present
+
+    def subtotal
+      quantity * unit_price
+    end
+
+    private
+
+    def quotation_item_or_listing_present
+      unless quotation_item.present? || listing.present?
+        errors.add(:base, "Either quotation_item or listing must be present")
+      end
+    end
+  end
+end

data/app/models/dscf/marketplace/quotation.rb

@@ -0,0 +1,184 @@
+module Dscf
+  module Marketplace
+    class Quotation < ApplicationRecord
+      belongs_to :request_for_quotation, class_name: "Dscf::Marketplace::RequestForQuotation"
+      belongs_to :business, class_name: "Dscf::Core::Business", optional: true if defined?(Dscf::Core)
+
+      has_many :quotation_items, class_name: "Dscf::Marketplace::QuotationItem", dependent: :destroy
+      has_one :order, class_name: "Dscf::Marketplace::Order", dependent: :destroy
+
+      validates :request_for_quotation_id, presence: true
+      validates :business_id, presence: true
+      validates :total_price, numericality: {greater_than_or_equal_to: 0}, allow_nil: true
+      validates :delivery_date, presence: true
+      validates :valid_until, presence: true
+      enum :status, {draft: 0, sent: 1, accepted: 2, rejected: 3, expired: 4}, default: :draft
+      validates :notes, length: {maximum: 2000}, allow_blank: true
+
+      validate :valid_until_after_delivery_date
+      validate :delivery_date_not_in_past
+      validate :valid_until_not_in_past
+      scope :by_business, ->(business_id) { where(business_id: business_id) }
+      scope :valid_quotations, -> { where("valid_until > ?", Time.current) }
+      scope :expired_quotations, -> { where("valid_until <= ?", Time.current) }
+
+      def calculate_total_price
+        self.total_price = quotation_items.sum(&:subtotal).to_f
+      end
+
+      def update_total_price!
+        calculate_total_price
+        save!
+      end
+
+      def sent?
+        status == "sent"
+      end
+
+      def accepted?
+        status == "accepted"
+      end
+
+      def rejected?
+        status == "rejected"
+      end
+
+      def expired?
+        status == "expired"
+      end
+
+      def draft?
+        status == "draft"
+      end
+
+      def sent?
+        status == "sent"
+      end
+
+      def accepted?
+        status == "accepted"
+      end
+
+      def rejected?
+        status == "rejected"
+      end
+
+      def within_validity_period?
+        valid_until > Time.current && !expired?
+      end
+
+      def expired!
+        update_columns(status: "expired") if valid_until <= Time.current
+      end
+
+      def accept!
+        return false unless sent?
+        return false if within_validity_period? == false
+
+        # Close other quotations for this RFQ first
+        request_for_quotation.quotations.where.not(id: id).update_all(status: "rejected")
+
+        update_columns(status: "accepted")
+        request_for_quotation.update!(status: "selected", selected_quotation: self)
+
+        # Create order from accepted quotation
+        create_order_from_quotation
+
+        true
+      end
+
+      def create_order_from_quotation
+        return if order.present?
+
+        Order.create_from_quotation(self)
+      end
+
+      def reject!
+        return false unless sent?
+
+        update!(status: "rejected")
+      end
+
+      def send_quotation!
+        return false unless draft?
+
+        update!(status: "sent")
+        request_for_quotation.update!(status: "responded") if request_for_quotation.sent? || request_for_quotation.draft?
+        true
+      end
+
+      def days_until_expiry
+        return nil unless valid_until
+
+        days = ((valid_until - Time.current) / 1.day).ceil
+        days.negative? ? nil : days
+      end
+
+      def delivery_in_days
+        return nil unless delivery_date
+
+        ((delivery_date.to_time - Time.current) / 1.day).ceil
+      end
+
+      def complete?
+        quotation_items.exists? && quotation_items.all? { |item| item.unit_price.present? }
+      end
+
+      def create_order_from_quotation
+        return if order.present?
+
+        order = Dscf::Marketplace::Order.create!(
+          order_type: :rfq_based,
+          status: :pending,
+          quotation: self,
+          user: request_for_quotation.user,
+          total_amount: total_price
+        )
+
+        quotation_items.each do |item|
+          Dscf::Marketplace::OrderItem.create!(
+            order: order,
+            quotation_item: item,
+            product: item.product,
+            unit: item.unit,
+            quantity: item.quantity,
+            unit_price: item.unit_price,
+            status: :pending
+          )
+        end
+
+        order
+      end
+
+      private
+
+      def calculate_total_price
+        self.total_price = quotation_items.sum(&:subtotal).to_f
+      end
+
+      def valid_until_after_delivery_date
+        return unless valid_until && delivery_date
+
+        if valid_until <= delivery_date
+          errors.add(:valid_until, "must be after delivery date")
+        end
+      end
+
+      def delivery_date_not_in_past
+        return unless delivery_date
+
+        if delivery_date < Date.current
+          errors.add(:delivery_date, "cannot be in the past")
+        end
+      end
+
+      def valid_until_not_in_past
+        return unless valid_until
+
+        if valid_until < Time.current
+          errors.add(:valid_until, "cannot be in the past")
+        end
+      end
+    end
+  end
+end

data/app/models/dscf/marketplace/quotation_item.rb

@@ -0,0 +1,118 @@
+module Dscf
+  module Marketplace
+    class QuotationItem < ApplicationRecord
+      belongs_to :quotation, class_name: "Dscf::Marketplace::Quotation"
+      belongs_to :rfq_item, class_name: "Dscf::Marketplace::RfqItem"
+      belongs_to :product, class_name: "Dscf::Marketplace::Product"
+      belongs_to :unit, class_name: "Dscf::Marketplace::Unit"
+
+
+
+      validates :quotation_id, presence: true
+      validates :rfq_item_id, presence: true
+      validates :product_id, presence: true
+      validates :quantity, presence: true, numericality: {greater_than: 0}
+      validates :unit_id, presence: true
+      validates :unit_price, numericality: {greater_than: 0}, allow_nil: true
+      validates :subtotal, numericality: {greater_than_or_equal_to: 0}, allow_nil: true
+
+      validate :product_matches_rfq_item
+      validate :unit_compatible_with_product
+      before_save :calculate_subtotal, if: :unit_price_changed?
+
+      # Only validate subtotal calculation if both unit_price and quantity are present
+      validate :subtotal_matches_calculation, if: :should_validate_subtotal?
+
+      scope :priced, -> { where.not(unit_price: nil) }
+      scope :unpriced, -> { where(unit_price: nil) }
+      scope :by_product, ->(product_id) { where(product_id: product_id) }
+      scope :by_unit, ->(unit_id) { where(unit_id: unit_id) }
+
+      def product_name
+        product&.name
+      end
+
+      def product_sku
+        product&.sku
+      end
+
+      def unit_name
+        unit&.name
+      end
+
+      def unit_code
+        unit&.code
+      end
+
+      def rfq_requested_quantity
+        rfq_item&.quantity
+      end
+
+      def quantity_difference
+        return nil unless quantity && rfq_requested_quantity
+
+        quantity - rfq_requested_quantity
+      end
+
+      def quantity_difference_percentage
+        return nil unless quantity && rfq_requested_quantity && rfq_requested_quantity > 0
+
+        ((quantity_difference.to_f / rfq_requested_quantity) * 100).round(2)
+      end
+
+      def price_per_base_unit
+        return nil unless unit_price && quantity && quantity > 0
+
+        unit_price / quantity
+      end
+
+      def matches_rfq_request?
+        return false unless rfq_item
+
+        product_id == rfq_item.product_id &&
+        unit_id == rfq_item.unit_id
+      end
+
+      def can_create_order?
+        quotation.sent? || quotation.accepted?
+      end
+
+      private
+
+      def calculate_subtotal
+        return unless unit_price && quantity
+
+        self.subtotal = unit_price * quantity
+      end
+
+      def product_matches_rfq_item
+        return unless rfq_item_id && product_id
+
+        unless product_id == rfq_item.product_id
+          errors.add(:product_id, "must match the product in the RFQ item")
+        end
+      end
+
+      def unit_compatible_with_product
+        return unless product_id && unit_id
+
+        unless product.unit_id == unit_id || product.unit.convertible_to?(unit)
+          errors.add(:unit_id, "is not compatible with the selected product")
+        end
+      end
+
+      def subtotal_matches_calculation
+        return unless should_validate_subtotal?
+
+        expected_subtotal = unit_price * quantity
+        unless subtotal == expected_subtotal
+          errors.add(:subtotal, "must equal unit_price * quantity")
+        end
+      end
+
+      def should_validate_subtotal?
+        unit_price.present? && quantity.present? && subtotal.present?
+      end
+    end
+  end
+end

data/app/models/dscf/marketplace/request_for_quotation.rb

@@ -0,0 +1,71 @@
+module Dscf
+  module Marketplace
+    class RequestForQuotation < ApplicationRecord
+      belongs_to :user, class_name: "Dscf::Core::User", optional: true if defined?(Dscf::Core)
+      belongs_to :selected_quotation, class_name: "Dscf::Marketplace::Quotation", optional: true
+
+      has_many :rfq_items, class_name: "Dscf::Marketplace::RfqItem", dependent: :destroy
+      has_many :quotations, class_name: "Dscf::Marketplace::Quotation", dependent: :destroy
+
+      validates :user_id, presence: true
+      enum :status, {draft: 0, sent: 1, responded: 2, selected: 3, closed: 4}, default: :draft
+      validates :notes, length: {maximum: 2000}, allow_blank: true
+
+      validate :selected_quotation_belongs_to_this_rfq
+      scope :by_user, ->(user_id) { where(user_id: user_id) }
+
+      def draft?
+        status == "draft"
+      end
+
+      def sent?
+        status == "sent"
+      end
+
+      def responded?
+        status == "responded"
+      end
+
+      def selected?
+        status == "selected"
+      end
+
+      def closed?
+        status == "closed"
+      end
+
+      def can_select_quotation?
+        sent? || responded?
+      end
+
+      def select_quotation!(quotation)
+        return false unless can_select_quotation?
+        return false unless quotations.include?(quotation)
+
+        update!(selected_quotation: quotation, status: "selected")
+      end
+
+      def total_items
+        rfq_items.count
+      end
+
+      def has_responses?
+        quotations.where.not(status: "draft").exists?
+      end
+
+      def accepted_quotations
+        quotations.where(status: "accepted")
+      end
+
+      private
+
+      def selected_quotation_belongs_to_this_rfq
+        return unless selected_quotation_id
+
+        unless quotations.where(id: selected_quotation_id).exists?
+          errors.add(:selected_quotation_id, "must belong to this RFQ")
+        end
+      end
+    end
+  end
+end

data/app/models/dscf/marketplace/rfq_item.rb

@@ -0,0 +1,81 @@
+module Dscf
+  module Marketplace
+    class RfqItem < ApplicationRecord
+      belongs_to :request_for_quotation, class_name: "Dscf::Marketplace::RequestForQuotation"
+      belongs_to :product, class_name: "Dscf::Marketplace::Product"
+      belongs_to :unit, class_name: "Dscf::Marketplace::Unit"
+
+      has_many :quotation_items, class_name: "Dscf::Marketplace::QuotationItem", dependent: :destroy
+
+      validates :request_for_quotation_id, presence: true
+      validates :product_id, presence: true
+      validates :quantity, presence: true, numericality: {greater_than: 0}
+      validates :unit_id, presence: true
+      validates :notes, length: {maximum: 1000}, allow_blank: true
+
+      validate :unit_compatible_with_product
+
+      scope :by_product, ->(product_id) { where(product_id: product_id) }
+      scope :by_unit, ->(unit_id) { where(unit_id: unit_id) }
+
+      def product_name
+        product&.name
+      end
+
+      def product_sku
+        product&.sku
+      end
+
+      def unit_name
+        unit&.name
+      end
+
+      def unit_code
+        unit&.code
+      end
+
+      def quotation_count
+        quotation_items.count
+      end
+
+      def has_quotations?
+        quotation_items.exists?
+      end
+
+      def lowest_quoted_price
+        quotation_items.where.not(unit_price: nil).minimum(:unit_price)
+      end
+
+      def highest_quoted_price
+        quotation_items.where.not(unit_price: nil).maximum(:unit_price)
+      end
+
+      def quoted_price_range
+        return nil unless has_quotations?
+
+        low = lowest_quoted_price
+        high = highest_quoted_price
+
+        return low if low == high
+        "#{low} - #{high}"
+      end
+
+      def total_requested_quantity
+        return nil unless quantity && unit
+
+        # Convert to base unit for comparison if needed
+        quantity
+      end
+
+      private
+
+      def unit_compatible_with_product
+        return unless product_id && unit_id
+
+        unless product.unit_id == unit_id || product.unit.convertible_to?(unit)
+          errors.add(:unit_id, "is not compatible with the selected product")
+        end
+      end
+    end
+  end
+end

data/db/migrate/20250828090000_create_dscf_marketplace_request_for_quotations.rb

@@ -0,0 +1,18 @@
+class CreateDscfMarketplaceRequestForQuotations < ActiveRecord::Migration[8.0]
+  def change
+    create_table :dscf_marketplace_request_for_quotations do |t|
+      t.bigint :user_id, null: false
+      t.string :status, null: false
+      t.bigint :selected_quotation_id
+      t.text :notes
+
+      t.timestamps
+
+      t.index [ :user_id ], name: "user_on_dm_rfqs_indx"
+      t.index [ :status ], name: "status_on_dm_rfqs_indx"
+      t.index [ :selected_quotation_id ], name: "selected_quotation_on_dm_rfqs_indx"
+    end
+
+    add_foreign_key :dscf_marketplace_request_for_quotations, :dscf_core_users, column: :user_id, name: "fk_dm_rfqs_user"
+  end
+end

data/db/migrate/20250828090100_create_dscf_marketplace_rfq_items.rb

@@ -0,0 +1,21 @@
+class CreateDscfMarketplaceRfqItems < ActiveRecord::Migration[8.0]
+  def change
+    create_table :dscf_marketplace_rfq_items do |t|
+      t.bigint :request_for_quotation_id, null: false
+      t.bigint :product_id, null: false
+      t.decimal :quantity, precision: 15, scale: 6, null: false
+      t.bigint :unit_id, null: false
+      t.text :notes
+
+      t.timestamps
+
+      t.index [ :request_for_quotation_id ], name: "rfq_on_dm_rfq_items_indx"
+      t.index [ :product_id ], name: "product_on_dm_rfq_items_indx"
+      t.index [ :unit_id ], name: "unit_on_dm_rfq_items_indx"
+    end
+
+    add_foreign_key :dscf_marketplace_rfq_items, :dscf_marketplace_request_for_quotations, column: :request_for_quotation_id, name: "fk_dm_rfq_items_rfq"
+    add_foreign_key :dscf_marketplace_rfq_items, :dscf_marketplace_products, column: :product_id, name: "fk_dm_rfq_items_product"
+    add_foreign_key :dscf_marketplace_rfq_items, :dscf_marketplace_units, column: :unit_id, name: "fk_dm_rfq_items_unit"
+  end
+end

data/db/migrate/20250828090200_create_dscf_marketplace_quotations.rb

@@ -0,0 +1,24 @@
+class CreateDscfMarketplaceQuotations < ActiveRecord::Migration[8.0]
+  def change
+    create_table :dscf_marketplace_quotations do |t|
+      t.bigint :request_for_quotation_id, null: false
+      t.bigint :business_id, null: false
+      t.decimal :total_price, precision: 15, scale: 2
+      t.date :delivery_date, null: false
+      t.datetime :valid_until, null: false
+      t.string :status, null: false
+      t.text :notes
+
+      t.timestamps
+
+      t.index [ :request_for_quotation_id ], name: "rfq_on_dm_quotations_indx"
+      t.index [ :business_id ], name: "business_on_dm_quotations_indx"
+      t.index [ :status ], name: "status_on_dm_quotations_indx"
+      t.index [ :valid_until ], name: "valid_until_on_dm_quotations_indx"
+    end
+
+    add_foreign_key :dscf_marketplace_quotations, :dscf_marketplace_request_for_quotations, column: :request_for_quotation_id, name: "fk_dm_quotations_rfq"
+    add_foreign_key :dscf_marketplace_quotations, :dscf_core_businesses, column: :business_id, name: "fk_dm_quotations_business"
+    add_foreign_key :dscf_marketplace_request_for_quotations, :dscf_marketplace_quotations, column: :selected_quotation_id, name: "fk_dm_rfqs_selected_quotation"
+  end
+end

data/db/migrate/20250828090300_create_dscf_marketplace_quotation_items.rb

@@ -0,0 +1,25 @@
+class CreateDscfMarketplaceQuotationItems < ActiveRecord::Migration[8.0]
+  def change
+    create_table :dscf_marketplace_quotation_items do |t|
+      t.bigint :quotation_id, null: false
+      t.bigint :rfq_item_id, null: false
+      t.bigint :product_id, null: false
+      t.decimal :quantity, precision: 15, scale: 6, null: false
+      t.bigint :unit_id, null: false
+      t.decimal :unit_price, precision: 15, scale: 2
+      t.decimal :subtotal, precision: 15, scale: 2
+
+      t.timestamps
+
+      t.index [ :quotation_id ], name: "quotation_on_dm_quotation_items_indx"
+      t.index [ :rfq_item_id ], name: "rfq_item_on_dm_quotation_items_indx"
+      t.index [ :product_id ], name: "product_on_dm_quotation_items_indx"
+      t.index [ :unit_id ], name: "unit_on_dm_quotation_items_indx"
+    end
+
+    add_foreign_key :dscf_marketplace_quotation_items, :dscf_marketplace_quotations, column: :quotation_id, name: "fk_dm_quotation_items_quotation"
+    add_foreign_key :dscf_marketplace_quotation_items, :dscf_marketplace_rfq_items, column: :rfq_item_id, name: "fk_dm_quotation_items_rfq_item"
+    add_foreign_key :dscf_marketplace_quotation_items, :dscf_marketplace_products, column: :product_id, name: "fk_dm_quotation_items_product"
+    add_foreign_key :dscf_marketplace_quotation_items, :dscf_marketplace_units, column: :unit_id, name: "fk_dm_quotation_items_unit"
+  end
+end

data/db/migrate/20250828090400_change_rfq_status_to_integer.rb

@@ -0,0 +1,35 @@
+class ChangeRfqStatusToInteger < ActiveRecord::Migration[8.0]
+  def up
+    # Map string values to integers
+    execute <<-SQL
+      UPDATE dscf_marketplace_request_for_quotations
+      SET status = CASE
+        WHEN status = 'draft' THEN 0
+        WHEN status = 'sent' THEN 1
+        WHEN status = 'responded' THEN 2
+        WHEN status = 'selected' THEN 3
+        WHEN status = 'closed' THEN 4
+        ELSE 0
+      END
+    SQL
+
+    change_column :dscf_marketplace_request_for_quotations, :status, :integer, using: 'status::integer', default: 0, null: false
+  end
+
+  def down
+    change_column :dscf_marketplace_request_for_quotations, :status, :string
+
+    # Map integers back to strings
+    execute <<-SQL
+      UPDATE dscf_marketplace_request_for_quotations
+      SET status = CASE
+        WHEN status = 0 THEN 'draft'
+        WHEN status = 1 THEN 'sent'
+        WHEN status = 2 THEN 'responded'
+        WHEN status = 3 THEN 'selected'
+        WHEN status = 4 THEN 'closed'
+        ELSE 'draft'
+      END
+    SQL
+  end
+end

data/db/migrate/20250828090500_change_quotation_status_to_integer.rb

@@ -0,0 +1,35 @@
+class ChangeQuotationStatusToInteger < ActiveRecord::Migration[8.0]
+  def up
+    # Map string values to integers
+    execute <<-SQL
+      UPDATE dscf_marketplace_quotations
+      SET status = CASE
+        WHEN status = 'draft' THEN 0
+        WHEN status = 'sent' THEN 1
+        WHEN status = 'accepted' THEN 2
+        WHEN status = 'rejected' THEN 3
+        WHEN status = 'expired' THEN 4
+        ELSE 0
+      END
+    SQL
+
+    change_column :dscf_marketplace_quotations, :status, :integer, using: 'status::integer', default: 0, null: false
+  end
+
+  def down
+    change_column :dscf_marketplace_quotations, :status, :string
+
+    # Map integers back to strings
+    execute <<-SQL
+      UPDATE dscf_marketplace_quotations
+      SET status = CASE
+        WHEN status = 0 THEN 'draft'
+        WHEN status = 1 THEN 'sent'
+        WHEN status = 2 THEN 'accepted'
+        WHEN status = 3 THEN 'rejected'
+        WHEN status = 4 THEN 'expired'
+        ELSE 'draft'
+      END
+    SQL
+  end
+end

data/db/migrate/20250828115509_create_dscf_marketplace_orders.rb

@@ -0,0 +1,19 @@
+class CreateDscfMarketplaceOrders < ActiveRecord::Migration[8.0]
+  def change
+    create_table :dscf_marketplace_orders do |t|
+      t.integer :order_type
+      t.integer :status
+      t.references :quotation, null: true, foreign_key: {to_table: :dscf_marketplace_quotations}
+      t.references :listing, null: true, foreign_key: {to_table: :dscf_marketplace_listings}
+      t.references :user, null: false, foreign_key: {to_table: :dscf_core_users}
+      t.decimal :total_amount
+
+      t.timestamps
+    end
+
+    add_index :dscf_marketplace_orders, :user_id, name: "user_id_on_dm_orders_idx"
+    add_index :dscf_marketplace_orders, :quotation_id, name: "quotation_id_on_dm_orders_idx"
+    add_index :dscf_marketplace_orders, :listing_id, name: "listing_id_on_dm_orders_idx"
+    add_index :dscf_marketplace_orders, :status, name: "status_on_dm_orders_idx"
+  end
+end

data/db/migrate/20250828115525_create_dscf_marketplace_order_items.rb

@@ -0,0 +1,22 @@
+class CreateDscfMarketplaceOrderItems < ActiveRecord::Migration[8.0]
+  def change
+    create_table :dscf_marketplace_order_items do |t|
+      t.references :order, null: false, foreign_key: {to_table: :dscf_marketplace_orders}
+      t.references :quotation_item, null: true, foreign_key: {to_table: :dscf_marketplace_quotation_items}
+      t.references :listing, null: true, foreign_key: {to_table: :dscf_marketplace_listings}
+      t.references :product, null: false, foreign_key: {to_table: :dscf_marketplace_products}
+      t.references :unit, null: false, foreign_key: {to_table: :dscf_marketplace_units}
+      t.decimal :quantity, precision: 15, scale: 6
+      t.decimal :unit_price
+      t.integer :status
+
+      t.timestamps
+    end
+
+    add_index :dscf_marketplace_order_items, :order_id, name: "order_id_on_dm_order_items_idx"
+    add_index :dscf_marketplace_order_items, :quotation_item_id, name: "quotation_item_id_on_dm_order_items_idx"
+    add_index :dscf_marketplace_order_items, :listing_id, name: "listing_id_on_dm_order_items_idx"
+    add_index :dscf_marketplace_order_items, :product_id, name: "product_id_on_dm_order_items_idx"
+    add_index :dscf_marketplace_order_items, :unit_id, name: "unit_id_on_dm_order_items_idx"
+  end
+end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.1.5".freeze
+    VERSION = "0.1.7".freeze
   end
 end

data/spec/factories/dscf/marketplace/listings.rb

@@ -1,10 +1,22 @@
 FactoryBot.define do
-  factory :dscf_marketplace_listing, class: 'Dscf::Marketplace::Listing' do
-    business { create(:dscf_core_business) }
-    supplier_product { create(:dscf_marketplace_supplier_product) }
+  factory :dscf_marketplace_listing, class: "Dscf::Marketplace::Listing" do
+    association :business, factory: :dscf_core_business
+    association :supplier_product, factory: :dscf_marketplace_supplier_product
     price { 500.00 }
     quantity { 100.0 }
     description { "High quality product listing" }
-    status { :draft }
+    # status defaults to :draft from model
+
+    trait :active do
+      status { :active }
+    end
+
+    trait :draft do
+      status { :draft }
+    end
+
+    trait :paused do
+      status { :paused }
+    end
   end
 end

data/spec/factories/dscf/marketplace/order_items.rb

@@ -0,0 +1,49 @@
+FactoryBot.define do
+  factory :dscf_marketplace_order_item, class: "Dscf::Marketplace::OrderItem" do
+    # Don't create order by default, let tests specify
+    quantity { 5 }
+    unit_price { 10.0 }
+    status { :pending }
+    quotation_item { nil } # Don't create by default
+    listing { nil } # Don't create by default
+
+    # Set product and unit based on quotation_item or listing
+    after(:build) do |item|
+      if item.quotation_item
+        item.product ||= item.quotation_item.product
+        item.unit ||= item.quotation_item.unit
+      elsif item.listing
+        item.product ||= item.listing.supplier_product.product
+        item.unit ||= item.listing.supplier_product.product.unit
+      else
+        item.product ||= create(:dscf_marketplace_product)
+        item.unit ||= create(:dscf_marketplace_unit)
+      end
+    end
+
+    trait :from_quotation do
+      association :quotation_item, factory: :dscf_marketplace_quotation_item
+    end
+
+    trait :from_listing do
+      association :listing, factory: :dscf_marketplace_listing
+      quotation_item { nil }
+    end
+
+    trait :confirmed do
+      status { :confirmed }
+    end
+
+    trait :processing do
+      status { :processing }
+    end
+
+    trait :fulfilled do
+      status { :fulfilled }
+    end
+
+    trait :cancelled do
+      status { :cancelled }
+    end
+  end
+end

data/spec/factories/dscf/marketplace/orders.rb

@@ -0,0 +1,36 @@
+FactoryBot.define do
+  factory :dscf_marketplace_order, class: "Dscf::Marketplace::Order" do
+    order_type { :rfq_based }
+    status { :pending }
+    association :user, factory: :dscf_core_user
+    quotation { nil }
+    listing { nil }
+
+    trait :rfq_based do
+      order_type { :rfq_based }
+      association :quotation, factory: :dscf_marketplace_quotation
+    end
+
+    trait :direct_listing do
+      order_type { :direct_listing }
+      association :listing, factory: :dscf_marketplace_listing
+      quotation { nil }
+    end
+
+    trait :confirmed do
+      status { :confirmed }
+    end
+
+    trait :processing do
+      status { :processing }
+    end
+
+    trait :completed do
+      status { :completed }
+    end
+
+    trait :cancelled do
+      status { :cancelled }
+    end
+  end
+end

data/spec/factories/dscf/marketplace/quotation_items.rb

@@ -0,0 +1,18 @@
+FactoryBot.define do
+  factory :dscf_marketplace_quotation_item, class: "Dscf::Marketplace::QuotationItem" do
+    association :quotation, factory: :dscf_marketplace_quotation
+    association :rfq_item, factory: :dscf_marketplace_rfq_item
+    product { rfq_item.product }
+    unit { rfq_item.unit }
+    quantity { 10.0 }
+    unit_price { 15.0 }
+    subtotal { nil }
+
+    after(:build) do |item|
+      # Only calculate subtotal if it's not explicitly set
+      if item.subtotal.nil? && item.unit_price && item.quantity
+        item.subtotal = item.unit_price * item.quantity
+      end
+    end
+  end
+end

data/spec/factories/dscf/marketplace/quotations.rb

@@ -0,0 +1,25 @@
+FactoryBot.define do
+  factory :dscf_marketplace_quotation, class: "Dscf::Marketplace::Quotation" do
+    association :request_for_quotation, factory: :dscf_marketplace_request_for_quotation
+    association :business, factory: :dscf_core_business
+    total_price { nil }
+    delivery_date { 5.days.from_now.to_date }
+    valid_until { 15.days.from_now }
+    status { :draft }
+    notes { "Sample quotation notes" }
+
+    trait :expired do
+      after(:create) do |quotation|
+        quotation.update_columns(delivery_date: 10.days.ago.to_date, valid_until: 5.days.ago, status: 4)
+      end
+    end
+
+    trait :sent do
+      status { :sent }
+    end
+
+    trait :accepted do
+      status { :accepted }
+    end
+  end
+end

data/spec/factories/dscf/marketplace/request_for_quotations.rb

@@ -0,0 +1,8 @@
+FactoryBot.define do
+  factory :dscf_marketplace_request_for_quotation, class: 'Dscf::Marketplace::RequestForQuotation' do
+    association :user, factory: :dscf_core_user
+    status { "draft" }
+    selected_quotation { nil }
+    notes { "Sample RFQ notes" }
+  end
+end

data/spec/factories/dscf/marketplace/rfq_items.rb

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :dscf_marketplace_rfq_item, class: 'Dscf::Marketplace::RfqItem' do
+    association :request_for_quotation, factory: :dscf_marketplace_request_for_quotation
+    association :product, factory: :dscf_marketplace_product
+    unit { product.unit }
+    quantity { 10.0 }
+    notes { "Sample RFQ item notes" }
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2025-08-28 00:00:00.000000000 Z
+date: 2025-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -423,7 +423,13 @@ files:
 - app/models/dscf/marketplace/application_record.rb
 - app/models/dscf/marketplace/category.rb
 - app/models/dscf/marketplace/listing.rb
+- app/models/dscf/marketplace/order.rb
+- app/models/dscf/marketplace/order_item.rb
 - app/models/dscf/marketplace/product.rb
+- app/models/dscf/marketplace/quotation.rb
+- app/models/dscf/marketplace/quotation_item.rb
+- app/models/dscf/marketplace/request_for_quotation.rb
+- app/models/dscf/marketplace/rfq_item.rb
 - app/models/dscf/marketplace/supplier_product.rb
 - app/models/dscf/marketplace/unit.rb
 - app/models/dscf/marketplace/unit_conversion.rb
@@ -435,6 +441,14 @@ files:
 - db/migrate/20250828062945_create_dscf_marketplace_products.rb
 - db/migrate/20250828072514_create_dscf_marketplace_supplier_products.rb
 - db/migrate/20250828081657_create_dscf_marketplace_listings.rb
+- db/migrate/20250828090000_create_dscf_marketplace_request_for_quotations.rb
+- db/migrate/20250828090100_create_dscf_marketplace_rfq_items.rb
+- db/migrate/20250828090200_create_dscf_marketplace_quotations.rb
+- db/migrate/20250828090300_create_dscf_marketplace_quotation_items.rb
+- db/migrate/20250828090400_change_rfq_status_to_integer.rb
+- db/migrate/20250828090500_change_quotation_status_to_integer.rb
+- db/migrate/20250828115509_create_dscf_marketplace_orders.rb
+- db/migrate/20250828115525_create_dscf_marketplace_order_items.rb
 - lib/dscf/marketplace.rb
 - lib/dscf/marketplace/engine.rb
 - lib/dscf/marketplace/version.rb
@@ -444,7 +458,13 @@ files:
 - spec/factories/dscf/core/users.rb
 - spec/factories/dscf/marketplace/categories.rb
 - spec/factories/dscf/marketplace/listings.rb
+- spec/factories/dscf/marketplace/order_items.rb
+- spec/factories/dscf/marketplace/orders.rb
 - spec/factories/dscf/marketplace/products.rb
+- spec/factories/dscf/marketplace/quotation_items.rb
+- spec/factories/dscf/marketplace/quotations.rb
+- spec/factories/dscf/marketplace/request_for_quotations.rb
+- spec/factories/dscf/marketplace/rfq_items.rb
 - spec/factories/dscf/marketplace/supplier_products.rb
 - spec/factories/dscf/marketplace/unit_conversions.rb
 - spec/factories/dscf/marketplace/units.rb