dscf-marketplace 0.3.6 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2118a22dd49f19b75b611bcdbb8ca04485e641b0eef6c1314d3557f8e2bd9144
-  data.tar.gz: 94e03aa2b185429dc02b0698fc3a39b4efb8ff497f473b23c81c9ed05c9f9407
+  metadata.gz: 7f0a8453f29e83aba38efbacb2e592d3dda7a77f8dce6ab5901ca3a10bb3f104
+  data.tar.gz: 66537058e5fad58e20f04e1df403333bb4ecfbe6eb14e1d6f175c065e2d3d966
 SHA512:
-  metadata.gz: e931358752fc3d8623e021bc95b0bd5ab40b66950aee72bc5ec2df3f3e4d66e49bddcc4ea6aa24a7ca6cd6ccde522b74398d7aef2d38af64da3ac213369473e9
-  data.tar.gz: 949bb44f979f5edaaf6aaa7035cc51ca93ccfed13ae9fb5d0fd010543e670d09f19fbadbb403a661d57e6e787bc25a036e5166bc4118fdd7354b43b24d840b41
+  metadata.gz: 8224d26f9a832d04343e5c1e4ffc362eddc764c79eec6fa09ab64200a2b505cfd4518b35e092a7a43e2deb7ed6b90db3289621043524ec7cf691b87ff20d6953
+  data.tar.gz: 027a3151dd4339ef9686462911af60a7ec906f79d8ff786d7990b30f3749aa06f1fbcec0aea883f80be3b0580cf077f748dcda01a6421d44bbb8c3be61fe41f3

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

@@ -78,7 +78,7 @@ module Dscf
 
       def default_serializer_includes
         {
-          index: [ :business, :supplier_product ],
+          index: [ :business, supplier_product: [ :product ] ],
           show: [ :business, :supplier_product, :order_items ],
           create: [ :business, :supplier_product ],
           update: [ :business, :supplier_product ]

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,29 +20,31 @@ 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!(
         order_type: :rfq_based,
-        status: :pending,
+        status: :processing,
         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
       )
 
@@ -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/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.3.6".freeze
+    VERSION = "0.3.8".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,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.8
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2025-09-16 00:00:00.000000000 Z
+date: 2025-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails