dscf-marketplace 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58e2c52ef9974bd9dda7994468e59ec441a17e44871df8d543f4c1e15127e5ec
-  data.tar.gz: 727cbb1d7c8bd88d9cabd362fbec25dacd46b43a8b505c298c4cdbc6fb0c9788
+  metadata.gz: 3344e182285e4e49140063b5e39456c4c51f9485460da13ec7e5a6e948fc0b3c
+  data.tar.gz: 9abdca4e70f5c315fa000ca5950d9dfc503dae85a167b3cef087e7c511757ccd
 SHA512:
-  metadata.gz: e9f1daeddec065e76828a30c4b87d2b8fdbe82a795f013b0a83ccb6c67480587beccc02c1cfec7a19bd95b5e0201a9e5894034d0cf8c58f5d5de11de949e0e9f
-  data.tar.gz: 4cb9a5a0086261329b19f894b92e4b023c8ec21aa2478b50a542371fe2c66b684c259517f0136c6fba4f21547470faf5487c2d5f91c3d4037040fb71ab8e026f
+  metadata.gz: '09781023abf0128615ddd44b516240f2fe32d83b582fb072fd4f86c40ea329e991b2dccfa0221512db413ba189b5955f0762f745bcf03adcab5c2d15a01cb2cd'
+  data.tar.gz: ed58b55872828a27773e9f72852f3ee301beb896b7b44df8fd841a2dd7b61d7d1e1ed56fc32e7fd2108f43526b854f12115ad57a0d3765f4a1cee3028945f5b1

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

@@ -41,6 +41,7 @@ module Dscf::Marketplace
     validate :bank_transfer_reference_required_for_completed_orders
 
     before_validation :clear_payment_references_for_cash
+    before_validation :auto_assign_dropoff_address, if: :delivery?
     before_save :calculate_total_amount
 
     # Ransack configuration for secure filtering
@@ -208,6 +209,38 @@ module Dscf::Marketplace
 
   private
 
+    def auto_assign_dropoff_address
+      return if dropoff_address_id.present? || dropoff_address.present?
+
+      user_address = ordered_by&.addresses&.find_by(address_type: :shipping) || ordered_by&.addresses&.first
+      if user_address.present?
+        self.dropoff_address = user_address
+        return
+      end
+
+      return unless defined?(Dscf::Marketplace::Retailer)
+
+      retailer = Dscf::Marketplace::Retailer.find_by(user_id: ordered_by_id)
+      if retailer&.location.present?
+        lat_str, lng_str = retailer.location.split(",")
+        lat = lat_str.to_f
+        lng = lng_str.to_f
+
+        if lat != 0.0 && lng != 0.0 && defined?(Dscf::Core::Address)
+          self.dropoff_address = Dscf::Core::Address.create!(
+            user_id: ordered_by_id,
+            address_type: :shipping,
+            country: "Ethiopia",
+            city: "Addis Ababa",
+            latitude: lat,
+            longitude: lng
+          )
+        end
+      end
+    rescue => e
+      Rails.logger.warn "Failed to auto-assign delivery address from retailer location: #{e.message}"
+    end
+
     def quotation_or_listing_present
       unless quotation.present? || listing.present? || order_items.any? { |item| item.source_type == "Dscf::Marketplace::AggregatorListing" }
         errors.add(:base, "Either quotation or listing must be present")

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.9.3".freeze
+    VERSION = "0.9.4".freeze
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2026-06-25 00:00:00.000000000 Z
+date: 2026-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails