dscf-marketplace 0.13.4 → 0.13.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e713d41fece224efb5187e70f38a81a3bcb951579dbab893eb0602abdca2ded8
-  data.tar.gz: 1beb16fefbd3e7d674fcf6854063665106d4b8858f015d396f656a23a4d37815
+  metadata.gz: 02ad82c5c180b78f7d7e6dd9fa99ad4f9d085fada05a9458d4f808dc4786589c
+  data.tar.gz: c2f9f253a2c90b0efd917f1479272bac714761e97a502eaaccc453b1cf57bfb4
 SHA512:
-  metadata.gz: c48b573dd70627bc33628e66f304325b52c252cf1001fec0788ffc9266f47b3375772286bd9e0754f9f88ad811a6a5001fe6431c63fbb695f00ddc59eebad45a
-  data.tar.gz: 8662c81c6b5942193a1b879f107d307666d38328186652d2f10fe6e4028280f86d96fb9b05c54f940c80a1e8af21c783ae033ce349691e8220ccb4f34f78c580
+  metadata.gz: fa26ea6d381ac3736aae27cb6cd1664629d39a6683524a5266ca8555cbe7c348c0d2c6c642cb1fe32cdfcb017f031091d8c6a07e146e8f7142ca319c83d5bc02
+  data.tar.gz: 5906f2d82f237f21a0038c2c2304a4455faeb46982fc5fb9779675796e75feb5f08f3a0584784b978a0ab159f439722a1c2c506f28d08c43ed9bf6f60096d193

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

@@ -462,8 +462,19 @@ module Dscf
         end
 
         items_params.map do |item_params|
-          listing_id = item_params[:listing_id] || model_params[:listing_id]
-          listing_type = item_params[:listing_type] || model_params[:listing_type]
+          # The mobile app names each aggregator-feed line by its polymorphic
+          # source (source_id + source_type: "Dscf::Marketplace::AggregatorListing")
+          # rather than listing_id/listing_type. Treat that as the listing
+          # reference — it identifies WHICH AggregatorListing; the final
+          # OrderItem.source is still re-derived per source_kind at build time.
+          agg_by_source = item_params[:source_type].to_s == "Dscf::Marketplace::AggregatorListing" &&
+                          item_params[:source_id].present?
+          listing_id = item_params[:listing_id].presence ||
+                       (agg_by_source ? item_params[:source_id] : nil) ||
+                       model_params[:listing_id]
+          listing_type = item_params[:listing_type].presence ||
+                         (agg_by_source ? "AggregatorListing" : nil) ||
+                         model_params[:listing_type]
           quantity = item_params[:quantity].to_i
 
           if quantity <= 0
@@ -572,7 +583,7 @@ module Dscf
           :quotation_id, :listing_id, :user_id, :ordered_by_id, :ordered_to_id, :delivery_order_id, :dropoff_address_id,
           :order_type, :status, :fulfillment_type, :payment_method, :received_bank_name, :transaction_reference, :listing_type,
           :agent_id, :retailer_id,
-          order_items_attributes: [ :id, :quotation_item_id, :listing_id, :listing_type, :product_id, :unit_id, :quantity, :unit_price, :status, :_destroy ]
+          order_items_attributes: [ :id, :quotation_item_id, :listing_id, :listing_type, :source_id, :source_type, :product_id, :unit_id, :quantity, :unit_price, :status, :_destroy ]
         )
         @model_params[:payment_method] = normalize_payment_method(@model_params[:payment_method]) if @model_params.key?(:payment_method)
         @model_params

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

@@ -15,7 +15,11 @@ module Dscf::Marketplace
     enum :source_kind, {catalog: 0, supplier: 1, sub_supplier: 2}, default: :catalog
 
     validates :price, numericality: {greater_than: 0}, presence: true
-    validates :quantity, numericality: {greater_than: 0}, presence: true
+    # Quantity must be positive while the listing is orderable, but a sold-out
+    # listing legitimately holds 0 — that's exactly the state set when the last
+    # unit is purchased (order creation decrements to 0 and flips to :sold_out).
+    validates :quantity, presence: true, numericality: {greater_than_or_equal_to: 0}
+    validates :quantity, numericality: {greater_than: 0}, unless: :sold_out?
     validates :aggregator, presence: true
 
     # Each kind requires (and is unique on) exactly one reference.

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

@@ -14,7 +14,11 @@ module Dscf::Marketplace
 
     # Validations
     validates :price, numericality: {greater_than: 0}, presence: true
-    validates :quantity, numericality: {greater_than: 0}, presence: true
+    # Quantity must be positive while the listing is orderable, but a sold-out
+    # listing legitimately holds 0 — that's exactly the state set when the last
+    # unit is purchased (order creation decrements to 0 and flips to :sold_out).
+    validates :quantity, presence: true, numericality: {greater_than_or_equal_to: 0}
+    validates :quantity, numericality: {greater_than: 0}, unless: :sold_out?
     validates :business_id, presence: true
     validates :supplier_product_id, presence: true
 

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.13.4".freeze
+    VERSION = "0.13.6".freeze
   end
 end

metadata

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