dscf-marketplace 0.7.6 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4beaf427e69fdbc843de062d0083c55ece3d751cca2adab8cf989c20de633886
-  data.tar.gz: 8479a97308423b04afa67d95c2cc3fde8096b01a6b24ec1c9f3519e0dfe0d35f
+  metadata.gz: f20dc6ec95c1bd2483126bf1f0b241ba3403999673a705b9f0e72e214ec29889
+  data.tar.gz: 6233b5ae039cd138f26ca51d70db6a9458e51b25d29a2ba21d37a142b103b933
 SHA512:
-  metadata.gz: 98399d8626f0fdd09979f7be48bc34f36126d3c07ad268d57338b1de4a9575ece83a8eabf13e279dcb0ea1824dd68317c211025ff6c3eb57ebf07121d3ec261a
-  data.tar.gz: b9e8eec981a2c12e01a06dac62e7d22d98c170d4c08760486321e6acbd61601e2380a9bf33cd1cf5fd5806f545543fdeb527795521e4c908c5eb6f394930a670
+  metadata.gz: b852b81aa1b9ea52cc219e40b1056691d4ed7d464e0fd684bf1395abf4219cd35bf07c2f7fa67ab6fc5397f438a95e420a98e826465e331002d1ebebe672ef8c
+  data.tar.gz: 0e32006533ed1f96fead2d9eb34b03cc74ed5eaf62a4ad5eb0eeb7e7c36b167d58559d0d27d5c023f5d67fef2c80a48783da0f13e08a7888c3fac93ce505cea4

data/app/controllers/dscf/marketplace/aggregator_listings_controller.rb

@@ -0,0 +1,40 @@
+module Dscf
+  module Marketplace
+    class AggregatorListingsController < ApplicationController
+      include Dscf::Core::Common
+
+      def feed
+        authorize @clazz.new, :index?
+        listings = @clazz.active.includes(supplier_product: :product)
+
+        options = {
+          include: default_serializer_includes[:index] || [],
+          meta: { resource_type: "aggregator_feed" }
+        }
+
+        render_success(data: listings, serializer_options: options)
+      end
+
+      def my_listings
+        authorize @clazz.new, :my_listings?
+        businesses = current_user.businesses.pluck(:id)
+        listings = @clazz.where(aggregator_id: businesses).includes(supplier_product: :product)
+
+        options = {
+          include: default_serializer_includes[:index] || [],
+          meta: { resource_type: "my_aggregator_listings" }
+        }
+
+        render_success(data: listings, serializer_options: options)
+      end
+
+      private
+
+      def model_params
+        params.require(:aggregator_listing).permit(
+          :aggregator_id, :supplier_product_id, :price, :quantity, :status
+        )
+      end
+    end
+  end
+end

data/app/controllers/dscf/marketplace/listings_controller.rb

@@ -33,6 +33,47 @@ module Dscf
         end
       end
 
+      def promote
+        @obj = find_record
+        authorize @obj, :promote?
+        if @obj.update(
+          orchestrator_promoted: true,
+          orchestrator_promoted_at: Time.current,
+          promoted_by: current_user
+        )
+          render_success("listings.success.promoted", data: @obj)
+        else
+          render_error("listings.errors.promote_failed")
+        end
+      end
+
+      def unpromote
+        @obj = find_record
+        authorize @obj, :unpromote?
+        if @obj.update(
+          orchestrator_promoted: false,
+          orchestrator_promoted_at: nil,
+          promoted_by: nil
+        )
+          render_success("listings.success.unpromoted", data: @obj)
+        else
+          render_error("listings.errors.unpromote_failed")
+        end
+      end
+
+      # Public feed: only visible listings (computed by 3 conditions)
+      def visible
+        authorize @clazz.new, :visible?
+        listings = @clazz.visible.includes(eager_loaded_associations)
+
+        options = {
+          include: default_serializer_includes[:index] || [],
+          meta: { resource_type: "visible_listings" }
+        }
+
+        render_success(data: listings, serializer_options: options)
+      end
+
       def my_listings
         authorize @clazz.new, :my_listings?
         service = MyResourceService.new(current_user)
@@ -40,7 +81,7 @@ module Dscf
 
         options = {
           include: default_serializer_includes[:index] || [],
-          meta: {resource_type: "my_listings"}
+          meta: { resource_type: "my_listings" }
         }
 
         render_success("listings.success.index", data: listings, serializer_options: options)
@@ -50,7 +91,6 @@ module Dscf
         authorize @clazz.new, :listings_by_supplier?
         supplier_id = params[:supplier_id]
 
-        # Validate supplier exists
         supplier = Dscf::Core::Business.find_by(id: supplier_id)
         return render_error("listings.errors.supplier_not_found") unless supplier
 
@@ -71,6 +111,10 @@ module Dscf
 
       private
 
+      def find_record
+        @clazz.find(params[:id])
+      end
+
       def model_params
         params.require(:listing).permit(
           :business_id, :supplier_product_id, :price, :quantity, :status

data/app/controllers/dscf/marketplace/orders_controller.rb

@@ -68,12 +68,29 @@ module Dscf
         authorize @obj, :complete?
         if @obj.can_be_completed? && @obj.update(status: :completed)
           @obj.order_items.update_all(status: OrderItem.statuses[:fulfilled])
-          render_success("orders.success.completed", data: @obj)
+          begin
+            invoice = Dscf::Marketplace::InvoicePdfGenerator.new(@obj).generate!
+            render_success("orders.success.completed", data: @obj, meta: { invoice_id: invoice.id })
+          rescue => e
+            Rails.logger.error("Invoice generation failed for order #{@obj.id}: #{e.message}")
+            render_success("orders.success.completed", data: @obj)
+          end
         else
           render_error("orders.errors.complete_failed")
         end
       end
 
+      def invoice
+        @obj = find_record
+        authorize @obj, :show?
+        invoice = @obj.order_invoice
+        if invoice&.pdf_file&.attached?
+          redirect_to rails_blob_url(invoice.pdf_file, disposition: "attachment")
+        else
+          render_error("orders.errors.no_invoice")
+        end
+      end
+
       def my_orders
         authorize @clazz.new, :my_orders?
         service = MyResourceService.new(current_user)

data/app/controllers/dscf/marketplace/products_controller.rb

@@ -28,7 +28,7 @@ module Dscf
       def model_params
         params.require(:product).permit(
           :sku, :name, :description, :category_id, :unit_id,
-          :base_price, :base_quantity, :business_only,
+          :gross_weight, :base_quantity, :business_only,
           :thumbnail, images: []
         )
       end

data/app/controllers/dscf/marketplace/supplier_products_controller.rb

@@ -71,22 +71,21 @@ module Dscf
 
       def model_params
         params.require(:supplier_product).permit(
-          :business_id, :product_id, :supplier_price, :available_quantity,
-          :minimum_order_quantity, :status,
-          :supplier_name, :supplier_address, :supplier_contact_phone
+          :business_id, :product_id, :supplier_id, :supplier_price,
+          :available_quantity, :minimum_order_quantity, :status
         )
       end
 
       def eager_loaded_associations
-        [ :business, :product, :listings ]
+        [ :business, :product, :supplier, :listings ]
       end
 
       def default_serializer_includes
         {
-          index: [ :business, :product ],
-          show: [ :business, :product, :listings ],
-          create: [ :business, :product ],
-          update: [ :business, :product ]
+          index: [ :business, :product, :supplier ],
+          show: [ :business, :product, :supplier, :listings ],
+          create: [ :business, :product, :supplier ],
+          update: [ :business, :product, :supplier ]
         }
       end
     end

data/app/controllers/dscf/marketplace/suppliers_controller.rb

@@ -0,0 +1,28 @@
+module Dscf
+  module Marketplace
+    class SuppliersController < ApplicationController
+      include Dscf::Core::Common
+
+      def my_suppliers
+        authorize @clazz.new, :index?
+        businesses = current_user.businesses.pluck(:id)
+        suppliers = @clazz.where(business_id: businesses)
+
+        options = {
+          include: default_serializer_includes[:index] || [],
+          meta: { resource_type: "my_suppliers" }
+        }
+
+        render_success("suppliers.success.index", data: suppliers, serializer_options: options)
+      end
+
+      private
+
+      def model_params
+        params.require(:supplier).permit(
+          :name, :address, :contact_phone, :business_type, :business_id
+        )
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+module Dscf::Marketplace
+  class AggregatorListing < ApplicationRecord
+    belongs_to :aggregator, class_name: "Dscf::Core::Business"
+    belongs_to :supplier_product, class_name: "Dscf::Marketplace::SupplierProduct"
+
+    has_many :order_items, class_name: "Dscf::Marketplace::OrderItem", as: :source, dependent: :nullify
+
+    delegate :name, :description, :thumbnail_url, :images_urls, to: :product, allow_nil: true
+
+    enum :status, { active: 0, draft: 1, paused: 2, sold_out: 3 }, default: :draft
+
+    validates :price, numericality: { greater_than: 0 }, presence: true
+    validates :quantity, numericality: { greater_than: 0 }, presence: true
+    validates :aggregator, presence: true
+    validates :supplier_product_id, presence: true, uniqueness: { scope: :aggregator_id }
+
+    scope :active, -> { where(status: :active) }
+    scope :by_aggregator, ->(aggregator_id) { where(aggregator_id: aggregator_id) }
+
+    def self.ransackable_attributes(_auth_object = nil)
+      %w[id aggregator_id supplier_product_id price quantity status created_at updated_at]
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      %w[aggregator supplier_product]
+    end
+
+    def product
+      supplier_product&.product
+    end
+
+    def available?
+      active? && quantity > 0
+    end
+
+    def total_value
+      price * quantity
+    end
+  end
+end

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

@@ -3,6 +3,7 @@ module Dscf::Marketplace
     # References
     belongs_to :business, class_name: "Dscf::Core::Business"
     belongs_to :supplier_product, class_name: "Dscf::Marketplace::SupplierProduct"
+    belongs_to :promoted_by, class_name: "Dscf::Core::User", optional: true
 
     # Relationships
     has_many :order_items, class_name: "Dscf::Marketplace::OrderItem"
@@ -20,14 +21,106 @@ module Dscf::Marketplace
     scope :active, -> { where(status: :active) }
     scope :by_business, ->(business_id) { where(business_id: business_id) }
     scope :owned_by, ->(business) { where(business: business) }
+    scope :promoted, -> { where(orchestrator_promoted: true) }
+    scope :not_promoted, -> { where(orchestrator_promoted: false) }
+
+    # Returns listings visible to end users based on 3 conditions:
+    # 1. Orchestrator promoted (manual override)
+    # 2. Sole provider — only one active listing for this product
+    # 3. Cheapest price — lowest price among active listings for the same product
+    scope :visible, -> {
+      active.where(<<~SQL.squish)
+        orchestrator_promoted = true
+        OR (
+          SELECT COUNT(*) FROM dscf_marketplace_listings l2
+          JOIN dscf_marketplace_supplier_products sp2 ON l2.supplier_product_id = sp2.id
+          WHERE sp2.product_id = (
+            SELECT sp.product_id FROM dscf_marketplace_supplier_products sp
+            WHERE sp.id = dscf_marketplace_listings.supplier_product_id
+          )
+          AND l2.status = #{Listing.statuses[:active]}
+        ) = 1
+        OR (
+          dscf_marketplace_listings.price = (
+            SELECT MIN(l3.price) FROM dscf_marketplace_listings l3
+            JOIN dscf_marketplace_supplier_products sp3 ON l3.supplier_product_id = sp3.id
+            WHERE sp3.product_id = (
+              SELECT sp.product_id FROM dscf_marketplace_supplier_products sp
+              WHERE sp.id = dscf_marketplace_listings.supplier_product_id
+            )
+            AND l3.status = #{Listing.statuses[:active]}
+          )
+        )
+      SQL
+    }
 
     # Ransack configuration for secure filtering
     def self.ransackable_attributes(_auth_object = nil)
-      %w[id business_id supplier_product_id price quantity status created_at updated_at]
+      %w[id business_id supplier_product_id price quantity status
+         orchestrator_promoted orchestrator_promoted_at promoted_by_id
+         created_at updated_at]
     end
 
     def self.ransackable_associations(_auth_object = nil)
-      %w[business supplier_product order_items]
+      %w[business supplier_product order_items promoted_by]
+    end
+
+    # Is this listing the only active listing for its product?
+    def sole_provider?
+      self.class.active
+        .joins(:supplier_product)
+        .where(supplier_product: { product_id: supplier_product.product_id })
+        .count == 1
+    end
+
+    # Does this listing have the lowest price for its product?
+    def cheapest?
+      self.class.active
+        .joins(:supplier_product)
+        .where(supplier_product: { product_id: supplier_product.product_id })
+        .minimum(:price) == price
+    end
+
+    # Should this listing be shown to end users?
+    def visible?
+      return false unless active? && quantity > 0
+      return true if orchestrator_promoted?
+
+      product_id = supplier_product.product_id
+      active_listings = self.class.active.joins(:supplier_product)
+        .where(supplier_product: { product_id: product_id })
+
+      active_listings.count == 1 || active_listings.minimum(:price) == price
+    end
+
+    # Returns :orchestrator_promoted, :sole_provider, :cheapest, or nil
+    def visibility_reason
+      return nil unless visible?
+      return :orchestrator_promoted if orchestrator_promoted?
+      return :sole_provider if sole_provider?
+      return :cheapest if cheapest?
+    end
+
+    # Market insight: how many active listings exist for this product
+    def total_listings_for_product
+      self.class.active.joins(:supplier_product)
+        .where(supplier_product: { product_id: supplier_product.product_id })
+        .count
+    end
+
+    # Market insight: lowest price across all businesses for this product
+    def cheapest_price_for_product
+      self.class.active.joins(:supplier_product)
+        .where(supplier_product: { product_id: supplier_product.product_id })
+        .minimum(:price)
+    end
+
+    # Market insight: this listing's price rank (1 = cheapest)
+    def price_rank
+      self.class.active.joins(:supplier_product)
+        .where(supplier_product: { product_id: supplier_product.product_id })
+        .where("price < ?", price)
+        .count + 1
     end
 
     # Custom methods

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

@@ -13,6 +13,7 @@ module Dscf::Marketplace
     belongs_to :delivery_order, optional: true
     belongs_to :dropoff_address, class_name: "Dscf::Core::Address", optional: true
     has_many :order_items, dependent: :destroy, autosave: true
+    has_one :order_invoice, class_name: "Dscf::Marketplace::OrderInvoice", dependent: :destroy
     accepts_nested_attributes_for :order_items, allow_destroy: true
 
     validates :order_type, presence: true
@@ -73,7 +74,7 @@ module Dscf::Marketplace
     end
 
     def self.create_from_listing(listing, user, quantity, dropoff_address = nil, payment_method = nil)
-      return nil unless listing.status == "active" && quantity <= listing.quantity
+      return nil unless listing.visible? && quantity <= listing.quantity
 
       attributes = {
         order_type: :direct_listing,

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

@@ -0,0 +1,39 @@
+module Dscf::Marketplace
+  class OrderInvoice < ApplicationRecord
+    belongs_to :order, class_name: "Dscf::Marketplace::Order"
+
+    enum :status, { generated: 0 }
+
+    before_validation :generate_invoice_number, on: :create
+    before_validation :set_issued_at, on: :create
+
+    validates :invoice_number, presence: true, uniqueness: { case_sensitive: false }
+    validates :subtotal, presence: true, numericality: { greater_than_or_equal_to: 0 }
+    validates :total, presence: true, numericality: { greater_than_or_equal_to: 0 }
+    validates :vat_amount, presence: true, numericality: { greater_than_or_equal_to: 0 }
+    validates :status, presence: true
+    validates :issued_at, presence: true
+    validates :order, presence: true
+
+    has_one_attached :pdf_file
+
+    def self.ransackable_attributes(_auth_object = nil)
+      %w[id order_id invoice_number subtotal vat_amount total status issued_at created_at updated_at]
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      %w[order]
+    end
+
+    private
+
+    def generate_invoice_number
+      year = Date.current.year.to_s
+      self.invoice_number ||= "INV-#{year}-#{SecureRandom.hex(4).upcase}"
+    end
+
+    def set_issued_at
+      self.issued_at ||= Time.current
+    end
+  end
+end

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

@@ -17,7 +17,7 @@ module Dscf
       validates :name, presence: true, length: {maximum: 200}
       validates :description, length: {maximum: 2000}, allow_blank: true
       validates :category_id, presence: true
-      validates :base_price, presence: true, numericality: {greater_than: 0}
+      validates :gross_weight, presence: true, numericality: {greater_than: 0}
       validates :business_only, inclusion: {in: [ true, false ]}
       validates :unit_id, presence: true
       validates :base_quantity, presence: true, numericality: {greater_than: 0}
@@ -29,7 +29,7 @@ module Dscf
 
       # Ransack configuration for secure filtering
       def self.ransackable_attributes(_auth_object = nil)
-        %w[id sku name description category_id unit_id base_price base_quantity business_only created_at updated_at]
+        %w[id sku name description category_id unit_id gross_weight base_quantity business_only created_at updated_at]
       end
 
       def self.ransackable_associations(_auth_object = nil)
@@ -41,8 +41,8 @@ module Dscf
       end
 
       def price_per_unit
-        return nil unless base_price && base_quantity && base_quantity > 0
-        base_price / base_quantity
+        return nil unless base_quantity && base_quantity > 0
+        nil
       end
 
       def category_path

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

@@ -0,0 +1,42 @@
+module Dscf::Marketplace
+  class Supplier < ApplicationRecord
+    belongs_to :business, class_name: "Dscf::Core::Business"
+    has_many :supplier_products, class_name: "Dscf::Marketplace::SupplierProduct",
+             dependent: :nullify
+    has_many :addresses, class_name: "Dscf::Core::Address", dependent: :nullify
+
+    enum :business_type, {
+      retailer: 0,
+      wholesaler: 1,
+      distributor: 2,
+      manufacturer: 3,
+      importer: 4,
+      exporter: 5,
+      service_provider: 6,
+      aggregator: 7
+    }
+
+    before_validation :generate_code, on: :create
+
+    validates :name, presence: true
+    validates :code, presence: true, uniqueness: true
+    validates :business_type, presence: true
+    validates :business, presence: true
+
+    scope :by_business, ->(business_id) { where(business_id: business_id) }
+
+    def self.ransackable_attributes(_auth_object = nil)
+      %w[id name code address contact_phone business_type business_id created_at updated_at]
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      %w[business supplier_products addresses]
+    end
+
+    private
+
+    def generate_code
+      self.code ||= "SUP-#{SecureRandom.hex(4).upcase}"
+    end
+  end
+end

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

@@ -2,8 +2,10 @@ module Dscf::Marketplace
   class SupplierProduct < ApplicationRecord
     belongs_to :business, class_name: "Dscf::Core::Business"
     belongs_to :product, class_name: "Dscf::Marketplace::Product"
+    belongs_to :supplier, class_name: "Dscf::Marketplace::Supplier", optional: true
 
     delegate :name, :description, :thumbnail_url, :images_urls, to: :product, allow_nil: true
+    delegate :name, :address, :contact_phone, to: :supplier, prefix: true, allow_nil: true
 
     has_many :listings, class_name: "Dscf::Marketplace::Listing"
     has_many :order_items, class_name: "Dscf::Marketplace::OrderItem"
@@ -20,11 +22,11 @@ module Dscf::Marketplace
     scope :by_product, ->(product_id) { where(product_id: product_id) }
 
     def self.ransackable_attributes(_auth_object = nil)
-      %w[id business_id product_id supplier_price available_quantity minimum_order_quantity status created_at updated_at supplier_name supplier_address supplier_contact_phone]
+      %w[id business_id product_id supplier_id supplier_price available_quantity minimum_order_quantity status created_at updated_at]
     end
 
     def self.ransackable_associations(_auth_object = nil)
-      %w[business product listings order_items]
+      %w[business product supplier listings order_items]
     end
 
     # Custom methods

data/app/policies/dscf/marketplace/aggregator_listing_policy.rb

@@ -0,0 +1,29 @@
+module Dscf
+  module Marketplace
+    class AggregatorListingPolicy < Dscf::Core::ApplicationPolicy
+      def index?
+        true
+      end
+
+      def show?
+        true
+      end
+
+      def create?
+        user.present?
+      end
+
+      def update?
+        user.present? && record.aggregator_id.in?(user.businesses.pluck(:id))
+      end
+
+      def feed?
+        true
+      end
+
+      def my_listings?
+        user.present?
+      end
+    end
+  end
+end

data/app/policies/dscf/marketplace/listing_policy.rb

@@ -13,6 +13,18 @@ module Dscf
         user.has_permission?("listings.sold_out")
       end
 
+      def promote?
+        user.has_permission?("listings.promote")
+      end
+
+      def unpromote?
+        user.has_permission?("listings.unpromote")
+      end
+
+      def visible?
+        true
+      end
+
       def my_listings?
         user.has_permission?("listings.my_listings")
       end

data/app/policies/dscf/marketplace/supplier_policy.rb

@@ -0,0 +1,25 @@
+module Dscf
+  module Marketplace
+    class SupplierPolicy < Dscf::Core::ApplicationPolicy
+      def index?
+        true
+      end
+
+      def show?
+        true
+      end
+
+      def create?
+        user.present?
+      end
+
+      def update?
+        user.present? && record.business_id.in?(user.businesses.pluck(:id))
+      end
+
+      def my_suppliers?
+        true
+      end
+    end
+  end
+end

data/app/serializers/dscf/marketplace/aggregator_listing_serializer.rb

@@ -0,0 +1,27 @@
+module Dscf
+  module Marketplace
+    class AggregatorListingSerializer < ActiveModel::Serializer
+      attributes :id, :aggregator_id, :supplier_product_id, :price, :quantity,
+                 :status, :created_at, :updated_at, :total_value, :available?,
+                 :product_name, :product_description, :thumbnail_url, :images_urls
+
+      belongs_to :aggregator
+
+      def product_name
+        object.product&.name
+      end
+
+      def product_description
+        object.product&.description
+      end
+
+      def thumbnail_url
+        object.product&.thumbnail_url
+      end
+
+      def images_urls
+        object.product&.images_urls
+      end
+    end
+  end
+end

data/app/serializers/dscf/marketplace/listing_serializer.rb

@@ -3,11 +3,43 @@ module Dscf
     class ListingSerializer < ActiveModel::Serializer
       attributes :id, :business_id, :supplier_product_id, :price, :quantity,
         :status, :created_at, :updated_at, :total_value, :margin,
-        :margin_percentage, :available?
+        :margin_percentage, :available?,
+        :visible, :visibility_reason, :orchestrator_promoted,
+        :orchestrator_promoted_at, :promoted_by_id,
+        :sole_provider, :cheapest,
+        :total_listings_for_product, :cheapest_price_for_product, :price_rank
 
       belongs_to :business
       belongs_to :supplier_product
       has_many :order_items
+
+      def visible
+        object.visible?
+      end
+
+      def visibility_reason
+        object.visibility_reason
+      end
+
+      def sole_provider
+        object.sole_provider?
+      end
+
+      def cheapest
+        object.cheapest?
+      end
+
+      def total_listings_for_product
+        object.total_listings_for_product
+      end
+
+      def cheapest_price_for_product
+        object.cheapest_price_for_product
+      end
+
+      def price_rank
+        object.price_rank
+      end
     end
   end
 end

data/app/serializers/dscf/marketplace/product_serializer.rb

@@ -2,7 +2,7 @@ module Dscf
   module Marketplace
     class ProductSerializer < ActiveModel::Serializer
       attributes :id, :sku, :name, :description, :category_id, :unit_id,
-        :base_price, :base_quantity, :business_only, :created_at, :updated_at,
+        :gross_weight, :base_quantity, :business_only, :created_at, :updated_at,
         :display_name, :price_per_unit, :thumbnail_url, :image_urls
 
       belongs_to :category

data/app/serializers/dscf/marketplace/supplier_product_serializer.rb

@@ -1,14 +1,15 @@
 module Dscf
   module Marketplace
     class SupplierProductSerializer < ActiveModel::Serializer
-      attributes :id, :business_id, :product_id, :supplier_price, :available_quantity,
-        :minimum_order_quantity, :status, :created_at, :updated_at,
+      attributes :id, :business_id, :product_id, :supplier_id, :supplier_price,
+        :available_quantity, :minimum_order_quantity, :status, :created_at, :updated_at,
         :in_stock?, :price_per_unit, :display_name, :name, :description,
         :thumbnail_url, :images_urls,
         :supplier_name, :supplier_address, :supplier_contact_phone
 
       belongs_to :business
       belongs_to :product
+      belongs_to :supplier
       has_many :listings
     end
   end

data/app/serializers/dscf/marketplace/supplier_serializer.rb

@@ -0,0 +1,11 @@
+module Dscf
+  module Marketplace
+    class SupplierSerializer < ActiveModel::Serializer
+      attributes :id, :name, :code, :address, :contact_phone, :business_type,
+                 :business_id, :created_at, :updated_at
+
+      belongs_to :business
+      has_many :addresses
+    end
+  end
+end

data/app/services/dscf/marketplace/invoice_pdf_generator.rb

@@ -0,0 +1,110 @@
+module Dscf
+  module Marketplace
+    class InvoicePdfGenerator
+      attr_reader :order, :order_invoice
+
+      def initialize(order)
+        @order = order
+        @business = order.ordered_to
+        @customer = order.ordered_by
+      end
+
+      def generate!
+        @order_invoice = build_invoice
+        ActiveRecord::Base.transaction do
+          @order_invoice.save!
+          generate_and_attach_pdf
+        end
+        @order_invoice
+      end
+
+      private
+
+      def build_invoice
+        Dscf::Marketplace::OrderInvoice.new(
+          order: order,
+          subtotal: calculate_subtotal,
+          vat_amount: calculate_vat,
+          total: calculate_total,
+          status: :generated
+        )
+      end
+
+      def calculate_subtotal
+        order.order_items.sum(&:subtotal)
+      end
+
+      def calculate_vat
+        (calculate_subtotal * 0.15).round(2)
+      end
+
+      def calculate_total
+        calculate_subtotal + calculate_vat
+      end
+
+      def generate_and_attach_pdf
+        pdf = render_pdf
+        @order_invoice.pdf_file.attach(
+          io: StringIO.new(pdf.render),
+          filename: "#{@order_invoice.invoice_number}.pdf",
+          content_type: "application/pdf"
+        )
+      end
+
+      def render_pdf
+        invoice = @order_invoice
+        business = @business
+        customer = @customer
+        order_items = order.order_items.includes(:product, :unit)
+
+        Prawn::Document.new do |pdf|
+          pdf.text "INVOICE", size: 24, style: :bold, align: :center
+          pdf.move_down 10
+
+          pdf.text business.name, size: 16, style: :bold
+          pdf.text "TIN: #{business.tin_number}" if business.tin_number.present?
+          pdf.text business.contact_phone if business.contact_phone.present?
+          pdf.move_down 10
+
+          pdf.text "Invoice #: #{invoice.invoice_number}"
+          pdf.text "Date: #{invoice.issued_at.strftime('%B %d, %Y')}"
+          pdf.text "Order #: #{order.id}"
+          pdf.move_down 10
+
+          pdf.text "Bill To:", style: :bold
+          pdf.text customer.name
+          pdf.move_down 15
+
+          table_data = [["Item", "Qty", "Unit", "Unit Price", "Total"]]
+          order_items.each do |item|
+            table_data << [
+              item.product_name,
+              item.quantity.to_s,
+              item.unit_name,
+              format_currency(item.unit_price),
+              format_currency(item.subtotal)
+            ]
+          end
+
+          pdf.table(table_data, header: true, width: pdf.bounds.width) do
+            row(0).font_style = :bold
+            cells.padding = 5
+          end
+
+          pdf.move_down 15
+
+          pdf.text "Subtotal: #{format_currency(invoice.subtotal)}", align: :right
+          pdf.text "VAT (15%): #{format_currency(invoice.vat_amount)}", align: :right
+          pdf.text "Total: #{format_currency(invoice.total)}", align: :right, size: 14, style: :bold
+
+          pdf.move_down 30
+          pdf.text "Thank you for your business!", align: :center, style: :italic
+        end
+      end
+
+      def format_currency(amount)
+        "ETB #{format('%.2f', amount)}"
+      end
+    end
+  end
+end

data/config/locales/en.yml

@@ -102,6 +102,9 @@ en:
       activated: "Listing activated successfully"
       paused: "Listing paused successfully"
       sold_out: "Listing marked as sold out successfully"
+      promoted: "Listing promoted by orchestrator successfully"
+      unpromoted: "Listing unpromoted successfully"
+      visible: "Visible listings retrieved successfully"
     errors:
       index: "Failed to retrieve listings"
       show: "Failed to retrieve listing details"
@@ -109,6 +112,9 @@ en:
       update: "Failed to update listing"
       destroy: "Failed to delete listing"
       supplier_not_found: "Supplier not found"
+      promote_failed: "Failed to promote listing"
+      unpromote_failed: "Failed to unpromote listing"
+      visible_failed: "Failed to retrieve visible listings"
 
   request_for_quotations:
     success:

data/config/routes.rb

@@ -19,6 +19,21 @@ Dscf::Marketplace::Engine.routes.draw do
 
   resources :unit_conversions
 
+  # Supplier Management
+  resources :suppliers do
+    collection do
+      get "my_suppliers"
+    end
+  end
+
+  # Aggregator Feed
+  resources :aggregator_listings do
+    collection do
+      get "feed"
+      get "my_listings"
+    end
+  end
+
   # Trading Models
   resources :supplier_products do
     resources :listings, only: [ :index ]
@@ -36,9 +51,12 @@ Dscf::Marketplace::Engine.routes.draw do
       post "activate"
       post "pause"
       post "sold_out"
+      post "promote"
+      post "unpromote"
     end
     collection do
       get "my_listings"
+      get "visible"
       get "by_supplier/:supplier_id", to: "listings#listings_by_supplier"
     end
   end
@@ -82,6 +100,7 @@ Dscf::Marketplace::Engine.routes.draw do
       post "confirm"
       post "cancel"
       post "complete"
+      get "invoice"
     end
     collection do
       get "my_orders"

data/db/migrate/20260514000001_create_dscf_marketplace_suppliers.rb

@@ -0,0 +1,20 @@
+class CreateDscfMarketplaceSuppliers < ActiveRecord::Migration[8.0]
+  def change
+    create_table :dscf_marketplace_suppliers do |t|
+      t.string :name, null: false
+      t.string :code, null: false
+      t.text :address
+      t.string :contact_phone
+      t.integer :business_type, null: false, default: 0
+      t.references :business,
+                   null: false,
+                   index: { name: "business_on_dm_suppliers_indx" },
+                   foreign_key: { to_table: :dscf_core_businesses }
+
+      t.timestamps
+    end
+
+    add_index :dscf_marketplace_suppliers, :code, unique: true
+    add_index :dscf_marketplace_suppliers, :business_type
+  end
+end

data/db/migrate/20260514000002_add_supplier_id_to_supplier_products.rb

@@ -0,0 +1,12 @@
+class AddSupplierIdToSupplierProducts < ActiveRecord::Migration[8.0]
+  def change
+    add_reference :dscf_marketplace_supplier_products, :supplier,
+                  null: true,
+                  index: { name: "supplier_on_dm_sp_indx" },
+                  foreign_key: { to_table: :dscf_marketplace_suppliers }
+
+    remove_column :dscf_marketplace_supplier_products, :supplier_name, :string if column_exists?(:dscf_marketplace_supplier_products, :supplier_name)
+    remove_column :dscf_marketplace_supplier_products, :supplier_address, :text if column_exists?(:dscf_marketplace_supplier_products, :supplier_address)
+    remove_column :dscf_marketplace_supplier_products, :supplier_contact_phone, :string if column_exists?(:dscf_marketplace_supplier_products, :supplier_contact_phone)
+  end
+end

data/db/migrate/20260514000003_create_dscf_marketplace_order_invoices.rb

@@ -0,0 +1,19 @@
+class CreateDscfMarketplaceOrderInvoices < ActiveRecord::Migration[8.0]
+  def change
+    create_table :dscf_marketplace_order_invoices do |t|
+      t.references :order, null: false,
+                   foreign_key: { to_table: :dscf_marketplace_orders },
+                   index: { name: "order_on_dm_oi_indx" }
+      t.string :invoice_number, null: false
+      t.decimal :subtotal, precision: 15, scale: 2, null: false
+      t.decimal :vat_amount, precision: 15, scale: 2, null: false, default: 0
+      t.decimal :total, precision: 15, scale: 2, null: false
+      t.integer :status, null: false, default: 0
+      t.datetime :issued_at, null: false
+
+      t.timestamps
+    end
+
+    add_index :dscf_marketplace_order_invoices, :invoice_number, unique: true
+  end
+end

data/db/migrate/20260514000004_replace_base_price_with_gross_weight_on_products.rb

@@ -0,0 +1,6 @@
+class ReplaceBasePriceWithGrossWeightOnProducts < ActiveRecord::Migration[8.0]
+  def change
+    remove_column :dscf_marketplace_products, :base_price, :decimal
+    add_column :dscf_marketplace_products, :gross_weight, :decimal, precision: 15, scale: 6, null: false, default: 0
+  end
+end

data/db/migrate/20260514000005_create_dscf_marketplace_aggregator_listings.rb

@@ -0,0 +1,22 @@
+class CreateDscfMarketplaceAggregatorListings < ActiveRecord::Migration[8.0]
+  def change
+    create_table :dscf_marketplace_aggregator_listings do |t|
+      t.references :aggregator, null: false,
+                   foreign_key: { to_table: :dscf_core_businesses },
+                   index: { name: "aggregator_on_dm_al_indx" }
+      t.references :supplier_product, null: false,
+                   foreign_key: { to_table: :dscf_marketplace_supplier_products },
+                   index: { name: "sp_on_dm_al_indx" }
+      t.decimal :price, precision: 15, scale: 2, null: false
+      t.decimal :quantity, precision: 15, scale: 6, null: false, default: 0
+      t.integer :status, null: false, default: 0
+
+      t.timestamps
+    end
+
+    add_index :dscf_marketplace_aggregator_listings,
+              [:aggregator_id, :supplier_product_id],
+              unique: true,
+              name: "unique_aggregator_sp_indx"
+  end
+end

data/db/migrate/20260514000006_add_supplier_id_to_addresses.rb

@@ -0,0 +1,9 @@
+class AddSupplierIdToAddresses < ActiveRecord::Migration[8.0]
+  def change
+    add_reference :dscf_core_addresses, :supplier, null: true,
+                  foreign_key: { to_table: :dscf_marketplace_suppliers },
+                  index: { name: "supplier_on_dca_indx" }
+
+    change_column_null :dscf_core_addresses, :user_id, true
+  end
+end

data/db/migrate/20260527000001_add_orchestrator_fields_to_listings.rb

@@ -0,0 +1,22 @@
+class AddOrchestratorFieldsToListings < ActiveRecord::Migration[8.0]
+  def change
+    add_column :dscf_marketplace_listings, :orchestrator_promoted, :boolean, default: false, null: false
+    add_column :dscf_marketplace_listings, :orchestrator_promoted_at, :datetime
+
+    add_reference :dscf_marketplace_listings, :promoted_by,
+                  foreign_key: { to_table: :dscf_core_users },
+                  index: { name: "promoted_by_on_dm_listings_indx" }
+
+    # Backfill: existing active listings remain visible after deploy
+    reversible do |dir|
+      dir.up do
+        execute <<~SQL.squish
+          UPDATE dscf_marketplace_listings
+          SET orchestrator_promoted = true,
+              orchestrator_promoted_at = NOW()
+          WHERE status = 0
+        SQL
+      end
+    end
+  end
+end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.7.6".freeze
+    VERSION = "0.8.1".freeze
   end
 end

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

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :dscf_marketplace_aggregator_listing, class: "Dscf::Marketplace::AggregatorListing" do
+    association :aggregator, factory: :dscf_core_business
+    association :supplier_product, factory: :dscf_marketplace_supplier_product
+    price { 250.00 }
+    quantity { 50.0 }
+    status { :active }
+  end
+end

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

@@ -0,0 +1,11 @@
+FactoryBot.define do
+  factory :dscf_marketplace_order_invoice, class: "Dscf::Marketplace::OrderInvoice" do
+    invoice_number { "INV-#{Date.current.year}-#{SecureRandom.hex(4).upcase}" }
+    subtotal { 1000.00 }
+    vat_amount { 150.00 }
+    total { 1150.00 }
+    status { :generated }
+    issued_at { Time.current }
+    association :order, factory: :dscf_marketplace_order
+  end
+end

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

@@ -4,7 +4,7 @@ FactoryBot.define do
     sequence(:name) { |n| "Product #{n}" }
     description { "Product description" }
     category { create(:dscf_marketplace_category) }
-    base_price { 99.99 }
+    gross_weight { 1.5 }
     business_only { false }
     unit { create(:dscf_marketplace_unit) }
     base_quantity { 1.0 }

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

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :dscf_marketplace_supplier, class: "Dscf::Marketplace::Supplier" do
+    name { Faker::Company.name }
+    code { "SUP-#{SecureRandom.hex(4).upcase}" }
+    address { Faker::Address.full_address }
+    contact_phone { Faker::PhoneNumber.phone_number }
+    business_type { :retailer }
+    association :business, factory: :dscf_core_business
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.7.6
+  version: 0.8.1
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2026-05-06 00:00:00.000000000 Z
+date: 2026-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -35,14 +35,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
   requirement: !ruby/object:Gem::Requirement
@@ -417,6 +417,7 @@ files:
 - MIT-LICENSE
 - Rakefile
 - app/controllers/concerns/dscf/marketplace/demo_permission_bypass.rb
+- app/controllers/dscf/marketplace/aggregator_listings_controller.rb
 - app/controllers/dscf/marketplace/application_controller.rb
 - app/controllers/dscf/marketplace/categories_controller.rb
 - app/controllers/dscf/marketplace/delivery_order_items_controller.rb
@@ -433,10 +434,12 @@ files:
 - app/controllers/dscf/marketplace/request_for_quotations_controller.rb
 - app/controllers/dscf/marketplace/rfq_items_controller.rb
 - app/controllers/dscf/marketplace/supplier_products_controller.rb
+- app/controllers/dscf/marketplace/suppliers_controller.rb
 - app/controllers/dscf/marketplace/unit_conversions_controller.rb
 - app/controllers/dscf/marketplace/units_controller.rb
 - app/jobs/dscf/marketplace/application_job.rb
 - app/mailers/dscf/marketplace/application_mailer.rb
+- app/models/dscf/marketplace/aggregator_listing.rb
 - app/models/dscf/marketplace/application_record.rb
 - app/models/dscf/marketplace/category.rb
 - app/models/dscf/marketplace/delivery_order.rb
@@ -445,15 +448,18 @@ files:
 - app/models/dscf/marketplace/delivery_vehicle.rb
 - app/models/dscf/marketplace/listing.rb
 - app/models/dscf/marketplace/order.rb
+- app/models/dscf/marketplace/order_invoice.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.rb
 - app/models/dscf/marketplace/supplier_product.rb
 - app/models/dscf/marketplace/unit.rb
 - app/models/dscf/marketplace/unit_conversion.rb
+- app/policies/dscf/marketplace/aggregator_listing_policy.rb
 - app/policies/dscf/marketplace/category_policy.rb
 - app/policies/dscf/marketplace/delivery_order_item_policy.rb
 - app/policies/dscf/marketplace/delivery_order_policy.rb
@@ -468,9 +474,11 @@ files:
 - app/policies/dscf/marketplace/quotation_policy.rb
 - app/policies/dscf/marketplace/request_for_quotation_policy.rb
 - app/policies/dscf/marketplace/rfq_item_policy.rb
+- app/policies/dscf/marketplace/supplier_policy.rb
 - app/policies/dscf/marketplace/supplier_product_policy.rb
 - app/policies/dscf/marketplace/unit_conversion_policy.rb
 - app/policies/dscf/marketplace/unit_policy.rb
+- app/serializers/dscf/marketplace/aggregator_listing_serializer.rb
 - app/serializers/dscf/marketplace/category_serializer.rb
 - app/serializers/dscf/marketplace/delivery_order_item_serializer.rb
 - app/serializers/dscf/marketplace/delivery_order_serializer.rb
@@ -486,12 +494,14 @@ files:
 - app/serializers/dscf/marketplace/request_for_quotation_serializer.rb
 - app/serializers/dscf/marketplace/rfq_item_serializer.rb
 - app/serializers/dscf/marketplace/supplier_product_serializer.rb
+- app/serializers/dscf/marketplace/supplier_serializer.rb
 - app/serializers/dscf/marketplace/unit_conversion_serializer.rb
 - app/serializers/dscf/marketplace/unit_serializer.rb
 - app/serializers/dscf/marketplace/user_serializer.rb
 - app/services/dscf/marketplace/delivery_order_service.rb
 - app/services/dscf/marketplace/dispute_service.rb
 - app/services/dscf/marketplace/gebeta_service.rb
+- app/services/dscf/marketplace/invoice_pdf_generator.rb
 - app/services/dscf/marketplace/my_resource_service.rb
 - app/services/dscf/marketplace/rfq_response_service.rb
 - app/services/dscf/marketplace/role_service.rb
@@ -534,6 +544,13 @@ files:
 - db/migrate/20260310122000_add_missing_fields_to_dscf_core_user_roles.rb
 - db/migrate/20260501000002_add_supplier_contact_fields_to_supplier_products.rb
 - db/migrate/20260506100000_add_payment_references_to_dscf_marketplace_orders.rb
+- db/migrate/20260514000001_create_dscf_marketplace_suppliers.rb
+- db/migrate/20260514000002_add_supplier_id_to_supplier_products.rb
+- db/migrate/20260514000003_create_dscf_marketplace_order_invoices.rb
+- db/migrate/20260514000004_replace_base_price_with_gross_weight_on_products.rb
+- db/migrate/20260514000005_create_dscf_marketplace_aggregator_listings.rb
+- db/migrate/20260514000006_add_supplier_id_to_addresses.rb
+- db/migrate/20260527000001_add_orchestrator_fields_to_listings.rb
 - db/seeds.rb
 - lib/dscf/marketplace.rb
 - lib/dscf/marketplace/engine.rb
@@ -545,12 +562,14 @@ files:
 - spec/factories/dscf/core/roles.rb
 - spec/factories/dscf/core/user_roles.rb
 - spec/factories/dscf/core/users.rb
+- spec/factories/dscf/marketplace/aggregator_listings.rb
 - spec/factories/dscf/marketplace/categories.rb
 - spec/factories/dscf/marketplace/delivery_order_items.rb
 - spec/factories/dscf/marketplace/delivery_orders.rb
 - spec/factories/dscf/marketplace/delivery_stops.rb
 - spec/factories/dscf/marketplace/delivery_vehicles.rb
 - spec/factories/dscf/marketplace/listings.rb
+- spec/factories/dscf/marketplace/order_invoices.rb
 - spec/factories/dscf/marketplace/order_items.rb
 - spec/factories/dscf/marketplace/orders.rb
 - spec/factories/dscf/marketplace/products.rb
@@ -559,6 +578,7 @@ files:
 - 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/suppliers.rb
 - spec/factories/dscf/marketplace/unit_conversions.rb
 - spec/factories/dscf/marketplace/units.rb
 homepage: https://mksaddis.com/