dscf-marketplace 0.13.0 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16b43241cc7e4a81527b02646b620a5d89ff4836aa1f14877d80a8c20e8b8b69
-  data.tar.gz: 9cf97a1241386f95e9af9088d740cbbf4a69734b40d1f29218d50e002775f20f
+  metadata.gz: d4c6eb6ecbebefdc74c7654b87e674fba61abc1e8dcbb670510435f31fbd0e32
+  data.tar.gz: a7b235e3a3334082c5fd21915736348646b505fdf96b26b96225a68e8da46b73
 SHA512:
-  metadata.gz: 906229d9cc272a399446d8d997ee880b7b66a1ca404eca3ea0ee6f23ab51ade9c45dfe517a04129cf09c6f1660a3d241637d8ba22405ac4d4ea952bdd959674e
-  data.tar.gz: 64e5345ccf614806d09b410be755e16e8a33ec58793443715f669bdcc934f034da085f78642e2b70638e75c2002df322bc099ce516a53ca6b0a2a470a3be656b
+  metadata.gz: 731973225dec8bcd3fb8ebdf4be9596967d3e48fb987f96e175b0deef38d5532c7839caa09661799308e83fe5f6e541fc87891aa787f57d72853d42b730ebeae
+  data.tar.gz: 5636304d389272d790ca33aab6e0c336a907e88f79243ec298f6d1a8e6f094839c60c6ac7c29ab2dac139853bdfd5a2b4fb73b53beee384bc8b1b277b36ea983

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

@@ -19,6 +19,10 @@ module Dscf
       end
 
       def source_name
+        # object.source (a polymorphic belongs_to) constantizes source_type
+        # internally and raises on anything that isn't a real class name —
+        # guard against legacy/bad data instead of 500ing the whole response.
+        return nil if object.source_type.present? && object.source_type.safe_constantize.nil?
         return nil unless object.source
         case object.source_type
         when 'Dscf::Marketplace::AggregatorListing'

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

@@ -3,7 +3,7 @@ module Dscf
     class OrderSerializer < ActiveModel::Serializer
       attributes :id, :quotation_id, :listing_id, :user_id, :ordered_by_id, :ordered_to_id, :delivery_order_id, :dropoff_address_id,
         :order_type, :status, :workflow_status, :has_validation_issues, :fulfillment_type, :payment_method, :received_bank_name, :transaction_reference, :total_amount,
-        :buyer_phone, :buyer_email, :seller_name, :seller_phone, :seller_email,
+        :buyer_name, :buyer_phone, :buyer_email, :seller_name, :seller_phone, :seller_email,
         :created_at, :updated_at
 
       belongs_to :quotation
@@ -15,6 +15,13 @@ module Dscf
       belongs_to :dropoff_address
       has_many :order_items
 
+      # Retailer's registered display name (users have no name field of their
+      # own — only email/phone) so admin can see who placed the order, per
+      # the requirements doc ("Retailer name" on the order lists).
+      def buyer_name
+        Dscf::Marketplace::Retailer.find_by(user_id: object.ordered_by_id)&.name
+      end
+
       def buyer_phone
         object.ordered_by&.phone
       end

data/app/services/dscf/marketplace/order_splitting_service.rb

@@ -8,8 +8,19 @@ module Dscf
       # - Other supplier
 
       def self.assign_source(order_item, source_type:, source_id:)
-        order_item.source_type = source_type
-        order_item.source_id = source_id
+        # "self" is the frontend SourcePicker's sentinel for "the aggregator
+        # fulfils it directly" — it is not a real polymorphic class name, so
+        # storing it literally corrupts the source association (any later
+        # read of order_item.source tries "self".constantize and crashes).
+        # A self-fulfilled line has no external source at all: clear it,
+        # matching the frontend's own isAggregatorManaged check (!source_type).
+        if source_type.to_s == "self"
+          order_item.source_type = nil
+          order_item.source_id = nil
+        else
+          order_item.source_type = source_type
+          order_item.source_id = source_id
+        end
         order_item.save!
         order_item
       end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.13.0".freeze
+    VERSION = "0.13.2".freeze
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.2
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2026-07-03 00:00:00.000000000 Z
+date: 2026-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails