dscf-marketplace 0.13.6 → 0.13.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02ad82c5c180b78f7d7e6dd9fa99ad4f9d085fada05a9458d4f808dc4786589c
-  data.tar.gz: c2f9f253a2c90b0efd917f1479272bac714761e97a502eaaccc453b1cf57bfb4
+  metadata.gz: 41a9dcd1ca1d3229c9f74bc40ed5b2b0813108348f28b52a667bff5109c7169a
+  data.tar.gz: 4c370bed0af3b391d58e574ce1d17a5ad6cc13523de64fd666f255f19adb645a
 SHA512:
-  metadata.gz: fa26ea6d381ac3736aae27cb6cd1664629d39a6683524a5266ca8555cbe7c348c0d2c6c642cb1fe32cdfcb017f031091d8c6a07e146e8f7142ca319c83d5bc02
-  data.tar.gz: 5906f2d82f237f21a0038c2c2304a4455faeb46982fc5fb9779675796e75feb5f08f3a0584784b978a0ab159f439722a1c2c506f28d08c43ed9bf6f60096d193
+  metadata.gz: b41084c0c19ed13fcc4f4be329758ee2b88b9ad665e4bf9c68d6b7f5cb83c1ecff2b619faa64f632c77267780aafacb31448dd3f1c58bff324d9091bb526dd67
+  data.tar.gz: 27e1aabb04b76390501c595a54227d1fcc8a6bcdddfdb4b7fd0600a0be49b5d1dc63a8e638eb09f7c82b2c213d27e63ea1fa5b8cc0ab364a81b9b8260526c02c

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

@@ -14,16 +14,27 @@ module Dscf
             password_confirmation: registration_params[:password_confirmation]
           )
 
+          # `authenticate_user` is skipped for this action so self-service
+          # registration stays public, but `current_user` still resolves
+          # whatever Bearer token was sent — an agent onboarding a retailer
+          # on their behalf attaches their own token, so we derive the
+          # onboarding agent from it rather than trusting a client-supplied
+          # agent_id.
+          onboarding_agent = Dscf::Marketplace::Agent.find_by(user_id: current_user&.id)
+
           retailer = Dscf::Marketplace::Retailer.new(
             name: registration_params[:name],
             phone: registration_params[:phone],
             tin_number: registration_params[:tin_number],
             location: registration_params[:location],
-            status: :active
+            status: :active,
+            agent: onboarding_agent,
+            onboarded_at: (Time.current if onboarding_agent)
           )
 
           user.save!
           assign_default_role(user, "RETAILER")
+          retailer.user = user
           retailer.save!
 
           render_success("retailers.success.register", data: retailer, status: :created)
@@ -34,8 +45,9 @@ module Dscf
       end
 
       def my_retailers
-        authorize @clazz.new, :index?
-        retailers = @clazz.where(agent_id: params[:agent_id])
+        authorize @clazz.new, :my_retailers?
+        service = MyResourceService.new(current_user)
+        retailers = service.my_retailers(params)
 
         options = {
           include: default_serializer_includes[:index] || [],

data/app/serializers/dscf/marketplace/supplier_serializer.rb

@@ -2,7 +2,7 @@ module Dscf
   module Marketplace
     class SupplierSerializer < ActiveModel::Serializer
       attributes :id, :name, :code, :address, :contact_phone, :business_type,
-                 :business_id, :review_status, :document_urls, :created_at, :updated_at
+                 :business_id, :review_status, :review_reason, :document_urls, :created_at, :updated_at
 
       belongs_to :business
       has_many :addresses
@@ -11,6 +11,15 @@ module Dscf
         object.review_status
       end
 
+      # Reason the admin gave on the latest review (modification request or
+      # rejection). Lives in the Review's jsonb `feedback` as {reason: "..."}.
+      # nil for approved/pending/draft. Lets the mobile "changes requested"
+      # screen show the admin's note without a push notification.
+      def review_reason
+        feedback = object.current_review_for(:default)&.feedback
+        feedback && (feedback["reason"] || feedback[:reason])
+      end
+
       def document_urls
         object.document_urls
       end

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

@@ -35,6 +35,13 @@ module Dscf
         apply_filters(listings, params)
       end
 
+      def my_retailers(params = {})
+        agent = Dscf::Marketplace::Agent.find_by(user_id: @current_user.id)
+        retailers = agent ? Dscf::Marketplace::Retailer.where(agent_id: agent.id) : Dscf::Marketplace::Retailer.none
+
+        apply_filters(retailers, params)
+      end
+
       def my_products(params = {})
         products = Dscf::Marketplace::SupplierProduct.joins(:business)
           .where(dscf_core_businesses: {user_id: @current_user.id})

data/lib/dscf/marketplace/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.13.6
+  version: 0.13.8
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2026-07-04 00:00:00.000000000 Z
+date: 2026-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails