dscf-marketplace 0.2.92 → 0.2.93

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cf17e898ac996cc17f10dc5f2297f510d6f2c68e6f0c1d3430db98934106282
-  data.tar.gz: 5efcbb36d3bfebfb462b92aeea5e386adf805da05f76ad10346e167a04dcf074
+  metadata.gz: 40d81c92e7033ba2d583bca456a9fa0114795f713c118e92c1b70d2141c1c3ac
+  data.tar.gz: e8f5cca804a50156aff124176f482980628a069a3961c295d0480c395607fbc8
 SHA512:
-  metadata.gz: cbf84769b2a1065d9e890f72c84ccd72732489ad1df9d8c1890df6602308c49545680d44eb2a2a89dc99fd737dcf8f42444fb78ee5c8b1b6f28fc5924f2355a2
-  data.tar.gz: d7c9080cc4109ddd58dc1fb0aa701e8e93511b660079c47a9e2b5016718e513c00d67272c5755ab1717a8788b73f315510a7c228ff5a7a213a80799d743e8faf
+  metadata.gz: 75ba3df20836f6e89c20b2a35a01822f132f13fec48c2604807e96ad5b75f675bc6cbf0f72d65acbf40492e4d03d80d8e28532ac1941d6cde80779f4611e208b
+  data.tar.gz: 1e3620e360ec311517da1ff4955960a301523b0375801b236b9c3f518dc70ddf97daa7bd576068f9955eed2658f72619ffad90cbca02a13dcccf5e62ffa85fbd

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

@@ -61,7 +61,7 @@ module Dscf
 
       def default_serializer_includes
         {
-          index: [ :user, :ordered_by, :ordered_to, :quotation, order_items: [:product] ],
+          index: [ :user, :ordered_by, :ordered_to, :quotation, order_items: [ :product ] ],
           show: [ :user, :ordered_by, :ordered_to, :quotation, :listing, :delivery_order, :order_items ],
           create: [ :user, :ordered_by, :ordered_to, :quotation, :listing ],
           update: [ :user, :ordered_by, :ordered_to, :quotation, :listing ]

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

@@ -34,6 +34,18 @@ module Dscf
         render_success("request_for_quotations.success.index", data: rfqs, serializer_options: options)
       end
 
+      def respond
+        @rfq = Dscf::Marketplace::RequestForQuotation.find(params[:id])
+        service = RfqResponseService.new(current_user)
+        result = service.respond_to_rfq(@rfq, params.permit(:notes, :valid_until, :delivery_date, quotation_items_attributes: [ :rfq_item_id, :unit_id, :quantity, :unit_price, :notes ]))
+
+        if result[:success]
+          render_success("request_for_quotations.success.responded", data: result[:quotation], serializer_options: {include: [ :business, quotation_items: [ :product, :unit, :rfq_item ] ]})
+        else
+          render_error("request_for_quotations.errors.respond_failed", errors: result[:errors])
+        end
+      end
+
       private
 
       def model_params

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

@@ -61,18 +61,6 @@ module Dscf
         status == "draft"
       end
 
-      def sent?
-        status == "sent"
-      end
-
-      def accepted?
-        status == "accepted"
-      end
-
-      def rejected?
-        status == "rejected"
-      end
-
       def within_validity_period?
         valid_until > Time.current && !expired?
       end
@@ -162,6 +150,23 @@ module Dscf
         order
       end
 
+      def build_from_rfq_items(items_attributes)
+        items_attributes.each do |item_attrs|
+          rfq_item = request_for_quotation.rfq_items.find_by(id: item_attrs[:rfq_item_id])
+          next unless rfq_item
+
+          quotation_items.build(
+            rfq_item: rfq_item,
+            product: rfq_item.product,
+            unit: item_attrs[:unit_id] ? Dscf::Marketplace::Unit.find(item_attrs[:unit_id]) : rfq_item.unit,
+            quantity: [ item_attrs[:quantity].to_i, rfq_item.quantity ].min,
+            unit_price: item_attrs[:unit_price].to_f,
+            notes: item_attrs[:notes] || ""
+          )
+        end
+        valid? # To trigger validations
+      end
+
       private
 
       def calculate_total_price

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

@@ -25,7 +25,7 @@ module Dscf
 
       # Ransack configuration for secure filtering
       def self.ransackable_attributes(_auth_object = nil)
-        %w[id quotation_id rfq_item_id product_id unit_id quantity unit_price subtotal created_at updated_at]
+        %w[id quotation_id rfq_item_id product_id unit_id quantity unit_price subtotal notes created_at updated_at]
       end
 
       def self.ransackable_associations(_auth_object = nil)

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

@@ -0,0 +1,55 @@
+module Dscf
+  module Marketplace
+    class RfqResponseService
+      def initialize(current_user)
+        @current_user = current_user
+      end
+
+      def respond_to_rfq(rfq, params = {})
+        return {success: false, errors: [ "RFQ not found or invalid" ]} unless rfq.present? && rfq.sent?
+
+        business = Dscf::Core::Business.find_by(user: @current_user)
+        return {success: false, errors: [ "No business associated with user" ]} unless business.present?
+
+        quotation = Dscf::Marketplace::Quotation.new(
+          request_for_quotation: rfq,
+          business: business,
+          status: :draft,
+          notes: params[:notes] || "",
+          valid_until: params[:valid_until] || 7.days.from_now,
+          delivery_date: params[:delivery_date] || (params[:valid_until] || 7.days.from_now).to_date
+        )
+
+        if quotation.save
+          create_quotation_items(quotation, params[:quotation_items_attributes] || [])
+          rfq.update(status: :responded) if rfq.sent?
+          {success: true, quotation: quotation}
+        else
+          {success: false, errors: quotation.errors.full_messages}
+        end
+      end
+
+      private
+
+      def create_quotation_items(quotation, items_attributes)
+        items_attributes.each do |item_attrs|
+          rfq_item = quotation.request_for_quotation.rfq_items.find_by(id: item_attrs[:rfq_item_id])
+          next unless rfq_item
+
+          unit_id = item_attrs[:unit_id] || rfq_item.unit_id
+          unit = Dscf::Marketplace::Unit.find_by(id: unit_id)
+
+          quotation.quotation_items.build(
+            rfq_item: rfq_item,
+            product: rfq_item.product,
+            unit: unit,
+            quantity: item_attrs[:quantity] || rfq_item.quantity,
+            unit_price: item_attrs[:unit_price],
+            notes: item_attrs[:notes] || ""
+          )
+        end
+        quotation.save
+      end
+    end
+  end
+end

data/config/locales/en.yml

@@ -1,6 +1,7 @@
-# DSCF Marketplace Locale File
-# This file contains I18n messages for automatic message resolution
-# Pattern: {model_name}.{success|errors}.{action_name}
+# Updated DSCF Marketplace Locale File
+# Added missing keys for request_for_quotations (plural) to match controller usage
+# Ensures full error messages are displayed instead of "Translation missing"
+# Pattern: {model_name}.{success|errors}.{action_name} - using plural for controller consistency
 
 en:
   # Core Models
@@ -106,6 +107,28 @@ en:
       update: "Failed to update listing"
       destroy: "Failed to delete listing"
 
+  # RFQ Models (Added plural keys to match controller)
+  request_for_quotations:
+    success:
+      index: "RFQs retrieved successfully"
+      show: "RFQ details retrieved successfully"
+      create: "RFQ created successfully"
+      update: "RFQ updated successfully"
+      destroy: "RFQ deleted successfully"
+      sent: "RFQ sent successfully"
+      closed: "RFQ closed successfully"
+      responded: "RFQ response sent successfully"
+    errors:
+      index: "Failed to retrieve RFQs"
+      show: "Failed to retrieve RFQ details"
+      create_failed: "Failed to create RFQ" # Key fix: Matches render_error("request_for_quotations.errors.create_failed")
+      update: "Failed to update RFQ"
+      destroy: "Failed to delete RFQ"
+      send_failed: "Failed to send RFQ"
+      close_failed: "Failed to close RFQ"
+      respond_failed: "Failed to respond to RFQ"
+
+  # Singular fallback for consistency
   request_for_quotation:
     success:
       index: "RFQs retrieved successfully"
@@ -115,6 +138,7 @@ en:
       destroy: "RFQ deleted successfully"
       sent: "RFQ sent successfully"
       closed: "RFQ closed successfully"
+      responded: "RFQ response sent successfully"
     errors:
       index: "Failed to retrieve RFQs"
       show: "Failed to retrieve RFQ details"
@@ -123,6 +147,7 @@ en:
       destroy: "Failed to delete RFQ"
       sent: "Failed to send RFQ"
       closed: "Failed to close RFQ"
+      responded: "Failed to respond to RFQ"
 
   rfq_item:
     success:
@@ -351,3 +376,34 @@ en:
     operation_failed: "Operation failed"
     record_not_found: "Record not found"
     supplier_not_found: "Supplier not found"
+    # Added for common validation errors to show full messages
+    activerecord:
+      errors:
+        messages:
+          record_invalid: "Validation failed: %{errors}"
+          inclusion: "is not included in the list"
+          confirmation: "doesn't match %{attribute}"
+          accepted: "must be accepted"
+          empty: "can't be empty"
+          blank: "can't be blank"
+          too_short: "is too short (minimum is %{count} characters)"
+          too_long: "is too long (maximum is %{count} characters)"
+          invalid: "is invalid"
+          not_a_number: "is not a number"
+          not_an_integer: "is not an integer"
+          greater_than: "must be greater than %{count}"
+          greater_than_or_equal_to: "must be greater than or equal to %{count}"
+          equal_to: "must be equal to %{count}"
+          less_than: "must be less than %{count}"
+          less_than_or_equal_to: "must be less than or equal to %{count}"
+          other_than: "must be other than %{count}"
+          excluded: "should not be %{object}"
+          taken: "has already been taken"
+          unique: "has already been taken"
+          uniqueness: "has already been taken"
+          present: "must be present"
+          absence: "must be blank"
+          url: "is not a valid URL"
+          email: "is not a valid email"
+          format: "is invalid"
+          required: "can't be blank"

data/config/routes.rb

@@ -50,6 +50,7 @@ Dscf::Marketplace::Engine.routes.draw do
     member do
       post "send_rfq"
       post "close"
+      post "respond"
     end
     collection do
       get "my_rfqs"

data/db/migrate/20250909092700_add_notes_to_dscf_marketplace_quotation_items.rb

@@ -0,0 +1,5 @@
+class AddNotesToDscfMarketplaceQuotationItems < ActiveRecord::Migration[8.0]
+  def change
+    add_column :dscf_marketplace_quotation_items, :notes, :text
+  end
+end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.2.92".freeze
+    VERSION = "0.2.93".freeze
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.2.92
+  version: 0.2.93
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2025-09-09 00:00:00.000000000 Z
+date: 2025-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -470,6 +470,7 @@ files:
 - app/serializers/dscf/marketplace/unit_conversion_serializer.rb
 - app/serializers/dscf/marketplace/unit_serializer.rb
 - app/services/dscf/marketplace/my_resource_service.rb
+- app/services/dscf/marketplace/rfq_response_service.rb
 - config/environments/production.rb
 - config/locales/en.yml
 - config/routes.rb
@@ -497,6 +498,7 @@ files:
 - db/migrate/20250901080134_add_fulfillment_type_to_orders.rb
 - db/migrate/20250903061154_add_ordered_fields_to_orders.rb
 - db/migrate/20250903061306_populate_ordered_fields_for_existing_orders.rb
+- db/migrate/20250909092700_add_notes_to_dscf_marketplace_quotation_items.rb
 - lib/dscf/marketplace.rb
 - lib/dscf/marketplace/engine.rb
 - lib/dscf/marketplace/version.rb