dscf-marketplace 0.7.5 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e66e6a4fac1c4edcfd47fee2305ae1f1003e0f5b67d1de4ed92437efab52c51d
-  data.tar.gz: 938e70e67ec267163bdb2414da889a90ecb5d46c4c72c016af6b26bac160a4cb
+  metadata.gz: 4beaf427e69fdbc843de062d0083c55ece3d751cca2adab8cf989c20de633886
+  data.tar.gz: 8479a97308423b04afa67d95c2cc3fde8096b01a6b24ec1c9f3519e0dfe0d35f
 SHA512:
-  metadata.gz: 74555ff90a3951e9ba75d3fc451da200458a4b15c6eb4cd227f48dee569fe14e70174c292e7e7f1454200a6765431f3b3e66cd2862e4885dc474e0a1eddfc6eb
-  data.tar.gz: 999a3fa20ea0ee8db77b9d39c48efcffb9f5f9d19c73d1fd7555c7a9b0b9a77c9cf76ee363564e5acfabf1ed3cfbfe5b84f6bda1525fdb018903429495f3a21f
+  metadata.gz: 98399d8626f0fdd09979f7be48bc34f36126d3c07ad268d57338b1de4a9575ece83a8eabf13e279dcb0ea1824dd68317c211025ff6c3eb57ebf07121d3ec261a
+  data.tar.gz: b9e8eec981a2c12e01a06dac62e7d22d98c170d4c08760486321e6acbd61601e2380a9bf33cd1cf5fd5806f545543fdeb527795521e4c908c5eb6f394930a670

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

@@ -5,6 +5,7 @@ module Dscf
 
       def create
         authorize @clazz.new, :create?
+        return render_unsupported_payment_method if unsupported_payment_method_for_new_order?(model_params[:payment_method])
 
         return create_direct_listing_order if direct_listing_request?
 
@@ -134,7 +135,7 @@ module Dscf
         options = {include: includes} if includes.present?
         render_success(data: order, serializer_options: options, status: :created)
       rescue ActiveRecord::RecordInvalid => e
-        errors = e.record&.errors&.full_messages&.presence || [e.message]
+        errors = e.record&.errors&.full_messages&.presence || [ e.message ]
         render_error(errors: errors.join(", "), status: :unprocessable_entity)
       rescue => e
         render_error(error: e.message)
@@ -150,11 +151,13 @@ module Dscf
       end
 
       def model_params
-        params.require(:order).permit(
+        @model_params ||= params.require(:order).permit(
           :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,
+          :order_type, :status, :fulfillment_type, :payment_method, :received_bank_name, :transaction_reference,
           order_items_attributes: [ :id, :quotation_item_id, :listing_id, :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
       end
 
       def eager_loaded_associations
@@ -173,6 +176,27 @@ module Dscf
       def find_record
         Dscf::Marketplace::Order.find(params[:id])
       end
+
+      def normalize_payment_method(value)
+        case value.to_s
+        when "", "0", "cash"
+          "cash"
+        when "1", "credit"
+          "credit"
+        when "2", "transfer", "bank transfer", "bank_transfer"
+          "bank_transfer"
+        else
+          value
+        end
+      end
+
+      def unsupported_payment_method_for_new_order?(payment_method)
+        payment_method.present? && payment_method == "credit"
+      end
+
+      def render_unsupported_payment_method
+        render_error(errors: "Credit is no longer supported for new marketplace orders", status: :unprocessable_entity)
+      end
     end
   end
 end

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

@@ -29,6 +29,7 @@ module Dscf
 
         fulfillment_type = params[:fulfillment_type]
         dropoff_address_id = params[:dropoff_address_id]
+        payment_method = normalize_payment_method(params[:payment_method]).presence || "cash"
 
         # Validate fulfillment_type
         unless fulfillment_type.present? && Dscf::Marketplace::Order.fulfillment_types.keys.include?(fulfillment_type)
@@ -50,7 +51,12 @@ module Dscf
           return
         end
 
-        if @obj.accept!(fulfillment_type: fulfillment_type, dropoff_address: dropoff_address)
+        unless %w[cash bank_transfer].include?(payment_method)
+          render_error(errors: "Credit is no longer supported for new marketplace orders", status: :unprocessable_entity)
+          return
+        end
+
+        if @obj.accept!(fulfillment_type: fulfillment_type, dropoff_address: dropoff_address, payment_method: payment_method)
           render_success("quotations.success.accepted", data: @obj)
         else
           render_error("quotations.errors.accept_failed")
@@ -116,6 +122,19 @@ module Dscf
           update: [ :request_for_quotation, :business ]
         }
       end
+
+      def normalize_payment_method(value)
+        case value.to_s
+        when "", "0", "cash"
+          "cash"
+        when "1", "credit"
+          "credit"
+        when "2", "transfer", "bank transfer", "bank_transfer"
+          "bank_transfer"
+        else
+          value
+        end
+      end
     end
   end
 end

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

@@ -3,7 +3,7 @@ module Dscf::Marketplace
     enum :order_type, {rfq_based: 0, direct_listing: 1}
     enum :status, {pending: 0, confirmed: 1, processing: 2, completed: 3, cancelled: 4}
     enum :fulfillment_type, {self_pickup: 0, delivery: 1}
-    enum :payment_method, {cash: 0, credit: 1, transfer: 2}, default: :cash
+    enum :payment_method, {cash: 0, credit: 1, bank_transfer: 2}, default: :cash
 
     belongs_to :quotation, optional: true
     belongs_to :listing, optional: true
@@ -23,13 +23,17 @@ module Dscf::Marketplace
     validates :ordered_by, presence: true
     validates :ordered_to, presence: true
     validates :dropoff_address, presence: true, if: :delivery?
+    validates :received_bank_name, :transaction_reference, absence: true, if: :cash?
     validate :quotation_or_listing_present
+    validate :credit_payment_method_disabled, if: :will_save_change_to_payment_method?
+    validate :bank_transfer_reference_required_for_completed_orders
 
+    before_validation :clear_payment_references_for_cash
     before_save :calculate_total_amount
 
     # Ransack configuration for secure filtering
     def self.ransackable_attributes(_auth_object = nil)
-      %w[id 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 total_amount created_at updated_at]
+      %w[id 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 total_amount created_at updated_at]
     end
 
     def self.ransackable_associations(_auth_object = nil)
@@ -152,12 +156,32 @@ module Dscf::Marketplace
       self.total_amount = order_items.sum { |item| item.quantity * item.unit_price }
     end
 
-    private
+  private
 
     def quotation_or_listing_present
       unless quotation.present? || listing.present?
         errors.add(:base, "Either quotation or listing must be present")
       end
     end
+
+    def credit_payment_method_disabled
+      return unless credit?
+
+      errors.add(:payment_method, "is no longer supported for new marketplace orders")
+    end
+
+    def bank_transfer_reference_required_for_completed_orders
+      return unless completed? && bank_transfer?
+
+      errors.add(:received_bank_name, "can't be blank") if received_bank_name.blank?
+      errors.add(:transaction_reference, "can't be blank") if transaction_reference.blank?
+    end
+
+    def clear_payment_references_for_cash
+      return unless cash?
+
+      self.received_bank_name = nil
+      self.transaction_reference = nil
+    end
   end
 end

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

@@ -122,11 +122,13 @@ module Dscf
 
         fulfillment_type = options[:fulfillment_type] || "self_pickup"
         dropoff_address = options[:dropoff_address]
+        payment_method = options[:payment_method].presence || :cash
 
         order = Dscf::Marketplace::Order.create!(
           order_type: :rfq_based,
           status: :processing,
           fulfillment_type: fulfillment_type,
+          payment_method: payment_method,
           quotation: self,
           user: request_for_quotation.user, # Keep for backward compatibility
           ordered_by: request_for_quotation.user,

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

@@ -2,7 +2,7 @@ module Dscf
   module Marketplace
     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, :fulfillment_type, :payment_method, :total_amount,
+        :order_type, :status, :fulfillment_type, :payment_method, :received_bank_name, :transaction_reference, :total_amount,
         :buyer_phone, :buyer_email, :seller_name, :seller_phone, :seller_email,
         :created_at, :updated_at
 

data/config/locales/en.yml

@@ -423,4 +423,4 @@ en:
           url: "is not a valid URL"
           email: "is not a valid email"
           format: "is invalid"
-          required: "can't be blank"
+          required: "can't be blank"

data/db/migrate/20260506100000_add_payment_references_to_dscf_marketplace_orders.rb

@@ -0,0 +1,6 @@
+class AddPaymentReferencesToDscfMarketplaceOrders < ActiveRecord::Migration[8.0]
+  def change
+    add_column :dscf_marketplace_orders, :received_bank_name, :string
+    add_column :dscf_marketplace_orders, :transaction_reference, :string
+  end
+end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.7.5".freeze
+    VERSION = "0.7.6".freeze
   end
 end

data/spec/factories/dscf/marketplace/orders.rb

@@ -37,6 +37,10 @@ FactoryBot.define do
       association :dropoff_address, factory: :dscf_core_address
     end
 
+    trait :bank_transfer do
+      payment_method { :bank_transfer }
+    end
+
     trait :confirmed do
       status { :confirmed }
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2026-05-02 00:00:00.000000000 Z
+date: 2026-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -533,6 +533,7 @@ files:
 - db/migrate/20260310120000_add_active_and_description_to_dscf_core_roles.rb
 - db/migrate/20260310122000_add_missing_fields_to_dscf_core_user_roles.rb
 - db/migrate/20260501000002_add_supplier_contact_fields_to_supplier_products.rb
+- db/migrate/20260506100000_add_payment_references_to_dscf_marketplace_orders.rb
 - db/seeds.rb
 - lib/dscf/marketplace.rb
 - lib/dscf/marketplace/engine.rb