dscf-marketplace 0.13.7 → 0.13.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21099282f07c99ae15cd4c526736df7c8e1597ff82caf3e1b540380417f093d0
-  data.tar.gz: e870bcffce615ba356fec8fa15055aa545a3c7efc17cffe95d6bb61f9420d73b
+  metadata.gz: 0a4e70c0a7ba7cd2e04c0789cf215631ee94ad124892ab5655bde66037b8a931
+  data.tar.gz: e02095b4c24fd10f30e46f8e2f9fff8df0a192d2dfbe32a8f9b81768833b4eb0
 SHA512:
-  metadata.gz: e3284d4198ad24bbe298fbf6a6a9c4be20a33e72ed0391d865f524859fd0064c925f8d0693f25bc23cf47504e1f180a0a52dc3fa0256ab8cf8b2ac0f5bfb0334
-  data.tar.gz: 3667ca220153c9a32cc0162ef8018c9204fdb39005f4a109ce88f8e77f31c08d110d1f76d2d25009e6bc891b0c611eb124dfc688044a81a53efd7adcd6695397
+  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/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/config/routes.rb

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

data/db/antigravity_seeds.rb

@@ -0,0 +1,274 @@
+# ════════════════════════════════════════════════════════════════════════════
+# ANTIGRAVITY SEEDS — Clean, collision-free, and fully idempotent demo data
+# ════════════════════════════════════════════════════════════════════════════
+# NOTE: This script does NOT delete any existing tables or database records.
+# It safely finds-or-creates our custom test ecosystem.
+
+puts "🌱 Initializing Antigravity test data safely..."
+
+# ── 1. Find Existing Super Admin ──
+admin = Dscf::Core::User.find_by(email: "admin@dscf.com")
+unless admin
+  puts "❌ admin@dscf.com not found! Creating default admin as fallback..."
+  admin = Dscf::Core::User.create!(
+    email: "admin@dscf.com",
+    phone: "+251999000000",
+    password: "Admin@2024",
+    verified_at: Time.current,
+    temp_password: false
+  )
+end
+
+sa_role = Dscf::Core::Role.find_or_create_by!(code: "SUPER_ADMIN") { |r| r.name = "Super Admin"; r.active = true }
+Dscf::Core::UserRole.find_or_create_by!(user: admin, role: sa_role)
+
+# Ensure SUPER_ADMIN has basic orders permissions
+orders_perms = Dscf::Core::Permission.where(resource: "orders")
+orders_perms.each do |perm|
+  Dscf::Core::RolePermission.find_or_create_by!(role: sa_role, permission: perm)
+end
+puts "✅ Super Admin configured."
+
+# ── 2. Find or Create Custom Antigravity Users safely ──
+retailer_user = Dscf::Core::User.find_by(email: "antigravity.retailer@example.com")
+unless retailer_user
+  phone = "+251977111111"
+  # Avoid phone collisions if already taken
+  while Dscf::Core::User.exists?(phone: phone)
+    phone = "+251977111#{rand(100..999)}"
+  end
+  
+  retailer_user = Dscf::Core::User.create!(
+    email: "antigravity.retailer@example.com",
+    phone: phone,
+    password: "password",
+    verified_at: Time.current,
+    temp_password: false
+  )
+end
+
+supplier_user = Dscf::Core::User.find_by(email: "antigravity.supplier@example.com")
+unless supplier_user
+  phone = "+251977222222"
+  # Avoid phone collisions if already taken
+  while Dscf::Core::User.exists?(phone: phone)
+    phone = "+251977222#{rand(100..999)}"
+  end
+  
+  supplier_user = Dscf::Core::User.create!(
+    email: "antigravity.supplier@example.com",
+    phone: phone,
+    password: "password",
+    verified_at: Time.current,
+    temp_password: false
+  )
+end
+
+# Assign default USER role
+user_role = Dscf::Core::Role.find_or_create_by!(code: "USER") { |r| r.name = "User"; r.active = true }
+Dscf::Core::UserRole.find_or_create_by!(user: retailer_user, role: user_role)
+Dscf::Core::UserRole.find_or_create_by!(user: supplier_user, role: user_role)
+
+# Assign marketplace permissions to USER role
+Dscf::Core::Permission.where(engine: "dscf-marketplace").find_each do |perm|
+  Dscf::Core::RolePermission.find_or_create_by!(role: user_role, permission: perm)
+end
+
+puts "✅ Custom users verified/created."
+
+# ── 3. Find or Create Custom Businesses safely ──
+bt_manufacturer = Dscf::Core::BusinessType.find_or_create_by!(name: "Manufacturer")
+bt_retailer = Dscf::Core::BusinessType.find_or_create_by!(name: "Retailer")
+
+retailer_biz = Dscf::Core::Business.find_by(tin_number: "TIN-AG-RET-001")
+unless retailer_biz
+  phone = "+251977111112"
+  while Dscf::Core::Business.exists?(contact_phone: phone)
+    phone = "+251977111#{rand(100..999)}"
+  end
+  
+  retailer_biz = Dscf::Core::Business.create!(
+    name: "Antigravity Supermarket",
+    user: retailer_user,
+    business_type: bt_retailer,
+    contact_phone: phone,
+    description: "Antigravity Premium Retailer Store",
+    tin_number: "TIN-AG-RET-001"
+  )
+end
+
+supplier_biz = Dscf::Core::Business.find_by(tin_number: "TIN-AG-SUP-001")
+unless supplier_biz
+  phone = "+251977222223"
+  while Dscf::Core::Business.exists?(contact_phone: phone)
+    phone = "+251977222#{rand(100..999)}"
+  end
+  
+  supplier_biz = Dscf::Core::Business.create!(
+    name: "Antigravity Coffee & Textile Wholesaler",
+    user: supplier_user,
+    business_type: bt_manufacturer,
+    contact_phone: phone,
+    description: "Premium Antigravity Wholesaler Export",
+    tin_number: "TIN-AG-SUP-001"
+  )
+end
+
+aggregator_biz = Dscf::Core::Business.find_by(tin_number: "TIN-AG-AGG-001")
+unless aggregator_biz
+  phone = "+251977333333"
+  while Dscf::Core::Business.exists?(contact_phone: phone)
+    phone = "+251977333#{rand(100..999)}"
+  end
+  
+  aggregator_biz = Dscf::Core::Business.create!(
+    name: "Antigravity Aggregators",
+    user: admin,
+    business_type: bt_manufacturer,
+    contact_phone: phone,
+    description: "Official Antigravity Marketplace Aggregator Hub",
+    tin_number: "TIN-AG-AGG-001"
+  )
+end
+
+puts "✅ Custom businesses verified/created."
+
+# ── 4. Categories & Units ──
+cat_coffee = Dscf::Marketplace::Category.find_or_create_by!(name: "Antigravity Coffee") do |c|
+  c.description = "Specialty roasted Ethiopian coffee"
+end
+
+cat_textile = Dscf::Marketplace::Category.find_or_create_by!(name: "Antigravity Textiles") do |c|
+  c.description = "Premium handwoven fabrics"
+end
+
+u_kg = Dscf::Marketplace::Unit.find_or_create_by!(code: "KG") do |u|
+  u.name = "Kilogram"
+  u.unit_type = :weight
+end
+
+u_meter = Dscf::Marketplace::Unit.find_or_create_by!(code: "M") do |u|
+  u.name = "Meter"
+  u.unit_type = :dimension
+end
+
+puts "✅ Categories & Units verified/created."
+
+# ── 5. Products ──
+p1 = Dscf::Marketplace::Product.find_or_create_by!(sku: "AG-COF-SID") do |p|
+  p.name = "Antigravity Sidamo Roasted Coffee"
+  p.description = "Premium washed Sidamo — Medium Roast"
+  p.category = cat_coffee
+  p.unit = u_kg
+  p.base_quantity = 1.0
+  p.gross_weight = 1.2
+end
+
+p2 = Dscf::Marketplace::Product.find_or_create_by!(sku: "AG-TEX-GAB") do |p|
+  p.name = "Antigravity Traditional Gabi Fabric"
+  p.description = "Handwoven thick cotton Gabi"
+  p.category = cat_textile
+  p.unit = u_meter
+  p.base_quantity = 1.0
+  p.gross_weight = 0.8
+end
+
+puts "✅ Products verified/created."
+
+# ── 6. Supplier Record ──
+supplier_record = Dscf::Marketplace::Supplier.find_or_create_by!(business_id: supplier_biz.id) do |s|
+  s.name = "Antigravity Wholesaler Outlet"
+  s.business_type = :manufacturer
+  s.contact_phone = supplier_biz.contact_phone
+  s.address = "Bole Sub-city, Addis Ababa"
+end
+
+# ── 7. Supplier Products ──
+sp1 = Dscf::Marketplace::SupplierProduct.find_or_create_by!(business_id: supplier_biz.id, product_id: p1.id) do |sp|
+  sp.supplier = supplier_record
+  sp.supplier_price = 400
+  sp.available_quantity = 1000
+  sp.minimum_order_quantity = 5
+  sp.status = :active
+end
+
+sp2 = Dscf::Marketplace::SupplierProduct.find_or_create_by!(business_id: supplier_biz.id, product_id: p2.id) do |sp|
+  sp.supplier = supplier_record
+  sp.supplier_price = 300
+  sp.available_quantity = 500
+  sp.minimum_order_quantity = 2
+  sp.status = :active
+end
+
+puts "✅ Supplier Products verified/created."
+
+# ── 8. Aggregator Listings (Sprint 2 Core Target) ──
+al1 = Dscf::Marketplace::AggregatorListing.find_or_create_by!(aggregator_id: aggregator_biz.id, supplier_product_id: sp1.id) do |al|
+  al.price = 550
+  al.quantity = 200
+  al.status = 0 # active/published
+end
+
+al2 = Dscf::Marketplace::AggregatorListing.find_or_create_by!(aggregator_id: aggregator_biz.id, supplier_product_id: sp2.id) do |al|
+  al.price = 420
+  al.quantity = 150
+  al.status = 0 # active/published
+end
+
+puts "✅ Aggregator Listings verified/created."
+
+# ── 9. Direct Listings ──
+Dscf::Marketplace::Listing.find_or_create_by!(business_id: supplier_biz.id, supplier_product_id: sp1.id) do |l|
+  l.price = 500
+  l.quantity = 300
+  l.status = :active
+  l.description = "Direct Sidamo Roasted Coffee from Antigravity Outlet"
+end
+
+Dscf::Marketplace::Listing.find_or_create_by!(business_id: supplier_biz.id, supplier_product_id: sp2.id) do |l|
+  l.price = 380
+  l.quantity = 200
+  l.status = :active
+  l.description = "Direct Traditional Handwoven Gabi from Antigravity Outlet"
+end
+
+puts "✅ Direct Listings verified/created."
+
+# ── 10. Demo Addresses & Agents ──
+address = Dscf::Core::Address.find_by(user_id: retailer_user.id)
+unless address
+  address = Dscf::Core::Address.create!(
+    user: retailer_user,
+    address_type: :shipping,
+    country: "Ethiopia",
+    city: "Addis Ababa",
+    sub_city: "Bole Sub-city",
+    woreda: "Woreda 03",
+    house_numbers: "Suite 4B"
+  )
+end
+
+agent = Dscf::Marketplace::Agent.find_by(onboarded_by_id: aggregator_biz.id)
+unless agent
+  agent_phone = "+251977444444"
+  while Dscf::Marketplace::Agent.exists?(phone: agent_phone)
+    agent_phone = "+251977444#{rand(100..999)}"
+  end
+  
+  Dscf::Marketplace::Agent.create!(
+    name: "Antigravity Logistics Agent",
+    phone: agent_phone,
+    service_area: "Bole Sub-city",
+    status: :active,
+    verification_status: :verified,
+    onboarded_by: aggregator_biz
+  )
+end
+
+puts "🎉 ALL ANTIGRAVITY SEEDS COMPLETED SUCCESSFULLY WITHOUT DELETING ANY DATA."
+puts "--------------------------------------------------------"
+puts "🔑 CREDENTIALS TO USE:"
+puts "Buyer (Retailer):      antigravity.retailer@example.com / password"
+puts "Supplier (Wholesaler): antigravity.supplier@example.com / password"
+puts "Super Admin:           admin@dscf.com / Admin@2024"
+puts "--------------------------------------------------------"

data/lib/dscf/marketplace/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.13.7
+  version: 0.13.9
 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
@@ -536,6 +536,7 @@ files:
 - config/environments/production.rb
 - config/locales/en.yml
 - config/routes.rb
+- db/antigravity_seeds.rb
 - db/demo_seeds.rb
 - db/migrate/20250827172043_create_dscf_marketplace_categories.rb
 - db/migrate/20250827173526_update_dscf_marketplace_categories_indexes.rb