dscf-marketplace 0.13.3 → 0.13.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 475043853266506246b2775c97fc0fb8a4c361fb7e415ae36b0c30c0a36f6a34
-  data.tar.gz: 5e5045ee415293974c10856a416907a1aeb9434a9e51fed26aecf72ed4ef1339
+  metadata.gz: ac67a4d6ccac52aad74574a62d841183717112bad1c093526a9b9966421a4747
+  data.tar.gz: e11523f30c6f601d8bad9f14c271a8077354d79e21c3a23bb991779f8c8f8cf7
 SHA512:
-  metadata.gz: 19eb9d280c9b18f8cf07c1532acff967a2bee651bc930f2c24a5142686999308b176d1622ebdbe9be233662fac3ed99bb4f55f2e50b4e3f4ac3bd29bc2e516ff
-  data.tar.gz: a907e0a7fa9aba5f8c14b3eaabc4b47224278bfdc32d758300c20744d12747a546aa846a219386f49e1cc6855fd96adebab43274f6835181fb016bcfbb5e0841
+  metadata.gz: 3468066de76f24decf7c547c0eb3b28044607082b64163251d667f3f8754adad9e47d2a0dfb99f91d93dd07c0595ad01e7dc896d77d222b9b4c25cfcf3598188
+  data.tar.gz: 88a186edeb669c7d90fda622a7c5a4835d4479f1d80064d926cbd396ed09c800efb3da3cb34ddd3e67b0269cc81ef6bc8d7454456b6cc5b5e3bf3805d8df48f4

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

@@ -534,13 +534,15 @@ module Dscf
           else
             aggregator_listing = ri[:aggregator_listing]
             product = aggregator_listing.product
-            # Order lines from the aggregator feed are auto-sourced to the originating
-            # AggregatorListing (regardless of source_kind) — the aggregator already
-            # knows the source, so there's no manual pick at split time. The listing's
-            # source_kind carries who ultimately fulfils it (self / sub-supplier /
-            # supplier), surfaced via source_name for display and confirmation routing.
+            # Order lines from the aggregator feed are auto-sourced so there's
+            # no manual pick at split time. A :supplier-kind listing has a real
+            # external business behind it — source the line straight to that
+            # Business so it shows up on the supplier's own confirmations page
+            # (same as if the aggregator had manually assigned it there).
+            # :catalog / :sub_supplier stay sourced to the AggregatorListing
+            # itself (aggregator-managed — see AggregatorListing#confirming_business).
             order.order_items.build(
-              source: aggregator_listing,
+              source: aggregator_listing.confirming_business || aggregator_listing,
               product: product,
               unit: product.unit,
               quantity: ri[:quantity],

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

@@ -15,7 +15,11 @@ module Dscf::Marketplace
     enum :source_kind, {catalog: 0, supplier: 1, sub_supplier: 2}, default: :catalog
 
     validates :price, numericality: {greater_than: 0}, presence: true
-    validates :quantity, numericality: {greater_than: 0}, presence: true
+    # Quantity must be positive while the listing is orderable, but a sold-out
+    # listing legitimately holds 0 — that's exactly the state set when the last
+    # unit is purchased (order creation decrements to 0 and flips to :sold_out).
+    validates :quantity, presence: true, numericality: {greater_than_or_equal_to: 0}
+    validates :quantity, numericality: {greater_than: 0}, unless: :sold_out?
     validates :aggregator, presence: true
 
     # Each kind requires (and is unique on) exactly one reference.
@@ -71,6 +75,17 @@ module Dscf::Marketplace
       end
     end
 
+    # The real external business that should confirm an order line placed
+    # against this listing on their OWN business dashboard, if any. Only
+    # meaningful for :supplier — that business is a genuine third party,
+    # unambiguously distinct from the aggregator. :catalog has no external
+    # party (the aggregator fulfils it) and :sub_supplier's business is
+    # offline/has no login (requirements doc: sub-suppliers "don't act
+    # directly on the system"), so both stay aggregator-managed (nil here).
+    def confirming_business
+      supplier_product&.business if supplier?
+    end
+
     def available?
       active? && quantity > 0
     end

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

@@ -14,7 +14,11 @@ module Dscf::Marketplace
 
     # Validations
     validates :price, numericality: {greater_than: 0}, presence: true
-    validates :quantity, numericality: {greater_than: 0}, presence: true
+    # Quantity must be positive while the listing is orderable, but a sold-out
+    # listing legitimately holds 0 — that's exactly the state set when the last
+    # unit is purchased (order creation decrements to 0 and flips to :sold_out).
+    validates :quantity, presence: true, numericality: {greater_than_or_equal_to: 0}
+    validates :quantity, numericality: {greater_than: 0}, unless: :sold_out?
     validates :business_id, presence: true
     validates :supplier_product_id, presence: true
 

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

@@ -275,7 +275,14 @@ module Dscf::Marketplace
     end
 
     def quotation_or_listing_present
-      unless quotation.present? || listing.present? || order_items.any? { |item| item.source_type == "Dscf::Marketplace::AggregatorListing" }
+      # A feed-purchased order has no order.listing (Order#listing is a single
+      # FK; nothing to point it at when every item came from the aggregator's
+      # feed) but each item's own presence validation already requires it to
+      # carry a quotation_item, listing, or assigned source — so any item with
+      # an assigned source_type proves the order is legitimately grounded,
+      # regardless of whether that source resolved to an AggregatorListing or
+      # straight to the fulfilling Business (see AggregatorListing#confirming_business).
+      unless quotation.present? || listing.present? || order_items.any? { |item| item.source_type.present? }
         errors.add(:base, "Either quotation or listing must be present")
       end
     end

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

@@ -57,17 +57,28 @@ module Dscf
       # any object responding to #price and #quantity works (Listing or
       # AggregatorListing), since validate_item only reads those two fields.
       private_class_method def self.find_current_active_listing(item)
-        # Lines placed from the aggregator feed are sourced to their AggregatorListing —
-        # validate against that listing's live price/quantity, not a supplier listing.
-        if item.source.is_a?(AggregatorListing)
-          return AggregatorListing.active.find_by(id: item.source_id)
-        end
-
-        # Prefer the original supplier listing if still active
+        # Prefer the original supplier listing if still active — the most
+        # authoritative reference when the item actually has one (a plain
+        # Listing-based order line).
         if item.listing && Listing.active.exists?(id: item.listing.id)
           return item.listing
         end
 
+        # A feed-purchased line (no listing_id at all) should validate against
+        # the aggregator's own markup price, not a random supplier listing —
+        # even after a :supplier-kind item's source has been resolved straight
+        # to the fulfilling Business (see AggregatorListing#confirming_business),
+        # so this can't just check item.source's class anymore. Does the
+        # order's own business (order.ordered_to) have an active aggregator
+        # listing for this product at all? If so, that's the reference the
+        # retailer actually agreed to pay, regardless of what source is now.
+        if item.listing_id.nil? && item.order&.ordered_to.present?
+          aggregator_listing = AggregatorListing.active
+            .where(aggregator_id: item.order.ordered_to_id)
+            .detect { |al| al.product&.id == item.product_id }
+          return aggregator_listing if aggregator_listing
+        end
+
         # Fallback: find cheapest active listing for the product
         Listing.active
                .joins(:supplier_product)

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.13.3".freeze
+    VERSION = "0.13.5".freeze
   end
 end

metadata

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