dscf-marketplace 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6868f5b7cbade52d287939591c2011a7140b76eda6f3223ba7f66a3a51fb3d08
-  data.tar.gz: dd56581029c76743ec281f4de717f00410a38d780b68ad57a13a11cd36e8ddd2
+  metadata.gz: e66e6a4fac1c4edcfd47fee2305ae1f1003e0f5b67d1de4ed92437efab52c51d
+  data.tar.gz: 938e70e67ec267163bdb2414da889a90ecb5d46c4c72c016af6b26bac160a4cb
 SHA512:
-  metadata.gz: 1d7737babebba09f37154720fea2502464ad2c71cac4007114a40d3d22529efc664091d8f96a26086140bdd66696cfffa0bf7b1d828b6764f833e1497327940e
-  data.tar.gz: a2f2b76706da91f693a76cbe47e6b913b97819777f81ef3dacd354a83e59d8106dfcca11402af054493c1dcda586edca8b998858adbcfaeb11297aea302ffff2
+  metadata.gz: 74555ff90a3951e9ba75d3fc451da200458a4b15c6eb4cd227f48dee569fe14e70174c292e7e7f1454200a6765431f3b3e66cd2862e4885dc474e0a1eddfc6eb
+  data.tar.gz: 999a3fa20ea0ee8db77b9d39c48efcffb9f5f9d19c73d1fd7555c7a9b0b9a77c9cf76ee363564e5acfabf1ed3cfbfe5b84f6bda1525fdb018903429495f3a21f

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

@@ -16,12 +16,64 @@ module Dscf
         render_success("supplier_products.success.index", data: products, serializer_options: options)
       end
 
+      # Override create so supplier submissions default to inactive (require approval)
+      def create
+        authorize @clazz.new, :create?
+
+        obj = @clazz.new(model_params)
+        # Ensure newly created supplier products are inactive until approved by platform admin
+        obj.status = :inactive
+
+        ActiveRecord::Base.transaction do
+          if obj.save
+            @obj = obj
+            after_save_hook(obj) if respond_to?(:after_save_hook, true)
+
+            obj = @clazz.includes(eager_loaded_associations).find(obj.id) if eager_loaded_associations.present?
+            @obj = obj
+
+            includes = serializer_includes_for_action(:create)
+            options = {}
+            options[:include] = includes if includes.present?
+
+            render_success(data: obj, serializer_options: options, status: :created)
+          else
+            render_error(errors: obj.errors.full_messages[0], status: :unprocessable_entity)
+          end
+        end
+      end
+
+      # Admin action to approve a supplier product (makes it active)
+      def approve
+        set_object
+        authorize @obj, :approve?
+
+        if @obj.update(status: :active)
+          render_success("supplier_products.success.approve", data: @obj)
+        else
+          render_error("supplier_products.errors.approve", errors: @obj.errors.full_messages, status: :unprocessable_entity)
+        end
+      end
+
+      # Admin action to reject a supplier product (makes it inactive)
+      def reject
+        set_object
+        authorize @obj, :approve?
+
+        if @obj.update(status: :inactive)
+          render_success("supplier_products.success.reject", data: @obj)
+        else
+          render_error("supplier_products.errors.reject", errors: @obj.errors.full_messages, status: :unprocessable_entity)
+        end
+      end
+
       private
 
       def model_params
         params.require(:supplier_product).permit(
           :business_id, :product_id, :supplier_price, :available_quantity,
-          :minimum_order_quantity, :status
+          :minimum_order_quantity, :status,
+          :supplier_name, :supplier_address, :supplier_contact_phone
         )
       end
 

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

@@ -20,7 +20,7 @@ module Dscf::Marketplace
     scope :by_product, ->(product_id) { where(product_id: product_id) }
 
     def self.ransackable_attributes(_auth_object = nil)
-      %w[id business_id product_id supplier_price available_quantity minimum_order_quantity status created_at updated_at]
+      %w[id business_id product_id supplier_price available_quantity minimum_order_quantity status created_at updated_at supplier_name supplier_address supplier_contact_phone]
     end
 
     def self.ransackable_associations(_auth_object = nil)

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

@@ -4,6 +4,13 @@ module Dscf
       def my_products?
         user.has_permission?("supplier_products.my_products")
       end
+
+      def approve?
+        return true if user.super_admin?
+
+        # Only allow users who belong to a system business to approve supplier products
+        user.businesses.where(is_system: true).exists?
+      end
     end
   end
 end

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

@@ -4,7 +4,8 @@ module Dscf
       attributes :id, :business_id, :product_id, :supplier_price, :available_quantity,
         :minimum_order_quantity, :status, :created_at, :updated_at,
         :in_stock?, :price_per_unit, :display_name, :name, :description,
-        :thumbnail_url, :images_urls
+        :thumbnail_url, :images_urls,
+        :supplier_name, :supplier_address, :supplier_contact_phone
 
       belongs_to :business
       belongs_to :product

data/config/locales/en.yml

@@ -77,12 +77,16 @@ en:
   supplier_products:
     success:
       index: "Supplier products retrieved successfully"
+      approve: "Supplier product approved successfully"
+      reject: "Supplier product rejected successfully"
       show: "Supplier product details retrieved successfully"
       create: "Supplier product created successfully"
       update: "Supplier product updated successfully"
       destroy: "Supplier product deleted successfully"
     errors:
       index: "Failed to retrieve supplier products"
+      approve: "Failed to approve supplier product"
+      reject: "Failed to reject supplier product"
       show: "Failed to retrieve supplier product details"
       create: "Failed to create supplier product"
       update: "Failed to update supplier product"

data/config/routes.rb

@@ -25,6 +25,10 @@ Dscf::Marketplace::Engine.routes.draw do
     collection do
       get "my_products"
     end
+    member do
+      post "approve"
+      post "reject"
+    end
   end
 
   resources :listings do

data/db/migrate/20260501000002_add_supplier_contact_fields_to_supplier_products.rb

@@ -0,0 +1,7 @@
+class AddSupplierContactFieldsToSupplierProducts < ActiveRecord::Migration[8.0]
+  def change
+    add_column :dscf_marketplace_supplier_products, :supplier_name, :string
+    add_column :dscf_marketplace_supplier_products, :supplier_address, :text
+    add_column :dscf_marketplace_supplier_products, :supplier_contact_phone, :string
+  end
+end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.7.4".freeze
+    VERSION = "0.7.5".freeze
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2026-04-24 00:00:00.000000000 Z
+date: 2026-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -532,6 +532,7 @@ files:
 - db/migrate/20251130144500_add_delivery_stop_to_delivery_order_items.rb
 - db/migrate/20260310120000_add_active_and_description_to_dscf_core_roles.rb
 - db/migrate/20260310122000_add_missing_fields_to_dscf_core_user_roles.rb
+- db/migrate/20260501000002_add_supplier_contact_fields_to_supplier_products.rb
 - db/seeds.rb
 - lib/dscf/marketplace.rb
 - lib/dscf/marketplace/engine.rb