dscf-marketplace 0.4.3 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2efb9f7107c850ca7e7d328ab4c1c9a1785c50cf9b6b854f426e85f11d1d609f
-  data.tar.gz: ed4b6f619a6a13e3785386d56072e84d0bf62ad6f041a122b3ae9fab51923e18
+  metadata.gz: 3cf7ce0a12c623c5befab2e887f6f5f28d922ed8a6b2ab0a40f3bc02f32f93eb
+  data.tar.gz: 1aff775c474842bf4412d15bc5c627a6684afeea44f6e79636398abd12f72ba6
 SHA512:
-  metadata.gz: 180b318401c1043e7d0ded241270494d437e18aac507c461594558f87135c4b395b561bf82fcfba0cdac89fbf93784fad91028d11ff49d82219afbddb40ab2ab
-  data.tar.gz: fea2f807396c0a948d8122099930dc6bf5172458b5246c26af688894fd528ed3ac2c24520f9e5875ed261fbb6be8dc0b44021fe350ab62cde1df9240e5294bf2
+  metadata.gz: 41f34897815559dfb2ae6acb376a8a7da8ce9dc04cc7a5d13198b8a82f51e1aeec06ace786adc16d288fba0434f54cc89a771aec39ba94a4990a477af206a990
+  data.tar.gz: 21f7fb3efb503de32bcaffaff5aa5baabbc445ac870880aed18c88dc29a5971da89e33c2953b58c267e3e6bc2ac3e19e54cb5a654b62c7856ead7df76ec4ce0c

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

@@ -3,6 +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
 
     belongs_to :quotation, optional: true
     belongs_to :listing, optional: true
@@ -17,6 +18,7 @@ module Dscf::Marketplace
     validates :order_type, presence: true
     validates :status, presence: true
     validates :fulfillment_type, presence: true
+    validates :payment_method, presence: true
     validates :user, presence: true # Keep for backward compatibility
     validates :ordered_by, presence: true
     validates :ordered_to, presence: true
@@ -27,26 +29,30 @@ module Dscf::Marketplace
 
     # 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 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 total_amount created_at updated_at]
     end
 
     def self.ransackable_associations(_auth_object = nil)
       %w[quotation listing user ordered_by ordered_to delivery_order dropoff_address order_items]
     end
 
-    def self.create_from_quotation(quotation, dropoff_address = nil)
+    def self.create_from_quotation(quotation, dropoff_address = nil, payment_method = nil)
       return nil unless quotation.accepted?
 
-      order = create!(
+      attributes = {
         order_type: :rfq_based,
         status: :processing,
+        fulfillment_type: dropoff_address.present? ? :delivery : :self_pickup,
         quotation: quotation,
         user: quotation.request_for_quotation.user, # Keep for backward compatibility
         ordered_by: quotation.request_for_quotation.user,
         ordered_to: quotation.business,
         dropoff_address: dropoff_address,
         total_amount: quotation.total_price
-      )
+      }
+      attributes[:payment_method] = payment_method if payment_method.present?
+
+      order = create!(attributes)
 
       quotation.quotation_items.each do |item|
         order.order_items.create!(
@@ -62,19 +68,23 @@ module Dscf::Marketplace
       order
     end
 
-    def self.create_from_listing(listing, user, quantity, dropoff_address = nil)
+    def self.create_from_listing(listing, user, quantity, dropoff_address = nil, payment_method = nil)
       return nil unless listing.status == "active" && quantity <= listing.quantity
 
-      order = create!(
+      attributes = {
         order_type: :direct_listing,
         status: :pending,
+        fulfillment_type: dropoff_address.present? ? :delivery : :self_pickup,
         listing: listing,
         user: user, # Keep for backward compatibility
         ordered_by: user,
         ordered_to: listing.business,
         dropoff_address: dropoff_address,
         total_amount: listing.price * quantity
-      )
+      }
+      attributes[:payment_method] = payment_method if payment_method.present?
+
+      order = create!(attributes)
 
       order.order_items.create!(
         listing: listing,

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, :total_amount,
+        :order_type, :status, :fulfillment_type, :payment_method, :total_amount,
         :buyer_phone, :buyer_email, :seller_name, :seller_phone, :seller_email,
         :created_at, :updated_at
 

data/db/migrate/20251006055550_add_payment_method_to_dscf_marketplace_orders.rb

@@ -0,0 +1,6 @@
+class AddPaymentMethodToDscfMarketplaceOrders < ActiveRecord::Migration[8.0]
+  def change
+    add_column :dscf_marketplace_orders, :payment_method, :integer, default: 0
+    add_index :dscf_marketplace_orders, :payment_method, name: "payment_method_on_dm_orders_idx"
+  end
+end

data/db/migrate/20251006055948_change_default_payment_method_on_orders.rb

@@ -0,0 +1,5 @@
+class ChangeDefaultPaymentMethodOnOrders < ActiveRecord::Migration[8.0]
+  def change
+    change_column_default :dscf_marketplace_orders, :payment_method, 0
+  end
+end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.4.3".freeze
+    VERSION = "0.4.5".freeze
   end
 end

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

@@ -3,6 +3,7 @@ FactoryBot.define do
     order_type { :rfq_based }
     status { :pending }
     fulfillment_type { :self_pickup }
+    payment_method { :cash }
     association :user, factory: :dscf_core_user # Keep for backward compatibility
     association :ordered_to, factory: :dscf_core_business
     association :quotation, factory: :dscf_marketplace_quotation

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.5
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2025-09-25 00:00:00.000000000 Z
+date: 2025-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -503,6 +503,8 @@ files:
 - db/migrate/20250909092700_add_notes_to_dscf_marketplace_quotation_items.rb
 - db/migrate/20250916083536_make_driver_id_nullable_in_delivery_orders.rb
 - db/migrate/20250917110618_add_dropoff_address_to_dscf_marketplace_orders.rb
+- db/migrate/20251006055550_add_payment_method_to_dscf_marketplace_orders.rb
+- db/migrate/20251006055948_change_default_payment_method_on_orders.rb
 - db/seeds.rb
 - lib/dscf/marketplace.rb
 - lib/dscf/marketplace/engine.rb