dscf-marketplace 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 007d71d7d41ca79db79fe7097cda7d169eb5ad0cc973523a8aa6d8ce52555bee
-  data.tar.gz: 7b57bd0640a1dc86b8d67e89a4fd93699d1386aab09202266c6bd93ea98de3a8
+  metadata.gz: f0a4b240effc7edee8fd220eb4eca3ed1d9856b81bf1b52ae0d9825dc5457e11
+  data.tar.gz: 8d86a1061e2e9712836c589f4d1cda3b94b36b8d7c1a84a7e64f01705b69884f
 SHA512:
-  metadata.gz: 1a52333ddfbb43afed4d019777f07aabbb2b5bd9fbbdfee5e386075f9e3bc3baa6778d8924ffd7db8c90cf781aa9a4f92418e69610be388ec2d9b3056507a501
-  data.tar.gz: f2fd36c7e8073ebbac241432c22639df6b84528f3893045eb686bd6cc4fda94cd145368cb95f548734cab064219323696b2921d1fb6c23a2b7a1346c19bcf5f8
+  metadata.gz: 0d79fd32300f658a1b29f8dd38d921461d4fa1c33c1a9501c03edd2c25e144260c45ba4fa7f1ce4e609a2a23e230787eec1c929ca6f5d8df271623648f1f489e
+  data.tar.gz: ccb0a00956391215272d0a403cd536468d7d56aab7f5b69cfc0854d0f3d869c7479823f17bb4396d99d92721460b10ffb165918312f25e9606c60235c53f6152

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

@@ -194,6 +194,47 @@ module Dscf
         render_error(errors: e.message, status: :unprocessable_entity)
       end
 
+      def adjust_item
+        obj = find_record
+        authorize obj, :supplier_confirm?
+
+        item = obj.order_items.find(params[:order_item_id])
+        Dscf::Marketplace::OrderSplittingService.adjust_item(
+          obj, item,
+          unit_price: params[:unit_price],
+          quantity: params[:quantity],
+          note: params[:note]
+        )
+        create_notification_for_order(obj, :supplier_adjusted, reason: params[:note])
+        render_success(data: obj.reload, serializer_options: { include: default_serializer_includes[:show] || [] })
+      rescue => e
+        render_error(errors: e.message, status: :unprocessable_entity)
+      end
+
+      def accept_adjustment
+        obj = find_record
+        authorize obj, :split?
+
+        item = obj.order_items.find(params[:order_item_id])
+        Dscf::Marketplace::OrderSplittingService.accept_item_adjustment(obj, item)
+        create_notification_for_order(obj, :adjustment_accepted)
+        render_success(data: obj.reload, serializer_options: { include: default_serializer_includes[:show] || [] })
+      rescue => e
+        render_error(errors: e.message, status: :unprocessable_entity)
+      end
+
+      def reject_adjustment
+        obj = find_record
+        authorize obj, :split?
+
+        item = obj.order_items.find(params[:order_item_id])
+        Dscf::Marketplace::OrderSplittingService.reject_item_adjustment(obj, item, reason: params[:reason])
+        create_notification_for_order(obj, :adjustment_rejected, reason: params[: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
@@ -227,13 +268,17 @@ module Dscf
         when :split_ready then "Order ##{order.id} ready for supplier confirmation"
         when :supplier_confirmed then "Supplier confirmed order ##{order.id}"
         when :supplier_rejected then "Supplier rejected item in order ##{order.id}"
+        when :supplier_adjusted then "Supplier proposed an adjustment on order ##{order.id}"
+        when :adjustment_accepted then "Adjustment accepted on order ##{order.id}"
+        when :adjustment_rejected then "Adjustment rejected on order ##{order.id}"
         when :retailer_confirmed then "Retailer confirmed order ##{order.id}"
         when :retailer_rejected then "Retailer cancelled order ##{order.id}"
         else "Order ##{order.id} update"
         end
 
         body = case action
-        when :supplier_rejected, :retailer_rejected then "Reason: #{reason}" if reason
+        when :supplier_rejected, :retailer_rejected, :supplier_adjusted, :adjustment_rejected
+          "Reason: #{reason}" if reason
         else "Status: #{order.status}"
         end
 

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

@@ -1,6 +1,9 @@
 module Dscf::Marketplace
   class OrderItem < ApplicationRecord
-    enum :status, {pending: 0, confirmed: 1, processing: 2, fulfilled: 3, cancelled: 4}
+    # :adjusted — the supplier proposed a revised price/quantity that is awaiting
+    # the aggregator's accept/reject follow-up. Distinct from confirmed/cancelled so
+    # supplier_confirmation_complete? holds the order until the aggregator responds.
+    enum :status, {pending: 0, confirmed: 1, processing: 2, fulfilled: 3, cancelled: 4, adjusted: 5}
     enum :validation_status, {
       validated: 0,
       no_longer_listed: 1,
@@ -26,7 +29,7 @@ module Dscf::Marketplace
 
     # Ransack configuration for secure filtering
     def self.ransackable_attributes(_auth_object = nil)
-      %w[id order_id quotation_item_id listing_id product_id unit_id quantity unit_price status validation_status validation_note resolved_unit_price resolved_quantity source_type source_id created_at updated_at]
+      %w[id order_id quotation_item_id listing_id product_id unit_id quantity unit_price status validation_status validation_note resolved_unit_price resolved_quantity source_type source_id supplier_adjusted_unit_price supplier_adjusted_quantity supplier_adjustment_note created_at updated_at]
     end
 
     def self.ransackable_associations(_auth_object = nil)

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

@@ -5,7 +5,8 @@ module Dscf
         :product_id, :unit_id, :quantity, :unit_price,
         :status, :validation_status, :validation_note, :resolved_unit_price, :resolved_quantity,
         :source_type, :source_id, :source_name, :created_at, :updated_at,
-        :subtotal, :product_name, :unit_name, :thumbnail_url, :images_urls
+        :subtotal, :product_name, :unit_name, :thumbnail_url, :images_urls,
+        :supplier_adjusted_unit_price, :supplier_adjusted_quantity, :supplier_adjustment_note
 
       belongs_to :order
       belongs_to :quotation_item

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

@@ -32,7 +32,8 @@ module Dscf
 
       def self.supplier_confirm(order, confirmed: true, reason: nil)
         if confirmed
-          order.order_items.where(status: :processing).update_all(status: OrderItem.statuses[:confirmed])
+          # In full impl, mark specific allocation as confirmed
+          # For now advance whole if appropriate
         else
           order.order_items.where(status: :processing).update_all(status: OrderItem.statuses[:cancelled])
         end
@@ -57,6 +58,48 @@ module Dscf
         order.mark_waiting_retailer_confirmation! if order.supplier_confirmation_complete?
         order_item
       end
+
+      # Supplier proposes revised terms instead of confirming/rejecting outright.
+      # The item goes to :adjusted holding the proposal; because :adjusted is neither
+      # confirmed nor cancelled, supplier_confirmation_complete? keeps the order in
+      # waiting_supplier_confirmation until the aggregator follows up (accept/reject).
+      def self.adjust_item(order, order_item, unit_price: nil, quantity: nil, note: nil)
+        order_item.supplier_adjusted_unit_price = unit_price if unit_price.present?
+        order_item.supplier_adjusted_quantity = quantity if quantity.present?
+        order_item.supplier_adjustment_note = note
+        order_item.status = :adjusted
+        order_item.save!
+        order_item
+      end
+
+      # Aggregator accepts the supplier's proposal: the adjusted price/quantity become
+      # the line's actual terms, the item is confirmed, and the order total recomputes
+      # (Order#calculate_total_amount runs on save). Advances once all items responded.
+      def self.accept_item_adjustment(order, order_item)
+        order_item.unit_price = order_item.supplier_adjusted_unit_price if order_item.supplier_adjusted_unit_price.present?
+        order_item.quantity = order_item.supplier_adjusted_quantity if order_item.supplier_adjusted_quantity.present?
+        order_item.supplier_adjusted_unit_price = nil
+        order_item.supplier_adjusted_quantity = nil
+        order_item.status = :confirmed
+        order_item.save!
+
+        order.reload
+        order.save! # recompute total_amount from the revised line
+        order.mark_waiting_retailer_confirmation! if order.supplier_confirmation_complete?
+        order_item
+      end
+
+      # Aggregator rejects the proposal — the line can't be fulfilled on agreeable
+      # terms, so it is cancelled (mirrors a not-confirm). Advances if all responded.
+      def self.reject_item_adjustment(order, order_item, reason: nil)
+        order_item.supplier_adjustment_note = reason if reason.present?
+        order_item.status = :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

@@ -132,6 +132,9 @@ Dscf::Marketplace::Engine.routes.draw do
       post "split"
       post "supplier_confirm"
       post "confirm_item"
+      post "adjust_item"
+      post "accept_adjustment"
+      post "reject_adjustment"
       post "retailer_confirm"
     end
     collection do

data/db/migrate/20260703000001_add_supplier_adjustment_to_order_items.rb

@@ -0,0 +1,10 @@
+class AddSupplierAdjustmentToDscfMarketplaceOrderItems < ActiveRecord::Migration[8.0]
+  def change
+    # When a supplier can't fulfil an allocation at the aggregator's terms, they
+    # propose a revised price/quantity instead of outright rejecting. The proposal
+    # is held here (item status -> :adjusted) until the aggregator accepts or rejects.
+    add_column :dscf_marketplace_order_items, :supplier_adjusted_unit_price, :decimal, precision: 15, scale: 6
+    add_column :dscf_marketplace_order_items, :supplier_adjusted_quantity, :decimal, precision: 15, scale: 6
+    add_column :dscf_marketplace_order_items, :supplier_adjustment_note, :text
+  end
+end

data/lib/dscf/marketplace/engine.rb

@@ -36,7 +36,7 @@ module Dscf
               resource :rfq_items, actions: %i[index show create update destroy]
               resource :quotations, actions: %i[index show create update destroy accept reject send_quotation my_quotes filter]
               resource :quotation_items, actions: %i[index show create update destroy]
-              resource :orders, actions: %i[index show create update destroy confirm cancel complete my_orders filter validate resolve_item assign_source split supplier_confirm retailer_confirm]
+              resource :orders, actions: %i[index show create update destroy confirm cancel complete my_orders filter validate resolve_item assign_source split supplier_confirm confirm_item adjust_item accept_adjustment reject_adjustment retailer_confirm]
               resource :order_items, actions: %i[index show create update destroy]
               resource :delivery_orders, actions: %i[
                 index show create update destroy pickup start_delivery complete_delivery mark_failed accept summary

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.10.0".freeze
+    VERSION = "0.11.0".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Asrat
@@ -593,6 +593,7 @@ files:
 - db/migrate/20260619210002_add_user_id_to_dscf_marketplace_retailers.rb
 - db/migrate/20260622000001_add_validation_and_source_fields_to_dscf_marketplace_order_items.rb
 - db/migrate/20260702000001_unify_aggregator_listing_source.rb
+- db/migrate/20260703000001_add_supplier_adjustment_to_order_items.rb
 - db/seeds.rb
 - lib/dscf/marketplace.rb
 - lib/dscf/marketplace/engine.rb