dscf-marketplace 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82b1976ad1b3d99364b621d51ce06c5ac51e8eb818e10527580419d61f5aeb3d
-  data.tar.gz: 6264cf89e35f2f24cc756f0eeaa48336af30b2e20473bab859453faf3964691e
+  metadata.gz: 9bbdcc2258fee7a63ff11ba8c87e73a47923e8dbb6d9737e55d6e3e9d7002822
+  data.tar.gz: 184a09306eb3c9de61c2e9edc82cdd49ed735e7bf91acae09b5ace7cd7e9f3a1
 SHA512:
-  metadata.gz: 9a4e05d5b18d0bc545d036b9f623eaa65345b3e641cc069a1bde5fc0a7179fa0a0aa7bc4cd2d3243406c32dd4d5e0ee6ed3fbb05133770f9da638161a7a7341d
-  data.tar.gz: 0eaa365be89d92f5320e5a7fca4ee74f300f19b4c5ad325740428bf456126cad807f9fbc700565262c289a912c2fe23661246308b9c9a192631a3a4388d9211d
+  metadata.gz: 503e6dcdb6f209cbc278219572beb1deadbbeff8910e979914b4cd316e176528bc91130b4917bc874e3de36afb9e0f4c56978ecc3aa0dd54f4e175ee8cd2a071
+  data.tar.gz: e2790cb38d3a76cff511631c8b4fc7ae4b277e8faa2459241379ba3127438b242449438d363e5976dda72aa90a4d3b354e091ebf3d699bf4afb3e48a504689ef

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

@@ -0,0 +1,107 @@
+module Dscf::Marketplace
+  class DeliveryOrder < ApplicationRecord
+    enum :status, {assigned: 0, picked_up: 1, in_transit: 2, delivered: 3, failed: 4}
+    enum :vehicle_type, {motorcycle: 0, car: 1, van: 2, truck: 3}
+
+    belongs_to :driver, class_name: "Dscf::Core::User"
+    belongs_to :pickup_address, class_name: "Dscf::Core::Address"
+    belongs_to :delivery_vehicle, optional: true
+    has_many :delivery_order_items, dependent: :destroy
+    has_many :marketplace_orders, class_name: "Dscf::Marketplace::Order", dependent: :nullify
+
+    validates :driver_id, presence: true
+    validates :pickup_address_id, presence: true
+    validates :status, presence: true
+    validates :vehicle_type, presence: true
+    validates :estimated_delivery_price, numericality: {greater_than_or_equal_to: 0}, allow_nil: true
+    validates :actual_delivery_price, numericality: {greater_than_or_equal_to: 0}, allow_nil: true
+
+    before_save :calculate_actual_delivery_price, if: :status_changed?
+
+    def pickup!
+      return false unless assigned?
+      update!(status: :picked_up, actual_delivery_time: Time.current)
+      true
+    end
+
+    def start_delivery!
+      return false unless picked_up?
+      update!(status: :in_transit)
+      true
+    end
+
+    def complete_delivery!
+      return false unless in_transit?
+      update!(status: :delivered, actual_delivery_time: Time.current)
+      update_associated_orders
+      true
+    end
+
+    def mark_failed!(reason = nil)
+      update!(status: :failed, delivery_notes: reason)
+      true
+    end
+
+    def total_items
+      delivery_order_items.sum(:quantity)
+    end
+
+    def total_orders
+      marketplace_orders.count
+    end
+
+    def delivery_duration
+      return nil unless actual_delivery_time && estimated_delivery_time
+      (actual_delivery_time - estimated_delivery_time).to_i
+    end
+
+    def on_time?
+      return nil unless actual_delivery_time && estimated_delivery_time
+      actual_delivery_time <= estimated_delivery_time
+    end
+
+    # Handoff tracking methods
+    def handoff_completion_status
+      items = delivery_order_items
+      {
+        total_items: items.count,
+        confirmed_items: items.count(&:receiver_confirmed?),
+        pending_confirmation: items.count { |item| item.delivered? && !item.receiver_confirmed? },
+        issues_reported: items.count(&:requires_resolution?),
+        completion_percentage: items.present? ? (items.count(&:receiver_confirmed?).to_f / items.count * 100).round(2) : 0
+      }
+    end
+
+    def all_handoffs_confirmed?
+      delivery_order_items.all?(&:receiver_confirmed?)
+    end
+
+    def items_requiring_attention
+      delivery_order_items.select(&:requires_resolution?)
+    end
+
+    def generate_handoff_summary_report
+      {
+        delivery_order_id: id,
+        driver: driver&.name,
+        vehicle: vehicle_type,
+        total_destinations: delivery_order_items.distinct.pluck(:dropoff_address_id).count,
+        handoff_status: handoff_completion_status,
+        issues: items_requiring_attention.map(&:comprehensive_damage_report),
+        generated_at: Time.current
+      }
+    end
+
+    private
+
+    def calculate_actual_delivery_price
+      self.actual_delivery_price ||= estimated_delivery_price
+    end
+
+    def update_associated_orders
+      marketplace_orders.each do |order|
+        order.update!(status: :completed)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,192 @@
+module Dscf::Marketplace
+  class DeliveryOrderItem < ApplicationRecord
+    enum :status, {pending: 0, picked_up: 1, delivered: 2, receiver_confirmed: 3, damaged: 4, missing: 5, disputed: 6}
+
+    belongs_to :delivery_order
+    belongs_to :order_item, class_name: "Dscf::Marketplace::OrderItem"
+    belongs_to :pickup_address, class_name: "Dscf::Core::Address"
+    belongs_to :dropoff_address, class_name: "Dscf::Core::Address"
+
+    validates :delivery_order_id, presence: true
+    validates :order_item_id, presence: true
+    validates :quantity, presence: true, numericality: {greater_than: 0}
+    validates :status, presence: true
+    validates :pickup_verified_quantity, numericality: {greater_than_or_equal_to: 0}, allow_nil: true
+    validates :dropoff_verified_quantity, numericality: {greater_than_or_equal_to: 0}, allow_nil: true
+    validates :damaged_quantity, numericality: {greater_than_or_equal_to: 0}, allow_nil: true
+    validates :missing_quantity, numericality: {greater_than_or_equal_to: 0}, allow_nil: true
+    validates :receiver_confirmed_by, presence: true, if: :receiver_action_taken?
+    validates :receiver_confirmed_at, presence: true, if: :receiver_action_taken?
+
+    before_save :calculate_verification_totals
+
+    def pending?
+      status == "pending"
+    end
+
+    def picked_up?
+      status == "picked_up"
+    end
+
+    def delivered?
+      status == "delivered"
+    end
+
+    def damaged?
+      status == "damaged"
+    end
+
+    def missing?
+      status == "missing"
+    end
+
+    def receiver_confirmed?
+      status == "receiver_confirmed"
+    end
+
+    def disputed?
+      status == "disputed"
+    end
+
+    def pickup!
+      return false unless pending?
+      update!(status: :picked_up, pickup_verified_quantity: quantity)
+      true
+    end
+
+    def deliver!
+      return false unless picked_up?
+      update!(status: :delivered, dropoff_verified_quantity: pickup_verified_quantity.to_f - (damaged_quantity || 0) - (missing_quantity || 0))
+      true
+    end
+
+    # Handoff workflow methods
+    def receiver_confirm!(confirmed_quantity, notes = nil, confirmed_by = nil)
+      return false unless delivered? || picked_up?
+
+      update!(
+        status: :receiver_confirmed,
+        dropoff_verified_quantity: confirmed_quantity,
+        receiver_notes: notes,
+        receiver_confirmed_at: Time.current,
+        receiver_confirmed_by: confirmed_by,
+        handoff_checklist_completed: true
+      )
+      notify_receiver_confirmation
+      true
+    end
+
+    def report_issue!(issue_type, quantity, description, reported_by)
+      return false unless delivered? || picked_up?
+
+      update!(
+        status: issue_type.to_sym, # :damaged or :missing
+        damaged_quantity: ((issue_type == "damaged") ? quantity : 0),
+        missing_quantity: ((issue_type == "missing") ? quantity : 0),
+        receiver_notes: description,
+        receiver_confirmed_at: Time.current,
+        receiver_confirmed_by: reported_by,
+        handoff_checklist_completed: true
+      )
+      notify_platform_of_issue
+      true
+    end
+
+    def dispute_delivery!(reason, disputed_by)
+      return false unless delivered? || receiver_confirmed?
+
+      update!(
+        status: :disputed,
+        receiver_notes: reason,
+        receiver_confirmed_at: Time.current,
+        receiver_confirmed_by: disputed_by
+      )
+      create_dispute_record
+      true
+    end
+
+    def mark_damaged!(quantity)
+      update!(status: :damaged, damaged_quantity: quantity)
+      true
+    end
+
+    def mark_missing!(quantity)
+      update!(status: :missing, missing_quantity: quantity)
+      true
+    end
+
+    def verification_complete?
+      pickup_verified_quantity.present? && dropoff_verified_quantity.present?
+    end
+
+    def has_discrepancy?
+      return false unless verification_complete?
+      pickup_verified_quantity != dropoff_verified_quantity
+    end
+
+    def discrepancy_amount
+      return 0 unless has_discrepancy?
+      (pickup_verified_quantity - dropoff_verified_quantity).abs
+    end
+
+    def product_name
+      order_item&.product_name
+    end
+
+    def unit_name
+      order_item&.unit_name
+    end
+
+    # Loss/Damage Reporting Methods
+    def comprehensive_damage_report
+      {
+        item_id: id,
+        product_name: order_item&.product&.name,
+        expected_quantity: quantity,
+        received_quantity: dropoff_verified_quantity,
+        damaged_quantity: damaged_quantity,
+        missing_quantity: missing_quantity,
+        total_discrepancy: discrepancy_amount,
+        issue_description: receiver_notes,
+        reported_at: receiver_confirmed_at,
+        reported_by: receiver_confirmed_by,
+        requires_resolution: requires_resolution?
+      }
+    end
+
+    def requires_resolution?
+      has_discrepancy? || damaged? || missing? || disputed?
+    end
+
+    private
+
+    def receiver_action_taken?
+      receiver_confirmed? || damaged? || missing? || disputed?
+    end
+
+    def notify_receiver_confirmation
+      # Placeholder for notification logic
+      # This will be implemented when we add notification system
+      Rails.logger.info("Receiver confirmation completed for delivery order item #{id}")
+    end
+
+    def notify_platform_of_issue
+      # Placeholder for platform notification
+      # This will be implemented when we add notification system
+      Rails.logger.info("Issue reported for delivery order item #{id}: #{status}")
+    end
+
+    def create_dispute_record
+      # Placeholder for dispute record creation
+      # This will be implemented when we add dispute management
+      Rails.logger.info("Dispute created for delivery order item #{id}")
+    end
+
+    def calculate_verification_totals
+      if pickup_verified_quantity.present? && damaged_quantity.present? && missing_quantity.present?
+        expected_dropoff = pickup_verified_quantity - damaged_quantity - missing_quantity
+        self.dropoff_verified_quantity ||= expected_dropoff
+      end
+    end
+  end
+end

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

@@ -0,0 +1,61 @@
+module Dscf
+  module Marketplace
+    class DeliveryVehicle < ApplicationRecord
+      enum :vehicle_type, {motorcycle: 0, car: 1, van: 2, truck: 3}
+
+      belongs_to :driver, class_name: "Dscf::Core::User"
+      has_many :delivery_orders, dependent: :nullify
+
+      validates :driver_id, presence: true
+      validates :plate_number, presence: true, uniqueness: true
+      validates :vehicle_type, presence: true
+      validates :year, numericality: {greater_than: 1900, less_than_or_equal_to: Time.current.year + 1}, allow_nil: true
+      validates :brand, length: {maximum: 50}, allow_blank: true
+      validates :model, length: {maximum: 50}, allow_blank: true
+      validates :color, length: {maximum: 30}, allow_blank: true
+
+      def motorcycle?
+        vehicle_type == "motorcycle"
+      end
+
+      def car?
+        vehicle_type == "car"
+      end
+
+      def van?
+        vehicle_type == "van"
+      end
+
+      def truck?
+        vehicle_type == "truck"
+      end
+
+      def display_name
+        brand_and_model = [ brand.presence, model.presence ].compact.join(" ")
+        brand_and_model = nil if brand_and_model.blank?
+        "#{brand_and_model} (#{plate_number})".strip
+      end
+
+      def active_deliveries
+        delivery_orders.where.not(status: [ :delivered, :failed ])
+      end
+
+      def completed_deliveries
+        delivery_orders.where(status: :delivered)
+      end
+
+      def failed_deliveries
+        delivery_orders.where(status: :failed)
+      end
+
+      def total_deliveries
+        delivery_orders.count
+      end
+
+      def success_rate
+        return 0 if total_deliveries.zero?
+        (completed_deliveries.count.to_f / total_deliveries * 100).round(2)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,131 @@
+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}
+    enum :fulfillment_type, {self_pickup: 0, delivery: 1}
+
+    belongs_to :quotation, optional: true
+    belongs_to :listing, optional: true
+    belongs_to :user, class_name: "Dscf::Core::User"
+    belongs_to :delivery_order, optional: true
+    has_many :order_items, dependent: :destroy
+
+    validates :order_type, presence: true
+    validates :status, presence: true
+    validates :fulfillment_type, 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
+
+    # Fulfillment type methods
+    def self_pickup?
+      fulfillment_type == "self_pickup"
+    end
+
+    def delivery?
+      fulfillment_type == "delivery"
+    end
+
+    def requires_delivery_order?
+      delivery? && !completed?
+    end
+
+    def can_be_completed?
+      if self_pickup?
+        # Self-pickup orders can be completed immediately after confirmation
+        confirmed? || processing?
+      else
+        # Delivery orders require delivery_order association
+        delivery_order.present? && delivery_order.delivered?
+      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,38 @@
+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
+
+    def product_name
+      product&.name
+    end
+
+    def unit_name
+      unit&.name
+    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

@@ -5,6 +5,7 @@ module Dscf
       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
@@ -79,9 +80,19 @@ module Dscf
 
         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?
 
@@ -113,6 +124,32 @@ module Dscf
         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

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/db/migrate/20250831110907_create_dscf_marketplace_delivery_orders.rb

@@ -0,0 +1,21 @@
+class CreateDscfMarketplaceDeliveryOrders < ActiveRecord::Migration[8.0]
+  def change
+    create_table :dscf_marketplace_delivery_orders do |t|
+      t.bigint :driver_id, null: false
+      t.bigint :pickup_address_id, null: false
+      t.integer :status
+      t.text :delivery_notes
+      t.datetime :estimated_delivery_time
+      t.datetime :actual_delivery_time
+      t.decimal :estimated_delivery_price
+      t.decimal :actual_delivery_price
+      t.json :optimized_route
+      t.integer :vehicle_type
+
+      t.timestamps
+    end
+
+    add_foreign_key :dscf_marketplace_delivery_orders, :dscf_core_users, column: :driver_id
+    add_foreign_key :dscf_marketplace_delivery_orders, :dscf_core_addresses, column: :pickup_address_id
+  end
+end

data/db/migrate/20250831110921_create_dscf_marketplace_delivery_order_items.rb

@@ -0,0 +1,27 @@
+class CreateDscfMarketplaceDeliveryOrderItems < ActiveRecord::Migration[8.0]
+  def change
+    create_table :dscf_marketplace_delivery_order_items do |t|
+      t.bigint :delivery_order_id, null: false
+      t.bigint :order_item_id, null: false
+      t.bigint :pickup_address_id, null: false
+      t.bigint :dropoff_address_id, null: false
+      t.decimal :quantity
+      t.integer :status
+      t.text :notes
+      t.decimal :pickup_verified_quantity
+      t.decimal :dropoff_verified_quantity
+      t.decimal :damaged_quantity
+      t.decimal :missing_quantity
+      t.text :pickup_notes
+      t.text :dropoff_notes
+      t.integer :position
+
+      t.timestamps
+    end
+
+    add_foreign_key :dscf_marketplace_delivery_order_items, :dscf_marketplace_delivery_orders, column: :delivery_order_id
+    add_foreign_key :dscf_marketplace_delivery_order_items, :dscf_marketplace_order_items, column: :order_item_id
+    add_foreign_key :dscf_marketplace_delivery_order_items, :dscf_core_addresses, column: :pickup_address_id
+    add_foreign_key :dscf_marketplace_delivery_order_items, :dscf_core_addresses, column: :dropoff_address_id
+  end
+end

data/db/migrate/20250831110933_create_dscf_marketplace_delivery_vehicles.rb

@@ -0,0 +1,17 @@
+class CreateDscfMarketplaceDeliveryVehicles < ActiveRecord::Migration[8.0]
+  def change
+    create_table :dscf_marketplace_delivery_vehicles do |t|
+      t.bigint :driver_id, null: false
+      t.string :plate_number
+      t.integer :vehicle_type
+      t.string :brand
+      t.string :model
+      t.integer :year
+      t.string :color
+
+      t.timestamps
+    end
+
+    add_foreign_key :dscf_marketplace_delivery_vehicles, :dscf_core_users, column: :driver_id
+  end
+end

data/db/migrate/20250901074509_add_delivery_handoff_fields_to_delivery_order_items.rb

@@ -0,0 +1,16 @@
+class AddDeliveryHandoffFieldsToDeliveryOrderItems < ActiveRecord::Migration[8.0]
+  def change
+    # Add new handoff fields
+    add_column :dscf_marketplace_delivery_order_items, :receiver_confirmed_at, :datetime
+    add_column :dscf_marketplace_delivery_order_items, :receiver_confirmed_by, :integer
+    add_column :dscf_marketplace_delivery_order_items, :receiver_notes, :text
+    add_column :dscf_marketplace_delivery_order_items, :handoff_checklist_completed, :boolean, default: false
+
+    # Add indexes for performance
+    add_index :dscf_marketplace_delivery_order_items, :receiver_confirmed_by
+    add_index :dscf_marketplace_delivery_order_items, :handoff_checklist_completed
+
+    # Note: Status enum migration handled separately to avoid data loss
+    # The status values will be updated in the model after this migration
+  end
+end

data/db/migrate/20250901074746_add_delivery_order_to_orders.rb

@@ -0,0 +1,7 @@
+class AddDeliveryOrderToOrders < ActiveRecord::Migration[8.0]
+  def change
+    add_column :dscf_marketplace_orders, :delivery_order_id, :bigint
+    add_foreign_key :dscf_marketplace_orders, :dscf_marketplace_delivery_orders, column: :delivery_order_id
+    add_index :dscf_marketplace_orders, :delivery_order_id
+  end
+end

data/db/migrate/20250901075511_add_delivery_vehicle_to_delivery_orders.rb

@@ -0,0 +1,7 @@
+class AddDeliveryVehicleToDeliveryOrders < ActiveRecord::Migration[8.0]
+  def change
+    add_column :dscf_marketplace_delivery_orders, :delivery_vehicle_id, :bigint
+    add_foreign_key :dscf_marketplace_delivery_orders, :dscf_marketplace_delivery_vehicles, column: :delivery_vehicle_id
+    add_index :dscf_marketplace_delivery_orders, :delivery_vehicle_id
+  end
+end

data/db/migrate/20250901080134_add_fulfillment_type_to_orders.rb

@@ -0,0 +1,6 @@
+class AddFulfillmentTypeToOrders < ActiveRecord::Migration[8.0]
+  def change
+    add_column :dscf_marketplace_orders, :fulfillment_type, :integer, default: 0
+    add_index :dscf_marketplace_orders, :fulfillment_type
+  end
+end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.1.6".freeze
+    VERSION = "0.1.8".freeze
   end
 end

data/spec/factories/dscf/core/addresses.rb

@@ -0,0 +1,15 @@
+FactoryBot.define do
+  factory :dscf_core_address, class: "Dscf::Core::Address" do
+    user
+    address_type { 0 } # home
+    country { "Ethiopia" }
+    city { "Addis Ababa" }
+    sub_city { "Bole" }
+    woreda { "03" }
+    kebele { "07" }
+    house_numbers { "123" }
+    po_box { "1234" }
+    latitude { 9.1450 }
+    longitude { 38.7525 }
+  end
+end

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

@@ -0,0 +1,46 @@
+FactoryBot.define do
+  factory :dscf_marketplace_delivery_order_item, class: "Dscf::Marketplace::DeliveryOrderItem" do
+    association :delivery_order, factory: :dscf_marketplace_delivery_order
+    association :order_item, factory: :dscf_marketplace_order_item
+    pickup_address { create(:dscf_core_address) }
+    dropoff_address { create(:dscf_core_address) }
+    quantity { 10.0 }
+    status { :pending }
+    notes { "Test delivery item" }
+    pickup_verified_quantity { nil }
+    dropoff_verified_quantity { nil }
+    damaged_quantity { nil }
+    missing_quantity { nil }
+    pickup_notes { nil }
+    dropoff_notes { nil }
+    position { 1 }
+
+    trait :picked_up do
+      status { :picked_up }
+      pickup_verified_quantity { 10.0 }
+    end
+
+    trait :delivered do
+      status { :delivered }
+      pickup_verified_quantity { 10.0 }
+      dropoff_verified_quantity { 10.0 }
+    end
+
+    trait :receiver_confirmed do
+      status { :receiver_confirmed }
+      pickup_verified_quantity { 10.0 }
+      dropoff_verified_quantity { 10.0 }
+      receiver_confirmed_at { Time.current }
+      receiver_confirmed_by { create(:dscf_core_user).id }
+      handoff_checklist_completed { true }
+    end
+
+    trait :with_damage do
+      status { :damaged }
+      pickup_verified_quantity { 10.0 }
+      dropoff_verified_quantity { 8.0 }
+      damaged_quantity { 2.0 }
+      receiver_notes { "Package damaged during transport" }
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+FactoryBot.define do
+  factory :dscf_marketplace_delivery_order, class: "Dscf::Marketplace::DeliveryOrder" do
+    association :driver, factory: :dscf_core_user
+    association :pickup_address, factory: :dscf_core_address
+    status { :assigned }
+    delivery_notes { "Test delivery order" }
+    estimated_delivery_time { 2.hours.from_now }
+    actual_delivery_time { nil }
+    estimated_delivery_price { 50.0 }
+    actual_delivery_price { nil }
+    optimized_route { {} }
+    vehicle_type { :motorcycle }
+  end
+end

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

@@ -0,0 +1,37 @@
+FactoryBot.define do
+  factory :dscf_marketplace_delivery_vehicle, class: "Dscf::Marketplace::DeliveryVehicle" do
+    association :driver, factory: :dscf_core_user
+    sequence(:plate_number) { |n| "ABC#{n.to_s.rjust(3, "0")}" }
+    vehicle_type { :motorcycle }
+    brand { "Honda" }
+    model { "CBR" }
+    year { 2020 }
+    color { "Red" }
+
+    trait :car do
+      vehicle_type { :car }
+      brand { "Toyota" }
+      model { "Corolla" }
+    end
+
+    trait :van do
+      vehicle_type { :van }
+      brand { "Ford" }
+      model { "Transit" }
+    end
+
+    trait :truck do
+      vehicle_type { :truck }
+      brand { "Volvo" }
+      model { "FH16" }
+    end
+
+    trait :old_vehicle do
+      year { 2010 }
+    end
+
+    trait :future_vehicle do
+      year { Time.current.year + 2 }
+    end
+  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
+    association :order, factory: :dscf_marketplace_order
+    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,45 @@
+FactoryBot.define do
+  factory :dscf_marketplace_order, class: "Dscf::Marketplace::Order" do
+    order_type { :rfq_based }
+    status { :pending }
+    fulfillment_type { :self_pickup }
+    association :user, factory: :dscf_core_user
+    association :quotation, factory: :dscf_marketplace_quotation
+    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 :self_pickup do
+      fulfillment_type { :self_pickup }
+    end
+
+    trait :delivery do
+      fulfillment_type { :delivery }
+    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/{dscf/marketplace/quotation_items.rb → quotation_items.rb}

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :dscf_marketplace_quotation_item, class: 'Dscf::Marketplace::QuotationItem' 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 }

data/spec/factories/dscf/marketplace/{dscf/marketplace/quotations.rb → quotations.rb}

@@ -1,11 +1,11 @@
 FactoryBot.define do
-  factory :dscf_marketplace_quotation, class: 'Dscf::Marketplace::Quotation' 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" }
+    status { :draft }
     notes { "Sample quotation notes" }
 
     trait :expired do
@@ -15,11 +15,11 @@ FactoryBot.define do
     end
 
     trait :sent do
-      status { "sent" }
+      status { :sent }
     end
 
     trait :accepted do
-      status { "accepted" }
+      status { :accepted }
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2025-08-28 00:00:00.000000000 Z
+date: 2025-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -415,14 +415,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
-- README.md
 - Rakefile
 - app/controllers/dscf/marketplace/application_controller.rb
 - app/jobs/dscf/marketplace/application_job.rb
 - app/mailers/dscf/marketplace/application_mailer.rb
 - app/models/dscf/marketplace/application_record.rb
 - app/models/dscf/marketplace/category.rb
+- app/models/dscf/marketplace/delivery_order.rb
+- app/models/dscf/marketplace/delivery_order_item.rb
+- app/models/dscf/marketplace/delivery_vehicle.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
@@ -445,20 +449,35 @@ files:
 - 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
+- db/migrate/20250831110907_create_dscf_marketplace_delivery_orders.rb
+- db/migrate/20250831110921_create_dscf_marketplace_delivery_order_items.rb
+- db/migrate/20250831110933_create_dscf_marketplace_delivery_vehicles.rb
+- db/migrate/20250901074509_add_delivery_handoff_fields_to_delivery_order_items.rb
+- db/migrate/20250901074746_add_delivery_order_to_orders.rb
+- db/migrate/20250901075511_add_delivery_vehicle_to_delivery_orders.rb
+- db/migrate/20250901080134_add_fulfillment_type_to_orders.rb
 - lib/dscf/marketplace.rb
 - lib/dscf/marketplace/engine.rb
 - lib/dscf/marketplace/version.rb
 - lib/tasks/dscf/marketplace_tasks.rake
+- spec/factories/dscf/core/addresses.rb
 - spec/factories/dscf/core/business_types.rb
 - spec/factories/dscf/core/businesses.rb
 - spec/factories/dscf/core/users.rb
 - spec/factories/dscf/marketplace/categories.rb
-- spec/factories/dscf/marketplace/dscf/marketplace/quotation_items.rb
-- spec/factories/dscf/marketplace/dscf/marketplace/quotations.rb
-- spec/factories/dscf/marketplace/dscf/marketplace/request_for_quotations.rb
-- spec/factories/dscf/marketplace/dscf/marketplace/rfq_items.rb
+- spec/factories/dscf/marketplace/delivery_order_items.rb
+- spec/factories/dscf/marketplace/delivery_orders.rb
+- spec/factories/dscf/marketplace/delivery_vehicles.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

data/README.md

@@ -1,28 +0,0 @@
-# Dscf::Marketplace
-Short description and motivation.
-
-## Usage
-How to use my plugin.
-
-## Installation
-Add this line to your application's Gemfile:
-
-```ruby
-gem "dscf-marketplace"
-```
-
-And then execute:
-```bash
-$ bundle
-```
-
-Or install it yourself as:
-```bash
-$ gem install dscf-marketplace
-```
-
-## Contributing
-Contribution directions go here.
-
-## License
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).