dscf-marketplace 0.16.1 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a15bb7684af77ccd9899a60837a6c1e9e8ee8fb17a22729a39e070360d33dbfd
-  data.tar.gz: 4cff160785cbc7a393836aabe6b867764680b43b0a8d35cea99669f2ee21946d
+  metadata.gz: be5ac84a6073e85553af278f37aed96cab1d39d3284817361e76060ca789f638
+  data.tar.gz: 2dfbf53884b07ea2e894e46b8dc3c99f8843b997ff6174a9a154ee1299ce6993
 SHA512:
-  metadata.gz: bc114a3c32f7d60a54add756c7806c07d6c729b4a71be4e8be75c0a7db2a88e0818c437a64e7b6eeb4d5d64385c9311c309f56d89cceb913340b2c6030076d12
-  data.tar.gz: 3dd22ead0c2ea3ad985505e336b2ff238a12d9b08e5f016286b584ed35f8c05dc8798d7ec64a19c47f6131831a95da653f8e88f7a0215d4533f1b7730833dbed
+  metadata.gz: 3e6c001c6f0af07cda0207acda610c20cb6eabd41c2a3fd24f8c4ea026c46e1b0dc8b6c7a84b5d3fcf22ec4b0bf974c434cdfe668a50049d4320260005d2b34c
+  data.tar.gz: 5115dad31f5607464892aea0b3dbee5d6761b84f21c81e26cc73febe091a13a1c7358911f89b21c37c618f78cbbd5f32a437ea131627502ae0872f5be486a538

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

@@ -44,11 +44,17 @@ module Dscf
         resolved_items, skipped, adjusted = resolve_reorder_items(source_order)
 
         if resolved_items.empty?
-          return render_error(
-            errors: "None of the items on order ##{source_order.id} are available to reorder",
-            status: :unprocessable_entity,
-            skipped_items: skipped
-          )
+          # Distinguish "nothing left to reorder" from "everything is
+          # unavailable" — an order whose lines were all cancelled has no
+          # availability problem, and reporting one sends the caller hunting
+          # through listings for a cause that isn't there.
+          message = if skipped.empty?
+            "Order ##{source_order.id} has no reorderable items (every line was cancelled or the order has no items)"
+          else
+            "None of the items on order ##{source_order.id} are available to reorder"
+          end
+
+          return render_error(errors: message, status: :unprocessable_entity, skipped_items: skipped)
         end
 
         parent, orders = place_direct_listing_cart(resolved_items, base_attrs: reorder_base_attributes(source_order))
@@ -648,8 +654,15 @@ module Dscf
 
         reorder_source_lines(source_order).each do |item, seller|
           product_name = item.product&.name
-          wanted = item.quantity.to_i
-          next if wanted <= 0
+          # Quantities are decimal(15,6) — goods sold by weight have fractional
+          # lines, and an aggregator resolving a line can set any decimal. to_i
+          # would silently truncate 0.5 to 0 and drop the line.
+          wanted = item.quantity.to_d
+
+          if wanted <= 0
+            skipped << {product_id: item.product_id, product_name: product_name, reason: "invalid_quantity"}
+            next
+          end
 
           listing, aggregator_listing = find_reorder_listing(item, seller)
 
@@ -658,7 +671,7 @@ module Dscf
             next
           end
 
-          available = (listing || aggregator_listing).quantity.to_i
+          available = (listing || aggregator_listing).quantity.to_d
           if available <= 0
             skipped << {product_id: item.product_id, product_name: product_name, reason: "out_of_stock"}
             next
@@ -684,12 +697,18 @@ module Dscf
 
       # The lines worth reordering, each paired with the business it was bought
       # from. A parent holds no lines of its own, so a reorder of a whole cart
-      # collects them from its sub-orders (and may split again). Cancelled lines
-      # were never fulfilled, so they don't come along.
+      # collects them from its sub-orders (and may split again).
+      #
+      # Whether a cancelled line comes along depends on what was cancelled. A
+      # cancelled ORDER is precisely what a retailer wants to re-place — every
+      # line reads as cancelled, and dropping them all would leave nothing to
+      # reorder. On a live order a cancelled LINE was deliberately removed
+      # during validation or refused by its supplier, and that decision stands.
       def reorder_source_lines(source_order)
         orders = source_order.parent? ? source_order.sub_orders.to_a : [ source_order ]
         orders.flat_map do |order|
-          order.order_items.reject(&:cancelled?).map { |item| [ item, order.ordered_to ] }
+          items = order.cancelled? ? order.order_items.to_a : order.order_items.reject(&:cancelled?)
+          items.map { |item| [ item, order.ordered_to ] }
         end
       end
 

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.16.1".freeze
+    VERSION = "0.16.2".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.2
 platform: ruby
 authors:
 - Asrat