dscf-marketplace 0.3.93 → 0.3.95

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83b9e16160c50312669963822847e82d13756edfa0e0fd54d799bfe7130cd29a
-  data.tar.gz: e8b248ae95abd6813eb78729aad97dd5611d15f6164cfc5cecaf8e9087fd6227
+  metadata.gz: 5878fba3426fc915f242010ea6bdb33c005c9ef025b024927bae599c507bfe03
+  data.tar.gz: 7088299b3f36bb604631e8613d08abf6e36bbc333654e353d024ea3963f1733c
 SHA512:
-  metadata.gz: 85f8a61f30863c23de3c0ca9e8eb1fbddbe4c5a12796c994c314e8e401931009e164bd2bd5e05fc20bed84c36e2c5c4db1f29a23db27a15d6db45046b6a22150
-  data.tar.gz: 89b3cb139f4404b538154ab6769a9fe133fc543eee181337d3be535cf6b37b5181884e2977265e368693d979d62a71af05a597324023860447495f28b51958c6
+  metadata.gz: 02ab38c3146642161812dbcb3b9de94d748af96ada56bf9d159eb183659b8f5c50eb1223d484d5219a2b98327f86ff4b107e817cf856b1904d5dd72db76536ca
+  data.tar.gz: 9b3815919000c5f5b57cf93ffd3bd1af6f165efcf1ff4ab1debedc9efb3e36a6c4ca0fffcbe58aea16fb0236c21d104b328d506178b6bdcb7480d399d07e15a2

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

@@ -159,8 +159,60 @@ 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
+        Dscf::Marketplace::DeliveryOrder.find(params[:id])
+      end
+
       def model_params
         params.require(:delivery_order).permit(
           :driver_id, :pickup_address_id, :delivery_vehicle_id, :status,

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) }
@@ -170,7 +171,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 +199,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/delivery_order_service.rb

@@ -89,7 +89,8 @@ module Dscf::Marketplace
 
     def associate_orders_with_delivery(delivery_order, orders)
       orders.each do |order|
-        order.update!(delivery_order: delivery_order)
+        order.update!(delivery_order: delivery_order, status: :confirmed)
+        order.order_items.update_all(status: OrderItem.statuses[:confirmed])
       end
     end
   end

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.93".freeze
+    VERSION = "0.3.95".freeze
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.3.93
+  version: 0.3.95
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2025-09-18 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