dscf-marketplace 0.9.6 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 888e597416339864fb9f310837a1624135b615dbf8ec21d875594a05bab42632
-  data.tar.gz: a0476fcb98220d993ce5cc5b63c0f497b2d887c54a9397e19399750c2fc57a33
+  metadata.gz: 96faa437c564d4a08d4df63b8e1143c8e69da546d8e576e03d30bd2c99443e50
+  data.tar.gz: 58eeb5fed2f4afea0a88dd25f55d2bfc791a7d7f488a7be46357fcc4b79597fb
 SHA512:
-  metadata.gz: f5c7d51bdf7f4d9923416be26301bb9c52dc15620634aa9cbf7c752607a5a31bb54264f73cf1df4f021da6ed5a403a23a93e64d581c82cc7c0718df767517726
-  data.tar.gz: 0f16faf59dbf7676fa2ef70ae16a04d8e37a57eb359011e381a67038be06cee41cf1ed234561410869e8f03c6d76497e9d4307aee9bab24e656464ab137c7f1f
+  metadata.gz: cd51195fca94e7f6018aca92c64620f1f686a5b1584858add1afb1ceb0ee8a34b09e90fd27e9681dadbaef3a514741109c5a293aee3aa57c905f11df962cda4f
+  data.tar.gz: c9bc4eefa1acdd394eb3d23ae3a57f60126ccdb5dd698e64050c4ca8f48d2364a99c06266aff03b9d84b90a9d45ea2881e847d98a2b58a51335ee2751f245230

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

@@ -85,7 +85,7 @@ module Dscf
         authorize @obj, :show?
         invoice = @obj.order_invoice
         if invoice&.pdf_file&.attached?
-          redirect_to rails_blob_url(invoice.pdf_file, disposition: "attachment")
+          redirect_to rails_storage_proxy_url(invoice.pdf_file, disposition: "attachment")
         else
           render_error("orders.errors.no_invoice")
         end
@@ -179,6 +179,21 @@ module Dscf
         render_error(errors: e.message, status: :unprocessable_entity)
       end
 
+      def confirm_item
+        obj = find_record
+        authorize obj, :supplier_confirm?
+
+        item = obj.order_items.find(params[:order_item_id])
+        confirmed = params[:confirmed] != false
+        reason = params[:reason]
+        Dscf::Marketplace::OrderSplittingService.confirm_item(obj, item, confirmed: confirmed, reason: reason)
+
+        create_notification_for_order(obj, confirmed ? :supplier_confirmed : :supplier_rejected, reason: reason)
+        render_success(data: obj.reload, serializer_options: { include: default_serializer_includes[:show] || [] })
+      rescue => e
+        render_error(errors: e.message, status: :unprocessable_entity)
+      end
+
       def retailer_confirm
         obj = find_record
         authorize obj, :confirm? # reuse existing or add specific

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

@@ -46,13 +46,13 @@ module Dscf::Marketplace
     def photo_url
       return nil unless photo.attached?
 
-      Rails.application.routes.url_helpers.rails_blob_url(photo, only_path: true)
+      Rails.application.routes.url_helpers.rails_storage_proxy_url(photo, only_path: true)
     end
 
     def national_id_url
       return nil unless national_id.attached?
 
-      Rails.application.routes.url_helpers.rails_blob_url(national_id, only_path: true)
+      Rails.application.routes.url_helpers.rails_storage_proxy_url(national_id, only_path: true)
     end
 
     private

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

@@ -8,6 +8,8 @@ module Dscf::Marketplace
     belongs_to :pickup_address, class_name: "Dscf::Core::Address"
     belongs_to :dropoff_address, class_name: "Dscf::Core::Address"
 
+    delegate :thumbnail_url, :images_urls, to: :order_item, allow_nil: true
+
     validates :delivery_order_id, presence: true
     validates :order_item_id, presence: true
     validates :quantity, presence: true, numericality: {greater_than: 0}

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

@@ -69,7 +69,7 @@ module Dscf
           return unless attachment.present?
           return if attachment.respond_to?(:attached?) && !attachment.attached?
 
-          Rails.application.routes.url_helpers.rails_blob_url(attachment, **active_storage_url_options)
+          Rails.application.routes.url_helpers.rails_storage_proxy_url(attachment, **active_storage_url_options)
         end
 
         def active_storage_url_options

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

@@ -6,6 +6,8 @@ module Dscf
       belongs_to :product, class_name: "Dscf::Marketplace::Product"
       belongs_to :unit, class_name: "Dscf::Marketplace::Unit"
 
+      delegate :thumbnail_url, :images_urls, to: :product, allow_nil: true
+
       validates :product_id, presence: true
       validates :quantity, presence: true, numericality: {greater_than: 0}
       validates :unit_id, presence: true

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

@@ -7,6 +7,8 @@ module Dscf
 
       has_many :quotation_items, class_name: "Dscf::Marketplace::QuotationItem", dependent: :destroy
 
+      delegate :thumbnail_url, :images_urls, to: :product, allow_nil: true
+
       validates :quantity, presence: true, numericality: {greater_than: 0}
       validates :notes, length: {maximum: 1000}, allow_blank: true
 

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

@@ -81,7 +81,7 @@ module Dscf::Marketplace
       return [] unless documents.attached?
 
       documents.map do |doc|
-        Rails.application.routes.url_helpers.rails_blob_url(doc, only_path: true)
+        Rails.application.routes.url_helpers.rails_storage_proxy_url(doc, only_path: true)
       end
     end
 

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

@@ -6,7 +6,8 @@ module Dscf
         :damaged_quantity, :missing_quantity, :receiver_confirmed_by,
         :receiver_confirmed_at, :receiver_notes, :handoff_checklist_completed,
         :created_at, :updated_at, :product_name, :unit_name, :verification_complete?,
-        :has_discrepancy?, :discrepancy_amount, :requires_resolution?
+        :has_discrepancy?, :discrepancy_amount, :requires_resolution?,
+        :thumbnail_url, :images_urls
 
       belongs_to :delivery_order
       belongs_to :order_item

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

@@ -14,7 +14,7 @@ module Dscf
 
         url_options = Rails.application.config.x.active_storage_url_options || {}
         object.product_images.map do |image|
-          Rails.application.routes.url_helpers.rails_blob_url(image, **url_options)
+          Rails.application.routes.url_helpers.rails_storage_proxy_url(image, **url_options)
         end
       end
 

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

@@ -5,7 +5,7 @@ module Dscf
         :unit_price, :subtotal, :created_at, :updated_at, :product_name,
         :product_sku, :unit_name, :unit_code, :rfq_requested_quantity,
         :quantity_difference, :quantity_difference_percentage, :price_per_base_unit,
-        :matches_rfq_request?, :can_create_order?
+        :matches_rfq_request?, :can_create_order?, :thumbnail_url, :images_urls
 
       belongs_to :quotation
       belongs_to :rfq_item

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

@@ -3,7 +3,8 @@ module Dscf
     class RfqItemSerializer < ActiveModel::Serializer
       attributes :id, :request_for_quotation_id, :product_id, :unit_id, :quantity, :notes,
         :created_at, :updated_at, :product_name, :product_sku, :unit_name,
-        :unit_code, :quotation_count, :has_quotations?, :quoted_price_range
+        :unit_code, :quotation_count, :has_quotations?, :quoted_price_range,
+        :thumbnail_url, :images_urls
 
       belongs_to :request_for_quotation
       belongs_to :product

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

@@ -8,7 +8,7 @@ module Dscf
       def business_license_url
         return nil unless object.business_license.attached?
 
-        Rails.application.routes.url_helpers.rails_blob_url(object.business_license, only_path: true)
+        Rails.application.routes.url_helpers.rails_storage_proxy_url(object.business_license, only_path: true)
       end
     end
   end

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

@@ -43,6 +43,20 @@ module Dscf
         end
         order
       end
+
+      # Per-source confirmation (requirements doc: "Supplier and aggregator order
+      # confirmation"). The aggregator confirms each sub-supplier / aggregator-store
+      # allocation individually; other-supplier items are confirmed by that supplier.
+      # Once every item has responded (confirmed or cancelled), the order advances
+      # to retailer confirmation.
+      def self.confirm_item(order, order_item, confirmed: true, reason: nil)
+        order_item.status = confirmed ? :confirmed : :cancelled
+        order_item.save!
+
+        order.reload
+        order.mark_waiting_retailer_confirmation! if order.supplier_confirmation_complete?
+        order_item
+      end
     end
   end
 end

data/config/routes.rb

@@ -130,6 +130,7 @@ Dscf::Marketplace::Engine.routes.draw do
       post "assign_source"
       post "split"
       post "supplier_confirm"
+      post "confirm_item"
       post "retailer_confirm"
     end
     collection do

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.9.6".freeze
+    VERSION = "0.9.8".freeze
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.8
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2026-06-29 00:00:00.000000000 Z
+date: 2026-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails