dscf-marketplace 0.3.8 → 0.3.91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f0a8453f29e83aba38efbacb2e592d3dda7a77f8dce6ab5901ca3a10bb3f104
-  data.tar.gz: 66537058e5fad58e20f04e1df403333bb4ecfbe6eb14e1d6f175c065e2d3d966
+  metadata.gz: 4c89b597c8c556ab326df05fd7d1f5bed421236c968a13def66d611123b3ba05
+  data.tar.gz: 78fef830eafe2e525d3ab5abaed08d46ba9217c42d7c128945849f2b383cf4dd
 SHA512:
-  metadata.gz: 8224d26f9a832d04343e5c1e4ffc362eddc764c79eec6fa09ab64200a2b505cfd4518b35e092a7a43e2deb7ed6b90db3289621043524ec7cf691b87ff20d6953
-  data.tar.gz: 027a3151dd4339ef9686462911af60a7ec906f79d8ff786d7990b30f3749aa06f1fbcec0aea883f80be3b0580cf077f748dcda01a6421d44bbb8c3be61fe41f3
+  metadata.gz: 6dc54cf4b3a6aa4576ea354b824f1cbca62b1281ac6562082a285910201ce27d7f2bd02301e544a850448b78a105f2f931fd10aaf0526e7935d78bf6e3abf8e1
+  data.tar.gz: 160571dd85a0fd6e053484c8209d5ceb31d63f53dc78a42ccad6ba29d06b84f2198f62597fb1021c26c21d90c1a8d684128bccddb9a489d9fcfa51ebd1e16fc6

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

@@ -86,6 +86,10 @@ module Dscf::Marketplace
       marketplace_orders.count
     end
 
+    def total_stops
+      delivery_order_items.distinct.pluck(:dropoff_address_id).count
+    end
+
     def delivery_duration
       return nil unless actual_delivery_time && estimated_delivery_time
       (actual_delivery_time - estimated_delivery_time).to_i

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

@@ -105,11 +105,11 @@ module Dscf
       def subtotal
         stored_value = super
         # If we have a stored value (including 0), return it
-        # Only calculate if it's nil and we have the required fields
         return stored_value unless stored_value.nil?
-        return nil unless unit_price && quantity
-
-        (unit_price * quantity).round(2)
+        # If no stored value but we have unit_price and quantity, calculate it
+        return (unit_price * quantity).round(2) if unit_price && quantity
+        # Otherwise return nil
+        nil
       end
       public :subtotal
 

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

@@ -5,7 +5,7 @@ module Dscf
         :vehicle_type, :estimated_delivery_price, :actual_delivery_price,
         :estimated_delivery_time, :actual_delivery_time, :delivery_notes,
         :created_at, :updated_at, :total_items, :total_orders, :delivery_duration,
-        :on_time?, :all_handoffs_confirmed?
+        :on_time?, :all_handoffs_confirmed?, :total_stops
 
       belongs_to :driver
       belongs_to :pickup_address

data/db/migrate/20250917110618_add_dropoff_address_to_dscf_marketplace_orders.rb

@@ -0,0 +1,6 @@
+class AddDropoffAddressToDscfMarketplaceOrders < ActiveRecord::Migration[8.0]
+  def change
+    add_reference :dscf_marketplace_orders, :dropoff_address, null: true, foreign_key: {to_table: :dscf_core_addresses}
+    add_index :dscf_marketplace_orders, :dropoff_address_id, name: "dropoff_address_id_on_dm_orders_idx"
+  end
+end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.3.8".freeze
+    VERSION = "0.3.91".freeze
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.91
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2025-09-17 00:00:00.000000000 Z
+date: 2025-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -501,6 +501,7 @@ files:
 - db/migrate/20250903061306_populate_ordered_fields_for_existing_orders.rb
 - 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
 - lib/dscf/marketplace.rb
 - lib/dscf/marketplace/engine.rb
 - lib/dscf/marketplace/version.rb