dscf-marketplace 0.3.97 → 0.3.98

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d54a0f098c2df4fc4d326830ffe7d2588525c39bd8de35c908670dd73f9a0505
-  data.tar.gz: dea5a11311daf7e2c3084960c8d9273bd86b57b388c3dd3216c737bb80680d11
+  metadata.gz: 4bfb73ec9f2d2d71a3f41f63d961f78a647a54ed2e662c6c37fcf353cb616166
+  data.tar.gz: 2cda27a9e978ce5b4f46d5b75fbadb054640ec5623c6bd93683d56f760da332c
 SHA512:
-  metadata.gz: 63336500de36d23b2c800012b2bbb72b2caa83e6969fef17dd319d036acac916902fe2358ad77a7dad8a8559b2115052347011cc8426fee3c47b695c7fdcc510
-  data.tar.gz: c0b63b4808ac8c914eb0ace252dbff343febf9f93b2335ea7d9d6bb7d85144fd8f83e42e8258e1170e3f6019cfbdea5286adca47fcaf8fb908898cfeabc012c3
+  metadata.gz: 3d1ca95ef3bba82e8595f2ebb897def65e6d2fc05ecd5f98334ebf5692573ee246cd6a8a0b3f80d6e780508f8320a58cd4cb370a82e071ebf32c8a79b62e3fa1
+  data.tar.gz: 2f0823dd0d008b7871bd5032d9a30aec45c388a2d56fdbff883256e4468ca579efda36a6d011d5b7415bd4de6ba58acb8d8f1d63f9d148c2e7158f609f52a61a

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

@@ -222,7 +222,7 @@ module Dscf
       end
 
       def eager_loaded_associations
-        [ :driver, :pickup_address, :delivery_vehicle, :delivery_order_items, :marketplace_orders ]
+        [ :driver, :pickup_address, :delivery_vehicle, :delivery_order_items ]
       end
 
       def default_serializer_includes
@@ -241,7 +241,8 @@ module Dscf
             :delivery_vehicle,
             :marketplace_orders,
             {
-              delivery_order_items: [ :dropoff_address ]
+              delivery_order_items: [ :dropoff_address ],
+              marketplace_orders: [ :ordered_by, :ordered_to ]
             }
           ],
           create: [ :driver, :pickup_address, :delivery_vehicle ],

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

@@ -3,6 +3,7 @@ module Dscf
     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,
+        :buyer_phone, :buyer_email, :seller_name, :seller_phone, :seller_email,
         :created_at, :updated_at
 
       belongs_to :quotation
@@ -13,6 +14,26 @@ module Dscf
       belongs_to :delivery_order
       belongs_to :dropoff_address
       has_many :order_items
+
+      def buyer_phone
+        object.ordered_by&.phone
+      end
+
+      def buyer_email
+        object.ordered_by&.email
+      end
+
+      def seller_name
+        object.ordered_to&.name
+      end
+
+      def seller_phone
+        object.ordered_to&.contact_phone
+      end
+
+      def seller_email
+        object.ordered_to&.contact_email
+      end
     end
   end
 end

data/db/seeds.rb

@@ -0,0 +1,343 @@
+puts "🚀 Starting demo seed..."
+begin
+  puts "🧹 Clearing existing demo data..."
+  Dscf::Marketplace::DeliveryOrderItem.delete_all
+  Dscf::Marketplace::DeliveryOrder.delete_all
+  Dscf::Marketplace::OrderItem.delete_all
+  Dscf::Marketplace::Order.delete_all
+  Dscf::Marketplace::QuotationItem.delete_all
+  Dscf::Marketplace::Quotation.delete_all
+  Dscf::Marketplace::RfqItem.delete_all
+  Dscf::Marketplace::RequestForQuotation.delete_all
+  Dscf::Marketplace::Listing.delete_all
+  Dscf::Marketplace::SupplierProduct.delete_all
+  Dscf::Marketplace::Product.delete_all
+  Dscf::Core::Business.delete_all
+  Dscf::Core::User.where.not(email: "admin@example.com").delete_all
+  Dscf::Core::Address.delete_all
+
+  puts "🌱 Creating base units and categories..."
+
+  # Units
+  kg = Dscf::Marketplace::Unit.create!(name: "Kilogram", code: "kg", unit_type: :weight)
+  Dscf::Marketplace::Unit.create!(name: "Piece", code: "pc", unit_type: :quantity)
+  liter = Dscf::Marketplace::Unit.create!(name: "Liter", code: "L", unit_type: :volume)
+
+  # Categories
+  fruits_veg = Dscf::Marketplace::Category.create!(name: "Fruits & Vegetables")
+  dairy = Dscf::Marketplace::Category.create!(name: "Dairy Products")
+  Dscf::Marketplace::Category.create!(name: "Grains & Cereals")
+  Dscf::Marketplace::Category.create!(name: "Beverages")
+
+  puts "✅ Created #{Dscf::Marketplace::Unit.count} units and #{Dscf::Marketplace::Category.count} categories"
+
+  puts "👥 Creating users and personas..."
+
+  # Business Types
+  wholesale_type = Dscf::Core::BusinessType.find_or_create_by!(name: "Wholesale Distributor")
+  retail_type = Dscf::Core::BusinessType.find_or_create_by!(name: "Retail Store")
+
+  # Consumers
+  consumer1 = Dscf::Core::User.create!(
+    email: "abebe.consumer@example.com",
+    phone: "+251911123456"
+  )
+  consumer2 = Dscf::Core::User.create!(
+    email: "tigist.consumer@example.com",
+    phone: "+251922334567"
+  )
+
+  # Drivers
+  driver1 = Dscf::Core::User.create!(
+    email: "driver.ahmed@example.com",
+    phone: "+251933445678"
+  )
+  Dscf::Core::User.create!(
+    email: "driver.mariam@example.com",
+    phone: "+251944556789"
+  )
+
+  puts "✅ Created #{Dscf::Core::User.count} users (#{Dscf::Core::User.where("email LIKE ?", "%consumer%").count} consumers, #{Dscf::Core::User.where("email LIKE ?", "%driver%").count} drivers)"
+
+  puts "🏢 Creating businesses and linking to users..."
+
+  # Wholesalers
+  wholesale_user1 = Dscf::Core::User.create!(
+    email: "wholesale.addis@example.com",
+    phone: "+251955667890"
+  )
+  wholesaler1 = Dscf::Core::Business.create!(
+    name: "Addis Wholesale Distributors",
+    contact_email: "contact@addiswholesale.et",
+    contact_phone: "+251966778901",
+    tin_number: "1234567890",
+    business_type: wholesale_type,
+    user: wholesale_user1
+  )
+
+  wholesale_user2 = Dscf::Core::User.create!(
+    email: "wholesale.ethio@example.com",
+    phone: "+251977889012"
+  )
+  wholesaler2 = Dscf::Core::Business.create!(
+    name: "Ethio Agricultural Wholesale",
+    contact_email: "info@ethiowholesale.et",
+    contact_phone: "+251988990123",
+    tin_number: "0987654321",
+    business_type: wholesale_type,
+    user: wholesale_user2
+  )
+
+  # Retailers
+  retail_user1 = Dscf::Core::User.create!(
+    email: "retail.meklit@example.com",
+    phone: "+251999001234"
+  )
+  Dscf::Core::Business.create!(
+    name: "Meklit Fresh Market",
+    contact_email: "meklit@freshmarket.et",
+    contact_phone: "+251910112345",
+    tin_number: "1122334455",
+    business_type: retail_type,
+    user: retail_user1
+  )
+
+  retail_user2 = Dscf::Core::User.create!(
+    email: "retail.bole@example.com",
+    phone: "+251921223456"
+  )
+  Dscf::Core::Business.create!(
+    name: "Bole Modern Supermarket",
+    contact_email: "info@bolesuper.et",
+    contact_phone: "+251932334567",
+    tin_number: "5566778899",
+    business_type: retail_type,
+    user: retail_user2
+  )
+
+  puts "✅ Created #{Dscf::Core::Business.count} businesses (#{Dscf::Core::Business.joins(:user).where("dscf_core_users.email LIKE ?", "%wholesale%").count} wholesalers, #{Dscf::Core::Business.joins(:user).where("dscf_core_users.email LIKE ?", "%retail%").count} retailers)"
+
+  puts "📦 Creating products and supplier listings..."
+
+  # Products from wholesalers
+  banana_product = wholesaler1.supplier_products.create!(
+    product: Dscf::Marketplace::Product.create!(
+      name: "Fresh Bananas",
+      category: fruits_veg,
+      unit: kg
+    )
+  )
+  banana_listing = Dscf::Marketplace::Listing.create!(
+    supplier_product: banana_product,
+    price: 25.00,
+    quantity: 1000,
+    status: :active
+  )
+
+  milk_product = wholesaler2.supplier_products.create!(
+    product: Dscf::Marketplace::Product.create!(
+      name: "Fresh Cow Milk",
+      category: dairy,
+      unit: liter
+    )
+  )
+  milk_listing = Dscf::Marketplace::Listing.create!(
+    supplier_product: milk_product,
+    price: 45.00,
+    quantity: 500,
+    status: :active
+  )
+
+  puts "✅ Created #{Dscf::Marketplace::Product.count} products and #{Dscf::Marketplace::Listing.count} active listings"
+
+  puts "📋 Creating RFQs and quotations..."
+
+  # RFQ from retailer to wholesalers
+  rfq = Dscf::Marketplace::RequestForQuotation.create!(
+    user: retail_user1,
+    status: :sent,
+    notes: "Monthly supply of fresh produce"
+  )
+
+  # RFQ items
+  rfq.rfq_items.create!(
+    product: banana_product.product,
+    unit: kg,
+    quantity: 200,
+    notes: "Premium quality bananas"
+  )
+
+  rfq.rfq_items.create!(
+    product: milk_product.product,
+    unit: liter,
+    quantity: 100,
+    notes: "Fresh morning milk"
+  )
+
+  # Quotations from wholesalers
+  quotation1 = Dscf::Marketplace::Quotation.create!(
+    request_for_quotation: rfq,
+    business: wholesaler1,
+    total_price: 5000.00,
+    delivery_date: 3.days.from_now.to_date,
+    valid_until: 10.days.from_now,
+    status: :accepted,
+    notes: "Competitive pricing for bulk orders"
+  )
+
+  quotation1.quotation_items.create!(
+    rfq_item: rfq.rfq_items.first,
+    product: banana_product.product,
+    unit: kg,
+    quantity: 200,
+    unit_price: 25.00
+  )
+
+  quotation2 = Dscf::Marketplace::Quotation.create!(
+    request_for_quotation: rfq,
+    business: wholesaler2,
+    total_price: 4500.00,
+    delivery_date: 2.days.from_now.to_date,
+    valid_until: 8.days.from_now,
+    status: :sent,
+    notes: "Direct from farm fresh milk"
+  )
+
+  quotation2.quotation_items.create!(
+    rfq_item: rfq.rfq_items.second,
+    product: milk_product.product,
+    unit: liter,
+    quantity: 100,
+    unit_price: 45.00
+  )
+
+  puts "✅ Created #{Dscf::Marketplace::RequestForQuotation.count} RFQs with #{Dscf::Marketplace::Quotation.count} quotations"
+
+  puts "🛒 Creating orders from consumers and retailers..."
+
+  # Addresses for orders
+  consumer_address = Dscf::Core::Address.create!(
+    user: consumer1,
+    address_type: :shipping,
+    country: "Ethiopia",
+    city: "Addis Ababa",
+    sub_city: "Bole",
+    woreda: "05",
+    kebele: "09",
+    house_numbers: "123",
+    po_box: "5678",
+    latitude: 9.0108,
+    longitude: 38.7613
+  )
+
+  retailer_address = Dscf::Core::Address.create!(
+    user: retail_user1,
+    address_type: :shipping,
+    country: "Ethiopia",
+    city: "Addis Ababa",
+    sub_city: "Piassa",
+    woreda: "01",
+    kebele: "12",
+    house_numbers: "456",
+    po_box: "9012",
+    latitude: 9.0308,
+    longitude: 38.7413
+  )
+
+  # Order from consumer via direct listing
+  consumer_order = Dscf::Marketplace::Order.create_from_listing(
+    milk_listing,
+    consumer1,
+    10,
+    consumer_address
+  )
+
+  # Order from retailer via accepted quotation
+  retailer_order = Dscf::Marketplace::Order.create_from_quotation(
+    quotation1,
+    retailer_address
+  )
+
+  puts "✅ Created #{Dscf::Marketplace::Order.count} orders (#{Dscf::Marketplace::Order.where(order_type: :direct_listing).count} direct, #{Dscf::Marketplace::Order.where(order_type: :rfq_based).count} RFQ-based)"
+
+  puts "🚚 Creating delivery orders with multiple dropoffs..."
+
+  # Pickup address
+  pickup_address = Dscf::Core::Address.create!(
+    user: wholesaler1.user,
+    address_type: :business,
+    country: "Ethiopia",
+    city: "Addis Ababa",
+    sub_city: "Kazanchis",
+    woreda: "03",
+    kebele: "15",
+    house_numbers: "789",
+    po_box: "3456",
+    latitude: 9.0208,
+    longitude: 38.7513
+  )
+
+  # Additional dropoff
+  extra_address = Dscf::Core::Address.create!(
+    user: consumer2,
+    address_type: :shipping,
+    country: "Ethiopia",
+    city: "Addis Ababa",
+    sub_city: "Merkato",
+    woreda: "07",
+    kebele: "21",
+    house_numbers: "101",
+    po_box: "7890",
+    latitude: 9.0008,
+    longitude: 38.7713
+  )
+
+  # Create delivery order
+  delivery_order = Dscf::Marketplace::DeliveryOrder.create!(
+    driver: driver1,
+    pickup_address: pickup_address,
+    status: :assigned,
+    vehicle_type: :motorcycle,
+    estimated_delivery_price: 150.00,
+    estimated_delivery_time: 2.hours.from_now
+  )
+
+  # Associate orders
+  consumer_order.update!(delivery_order: delivery_order)
+  retailer_order.update!(delivery_order: delivery_order)
+
+  # Create additional order for third dropoff
+  extra_order = Dscf::Marketplace::Order.create_from_listing(
+    banana_listing,
+    consumer2,
+    5,
+    extra_address
+  )
+  extra_order.update!(delivery_order: delivery_order)
+
+  # Create delivery order items
+  delivery_order.delivery_order_items.create!(
+    order_item: consumer_order.order_items.first,
+    pickup_address: pickup_address,
+    dropoff_address: consumer_address
+  )
+
+  delivery_order.delivery_order_items.create!(
+    order_item: retailer_order.order_items.first,
+    pickup_address: pickup_address,
+    dropoff_address: retailer_address
+  )
+
+  delivery_order.delivery_order_items.create!(
+    order_item: extra_order.order_items.first,
+    pickup_address: pickup_address,
+    dropoff_address: extra_address
+  )
+
+  puts "✅ Created #{Dscf::Marketplace::DeliveryOrder.count} delivery orders with #{Dscf::Marketplace::DeliveryOrderItem.count} total dropoffs"
+  puts "🎉 Demo seed completed! Created realistic supply chain with #{Dscf::Core::User.count} users, #{Dscf::Core::Business.count} businesses, and #{Dscf::Marketplace::Order.count} orders across the platform."
+rescue => e
+  puts "❌ Seed failed: #{e.message}"
+  puts e.backtrace
+  raise
+end

data/lib/dscf/marketplace/engine.rb

@@ -1,3 +1,5 @@
+require "dscf/core"
+
 module Dscf
   module Marketplace
     class Engine < ::Rails::Engine
@@ -12,6 +14,9 @@ module Dscf
 
       initializer :append_migrations do |app|
         app.config.paths["db/migrate"].concat(config.paths["db/migrate"].expanded) unless app.root.to_s.match(root.to_s + File::SEPARATOR)
+        # Append dscf-core migrations
+        core_engine = Dscf::Core::Engine
+        app.config.paths["db/migrate"].concat(core_engine.config.paths["db/migrate"].expanded) unless app.root.to_s.match(root.to_s + File::SEPARATOR)
       end
 
       require "active_storage/engine"

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.3.97".freeze
+    VERSION = "0.3.98".freeze
   end
 end

data/spec/factories/dscf/core/users.rb

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :dscf_core_user, class: 'Dscf::Core::User' do
+  factory :dscf_core_user, class: "Dscf::Core::User" do
     sequence(:email) { |n| "user#{n}@example.com" }
     sequence(:phone) { |n| "+25191112345#{n}" }
     temp_password { false }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.3.97
+  version: 0.3.98
 platform: ruby
 authors:
 - Asrat
@@ -504,6 +504,7 @@ files:
 - db/migrate/20250916083536_make_driver_id_nullable_in_delivery_orders.rb
 - db/migrate/20250917110618_add_dropoff_address_to_dscf_marketplace_orders.rb
 - db/migrate/20250920105329_backfill_quotation_total_prices.rb
+- db/seeds.rb
 - lib/dscf/marketplace.rb
 - lib/dscf/marketplace/engine.rb
 - lib/dscf/marketplace/version.rb