dscf-marketplace 0.13.8 → 0.13.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41a9dcd1ca1d3229c9f74bc40ed5b2b0813108348f28b52a667bff5109c7169a
-  data.tar.gz: 4c370bed0af3b391d58e574ce1d17a5ad6cc13523de64fd666f255f19adb645a
+  metadata.gz: 0a4e70c0a7ba7cd2e04c0789cf215631ee94ad124892ab5655bde66037b8a931
+  data.tar.gz: e02095b4c24fd10f30e46f8e2f9fff8df0a192d2dfbe32a8f9b81768833b4eb0
 SHA512:
-  metadata.gz: b41084c0c19ed13fcc4f4be329758ee2b88b9ad665e4bf9c68d6b7f5cb83c1ecff2b619faa64f632c77267780aafacb31448dd3f1c58bff324d9091bb526dd67
-  data.tar.gz: 27e1aabb04b76390501c595a54227d1fcc8a6bcdddfdb4b7fd0600a0be49b5d1dc63a8e638eb09f7c82b2c213d27e63ea1fa5b8cc0ab364a81b9b8260526c02c
+  metadata.gz: 7abf3080c4208782460e6ed94a223c4a0730dd6cd2ff27419980a501e7f2729c21699b4c0237ecfe8c85f81962b698aec7b17e73922eac595160238445203458
+  data.tar.gz: 96841b42186010cf01261d58d9749f2f253eec051a4e2f1de3cc977bf51b1ae96d423963941f46d921a5446bdaae4c7e4cd52f3953b010faf0adf65418539117

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

@@ -137,6 +137,39 @@ module Dscf
         render_error(errors: e.message, status: :unprocessable_entity)
       end
 
+      # Supplier-owner resubmission after an admin modification request.
+      # Applies any corrected fields / re-attached documents, then records a
+      # fresh :pending review so the record re-enters the admin queue. Only
+      # valid from the :modify state (mirrors the reviewable transition
+      # "modify" => "pending").
+      def resubmit
+        set_object
+        authorize @obj, :resubmit?
+
+        unless @obj.modification_requested?(:default)
+          return render_error(errors: "Supplier is not awaiting modification", status: :unprocessable_entity)
+        end
+
+        ActiveRecord::Base.transaction do
+          @obj.update!(model_params) if params[:supplier].present?
+
+          @obj.documents.attach(params[:business_license]) if params[:business_license].present?
+
+          if params[:additional_documents].present?
+            params[:additional_documents].each { |doc| @obj.documents.attach(doc) }
+          end
+
+          @obj.resubmit!
+        end
+
+        render_success("suppliers.success.resubmit", data: @obj.reload)
+      rescue ActiveRecord::RecordInvalid => e
+        errors = e.respond_to?(:record) && e.record ? e.record.errors.full_messages : [e.message]
+        render_error(errors: errors, status: :unprocessable_entity)
+      rescue StandardError => e
+        render_error(errors: e.message, status: :unprocessable_entity)
+      end
+
       private
 
       def create_notification(action_type, reason = nil)

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

@@ -73,6 +73,18 @@ module Dscf::Marketplace
       )
     end
 
+    # Owner resubmission after a modification request: records a fresh pending
+    # review (no reviewer — this is a submission, not an admin review), which
+    # moves current_status_for back to "pending" for re-review.
+    def resubmit!
+      Dscf::Core::Review.create!(
+        reviewable: self,
+        context: :default,
+        status: "pending",
+        reviewed_at: Time.current
+      )
+    end
+
     def review_status(context = :default)
       current_status_for(context)
     end

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

@@ -17,6 +17,11 @@ module Dscf
         user.present? && record.business_id.in?(user.businesses.pluck(:id))
       end
 
+      # Resubmission is an owner action (same ownership rule as update).
+      def resubmit?
+        update?
+      end
+
       def my_suppliers?
         true
       end

data/config/routes.rb

@@ -29,6 +29,7 @@ Dscf::Marketplace::Engine.routes.draw do
       post "approve"
       post "reject"
       post "modify"
+      post "resubmit"
     end
   end
 

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.13.8".freeze
+    VERSION = "0.13.9".freeze
   end
 end

metadata

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