dscf-marketplace 0.3.94 → 0.3.96

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 000d8116a19e742c018a144b6cde46aa1a3221b95735cb78794baa9981ed5228
-  data.tar.gz: 41b84e6e4b189dbe622fecc89e8bd4aa33a605b586a82ee7baa416b92c03baec
+  metadata.gz: 995d1749e7bc2caebbdfcaaef9ba08ca94d8ae3b6b71d7241c4d979ebdf8668c
+  data.tar.gz: e8725566a7aa2b5ea1d8b5b1dc78f464e87fdf2a9b8a0788918dec215b5b2fb4
 SHA512:
-  metadata.gz: 6e24ef4567ecf8373aa62fd33243f71bf9e102826dacbf9f7e9e03f66fab1c44770a71ef8e291ca42392254662d1f7c44646ba46405af12d499a354912b0a42f
-  data.tar.gz: d435066b0c124ee9a3ab0dedc1b037353f3433029dbafcf7bb38640c2c2dcbc4e43415a6d1cf323e890166edbfb9567c56f314c21289f043ccfd69d3548f4302
+  metadata.gz: 64a8101ea7155a3918dcceaef775a87b24d0534b8db003c439a676956374bd9afa7e71ea66ace1be00fde9d5eecb1656741e8048819515df75823cb0ec91aece
+  data.tar.gz: 9c28c9fe4b743de98be18fd3d1d01471e571e8a83b792042e84080a04bb5c0912e0637d398876520f5fe6082ba2ea1a008032903460afe8994af4da48b1d1d19

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

@@ -159,6 +159,54 @@ module Dscf
         end
       end
 
+      def my_driver_deliveries
+        # Verify user has driver role
+        unless Dscf::Marketplace::RoleService.user_has_driver_role?(current_user)
+          render_error("delivery_orders.errors.access_denied", message: "Only drivers can access this endpoint")
+          return
+        end
+
+        # Get deliveries where user is the driver
+        delivery_orders = @clazz.where(driver: current_user)
+
+        # Apply Ransack filtering if q params present
+        if params[:q].present?
+          # Filter out any parameters that might reference JSON fields
+          filtered_params = params[:q].reject { |key, _| key.to_s.include?("optimized_route") }
+          if filtered_params.present?
+            delivery_orders = delivery_orders.ransack(filtered_params).result
+          end
+        end
+
+        # Apply eager loading if defined
+        delivery_orders = delivery_orders.includes(eager_loaded_associations) if eager_loaded_associations.present?
+
+        # Apply pagination if requested
+        if params[:page]
+          total_count = delivery_orders.count
+          delivery_orders = delivery_orders.then(&paginate)
+          total_pages = (total_count.to_f / per_page).ceil
+          count = delivery_orders.is_a?(Array) ? delivery_orders.length : delivery_orders.count
+
+          pagination_meta = {
+            current_page: page_no,
+            per_page: per_page,
+            count: count,
+            total_count: total_count,
+            total_pages: total_pages,
+            links: pagination_links(total_pages)
+          }
+        end
+
+        # Add serializer includes
+        includes = serializer_includes_for_action(:index)
+        options = {}
+        options[:include] = includes if includes.present?
+        options[:pagination] = pagination_meta if params[:page]
+
+        render_success(data: delivery_orders, serializer_options: options)
+      end
+
       private
 
       def find_record

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

@@ -24,7 +24,31 @@ module Dscf
 
       def accept
         @obj = find_record
-        if @obj.accept!
+
+        fulfillment_type = params[:fulfillment_type]
+        dropoff_address_id = params[:dropoff_address_id]
+
+        # Validate fulfillment_type
+        unless fulfillment_type.present? && Dscf::Marketplace::Order.fulfillment_types.keys.include?(fulfillment_type)
+          render_error("Invalid or missing fulfillment_type", status: :unprocessable_entity)
+          return
+        end
+
+        dropoff_address = nil
+        if dropoff_address_id.present?
+          dropoff_address = Dscf::Core::Address.find_by(id: dropoff_address_id) if defined?(Dscf::Core::Address)
+          unless dropoff_address && dropoff_address.user_id == current_user.id
+            render_error("Invalid dropoff_address_id", status: :unprocessable_entity)
+            return
+          end
+        end
+
+        if fulfillment_type == "delivery" && dropoff_address.nil?
+          render_error("dropoff_address_id required for delivery", status: :unprocessable_entity)
+          return
+        end
+
+        if @obj.accept!(fulfillment_type: fulfillment_type, dropoff_address: dropoff_address)
           render_success("quotations.success.accepted", data: @obj)
         else
           render_error("quotations.errors.accept_failed")

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

@@ -19,6 +19,7 @@ module Dscf
       validate :valid_until_after_delivery_date
       validate :delivery_date_not_in_past
       validate :valid_until_not_in_past
+      validate :total_price_required_for_operations
       scope :by_business, ->(business_id) { where(business_id: business_id) }
       scope :valid_quotations, -> { where("valid_until > ?", Time.current) }
       scope :expired_quotations, -> { where("valid_until <= ?", Time.current) }
@@ -69,7 +70,7 @@ module Dscf
         update_columns(status: "expired") if valid_until <= Time.current
       end
 
-      def accept!
+      def accept!(options = {})
         return false unless sent?
         return false if within_validity_period? == false
 
@@ -80,17 +81,11 @@ module Dscf
         request_for_quotation.update!(status: "selected", selected_quotation: self)
 
         # Create order from accepted quotation
-        create_order_from_quotation
+        create_order_from_quotation(options)
 
         true
       end
 
-      def create_order_from_quotation
-        return if order.present?
-
-        Order.create_from_quotation(self)
-      end
-
       def reject!
         return false unless sent?
 
@@ -122,16 +117,21 @@ module Dscf
         quotation_items.exists? && quotation_items.all? { |item| item.unit_price.present? }
       end
 
-      def create_order_from_quotation
+      def create_order_from_quotation(options = {})
         return if order.present?
 
+        fulfillment_type = options[:fulfillment_type] || "self_pickup"
+        dropoff_address = options[:dropoff_address]
+
         order = Dscf::Marketplace::Order.create!(
           order_type: :rfq_based,
           status: :pending,
+          fulfillment_type: fulfillment_type,
           quotation: self,
           user: request_for_quotation.user, # Keep for backward compatibility
           ordered_by: request_for_quotation.user,
           ordered_to: business,
+          dropoff_address: dropoff_address,
           total_amount: total_price
         )
 
@@ -170,7 +170,9 @@ module Dscf
       private
 
       def calculate_total_price
-        self.total_price = quotation_items.sum(&:subtotal).to_f
+        # Reload association to ensure we have the latest data
+        quotation_items.reload
+        self.total_price = quotation_items.sum { |item| item.subtotal || 0 }.to_f
       end
 
       def valid_until_after_delivery_date
@@ -196,6 +198,17 @@ module Dscf
           errors.add(:valid_until, "cannot be in the past")
         end
       end
+
+      def total_price_required_for_operations
+        return if total_price.present?
+        return if draft? # Allow null total_price for draft quotations
+        return if quotation_items.empty? # Allow null if no items
+
+        # Require total_price for sent, accepted, rejected, or expired quotations
+        if sent? || accepted? || rejected? || expired?
+          errors.add(:total_price, "must be calculated before quotation can be processed")
+        end
+      end
     end
   end
 end

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

@@ -15,6 +15,8 @@ module Dscf
       # validate :unit_compatible_with_product
       validate :subtotal_matches_calculation, if: :should_validate_subtotal?
       before_save :calculate_subtotal, if: :should_recalculate_subtotal?
+      after_save :update_quotation_total_price
+      after_destroy :update_quotation_total_price
 
       scope :priced, -> { where.not(unit_price: nil) }
       scope :unpriced, -> { where(unit_price: nil) }
@@ -86,6 +88,10 @@ module Dscf
         self.subtotal = (unit_price * quantity).round(2)
       end
 
+      def update_quotation_total_price
+        quotation.update_total_price! if quotation.present?
+      end
+
       # Calculate subtotal automatically if not set
       def calculated_subtotal
         return subtotal if subtotal.present?

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

@@ -22,6 +22,7 @@ module Dscf
 
         if quotation.save
           create_quotation_items(quotation, params[:quotation_items_attributes] || [])
+          quotation.update_total_price!
           rfq.update(status: :responded) if rfq.sent?
           {success: true, quotation: quotation}
         else

data/config/locales/en.yml

@@ -288,6 +288,7 @@ en:
       orders_not_found: "Some orders were not found"
       orders_conversion_failed: "Failed to convert orders to delivery"
       convert_orders_failed: "Unexpected error during order conversion"
+      access_denied: "Access denied"
 
   delivery_order_item:
     success:

data/config/routes.rb

@@ -105,6 +105,7 @@ Dscf::Marketplace::Engine.routes.draw do
       post "accept"
     end
     collection do
+      get "my_driver_deliveries"
       get "filter"
       post "convert_orders"
     end

data/db/migrate/20250920105329_backfill_quotation_total_prices.rb

@@ -0,0 +1,11 @@
+class BackfillQuotationTotalPrices < ActiveRecord::Migration[8.0]
+  def up
+    # Backfill total_price for existing quotations
+    Dscf::Marketplace::Quotation.find_each do |quotation|
+      quotation.update_total_price!
+    end
+  end
+
+  def down
+  end
+end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.3.94".freeze
+    VERSION = "0.3.96".freeze
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.3.94
+  version: 0.3.96
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2025-09-19 00:00:00.000000000 Z
+date: 2025-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -503,6 +503,7 @@ files:
 - db/migrate/20250909092700_add_notes_to_dscf_marketplace_quotation_items.rb
 - db/migrate/20250916083536_make_driver_id_nullable_in_delivery_orders.rb
 - db/migrate/20250917110618_add_dropoff_address_to_dscf_marketplace_orders.rb
+- db/migrate/20250920105329_backfill_quotation_total_prices.rb
 - lib/dscf/marketplace.rb
 - lib/dscf/marketplace/engine.rb
 - lib/dscf/marketplace/version.rb