dscf-marketplace 0.9.5 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0e91f63e7ff64555d501536f0a77dbf3942fd4ad5a72f9e546306141c1d5901
-  data.tar.gz: 7b3826928b8f65fdaee4e448657b69bcf2e8eec33ec1c00498c679d52437b410
+  metadata.gz: 0707e9c3f1aee47d4403629222fd56a4a643e581c5e15e7e578db9b2457c93db
+  data.tar.gz: 21bd1451f5ed9da67e7fd1e703cdb780b70ffdfc092841bbf0f9e04440c79716
 SHA512:
-  metadata.gz: 37ac177b888c28335a60d18ca44485a4748ea1f71b58850a85dc6a465e68873776fa61a87b63b21b4680c501266181de4d743211dc88009fb4cf88155f2e6c6c
-  data.tar.gz: b42feafb45858e7f9d5e91826f32ea88469aeb2e7e55b9c8644f8dc7fc5d08f499f977b48ec2bfd9553665171d3f9a8b54878e6696946e8d452fa655f1baa9fb
+  metadata.gz: 73d08aab0d6e61e2bb3c3e07051c8edab5a6b36021ab25461cea3e7bf1fd2bf35e4130f3376f8ec56c54804c8ed4fb8443e5cc153b391fef647a1f0ff8202d3f
+  data.tar.gz: b52aecc0d699d73c06a800c2a20badcb4c7f0e8cacfbd2cb43e1cbea0a5c2b1b8f96264a763ea4a403b5a7379b4452e5fcec7aa29aaa2bc31b4532586fe0f29c

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

@@ -179,6 +179,21 @@ module Dscf
         render_error(errors: e.message, status: :unprocessable_entity)
       end
 
+      def confirm_item
+        obj = find_record
+        authorize obj, :supplier_confirm?
+
+        item = obj.order_items.find(params[:order_item_id])
+        confirmed = params[:confirmed] != false
+        reason = params[:reason]
+        Dscf::Marketplace::OrderSplittingService.confirm_item(obj, item, confirmed: confirmed, reason: reason)
+
+        create_notification_for_order(obj, confirmed ? :supplier_confirmed : :supplier_rejected, reason: reason)
+        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/services/dscf/marketplace/order_splitting_service.rb

@@ -43,6 +43,20 @@ module Dscf
         end
         order
       end
+
+      # Per-source confirmation (requirements doc: "Supplier and aggregator order
+      # confirmation"). The aggregator confirms each sub-supplier / aggregator-store
+      # allocation individually; other-supplier items are confirmed by that supplier.
+      # Once every item has responded (confirmed or cancelled), the order advances
+      # to retailer confirmation.
+      def self.confirm_item(order, order_item, confirmed: true, reason: nil)
+        order_item.status = confirmed ? :confirmed : :cancelled
+        order_item.save!
+
+        order.reload
+        order.mark_waiting_retailer_confirmation! if order.supplier_confirmation_complete?
+        order_item
+      end
     end
   end
 end

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

@@ -18,6 +18,14 @@ module Dscf
 
 
       def self.validate_item(item)
+        # Don't re-flag an item the aggregator has already resolved. Re-running
+        # validation would otherwise compare the live listing price against the
+        # untouched order unit_price and reopen the same issue forever.
+        # A resolved item is "validated" but RETAINS its validation_note; an item
+        # that was never flagged is "validated" with a nil note (set in the else
+        # branch below), so the retained note cleanly distinguishes the two.
+        return item if item.validation_status == "validated" && item.validation_note.present?
+
         current_listing = find_current_active_listing(item)
         return mark_no_longer_listed(item) unless current_listing
 

data/config/routes.rb

@@ -130,6 +130,7 @@ Dscf::Marketplace::Engine.routes.draw do
       post "assign_source"
       post "split"
       post "supplier_confirm"
+      post "confirm_item"
       post "retailer_confirm"
     end
     collection do

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.9.5".freeze
+    VERSION = "0.9.7".freeze
   end
 end

metadata

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