dscf-marketplace 0.3.9 → 0.3.92

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 235f55ed51171b519c91c2d56661f050c3e922926c93664b582f828c9b4fd08e
-  data.tar.gz: f81528ff043e259757cd636e3187e00df19b7e21d7495d4e2c534276ed24eda3
+  metadata.gz: 5f9f514677184147e40e66e85e6c1454265d0af758412f5dd892247a00082b25
+  data.tar.gz: 4bd18580c906728236c541ce5970323710ab5f350e3fd2c4aed132203b5fa309
 SHA512:
-  metadata.gz: 4d56da33dccaa8cc818a6c09730024ed70fe182cbe163c6e2537153b873691d7861c2f7d999c1bb578d8979dcf1d6282b974ec9f018d52938017ebe08d03e38d
-  data.tar.gz: 530ae8f3a4f60983a14de2a6d414b3bff9860eb6f4a5c683f457cbedc8a9c8b06d2389db0bed5a86719c44b20b8cabe07fbe218873d938f378dd1c94917cae32
+  metadata.gz: 7c6773338667d90dfa39c0b711934dce4ed94545a18a70a2d9aef3648536fd775e7fccda79a62004e5d5e6a05efca986cd61337480d629a0dbf7d138f7ba4dcf
+  data.tar.gz: 06ee3fdc0bd9d2f84934188be8ea9ff44c4bd8fccf06b3381265c9b01fd58389dece18884fb3afe9eef5018852bbc122a90bcebba1200638af43dabce55e3a83

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

@@ -175,8 +175,23 @@ module Dscf
 
       def default_serializer_includes
         {
-          index: [ :driver, :pickup_address, :delivery_vehicle ],
-          show: [ :driver, :pickup_address, :delivery_vehicle, :delivery_order_items, :marketplace_orders ],
+          index: [
+            :driver,
+            :pickup_address,
+            :delivery_vehicle,
+            {
+              delivery_order_items: [ :dropoff_address ]
+            }
+          ],
+          show: [
+            :driver,
+            :pickup_address,
+            :delivery_vehicle,
+            :marketplace_orders,
+            {
+              delivery_order_items: [ :dropoff_address ]
+            }
+          ],
           create: [ :driver, :pickup_address, :delivery_vehicle ],
           update: [ :driver, :pickup_address, :delivery_vehicle ]
         }

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

@@ -78,7 +78,7 @@ module Dscf
 
       def default_serializer_includes
         {
-          index: [ :business, supplier_product: [ :product ] ],
+          index: [ :business, {supplier_product: [ :product ]} ],
           show: [ :business, :supplier_product, :order_items ],
           create: [ :business, :supplier_product ],
           update: [ :business, :supplier_product ]

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/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.3.9".freeze
+    VERSION = "0.3.92".freeze
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.92
 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