dscf-marketplace 0.8.4 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ccdf7ab2d80d24d3125fc70cd2967e82b64ceec4fecad26005cc38539416d3d
-  data.tar.gz: 513a5ca0fc82efe0e44ed34d4f5ccc9360c6508747ae569bda5c36a8497f00d5
+  metadata.gz: 36275865e4363db165333b5274f3e16ef5ae38cd0c3b4fc3e4fe88f6a32f2d73
+  data.tar.gz: e440535b9bd3e6fdb5df853f47af02c43344dc05f8cca68f76d40235995bea25
 SHA512:
-  metadata.gz: 6293f513a29b0e11b5300350af009c07504582dd3f29ef423cb3ee14ee87e8389397cad18ab7e7b505ff598f92a9cf06ba99f0e4cd44ee91917928f79e3579e3
-  data.tar.gz: 68c91b028dbdce0862f7dafedf85e262469dc36bcdcd943e036edfe0ea3b271a56233870d4075272ae6da618d55c4ba0b2539bf74eff349ec83f339bd814d5ff
+  metadata.gz: 42cc494a65237a972384e89a19603183e7bd8521258d12c317cafdd134b0d965532c0b3d5a91393557573a618b5368b613b29c002743ddda0fcf56fb75051dc4
+  data.tar.gz: fd1469a19042fa3ffe9e0ad5b6c0e94077dc791052f79fb3cfa978f46bb67532ac4b8d6c650d23c86c1bb8b53f60dd4be0a5e95655bdce68e3f679d69ab64848

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

@@ -9,6 +9,7 @@ module Dscf
         obj = @clazz.new(registration_params)
         ActiveRecord::Base.transaction do
           if obj.save
+            create_registration_notification(obj)
             render_success("agent.success.register", data: obj, status: :created)
           else
             render_error("agent.errors.register", errors: obj.errors.full_messages[0], status: :unprocessable_entity)
@@ -23,29 +24,98 @@ module Dscf
         render_success("agent.success.destroy")
       end
 
+      # Verify (approve) or reject an agent based on presence of reason param
+      def verify
+        @obj = find_record
+        authorize @obj, :verify?
+
+        if params[:reason].present?
+          @obj.update!(
+            verification_status: :rejected,
+            rejection_reason: params[:reason],
+            rejected_at: Time.current
+          )
+          notification = Dscf::Core::Notification.create!(
+            notifiable: @obj,
+            recipient: current_user,
+            notification_type: :rejection,
+            title: "Agent Rejected",
+            body: "Agent '#{@obj.name}' (#{@obj.code}) has been rejected. Reason: #{params[:reason]}"
+          )
+          Dscf::Core::NotificationService.deliver(notification)
+          render_success("agent.success.rejected", data: @obj)
+        else
+          @obj.update!(verification_status: :verified)
+          render_success("agent.success.verified", data: @obj)
+        end
+      rescue StandardError => e
+        render_error(errors: e.message, status: :unprocessable_entity)
+      end
+
+      # Modify agent's location fields
+      def modify_location
+        @obj = find_record
+        authorize @obj, :modify_location?
+
+        @obj.update!(
+          service_area: params[:service_area],
+          sub_city: params[:sub_city],
+          woreda: params[:woreda],
+          modified_at: Time.current
+        )
+        notification = Dscf::Core::Notification.create!(
+          notifiable: @obj,
+          recipient: current_user,
+          notification_type: :modification,
+          title: "Agent Location Modified",
+          body: "Location for agent '#{@obj.name}' (#{@obj.code}) has been updated."
+        )
+        Dscf::Core::NotificationService.deliver(notification)
+        render_success("agent.success.location_modified", data: @obj)
+      rescue StandardError => e
+        render_error(errors: e.message, status: :unprocessable_entity)
+      end
+
       private
 
       def model_params
         params.require(:agent).permit(
-          :name, :phone, :service_area, :fayda_number, :photo, :onboarded_by_id
+          :name, :phone, :service_area, :sub_city, :woreda, :fayda_number, :photo, :onboarded_by_id
         )
       end
 
       # Registration allows same fields but no authentication required
       def registration_params
         params.require(:agent).permit(
-          :name, :phone, :service_area, :fayda_number, :onboarded_by_id
+          :name, :phone, :service_area, :fayda_number, :onboarded_by_id,
+          :gender, :national_id
+        )
+      end
+
+      def create_registration_notification(agent)
+        recipient = Dscf::Core::User.joins(:roles)
+                                     .where(dscf_core_roles: {code: "SUPER_ADMIN"})
+                                     .first || Dscf::Core::User.first
+
+        return unless recipient
+
+        Dscf::Core::Notification.create!(
+          notifiable: agent,
+          recipient: recipient,
+          notification_type: :general,
+          title: "New Agent Registration",
+          body: "Agent '#{agent.name}' (#{agent.code}) has registered and is pending review. Phone: #{agent.phone}, Area: #{agent.service_area}"
         )
       end
 
       def eager_loaded_associations
-        [:onboarded_by]
+        [ :onboarded_by ]
       end
 
       def default_serializer_includes
         {
-          index: [:onboarded_by],
-          show: [:onboarded_by]
+          index: [ :onboarded_by ],
+          show: [ :onboarded_by ]
         }
       end
 

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

@@ -9,7 +9,7 @@ module Dscf
 
         options = {
           include: default_serializer_includes[:index] || [],
-          meta: { resource_type: "aggregator_feed" }
+          meta: {resource_type: "aggregator_feed"}
         }
 
         render_success(data: listings, serializer_options: options)
@@ -22,7 +22,7 @@ module Dscf
 
         options = {
           include: default_serializer_includes[:index] || [],
-          meta: { resource_type: "my_aggregator_listings" }
+          meta: {resource_type: "my_aggregator_listings"}
         }
 
         render_success(data: listings, serializer_options: options)

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

@@ -7,11 +7,11 @@ module Dscf
         super do
           if params[:delivery_order_id]
             stops = DeliveryStop.where(delivery_order_id: params[:delivery_order_id])
-            options = { include: [:dropoff_address, :delivery_order_items] }
-            [stops, options]
+            options = {include: [ :dropoff_address, :delivery_order_items ]}
+            [ stops, options ]
           else
              # Fallback or standard index if needed, though mostly used nested
-             [DeliveryStop.all, {}]
+             [ DeliveryStop.all, {} ]
           end
         end
       end
@@ -21,8 +21,8 @@ module Dscf
         authorize @delivery_stop, :verify?
         if @delivery_stop.verify!(verified_by: current_user.id)
           render_success(
-            data: @delivery_stop, 
-            serializer_options: { include: [:dropoff_address, :delivery_order_items] }
+            data: @delivery_stop,
+            serializer_options: {include: [ :dropoff_address, :delivery_order_items ]}
           )
         else
           render_error(
@@ -39,7 +39,7 @@ module Dscf
       end
 
       def eager_loaded_associations
-        [:dropoff_address, :delivery_order_items]
+        [ :dropoff_address, :delivery_order_items ]
       end
 
       def allowed_order_columns
@@ -48,9 +48,9 @@ module Dscf
 
       def default_serializer_includes
         {
-          index: [:dropoff_address, :delivery_order_items],
-          show: [:dropoff_address, :delivery_order_items],
-          verify: [:dropoff_address, :delivery_order_items]
+          index: [ :dropoff_address, :delivery_order_items ],
+          show: [ :dropoff_address, :delivery_order_items ],
+          verify: [ :dropoff_address, :delivery_order_items ]
         }
       end
     end

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

@@ -0,0 +1,57 @@
+module Dscf
+  module Marketplace
+    class ListingApprovalsController < ApplicationController
+      include Dscf::Core::Common
+
+      def set_price
+        set_object
+        authorize @obj, :set_price?
+
+        if @obj.update(set_price_params.merge(approved_by: current_user, approved_at: Time.current))
+          notification = Dscf::Core::Notification.create!(
+            notification_type: :listing,
+            title: "Price set for listing ##{@obj.listing_id}",
+            body: "Aggregator price: #{@obj.aggregator_price}, Supplier price: #{@obj.supplier_price}",
+            recipient: current_user,
+            notifiable: @obj
+          )
+          Dscf::Core::NotificationService.deliver(notification)
+          render_success(data: @obj, serializer_options: {include: serializer_includes_for_action(:show)})
+        else
+          render_error(errors: @obj.errors.full_messages[0], status: :unprocessable_entity)
+        end
+      end
+
+      private
+
+      def model_params
+        params.require(:listing_approval).permit(
+          :listing_id, :aggregator_price, :supplier_price, :approval_status
+        )
+      end
+
+      def set_price_params
+        params.require(:listing_approval).permit(
+          :aggregator_price, :supplier_price, :approval_status
+        )
+      end
+
+      def eager_loaded_associations
+        [ :listing, :approved_by ]
+      end
+
+      def default_serializer_includes
+        {
+          index: [ :listing ],
+          show: [ :listing, :approved_by ],
+          create: [ :listing ],
+          update: [ :listing ]
+        }
+      end
+
+      def allowed_order_columns
+        %w[id listing_id approval_status aggregator_price supplier_price approved_at created_at updated_at]
+      end
+    end
+  end
+end

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

@@ -68,7 +68,7 @@ module Dscf
 
         options = {
           include: default_serializer_includes[:index] || [],
-          meta: { resource_type: "visible_listings" }
+          meta: {resource_type: "visible_listings"}
         }
 
         render_success(data: listings, serializer_options: options)
@@ -81,7 +81,7 @@ module Dscf
 
         options = {
           include: default_serializer_includes[:index] || [],
-          meta: { resource_type: "my_listings" }
+          meta: {resource_type: "my_listings"}
         }
 
         render_success("listings.success.index", data: listings, serializer_options: options)

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

@@ -70,7 +70,7 @@ module Dscf
           @obj.order_items.update_all(status: OrderItem.statuses[:fulfilled])
           begin
             invoice = Dscf::Marketplace::InvoicePdfGenerator.new(@obj).generate!
-            render_success("orders.success.completed", data: @obj, meta: { invoice_id: invoice.id })
+            render_success("orders.success.completed", data: @obj, meta: {invoice_id: invoice.id})
           rescue => e
             Rails.logger.error("Invoice generation failed for order #{@obj.id}: #{e.message}")
             render_success("orders.success.completed", data: @obj)

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

@@ -0,0 +1,127 @@
+module Dscf
+  module Marketplace
+    class ProductInclusionRequestsController < ApplicationController
+      include Dscf::Core::Common
+
+      # Override create to set requested_by from current_user
+      def create
+        authorize @clazz.new, :create?
+
+        obj = @clazz.new(model_params)
+        obj.requested_by = current_user
+
+        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
+      rescue ::Pundit::NotAuthorizedError
+        raise
+      rescue Dscf::Core::FileUploadError => e
+        render_error(errors: e.message, status: :unprocessable_entity)
+      rescue StandardError => e
+        render_error(error: e.message)
+      end
+
+      # Approve a pending product inclusion request
+      def approve
+        set_object
+        authorize @obj, :approve?
+
+        @obj.approve!(current_user)
+        create_notification(:approved)
+
+        render_success("product_inclusion_requests.success.approve", data: @obj)
+      rescue StandardError => e
+        render_error(errors: e.message, status: :unprocessable_entity)
+      end
+
+      # Request modification with a review comment
+      def modify
+        set_object
+        authorize @obj, :modify?
+
+        comment = params[:review_comment]
+        raise ArgumentError, "Review comment is required for modification" if comment.blank?
+
+        @obj.modify!(current_user, comment)
+        create_notification(:modification)
+
+        render_success("product_inclusion_requests.success.modify", data: @obj)
+      rescue ArgumentError => e
+        render_error(errors: e.message, status: :unprocessable_entity)
+      rescue StandardError => e
+        render_error(errors: e.message, status: :unprocessable_entity)
+      end
+
+      # Decline a pending product inclusion request
+      def decline
+        set_object
+        authorize @obj, :decline?
+
+        comment = params[:review_comment]
+        raise ArgumentError, "Review comment is required for decline" if comment.blank?
+
+        @obj.decline!(current_user, comment)
+        create_notification(:rejection)
+
+        render_success("product_inclusion_requests.success.decline", data: @obj)
+      rescue ArgumentError => e
+        render_error(errors: e.message, status: :unprocessable_entity)
+      rescue StandardError => e
+        render_error(errors: e.message, status: :unprocessable_entity)
+      end
+
+      private
+
+      def model_params
+        params.require(:product_inclusion_request).permit(
+          :supplier_id, :product_name, :product_description, :unit_of_measure,
+          product_images: []
+        )
+      end
+
+      def eager_loaded_associations
+        %i[supplier requested_by reviewer]
+      end
+
+      def default_serializer_includes
+        {
+          index: %i[supplier requested_by],
+          show: %i[supplier requested_by reviewer],
+          create: %i[supplier requested_by],
+          update: %i[supplier requested_by]
+        }
+      end
+
+      def create_notification(action_type)
+        notification_type = case action_type
+        when :approved then :approval
+        when :modification then :modification
+        when :rejection then :rejection
+        end
+
+        notification = Dscf::Core::Notification.create!(
+          notifiable: @obj,
+          recipient: @obj.requested_by,
+          notification_type: notification_type,
+          title: "Product Inclusion Request #{action_type.to_s.humanize}",
+          body: "Your product inclusion request for '#{@obj.product_name}' has been #{action_type.to_s.humanize.downcase}."
+        )
+        Dscf::Core::NotificationService.deliver(notification)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,61 @@
+module Dscf
+  module Marketplace
+    class RetailersController < ApplicationController
+      include Dscf::Core::Common
+
+      skip_before_action :authenticate_user, only: [ :register ]
+
+      def register
+        ActiveRecord::Base.transaction do
+          user = Dscf::Core::User.new(
+            phone: registration_params[:phone],
+            password: registration_params[:password],
+            password_confirmation: registration_params[:password_confirmation]
+          )
+
+          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
+          )
+
+          user.save!
+          retailer.save!
+
+          render_success("retailers.success.register", data: retailer, status: :created)
+        end
+      rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved => e
+        errors = e.respond_to?(:record) && e.record ? e.record.errors.full_messages : [ e.message ]
+        render_error("retailers.errors.register", errors: errors, status: :unprocessable_entity)
+      end
+
+      def my_retailers
+        authorize @clazz.new, :index?
+        retailers = @clazz.where(agent_id: params[:agent_id])
+
+        options = {
+          include: default_serializer_includes[:index] || [],
+          meta: {resource_type: "my_retailers"}
+        }
+
+        render_success("retailers.success.index", data: retailers, serializer_options: options)
+      end
+
+      private
+
+      def model_params
+        params.require(:retailer).permit(
+          :name, :phone, :tin_number, :location, :agent_id
+        )
+      end
+
+      def registration_params
+        params.require(:retailer).permit(
+          :name, :phone, :tin_number, :location, :password, :password_confirmation
+        )
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Dscf
+  module Marketplace
+    class SubSuppliersController < ApplicationController
+      include Dscf::Core::Common
+
+      private
+
+      def model_params
+        params.require(:sub_supplier).permit(
+          :business_name, :contact_person_name, :contact_person_phone,
+          :city, :sub_city, :woreda, :supplier_id, :business_license
+        )
+      end
+    end
+  end
+end

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

@@ -48,7 +48,11 @@ module Dscf
         set_object
         authorize @obj, :approve?
 
-        if @obj.update(status: :active)
+        update_params = {status: :active, approved_at: Time.current}
+        update_params[:rejection_reason] = params[:reason] if params[:reason].present?
+
+        if @obj.update(update_params)
+          create_notification(:approved)
           render_success("supplier_products.success.approve", data: @obj)
         else
           render_error("supplier_products.errors.approve", errors: @obj.errors.full_messages, status: :unprocessable_entity)
@@ -60,11 +64,17 @@ module Dscf
         set_object
         authorize @obj, :approve?
 
-        if @obj.update(status: :inactive)
+        reason = params[:reason]
+        raise ArgumentError, "Reason is required for rejection" if reason.blank?
+
+        if @obj.update(status: :inactive, rejection_reason: reason, rejected_at: Time.current)
+          create_notification(:rejected)
           render_success("supplier_products.success.reject", data: @obj)
         else
           render_error("supplier_products.errors.reject", errors: @obj.errors.full_messages, status: :unprocessable_entity)
         end
+      rescue ArgumentError => e
+        render_error(errors: e.message, status: :unprocessable_entity)
       end
 
       private
@@ -76,6 +86,21 @@ module Dscf
         )
       end
 
+      def create_notification(action_type)
+        notification_type = case action_type
+        when :approved then :approval
+        when :rejected then :rejection
+        end
+
+        Dscf::Core::Notification.create!(
+          notifiable: @obj,
+          recipient: @obj.business.user,
+          notification_type: notification_type,
+          title: "Supplier Product #{action_type.to_s.humanize}",
+          body: "Your supplier product '#{@obj.display_name}' has been #{action_type.to_s.humanize.downcase}."
+        )
+      end
+
       def eager_loaded_associations
         [ :business, :product, :supplier, :listings ]
       end