dscf-marketplace 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28fd6ca06416aafd1e185ec3c143cbca9ad794a793e93b809be54bbee9779cae
-  data.tar.gz: 01fdbf80d424f8d053be1b3bba44780758d52efb21e8ad7a6bf0a4bd761f2e68
+  metadata.gz: 06e78b71c3cb2e9a47b73bdc71eb3c221e6ef2c00fae135fbe6f4b9f6b76c0ad
+  data.tar.gz: f416eef38f577530f81e698f6c0fbccfbca0e18b342866e50736a3a328bd65e4
 SHA512:
-  metadata.gz: 2935f0370099d113ee36f2f2722357ad66115557043957a9a6152e94a20080d0c16044e57f3d101819d3ab231d7911317589598db6a947ba90e19ef40e5b0aa1
-  data.tar.gz: 3e7d3ce883999d57799693ecfc4ec9a52559f198de99ed512b9b80ded38d4a001afdd3e90f986d582ca34ebc9df34ff7580e4968ab04e6da3ba4943fac5ac184
+  metadata.gz: 58a193bbca932e849a71adfe6faad3bb2b9b79a8cb312fcb4973aeec8e650b740ae6d10977548b8c94633616fbdeb5089570e332d205ef83e77538e5af6953b6
+  data.tar.gz: 727fd25dd31d44c4f52544ecd161096a502ca4168ca934e1bcd4324ac4b9dcff57c37c268607e4f081ede2e88227441aeef35cd021dd8a7333313a451349de23

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

@@ -111,6 +111,8 @@ module Dscf
         Dscf::Marketplace::OrderValidationService.validate(obj)
         create_notification_for_order(obj, :validation_completed)
         render_success(data: obj, serializer_options: { include: default_serializer_includes[:show] || [] })
+      rescue => e
+        render_error(errors: e.message, status: :unprocessable_entity)
       end
 
       def resolve_item
@@ -135,6 +137,8 @@ module Dscf
         item.save!
         create_notification_for_order(obj, :item_resolved)
         render_success(data: item)
+      rescue => e
+        render_error(errors: e.message, status: :unprocessable_entity)
       end
 
       def assign_source
@@ -144,6 +148,8 @@ module Dscf
         item = obj.order_items.find(params[:order_item_id])
         Dscf::Marketplace::OrderSplittingService.assign_source(item, source_type: params[:source_type], source_id: params[:source_id])
         render_success(data: item)
+      rescue => e
+        render_error(errors: e.message, status: :unprocessable_entity)
       end
 
       def split
@@ -155,6 +161,8 @@ module Dscf
         Dscf::Marketplace::OrderSplittingService.perform_split(obj)
         create_notification_for_order(obj, :split_ready)
         render_success(data: obj, serializer_options: { include: default_serializer_includes[:show] || [] })
+      rescue => e
+        render_error(errors: e.message, status: :unprocessable_entity)
       end
 
       def supplier_confirm
@@ -167,6 +175,8 @@ module Dscf
 
         create_notification_for_order(obj, confirmed ? :supplier_confirmed : :supplier_rejected, reason: reason)
         render_success(data: obj, serializer_options: { include: default_serializer_includes[:show] || [] })
+      rescue => e
+        render_error(errors: e.message, status: :unprocessable_entity)
       end
 
       def retailer_confirm
@@ -187,6 +197,8 @@ module Dscf
         end
 
         render_success(data: obj, serializer_options: { include: default_serializer_includes[:show] || [] })
+      rescue => e
+        render_error(errors: e.message, status: :unprocessable_entity)
       end
 
 
@@ -223,44 +235,84 @@ module Dscf
       private
 
       def create_direct_listing_order
-        listing = Dscf::Marketplace::Listing.active.find_by(id: model_params[:listing_id])
-        return render_error(errors: "Listing is not available", status: :unprocessable_entity) unless listing
+        listing = nil
+        aggregator_listing = nil
+
+        if model_params[:listing_type] == "AggregatorListing"
+          aggregator_listing = Dscf::Marketplace::AggregatorListing.active.find_by(id: model_params[:listing_id])
+          return render_error(errors: "Listing is not available", status: :unprocessable_entity) unless aggregator_listing
+        else
+          listing = Dscf::Marketplace::Listing.active.find_by(id: model_params[:listing_id])
+          if listing.blank? && model_params[:listing_type].blank?
+            aggregator_listing = Dscf::Marketplace::AggregatorListing.active.find_by(id: model_params[:listing_id])
+          end
+          return render_error(errors: "Listing is not available", status: :unprocessable_entity) if listing.blank? && aggregator_listing.blank?
+        end
 
         quantity = direct_listing_quantity
         return render_error(errors: "Quantity must be greater than 0", status: :unprocessable_entity) unless quantity.positive?
 
-        if quantity > listing.quantity
+        limit_quantity = listing ? listing.quantity : aggregator_listing.quantity
+        if quantity > limit_quantity
           return render_error(errors: "Requested quantity exceeds available listing quantity", status: :unprocessable_entity)
         end
 
         order = nil
         ActiveRecord::Base.transaction do
-          listing.lock!
-
-          if quantity > listing.quantity
-            listing.errors.add(:base, "Requested quantity exceeds available listing quantity")
-            raise ActiveRecord::RecordInvalid.new(listing)
+          if listing
+            listing.lock!
+
+            if quantity > listing.quantity
+              listing.errors.add(:base, "Requested quantity exceeds available listing quantity")
+              raise ActiveRecord::RecordInvalid.new(listing)
+            end
+
+            order = @clazz.new(model_params.except(:order_items_attributes))
+            order.order_type = :direct_listing
+            order.status = :pending
+            order.listing = listing
+            order.ordered_to = listing.business
+
+            product = listing.supplier_product.product
+            order.order_items.build(
+              listing: listing,
+              product: product,
+              unit: product.unit,
+              quantity: quantity,
+              unit_price: listing.price,
+              status: :pending
+            )
+            order.save!
+
+            new_quantity = listing.quantity - quantity
+            listing.update!(quantity: new_quantity, status: (new_quantity.zero? ? :sold_out : listing.status))
+          else
+            aggregator_listing.lock!
+
+            if quantity > aggregator_listing.quantity
+              aggregator_listing.errors.add(:base, "Requested quantity exceeds available listing quantity")
+              raise ActiveRecord::RecordInvalid.new(aggregator_listing)
+            end
+
+            order = @clazz.new(model_params.except(:order_items_attributes, :listing_id))
+            order.order_type = :direct_listing
+            order.status = :pending
+            order.ordered_to = aggregator_listing.aggregator
+
+            product = aggregator_listing.supplier_product.product
+            order.order_items.build(
+              source: aggregator_listing,
+              product: product,
+              unit: product.unit,
+              quantity: quantity,
+              unit_price: aggregator_listing.price,
+              status: :pending
+            )
+            order.save!
+
+            new_quantity = aggregator_listing.quantity - quantity
+            aggregator_listing.update!(quantity: new_quantity, status: (new_quantity.zero? ? :sold_out : aggregator_listing.status))
           end
-
-          order = @clazz.new(model_params.except(:order_items_attributes))
-          order.order_type = :direct_listing
-          order.status = :pending
-          order.listing = listing
-          order.ordered_to = listing.business
-
-          product = listing.supplier_product.product
-          order.order_items.build(
-            listing: listing,
-            product: product,
-            unit: product.unit,
-            quantity: quantity,
-            unit_price: listing.price,
-            status: :pending
-          )
-          order.save!
-
-          new_quantity = listing.quantity - quantity
-          listing.update!(quantity: new_quantity, status: (new_quantity.zero? ? :sold_out : listing.status))
         end
 
         order = @clazz.includes(eager_loaded_associations).find(order.id) if eager_loaded_associations.present?
@@ -286,7 +338,7 @@ module Dscf
       def model_params
         @model_params ||= params.require(:order).permit(
           :quotation_id, :listing_id, :user_id, :ordered_by_id, :ordered_to_id, :delivery_order_id, :dropoff_address_id,
-          :order_type, :status, :fulfillment_type, :payment_method, :received_bank_name, :transaction_reference,
+          :order_type, :status, :fulfillment_type, :payment_method, :received_bank_name, :transaction_reference, :listing_type,
           order_items_attributes: [ :id, :quotation_item_id, :listing_id, :product_id, :unit_id, :quantity, :unit_price, :status, :_destroy ]
         )
         @model_params[:payment_method] = normalize_payment_method(@model_params[:payment_method]) if @model_params.key?(:payment_method)

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

@@ -132,7 +132,7 @@ module Dscf::Marketplace
       if rfq_based?
         quotation&.business
       elsif direct_listing?
-        listing&.business
+        listing&.business || ordered_to
       end
     end
 
@@ -209,7 +209,7 @@ module Dscf::Marketplace
   private
 
     def quotation_or_listing_present
-      unless quotation.present? || listing.present?
+      unless quotation.present? || listing.present? || order_items.any? { |item| item.source_type == "Dscf::Marketplace::AggregatorListing" }
         errors.add(:base, "Either quotation or listing must be present")
       end
     end

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

@@ -56,8 +56,8 @@ module Dscf::Marketplace
     private
 
     def quotation_item_or_listing_present
-      unless quotation_item.present? || listing.present?
-        errors.add(:base, "Either quotation_item or listing must be present")
+      unless quotation_item.present? || listing.present? || (source_type == "Dscf::Marketplace::AggregatorListing" && source_id.present?)
+        errors.add(:base, "Either quotation_item, listing, or aggregator listing source must be present")
       end
     end
   end

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

@@ -40,6 +40,10 @@ module Dscf
       def retailer_confirm?
         user.has_permission?("orders.confirm") # or dedicated permission
       end
+
+      def show?
+        user.has_permission?("orders.show") || user.has_permission?("orders.filter") || user.super_admin?
+      end
     end
   end
 end

data/db/demo_seeds.rb

@@ -22,6 +22,7 @@ Dscf::Marketplace::RfqItem.delete_all
 Dscf::Marketplace::RequestForQuotation.delete_all
 Dscf::Marketplace::AggregatorListing.delete_all
 Dscf::Marketplace::Listing.delete_all
+Dscf::Marketplace::ProductInclusionRequest.delete_all
 Dscf::Marketplace::Agent.delete_all
 Dscf::Marketplace::SupplierProduct.delete_all
 Dscf::Marketplace::Supplier.delete_all
@@ -41,6 +42,13 @@ end
 sa_role = Dscf::Core::Role.find_or_create_by!(code: "SUPER_ADMIN") { |r| r.name = "Super Admin"; r.active = true }
 Dscf::Core::UserRole.find_or_create_by!(user: admin, role: sa_role)
 
+# Ensure SUPER_ADMIN has basic orders permissions (show/filter etc) for detail views etc.
+orders_perms = Dscf::Core::Permission.where(resource: "orders")
+orders_perms.each do |perm|
+  Dscf::Core::RolePermission.find_or_create_by!(role: sa_role, permission: perm)
+end
+puts "  Granted orders permissions to SUPER_ADMIN"
+
 puts "🌱 Seeding demo data..."
 
 # ── Businesses ──
@@ -113,8 +121,85 @@ Dscf::Marketplace::AggregatorListing.create!(aggregator: biz_agg, supplier_produ
 Dscf::Marketplace::AggregatorListing.create!(aggregator: biz_agg, supplier_product: sp6b, price: 420, quantity: 80, status: 0)
 puts "  Aggregator Listings: 3"
 
+# ── Demo Address ──
+address = Dscf::Core::Address.first || Dscf::Core::Address.create!(addressable: admin, address_line_1: "Bole Road, Building 12", city: "Addis Ababa", country: "Ethiopia")
+
+# ── Orders (Direct Purchases) ──
+l1 = Dscf::Marketplace::Listing.first
+if l1
+  order1 = Dscf::Marketplace::Order.create!(
+    order_type: :direct_listing,
+    status: :pending,
+    fulfillment_type: :self_pickup,
+    payment_method: :cash,
+    user: admin,
+    ordered_by: admin,
+    ordered_to: l1.business,
+    listing: l1,
+    total_amount: l1.price * 5
+  )
+  order1.order_items.create!(
+    listing: l1,
+    product: l1.supplier_product.product,
+    unit: l1.supplier_product.product.unit,
+    quantity: 5,
+    unit_price: l1.price,
+    status: :pending
+  )
+end
+
+l2 = Dscf::Marketplace::Listing.last
+if l2 && l2 != l1
+  order2 = Dscf::Marketplace::Order.create!(
+    order_type: :direct_listing,
+    status: :processing,
+    fulfillment_type: :delivery,
+    payment_method: :bank_transfer,
+    user: admin,
+    ordered_by: admin,
+    ordered_to: l2.business,
+    listing: l2,
+    dropoff_address: address,
+    total_amount: l2.price * 10
+  )
+  order2.order_items.create!(
+    listing: l2,
+    product: l2.supplier_product.product,
+    unit: l2.supplier_product.product.unit,
+    quantity: 10,
+    unit_price: l2.price,
+    status: :pending
+  )
+end
+puts "  Orders: 2"
+
+# ── RFQs (Request For Quotations) ──
+rfq1 = Dscf::Marketplace::RequestForQuotation.create!(
+  user: admin,
+  status: :sent,
+  notes: "Looking for 500kg of premium washed Yirgacheffe coffee in bulk for export."
+)
+rfq1.rfq_items.create!(
+  product: p1,
+  unit: p1.unit,
+  quantity: 500
+)
+
+rfq2 = Dscf::Marketplace::RequestForQuotation.create!(
+  user: admin,
+  status: :draft,
+  notes: "Checking prices for traditional Shema fabrics."
+)
+rfq2.rfq_items.create!(
+  product: p4,
+  unit: p4.unit,
+  quantity: 100
+)
+puts "  RFQs: 2"
+
 puts ""
 puts "✅ DONE."
 puts "  6 visible: Yirgacheffe, Sidamo(650), Shema(promoted), Habesha(580), Berbere, Harrar"
 puts "  2 hidden:  Sidamo(720), Habesha(650)"
 puts "  1 pending approval (sp6), 2 pending KYC, 1 inactive agent"
+puts "  2 test orders, 2 test RFQs added for UI validation."

data/db/seeds.rb

@@ -39,3 +39,15 @@ marketplace_permissions.find_each do |permission|
 end
 
 puts "✅ Seeded #{marketplace_permissions.count} marketplace permissions and assigned to USER role."
+
+# Also grant key orders permissions (incl. show for detail views) to SUPER_ADMIN if exists
+sa_role = Dscf::Core::Role.find_by(code: "SUPER_ADMIN")
+if sa_role
+  orders_actions = %i[show filter validate resolve_item assign_source split supplier_confirm retailer_confirm]
+  orders_actions.each do |action|
+    if perm = Dscf::Core::Permission.find_by(resource: "orders", action: action)
+      Dscf::Core::RolePermission.find_or_create_by!(role: sa_role, permission: perm)
+    end
+  end
+  puts "  Also granted key orders.* to SUPER_ADMIN"
+end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.9.0".freeze
+    VERSION = "0.9.1".freeze
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2026-06-22 00:00:00.000000000 Z
+date: 2026-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails