dscf-marketplace 0.3.7 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7be6498573d6c61c1f3b8f589f0aff53d53c132a67939d80e7faf73117bf021
-  data.tar.gz: 960b9d8be09c2a6e9d6b54412a9be9da1e04867fccc9d82d2df8ce2ec2aa0520
+  metadata.gz: 235f55ed51171b519c91c2d56661f050c3e922926c93664b582f828c9b4fd08e
+  data.tar.gz: f81528ff043e259757cd636e3187e00df19b7e21d7495d4e2c534276ed24eda3
 SHA512:
-  metadata.gz: 43f00f107f3bd87ddedcdb8510e9db2b7d5f880bfdc097341ed6d1f0485b197864d2242ce54d452b1e9bec11bab029907aa61ce921f5e0c81ebb53ee1913b234
-  data.tar.gz: 6ac93de835319baca428a922339b72cb42c1a4024093da43ba90f44cd2ebbb1d970651ba79984e5779d81e228622247810545fbbf3d0077e07840b4357fe5e2f
+  metadata.gz: 4d56da33dccaa8cc818a6c09730024ed70fe182cbe163c6e2537153b873691d7861c2f7d999c1bb578d8979dcf1d6282b974ec9f018d52938017ebe08d03e38d
+  data.tar.gz: 530ae8f3a4f60983a14de2a6d414b3bff9860eb6f4a5c683f457cbedc8a9c8b06d2389db0bed5a86719c44b20b8cabe07fbe218873d938f378dd1c94917cae32

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

@@ -67,7 +67,7 @@ module Dscf
 
       def model_params
         params.require(:order).permit(
-          :quotation_id, :listing_id, :user_id, :ordered_by_id, :ordered_to_id, :delivery_order_id,
+          :quotation_id, :listing_id, :user_id, :ordered_by_id, :ordered_to_id, :delivery_order_id, :dropoff_address_id,
           :order_type, :status, :fulfillment_type,
           order_items_attributes: [ :id, :quotation_item_id, :listing_id, :product_id, :unit_id, :quantity, :unit_price, :status, :_destroy ]
         )

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

@@ -10,6 +10,7 @@ module Dscf::Marketplace
     belongs_to :ordered_by, class_name: "Dscf::Core::User"
     belongs_to :ordered_to, class_name: "Dscf::Core::Business"
     belongs_to :delivery_order, optional: true
+    belongs_to :dropoff_address, class_name: "Dscf::Core::Address", optional: true
     has_many :order_items, dependent: :destroy, autosave: true
     accepts_nested_attributes_for :order_items, allow_destroy: true
 
@@ -19,20 +20,21 @@ module Dscf::Marketplace
     validates :user, presence: true # Keep for backward compatibility
     validates :ordered_by, presence: true
     validates :ordered_to, presence: true
+    validates :dropoff_address, presence: true, if: :delivery?
     validate :quotation_or_listing_present
 
     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 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 total_amount created_at updated_at]
     end
 
     def self.ransackable_associations(_auth_object = nil)
-      %w[quotation listing user ordered_by ordered_to delivery_order order_items]
+      %w[quotation listing user ordered_by ordered_to delivery_order dropoff_address order_items]
     end
 
-    def self.create_from_quotation(quotation)
+    def self.create_from_quotation(quotation, dropoff_address = nil)
       return nil unless quotation.accepted?
 
       order = create!(
@@ -42,6 +44,7 @@ module Dscf::Marketplace
         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
       )
 
@@ -59,7 +62,7 @@ module Dscf::Marketplace
       order
     end
 
-    def self.create_from_listing(listing, user, quantity)
+    def self.create_from_listing(listing, user, quantity, dropoff_address = nil)
       return nil unless listing.status == "active" && quantity <= listing.quantity
 
       order = create!(
@@ -69,6 +72,7 @@ module Dscf::Marketplace
         user: user, # Keep for backward compatibility
         ordered_by: user,
         ordered_to: listing.business,
+        dropoff_address: dropoff_address,
         total_amount: listing.price * quantity
       )
 

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

@@ -1,7 +1,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,
+      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,
         :created_at, :updated_at
 
@@ -11,6 +11,7 @@ module Dscf
       belongs_to :ordered_by
       belongs_to :ordered_to
       belongs_to :delivery_order
+      belongs_to :dropoff_address
       has_many :order_items
     end
   end

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

@@ -72,9 +72,8 @@ module Dscf::Marketplace
     def create_delivery_order_items(delivery_order, orders, pickup_address)
       orders.each do |order|
         order.order_items.each do |order_item|
-          # For now, use the pickup address as both pickup and dropoff
-          # In a real implementation, you'd need to get the buyer's delivery address
-          dropoff_address = pickup_address # Temporary fallback
+          # Use the order's dropoff address for delivery orders
+          dropoff_address = order.dropoff_address
 
           DeliveryOrderItem.create!(
             delivery_order: delivery_order,

data/db/migrate/20250917110618_add_dropoff_address_to_dscf_marketplace_orders.rb

@@ -0,0 +1,6 @@
+class AddDropoffAddressToDscfMarketplaceOrders < ActiveRecord::Migration[8.0]
+  def change
+    add_reference :dscf_marketplace_orders, :dropoff_address, null: true, foreign_key: {to_table: :dscf_core_addresses}
+    add_index :dscf_marketplace_orders, :dropoff_address_id, name: "dropoff_address_id_on_dm_orders_idx"
+  end
+end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.3.7".freeze
+    VERSION = "0.3.9".freeze
   end
 end

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

@@ -28,10 +28,12 @@ FactoryBot.define do
 
     trait :self_pickup do
       fulfillment_type { :self_pickup }
+      dropoff_address { nil }
     end
 
     trait :delivery do
       fulfillment_type { :delivery }
+      association :dropoff_address, factory: :dscf_core_address
     end
 
     trait :confirmed do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.9
 platform: ruby
 authors:
 - Asrat
@@ -501,6 +501,7 @@ files:
 - db/migrate/20250903061306_populate_ordered_fields_for_existing_orders.rb
 - 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
 - lib/dscf/marketplace.rb
 - lib/dscf/marketplace/engine.rb
 - lib/dscf/marketplace/version.rb