dscf-marketplace 0.3.95 → 0.3.96

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5878fba3426fc915f242010ea6bdb33c005c9ef025b024927bae599c507bfe03
-  data.tar.gz: 7088299b3f36bb604631e8613d08abf6e36bbc333654e353d024ea3963f1733c
+  metadata.gz: 995d1749e7bc2caebbdfcaaef9ba08ca94d8ae3b6b71d7241c4d979ebdf8668c
+  data.tar.gz: e8725566a7aa2b5ea1d8b5b1dc78f464e87fdf2a9b8a0788918dec215b5b2fb4
 SHA512:
-  metadata.gz: 02ab38c3146642161812dbcb3b9de94d748af96ada56bf9d159eb183659b8f5c50eb1223d484d5219a2b98327f86ff4b107e817cf856b1904d5dd72db76536ca
-  data.tar.gz: 9b3815919000c5f5b57cf93ffd3bd1af6f165efcf1ff4ab1debedc9efb3e36a6c4ca0fffcbe58aea16fb0236c21d104b328d506178b6bdcb7480d399d07e15a2
+  metadata.gz: 64a8101ea7155a3918dcceaef775a87b24d0534b8db003c439a676956374bd9afa7e71ea66ace1be00fde9d5eecb1656741e8048819515df75823cb0ec91aece
+  data.tar.gz: 9c28c9fe4b743de98be18fd3d1d01471e571e8a83b792042e84080a04bb5c0912e0637d398876520f5fe6082ba2ea1a008032903460afe8994af4da48b1d1d19

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

@@ -24,7 +24,31 @@ module Dscf
 
       def accept
         @obj = find_record
-        if @obj.accept!
+
+        fulfillment_type = params[:fulfillment_type]
+        dropoff_address_id = params[:dropoff_address_id]
+
+        # Validate fulfillment_type
+        unless fulfillment_type.present? && Dscf::Marketplace::Order.fulfillment_types.keys.include?(fulfillment_type)
+          render_error("Invalid or missing fulfillment_type", status: :unprocessable_entity)
+          return
+        end
+
+        dropoff_address = nil
+        if dropoff_address_id.present?
+          dropoff_address = Dscf::Core::Address.find_by(id: dropoff_address_id) if defined?(Dscf::Core::Address)
+          unless dropoff_address && dropoff_address.user_id == current_user.id
+            render_error("Invalid dropoff_address_id", status: :unprocessable_entity)
+            return
+          end
+        end
+
+        if fulfillment_type == "delivery" && dropoff_address.nil?
+          render_error("dropoff_address_id required for delivery", status: :unprocessable_entity)
+          return
+        end
+
+        if @obj.accept!(fulfillment_type: fulfillment_type, dropoff_address: dropoff_address)
           render_success("quotations.success.accepted", data: @obj)
         else
           render_error("quotations.errors.accept_failed")

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

@@ -70,7 +70,7 @@ module Dscf
         update_columns(status: "expired") if valid_until <= Time.current
       end
 
-      def accept!
+      def accept!(options = {})
         return false unless sent?
         return false if within_validity_period? == false
 
@@ -81,17 +81,11 @@ module Dscf
         request_for_quotation.update!(status: "selected", selected_quotation: self)
 
         # Create order from accepted quotation
-        create_order_from_quotation
+        create_order_from_quotation(options)
 
         true
       end
 
-      def create_order_from_quotation
-        return if order.present?
-
-        Order.create_from_quotation(self)
-      end
-
       def reject!
         return false unless sent?
 
@@ -123,16 +117,21 @@ module Dscf
         quotation_items.exists? && quotation_items.all? { |item| item.unit_price.present? }
       end
 
-      def create_order_from_quotation
+      def create_order_from_quotation(options = {})
         return if order.present?
 
+        fulfillment_type = options[:fulfillment_type] || "self_pickup"
+        dropoff_address = options[:dropoff_address]
+
         order = Dscf::Marketplace::Order.create!(
           order_type: :rfq_based,
           status: :pending,
+          fulfillment_type: fulfillment_type,
           quotation: self,
           user: request_for_quotation.user, # Keep for backward compatibility
           ordered_by: request_for_quotation.user,
           ordered_to: business,
+          dropoff_address: dropoff_address,
           total_amount: total_price
         )
 

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.3.95".freeze
+    VERSION = "0.3.96".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.3.95
+  version: 0.3.96
 platform: ruby
 authors:
 - Asrat