dscf-marketplace 0.4.6 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3d34992026013336d09084b0e2679c7681013c06da1e81e226a17bfcf98c846
-  data.tar.gz: d8576224a26ec0115c3721f2c924f021bf3f896987b0a55a4785b37c6be6a751
+  metadata.gz: c5da4085e2caadf1df71f943d67cece2c0c71321ba45e7238240e27cddbf8732
+  data.tar.gz: 295de7880f4419b2f9a427159f58fcea661cbac0421a8524196cfd18a91eba13
 SHA512:
-  metadata.gz: bf9dcac6ea2394f3554d1c927f42a55553fa3fecc5be6408a05126ed4434d5ef5f7889eacac7cd1eaa20f62463a44aceb40dd430372c9ed941f16663c73ed265
-  data.tar.gz: e319a27d550e95ad2ca44433f2d83410385e0b370706e129a7aa9242ab1616ac5a43e2a4d8c3c0d62cee0ef8d8efe4e9f8a994081040ee54fad377342a37ffc4
+  metadata.gz: '04868324b3b929dcfab8299522ffff93a2c527d30b3bfea8f1aa6dfed5890d8ca5f9e4536ad8434e872e71a07239643ae1727ad65db65ce161c84e27b28e4fe3'
+  data.tar.gz: 0570f0c836854f909616af623f4b7660f641852bc1f68f6de1a325ff1ee1c56347500d068b03ac100846619a8e0eb5aebd4a279bf6ef33e4d2dce6b0fd1351c3

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

@@ -2,6 +2,9 @@ module Dscf
   module Marketplace
     class BusinessesController < ApplicationController
       include Dscf::Core::Common
+      include Dscf::Core::ReviewableController
+
+      reviewable_model Dscf::Core::Business
 
       def has_business
         has_business = current_user&.businesses&.exists? || false
@@ -54,17 +57,41 @@ module Dscf
       end
 
       def eager_loaded_associations
-        [ :business_type, :user, :documents ]
+        [
+          :business_type, :user, :documents,
+          reviews: {reviewed_by: :user}
+        ]
       end
 
       def default_serializer_includes
         {
-          index: [ :business_type, :user, :documents ],
-          show: [ :business_type, :user, :documents ],
-          create: [ :business_type, :user, :documents ],
-          update: [ :business_type, :user, :documents ]
+          index: [
+            :business_type, :user, :documents,
+            reviews: {reviewed_by: :user}
+          ],
+          show: [
+            :business_type, :user, :documents,
+            reviews: {reviewed_by: :user}
+          ],
+          create: [ :business_type, :user, :documents, :reviews ],
+          update: [
+            :business_type, :user, :documents,
+            reviews: {reviewed_by: :user}
+          ]
         }
       end
+
+      def allowed_order_columns
+        %w[id name description contact_email contact_phone tin_number created_at updated_at]
+      end
+
+      def render_success(message = nil, data: nil, serializer_options: {}, status: :ok)
+        if data.is_a?(Dscf::Core::Business) && data.respond_to?(:reviews)
+          includes = default_serializer_includes[:show] || []
+          serializer_options = serializer_options.merge(include: includes)
+        end
+        super
+      end
     end
   end
 end

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

@@ -19,9 +19,9 @@ module Dscf
         description = params[:description]
 
         if @obj.report_issue!(issue_type, quantity, description, current_user&.id)
-          render_success("delivery_order_items.success.issue_reported", data: @obj)
+          render_success("delivery_order_items.success.issue_reported", data: @obj.delivery_order)
         else
-          render_error("delivery_order_items.errors.report_issue_failed")
+          render_error("delivery_order_items.errors.report_issue")
         end
       end
 

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

@@ -86,7 +86,9 @@ module Dscf::Marketplace
     end
 
     def report_issue!(issue_type, quantity, description, reported_by)
-      return false unless delivered? || picked_up?
+      return false unless delivered? || picked_up? || pending?
+      return false unless [ "damaged", "missing" ].include?(issue_type)
+      return false if quantity > self.quantity
 
       update!(
         status: issue_type.to_sym, # :damaged or :missing

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

@@ -7,6 +7,9 @@ module Dscf
       belongs_to :business_type
       belongs_to :user
       has_many :documents
+
+      # ✅ REQUIRED: Add reviews association
+      has_many :reviews
     end
   end
 end

data/config/locales/en.yml

@@ -353,12 +353,22 @@ en:
       create: "Business created successfully"
       update: "Business updated successfully"
       destroy: "Business deleted successfully"
+      # ✅ ADD: Review actions
+      approve: "Business approved successfully"
+      reject: "Business rejected successfully"
+      request_modification: "Modification requested for business successfully"
+      resubmit: "Business resubmitted successfully"
     errors:
       index: "Failed to retrieve businesses"
       show: "Failed to retrieve business details"
       create: "Failed to create business"
       update: "Failed to update business"
       destroy: "Failed to delete business"
+      # ✅ ADD: Review action errors
+      approve: "Failed to approve business"
+      reject: "Failed to reject business"
+      request_modification: "Failed to request modification for business"
+      resubmit: "Failed to resubmit business"
 
   businesses:
     success:

data/config/routes.rb

@@ -24,6 +24,12 @@ Dscf::Marketplace::Engine.routes.draw do
       get "has_business"
       get "my_businesses"
     end
+    member do
+      patch :approve
+      patch :reject
+      patch :request_modification
+      patch :resubmit
+    end
   end
 
   # Trading Models

data/lib/dscf/marketplace/engine.rb

@@ -20,6 +20,11 @@ module Dscf
       end
 
       require "active_storage/engine"
+
+      # Extend core Business model with ReviewableModel for review workflow
+      config.to_prepare do
+        Dscf::Core::Business.include Dscf::Core::ReviewableModel if defined?(Dscf::Core::Business)
+      end
     end
   end
 end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.4.6".freeze
+    VERSION = "0.4.8".freeze
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.8
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2025-10-07 00:00:00.000000000 Z
+date: 2025-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails