dscf-marketplace 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7c97626ff0e52c8c5d5e601c4b33e5dbdd941d708096d20c5cdd5cf583b87eb
-  data.tar.gz: e9f22a25e8416efda6cb91e71d9073f69476753ee3cf049f37f5c96e3acdff57
+  metadata.gz: b6818b94cd7c2f6c55d5e39da13eee317dbfa3879e17d442be6821a50f993659
+  data.tar.gz: 840863a3f380843728489b4b6e6518fa0d5bed4cb73a5dd3bddde05f8c525c56
 SHA512:
-  metadata.gz: de2a962d28ad6ecb494784b63392adc834de9efda0a785c233a678f2dfdb1025c2b63993ccb5504cf1a6c632026afe6d0a341f4dd30ae1cd69c899f35d29b236
-  data.tar.gz: ca39c0da64f9c4387022bf67dbf9a857a0e3cd8fc47fd257a3dba6b968b1ca02b53bd5d7f304b8a1de2e4f2b2edaf945484db7bbc3bfade0279fe4545c55b5c0
+  metadata.gz: efa76d0e7f656a6af4de6a2fce5923992872da28135c6a8c723f35717926cd1326aad14a10a5a8ce5ce5961f369f0872fb7d4ef3bdfaff3dc1f83c1b90c5177f
+  data.tar.gz: d0f773b3303836c0dec8d963bc5397a93846d26a0ba83adc9625800a1c4c2239afec6e8fc25cdb15e9dfa2c8fcca6152ca4e02d7810a66ebc5b5c5af531e6420

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

@@ -120,21 +120,33 @@ module Dscf
         authorize obj, :resolve_item?
 
         item = obj.order_items.find(params[:order_item_id])
-        # Example: for price_changed, accept optional resolved_unit_price from params
-        if params[:resolved_unit_price].present?
-          item.resolved_unit_price = params[:resolved_unit_price]
-          item.validation_status = :validated
-        end
-        if params[:resolved_quantity].present?
-          item.resolved_quantity = params[:resolved_quantity]
-          item.validation_status = :validated
-        end
+
         if params[:action_type] == "remove"
+          # No quantity available (or the aggregator otherwise can't source it):
+          # cancel the line rather than zeroing quantity (which fails the
+          # quantity > 0 validation) — cancelled lines are excluded from the
+          # order total and from all_items_validated? gating.
           item.validation_status = :validated
-          item.quantity = 0 # will be cleaned or marked
+          item.status = :cancelled
+        else
+          # Store the resolved_* audit trail AND apply it to the actual
+          # unit_price/quantity — those are what total_amount/subtotal read,
+          # so "use listed price" / "reduce to available qty" must land here
+          # to actually change what's charged.
+          if params[:resolved_unit_price].present?
+            item.resolved_unit_price = params[:resolved_unit_price]
+            item.unit_price = params[:resolved_unit_price]
+            item.validation_status = :validated
+          end
+          if params[:resolved_quantity].present?
+            item.resolved_quantity = params[:resolved_quantity]
+            item.quantity = params[:resolved_quantity]
+            item.validation_status = :validated
+          end
         end
 
         item.save!
+        obj.save! # recompute total_amount from the resolved/cancelled line
         create_notification_for_order(obj, :item_resolved)
         render_success(data: item)
       rescue => e
@@ -235,6 +247,19 @@ module Dscf
         render_error(errors: e.message, status: :unprocessable_entity)
       end
 
+      # Re-source loop: reopen a cancelled line (e.g. a supplier who didn't
+      # confirm) so the aggregator can assign a new source via assign_source.
+      def reopen_item
+        obj = find_record
+        authorize obj, :split?
+
+        item = obj.order_items.find(params[:order_item_id])
+        Dscf::Marketplace::OrderSplittingService.reopen_item(obj, item)
+        render_success(data: obj.reload, serializer_options: { include: default_serializer_includes[:show] || [] })
+      rescue => e
+        render_error(errors: e.message, status: :unprocessable_entity)
+      end
+
       def retailer_confirm
         obj = find_record
         authorize obj, :confirm? # reuse existing or add specific

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

@@ -122,13 +122,21 @@ module Dscf::Marketplace
     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 }
+      calculated_value = billable_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
 
+    # Lines that should count toward the order total / retailer-facing amount.
+    # A cancelled line (removed during validation, or a rejected supplier
+    # allocation) is not being fulfilled, so it shouldn't inflate what the
+    # retailer is asked to confirm and pay.
+    def billable_order_items
+      order_items.reject(&:cancelled?)
+    end
+
     def supplier
       if rfq_based?
         quotation&.business
@@ -170,16 +178,22 @@ module Dscf::Marketplace
     end
 
     def calculate_total_amount
-      self.total_amount = order_items.sum { |item| item.quantity * item.unit_price }
+      self.total_amount = billable_order_items.sum { |item| item.quantity * item.unit_price }
     end
 
-    # Workflow helpers for Sprint 2 order validation + splitting
-    def validating?
-      pending? || status.to_s == "processing"
+    # Workflow helpers for Sprint 2 order validation + splitting.
+    # Note: `validating?` is the enum-generated predicate (true only when
+    # status == "validating"). Use this for "can still be run through
+    # validation" — covers the actual validating status plus the states an
+    # order can be created in (pending / legacy processing) before it does.
+    def awaiting_validation?
+      pending? || validating? || status.to_s == "processing"
     end
 
     def all_items_validated?
-      order_items.all? { |i| i.validation_status == "validated" }
+      # A cancelled line (removed during validation) is no longer part of what
+      # needs to ship, so it shouldn't block Split from becoming available.
+      order_items.reject(&:cancelled?).all? { |i| i.validation_status == "validated" }
     end
 
     def validation_summary
@@ -203,8 +217,12 @@ module Dscf::Marketplace
     end
 
     def supplier_confirmation_complete?
-      # simplistic: all items have source and are confirmed or cancelled
-      order_items.all? { |i| i.source_id.present? && (i.status.to_s == "confirmed" || i.status.to_s == "cancelled") }
+      # A cancelled line (removed at validation time, before a source was ever
+      # assigned, or rejected during confirmation) is done responding either
+      # way — only a still-live line needs a source + confirmed status.
+      order_items.all? do |i|
+        i.cancelled? || (i.source_id.present? && i.status.to_s == "confirmed")
+      end
     end
 
   private

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

@@ -32,7 +32,8 @@ module Dscf
 
       def self.supplier_confirm(order, confirmed: true, reason: nil)
         if confirmed
-          order.order_items.where(status: :processing).update_all(status: OrderItem.statuses[:confirmed])
+          # In full impl, mark specific allocation as confirmed
+          # For now advance whole if appropriate
         else
           order.order_items.where(status: :processing).update_all(status: OrderItem.statuses[:cancelled])
         end
@@ -99,6 +100,29 @@ module Dscf
         order.mark_waiting_retailer_confirmation! if order.supplier_confirmation_complete?
         order_item
       end
+
+      # Re-source loop (requirements doc: when a supplier doesn't confirm, "search
+      # for other sources" then go back to change-product-source). Reopens a
+      # cancelled line for a fresh source assignment: clears its source and any
+      # stale adjustment proposal, and puts it back in :processing. If the order
+      # had already advanced (because every other line had responded), pull it
+      # back to waiting_supplier_confirmation so the reassigned line gets a
+      # chance to be confirmed before the retailer sees the order.
+      def self.reopen_item(order, order_item)
+        raise "Only a cancelled item can be reopened" unless order_item.cancelled?
+
+        order_item.status = :processing
+        order_item.source_type = nil
+        order_item.source_id = nil
+        order_item.supplier_adjusted_unit_price = nil
+        order_item.supplier_adjusted_quantity = nil
+        order_item.supplier_adjustment_note = nil
+        order_item.save!
+
+        order.reload
+        order.mark_waiting_supplier_confirmation! unless order.waiting_supplier_confirmation?
+        order_item
+      end
     end
   end
 end

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

@@ -6,12 +6,14 @@ module Dscf
       # validated, no_longer_listed, price_changed, low_quantity
       # Also populates resolved_* fields where applicable.
       def self.validate(order)
-        order.order_items.each do |item|
+        # A cancelled line (removed earlier, or a rejected allocation) is done —
+        # re-validating it could resurrect a stale validation_status/note.
+        order.order_items.reject(&:cancelled?).each do |item|
           validate_item(item)
         end
-        # Transition order to splitting ready if all validated
-        if order.order_items.all? { |i| i.validation_status == "validated" }
-          order.update!(status: :splitting) if order.validating?
+        # Transition order to splitting ready if all (non-cancelled) items validated
+        if order.all_items_validated? && order.awaiting_validation?
+          order.update!(status: :splitting)
         end
         order.reload
       end

data/config/routes.rb

@@ -135,6 +135,7 @@ Dscf::Marketplace::Engine.routes.draw do
       post "adjust_item"
       post "accept_adjustment"
       post "reject_adjustment"
+      post "reopen_item"
       post "retailer_confirm"
     end
     collection do

data/db/demo_seeds.rb

@@ -115,11 +115,14 @@ Dscf::Marketplace::Agent.create!(name: "Yonas Girma", phone: "+251912000003", se
 Dscf::Marketplace::Agent.create!(name: "Aster Bekele", phone: "+251912000004", service_area: "Megenagna", status: :inactive, verification_status: :verified, onboarded_by: biz_agg)
 puts "  Agents: 4 (2 pending KYC, 1 inactive)"
 
-# ── Aggregator Listings ──
-Dscf::Marketplace::AggregatorListing.create!(aggregator: biz_agg, supplier_product: sp1, price: 950, quantity: 100, status: 0)
-Dscf::Marketplace::AggregatorListing.create!(aggregator: biz_agg, supplier_product: sp4, price: 320, quantity: 50, status: 0)
-Dscf::Marketplace::AggregatorListing.create!(aggregator: biz_agg, supplier_product: sp6b, price: 420, quantity: 80, status: 0)
-puts "  Aggregator Listings: 3"
+# ── Aggregator Listings (source_kind required since 0.10.0) ──
+# Supplier-sourced (resell a supplier_product):
+Dscf::Marketplace::AggregatorListing.create!(aggregator: biz_agg, source_kind: :supplier, supplier_product: sp1, price: 950, quantity: 100, status: 0)
+Dscf::Marketplace::AggregatorListing.create!(aggregator: biz_agg, source_kind: :supplier, supplier_product: sp4, price: 320, quantity: 50, status: 0)
+Dscf::Marketplace::AggregatorListing.create!(aggregator: biz_agg, source_kind: :supplier, supplier_product: sp6b, price: 420, quantity: 80, status: 0)
+# Catalog-sourced (aggregator lists a master-catalog product directly, no upstream cost):
+Dscf::Marketplace::AggregatorListing.create!(aggregator: biz_agg, source_kind: :catalog, product: p2, price: 700, quantity: 60, status: 0)
+puts "  Aggregator Listings: 4 (3 supplier, 1 catalog)"
 
 # ── 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")

data/lib/dscf/marketplace/engine.rb

@@ -36,7 +36,7 @@ module Dscf
               resource :rfq_items, actions: %i[index show create update destroy]
               resource :quotations, actions: %i[index show create update destroy accept reject send_quotation my_quotes filter]
               resource :quotation_items, actions: %i[index show create update destroy]
-              resource :orders, actions: %i[index show create update destroy confirm cancel complete my_orders filter validate resolve_item assign_source split supplier_confirm confirm_item adjust_item accept_adjustment reject_adjustment retailer_confirm]
+              resource :orders, actions: %i[index show create update destroy confirm cancel complete my_orders filter validate resolve_item assign_source split supplier_confirm confirm_item adjust_item accept_adjustment reject_adjustment reopen_item retailer_confirm]
               resource :order_items, actions: %i[index show create update destroy]
               resource :delivery_orders, actions: %i[
                 index show create update destroy pickup start_delivery complete_delivery mark_failed accept summary

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.11.1".freeze
+    VERSION = "0.12.0".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Asrat