dscf-marketplace 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 873ebd62a895e7774b5c0f235b4469258c7160516bd99e829897ceb586b3ff3f
-  data.tar.gz: 5a442910c89af40c3e610eb4df050f567250e225df5c5985926ddc8d86dba8db
+  metadata.gz: 81c4fc2b3cbb08308f4da22f26a56d9d7a3ca197325c340d491dacfe4adbaa6f
+  data.tar.gz: 1c89213f1171138ea6efc0c8566a60a6937348c7c934cfacc8ccecd53f35c310
 SHA512:
-  metadata.gz: 48fcf67a12f75cfbc5242011a1040af3d51c0dd1db54f4be7a06555717b49047072d00a8b16b4500f24ec225cbc7a70f55389eb2bbc977ad51f35b1f318fc85a
-  data.tar.gz: 9f2757a6957338c87e16d79290b78e118f350c50bf3f7e567f300af5fd67c7bbf1538d47b6c5d2887e1f3e82b706025d5be2d4007d478260434c335581e14c90
+  metadata.gz: 2f812ce7f37138fbf88cfed6c03233193b12fef8a194f8cd632c8006b86814201af5877122679c9634920bcb4ba73291e7ea2171009be15265a38cd9dad524c5
+  data.tar.gz: e6ffd5232a4f43d7d4020f789a0ce6b400858ffd2801192a7008dab0ffd4f66f3dcd3488c0364f26d8861c2b451eb2d6f1f2edcfbd9b990363cd121b6905a3b6

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

@@ -1,8 +1,6 @@
 module Dscf
   module Marketplace
-    class ApplicationController < ActionController::API
-      include Dscf::Core::JsonResponse
-      include Dscf::Core::Authenticatable
+    class ApplicationController < Dscf::Core::ApplicationController
     end
   end
 end

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

@@ -5,6 +5,7 @@ module Dscf
 
       def receiver_confirm
         @obj = find_record
+        authorize @obj, :receiver_confirm?
         if @obj.receiver_confirm!(params[:confirmed_quantity], params[:notes], current_user&.id)
           render_success("delivery_order_items.success.receiver_confirmed", data: @obj)
         else
@@ -14,6 +15,7 @@ module Dscf
 
       def report_issue
         @obj = find_record
+        authorize @obj, :report_issue?
         issue_type = params[:issue_type]
         quantity = params[:quantity]
         description = params[:description]
@@ -27,6 +29,7 @@ module Dscf
 
       def dispute_delivery
         @obj = find_record
+        authorize @obj, :dispute_delivery?
         reason = params[:reason]
 
         if @obj.dispute_delivery!(reason, current_user&.id)

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

@@ -4,6 +4,7 @@ module Dscf
       include Dscf::Core::Common
 
       def index
+        authorize @clazz.new, :index?
         # Custom implementation to avoid JSON field issues
         delivery_orders = @clazz.all
 
@@ -46,6 +47,7 @@ module Dscf
       end
 
       def filter
+        authorize @clazz.new, :filter?
         delivery_orders = @clazz.all
 
         # Apply Ransack filtering if q params present
@@ -70,11 +72,13 @@ module Dscf
 
       def summary
         @delivery_order = find_record
+        authorize @delivery_order, :summary?
         render_success(data: @delivery_order.generate_handoff_summary_report)
       end
 
       def pickup
         @obj = find_record
+        authorize @obj, :pickup?
         if @obj.pickup!
           render_success("delivery_orders.success.picked_up", data: @obj)
         else
@@ -84,6 +88,7 @@ module Dscf
 
       def start_delivery
         @obj = find_record
+        authorize @obj, :start_delivery?
         if @obj.start_delivery!
           render_success("delivery_orders.success.delivery_started", data: @obj)
         else
@@ -93,6 +98,7 @@ module Dscf
 
       def complete_delivery
         @obj = find_record
+        authorize @obj, :complete_delivery?
         if @obj.complete_delivery!
           render_success("delivery_orders.success.delivery_completed", data: @obj)
         else
@@ -102,6 +108,7 @@ module Dscf
 
       def mark_failed
         @obj = find_record
+        authorize @obj, :mark_failed?
         reason = params[:reason]
         if @obj.mark_failed!(reason)
           render_success("delivery_orders.success.marked_failed", data: @obj)
@@ -112,6 +119,7 @@ module Dscf
 
       def accept
         @obj = find_record
+        authorize @obj, :accept?
         service = Dscf::Marketplace::DeliveryOrderService.new
         begin
           service.assign_driver(@obj, current_user)
@@ -126,6 +134,7 @@ module Dscf
       end
 
       def convert_orders
+        authorize @clazz.new, :convert_orders?
         order_ids = params[:order_ids]
         vehicle_type = params[:vehicle_type]
         pickup_address_id = params[:pickup_address_id]
@@ -165,6 +174,7 @@ module Dscf
       end
 
       def my_driver_deliveries
+        authorize @clazz.new, :my_driver_deliveries?
         # Verify user has driver role
         unless Dscf::Marketplace::RoleService.user_has_driver_role?(current_user)
           render_error("delivery_orders.errors.access_denied", message: "Only drivers can access this endpoint")

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

@@ -18,6 +18,7 @@ module Dscf
 
       def verify
         @delivery_stop = DeliveryStop.find(params[:id])
+        authorize @delivery_stop, :verify?
         if @delivery_stop.verify!(verified_by: current_user.id)
           render_success(
             data: @delivery_stop, 

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

@@ -4,6 +4,7 @@ module Dscf
       include Dscf::Core::Common
 
       def create
+        authorize @clazz.new, :create?
         vehicle = @clazz.new(model_params.except(:vehicle_license, :driver_license))
         if vehicle.save
           # Auto-assign Driver role to the vehicle's driver
@@ -42,6 +43,7 @@ module Dscf
 
       def update
         vehicle = @clazz.find(params[:id])
+        authorize vehicle, :update?
         if vehicle.update(model_params.except(:vehicle_license, :driver_license))
           # Handle vehicle license update/replacement
           if params[:delivery_vehicle][:vehicle_license].present?

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

@@ -5,6 +5,7 @@ module Dscf
 
       def activate
         @obj = find_record
+        authorize @obj, :activate?
         if @obj.update(status: :active)
           render_success("listings.success.activated", data: @obj)
         else
@@ -14,6 +15,7 @@ module Dscf
 
       def pause
         @obj = find_record
+        authorize @obj, :pause?
         if @obj.update(status: :paused)
           render_success("listings.success.paused", data: @obj)
         else
@@ -23,6 +25,7 @@ module Dscf
 
       def sold_out
         @obj = find_record
+        authorize @obj, :sold_out?
         if @obj.update(status: :sold_out)
           render_success("listings.success.sold_out", data: @obj)
         else
@@ -31,6 +34,7 @@ module Dscf
       end
 
       def my_listings
+        authorize @clazz.new, :my_listings?
         service = MyResourceService.new(current_user)
         listings = service.my_listings(params)
 
@@ -43,6 +47,7 @@ module Dscf
       end
 
       def listings_by_supplier
+        authorize @clazz.new, :listings_by_supplier?
         supplier_id = params[:supplier_id]
 
         # Validate supplier exists

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

@@ -4,6 +4,7 @@ module Dscf
       include Dscf::Core::Common
 
       def filter
+        authorize @clazz.new, :filter?
         orders = @clazz.all
 
         # Apply Ransack filtering if q params present
@@ -24,6 +25,7 @@ module Dscf
 
       def confirm
         @obj = find_record
+        authorize @obj, :confirm?
         if @obj.confirm!
           render_success("orders.success.confirmed", data: @obj)
         else
@@ -33,6 +35,7 @@ module Dscf
 
       def cancel
         @obj = find_record
+        authorize @obj, :cancel?
         if @obj.update(status: :cancelled)
           @obj.order_items.update_all(status: OrderItem.statuses[:cancelled])
           render_success("orders.success.cancelled", data: @obj)
@@ -43,6 +46,7 @@ module Dscf
 
       def complete
         @obj = find_record
+        authorize @obj, :complete?
         if @obj.can_be_completed? && @obj.update(status: :completed)
           @obj.order_items.update_all(status: OrderItem.statuses[:completed])
           render_success("orders.success.completed", data: @obj)
@@ -52,6 +56,7 @@ module Dscf
       end
 
       def my_orders
+        authorize @clazz.new, :my_orders?
         service = MyResourceService.new(current_user)
         orders = service.my_orders(params)
 

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

@@ -4,6 +4,7 @@ module Dscf
       include Dscf::Core::Common
 
       def filter
+        authorize @clazz.new, :filter?
         products = @clazz.all
 
         # Apply Ransack filtering if q params present

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

@@ -4,6 +4,7 @@ module Dscf
       include Dscf::Core::Common
 
       def filter
+        authorize @clazz.new, :filter?
         quotations = @clazz.all
 
         # Apply Ransack filtering if q params present
@@ -24,6 +25,7 @@ module Dscf
 
       def accept
         @obj = find_record
+        authorize @obj, :accept?
 
         fulfillment_type = params[:fulfillment_type]
         dropoff_address_id = params[:dropoff_address_id]
@@ -57,6 +59,7 @@ module Dscf
 
       def reject
         @obj = find_record
+        authorize @obj, :reject?
         if @obj.reject!
           render_success("quotations.success.rejected", data: @obj)
         else
@@ -66,6 +69,7 @@ module Dscf
 
       def send_quotation
         @obj = find_record
+        authorize @obj, :send_quotation?
         if @obj.send_quotation!
           render_success("quotations.success.sent", data: @obj)
         else
@@ -74,6 +78,7 @@ module Dscf
       end
 
       def my_quotes
+        authorize @clazz.new, :my_quotes?
         service = MyResourceService.new(current_user)
         quotes = service.my_quotes(params)
 

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

@@ -4,6 +4,7 @@ module Dscf
       include Dscf::Core::Common
 
       def filter
+        authorize @clazz.new, :filter?
         rfqs = @clazz.all
 
         # Apply Ransack filtering if q params present
@@ -23,6 +24,7 @@ module Dscf
       end
 
       def create
+        authorize @clazz.new, :create?
         obj = @clazz.new(model_params)
         if obj.save
           obj = @clazz.includes(eager_loaded_associations).find(obj.id) if eager_loaded_associations.present?
@@ -41,6 +43,7 @@ module Dscf
 
       def send_rfq
         @obj = find_record
+        authorize @obj, :send_rfq?
         if @obj.draft? && @obj.update(status: :sent)
           render_success("request_for_quotations.success.sent", data: @obj)
         else
@@ -50,6 +53,7 @@ module Dscf
 
       def close
         @obj = find_record
+        authorize @obj, :close?
         if (@obj.sent? || @obj.responded?) && @obj.update(status: :closed)
           render_success("request_for_quotations.success.closed", data: @obj)
         else
@@ -58,6 +62,7 @@ module Dscf
       end
 
       def my_rfqs
+        authorize @clazz.new, :my_rfqs?
         service = MyResourceService.new(current_user)
         rfqs = service.my_rfqs(params)
 
@@ -71,6 +76,7 @@ module Dscf
 
       def respond
         @rfq = Dscf::Marketplace::RequestForQuotation.find(params[:id])
+        authorize @rfq, :respond?
         service = RfqResponseService.new(current_user)
         result = service.respond_to_rfq(@rfq, params.permit(:notes, :valid_until, :delivery_date, quotation_items_attributes: [ :rfq_item_id, :unit_id, :quantity, :unit_price, :notes ]))
 

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

@@ -4,6 +4,7 @@ module Dscf
       include Dscf::Core::Common
 
       def my_products
+        authorize @clazz.new, :my_products?
         service = MyResourceService.new(current_user)
         products = service.my_products(params)
 

data/app/policies/dscf/marketplace/category_policy.rb

@@ -0,0 +1,6 @@
+module Dscf
+  module Marketplace
+    class CategoryPolicy < Dscf::Core::ApplicationPolicy
+    end
+  end
+end

data/app/policies/dscf/marketplace/delivery_order_item_policy.rb

@@ -0,0 +1,17 @@
+module Dscf
+  module Marketplace
+    class DeliveryOrderItemPolicy < Dscf::Core::ApplicationPolicy
+      def receiver_confirm?
+        user.has_permission?("delivery_order_items.receiver_confirm")
+      end
+
+      def report_issue?
+        user.has_permission?("delivery_order_items.report_issue")
+      end
+
+      def dispute_delivery?
+        user.has_permission?("delivery_order_items.dispute_delivery")
+      end
+    end
+  end
+end

data/app/policies/dscf/marketplace/delivery_order_policy.rb

@@ -0,0 +1,41 @@
+module Dscf
+  module Marketplace
+    class DeliveryOrderPolicy < Dscf::Core::ApplicationPolicy
+      def filter?
+        user.has_permission?("delivery_orders.filter")
+      end
+
+      def summary?
+        user.has_permission?("delivery_orders.summary")
+      end
+
+      def pickup?
+        user.has_permission?("delivery_orders.pickup")
+      end
+
+      def start_delivery?
+        user.has_permission?("delivery_orders.start_delivery")
+      end
+
+      def complete_delivery?
+        user.has_permission?("delivery_orders.complete_delivery")
+      end
+
+      def mark_failed?
+        user.has_permission?("delivery_orders.mark_failed")
+      end
+
+      def accept?
+        user.has_permission?("delivery_orders.accept")
+      end
+
+      def convert_orders?
+        user.has_permission?("delivery_orders.convert_orders")
+      end
+
+      def my_driver_deliveries?
+        user.has_permission?("delivery_orders.my_driver_deliveries")
+      end
+    end
+  end
+end

data/app/policies/dscf/marketplace/delivery_stop_policy.rb

@@ -0,0 +1,9 @@
+module Dscf
+  module Marketplace
+    class DeliveryStopPolicy < Dscf::Core::ApplicationPolicy
+      def verify?
+        user.has_permission?("delivery_stops.verify")
+      end
+    end
+  end
+end

data/app/policies/dscf/marketplace/delivery_vehicle_policy.rb

@@ -0,0 +1,6 @@
+module Dscf
+  module Marketplace
+    class DeliveryVehiclePolicy < Dscf::Core::ApplicationPolicy
+    end
+  end
+end

data/app/policies/dscf/marketplace/listing_policy.rb

@@ -0,0 +1,25 @@
+module Dscf
+  module Marketplace
+    class ListingPolicy < Dscf::Core::ApplicationPolicy
+      def activate?
+        user.has_permission?("listings.activate")
+      end
+
+      def pause?
+        user.has_permission?("listings.pause")
+      end
+
+      def sold_out?
+        user.has_permission?("listings.sold_out")
+      end
+
+      def my_listings?
+        user.has_permission?("listings.my_listings")
+      end
+
+      def listings_by_supplier?
+        user.has_permission?("listings.listings_by_supplier")
+      end
+    end
+  end
+end

data/app/policies/dscf/marketplace/location_policy.rb

@@ -0,0 +1,9 @@
+module Dscf
+  module Marketplace
+    class LocationPolicy < Dscf::Core::ApplicationPolicy
+      def get_location?
+        user.has_permission?("locations.get_location")
+      end
+    end
+  end
+end

data/app/policies/dscf/marketplace/order_item_policy.rb

@@ -0,0 +1,6 @@
+module Dscf
+  module Marketplace
+    class OrderItemPolicy < Dscf::Core::ApplicationPolicy
+    end
+  end
+end

data/app/policies/dscf/marketplace/order_policy.rb

@@ -0,0 +1,25 @@
+module Dscf
+  module Marketplace
+    class OrderPolicy < Dscf::Core::ApplicationPolicy
+      def filter?
+        user.has_permission?("orders.filter")
+      end
+
+      def confirm?
+        user.has_permission?("orders.confirm")
+      end
+
+      def cancel?
+        user.has_permission?("orders.cancel")
+      end
+
+      def complete?
+        user.has_permission?("orders.complete")
+      end
+
+      def my_orders?
+        user.has_permission?("orders.my_orders")
+      end
+    end
+  end
+end

data/app/policies/dscf/marketplace/product_policy.rb

@@ -0,0 +1,13 @@
+module Dscf
+  module Marketplace
+    class ProductPolicy < Dscf::Core::ApplicationPolicy
+      def filter?
+        user.has_permission?("products.filter")
+      end
+
+      def supplier_products?
+        user.has_permission?("products.supplier_products")
+      end
+    end
+  end
+end

data/app/policies/dscf/marketplace/quotation_item_policy.rb

@@ -0,0 +1,6 @@
+module Dscf
+  module Marketplace
+    class QuotationItemPolicy < Dscf::Core::ApplicationPolicy
+    end
+  end
+end

data/app/policies/dscf/marketplace/quotation_policy.rb

@@ -0,0 +1,25 @@
+module Dscf
+  module Marketplace
+    class QuotationPolicy < Dscf::Core::ApplicationPolicy
+      def filter?
+        user.has_permission?("quotations.filter")
+      end
+
+      def accept?
+        user.has_permission?("quotations.accept")
+      end
+
+      def reject?
+        user.has_permission?("quotations.reject")
+      end
+
+      def send_quotation?
+        user.has_permission?("quotations.send_quotation")
+      end
+
+      def my_quotes?
+        user.has_permission?("quotations.my_quotes")
+      end
+    end
+  end
+end

data/app/policies/dscf/marketplace/request_for_quotation_policy.rb

@@ -0,0 +1,25 @@
+module Dscf
+  module Marketplace
+    class RequestForQuotationPolicy < Dscf::Core::ApplicationPolicy
+      def filter?
+        user.has_permission?("request_for_quotations.filter")
+      end
+
+      def send_rfq?
+        user.has_permission?("request_for_quotations.send_rfq")
+      end
+
+      def close?
+        user.has_permission?("request_for_quotations.close")
+      end
+
+      def respond?
+        user.has_permission?("request_for_quotations.respond")
+      end
+
+      def my_rfqs?
+        user.has_permission?("request_for_quotations.my_rfqs")
+      end
+    end
+  end
+end

data/app/policies/dscf/marketplace/rfq_item_policy.rb

@@ -0,0 +1,6 @@
+module Dscf
+  module Marketplace
+    class RfqItemPolicy < Dscf::Core::ApplicationPolicy
+    end
+  end
+end

data/app/policies/dscf/marketplace/supplier_product_policy.rb

@@ -0,0 +1,9 @@
+module Dscf
+  module Marketplace
+    class SupplierProductPolicy < Dscf::Core::ApplicationPolicy
+      def my_products?
+        user.has_permission?("supplier_products.my_products")
+      end
+    end
+  end
+end

data/app/policies/dscf/marketplace/unit_conversion_policy.rb

@@ -0,0 +1,6 @@
+module Dscf
+  module Marketplace
+    class UnitConversionPolicy < Dscf::Core::ApplicationPolicy
+    end
+  end
+end

data/app/policies/dscf/marketplace/unit_policy.rb

@@ -0,0 +1,6 @@
+module Dscf
+  module Marketplace
+    class UnitPolicy < Dscf::Core::ApplicationPolicy
+    end
+  end
+end

data/db/migrate/20260310120000_add_active_and_description_to_dscf_core_roles.rb

@@ -0,0 +1,8 @@
+class AddActiveAndDescriptionToDscfCoreRoles < ActiveRecord::Migration[8.0]
+  def change
+    add_column :dscf_core_roles, :description, :string, if_not_exists: true
+    add_column :dscf_core_roles, :active, :boolean, null: false, default: true, if_not_exists: true
+
+    add_index :dscf_core_roles, :active, if_not_exists: true
+  end
+end

data/db/migrate/20260310122000_add_missing_fields_to_dscf_core_user_roles.rb

@@ -0,0 +1,10 @@
+class AddMissingFieldsToDscfCoreUserRoles < ActiveRecord::Migration[8.0]
+  def change
+    add_column :dscf_core_user_roles, :expires_at, :datetime, if_not_exists: true
+    add_index :dscf_core_user_roles, :expires_at, name: "expires_at_on_dc_ur_indx", if_not_exists: true
+
+    add_column :dscf_core_user_roles, :assigned_by_id, :bigint, if_not_exists: true
+    add_index :dscf_core_user_roles, :assigned_by_id, name: "assigned_by_on_dc_ur_indx", if_not_exists: true
+    add_foreign_key :dscf_core_user_roles, :dscf_core_users, column: :assigned_by_id, if_not_exists: true
+  end
+end

data/db/seeds.rb

@@ -1,343 +1,38 @@
-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
-  )
+puts "🌱 Seeding marketplace permissions and default USER role..."
+
+Dscf::Core::PermissionRegistry.register("dscf-marketplace") do
+  resource :categories, actions: %i[index show create update destroy subcategories]
+  resource :products, actions: %i[index show create update destroy filter supplier_products]
+  resource :units, actions: %i[index show create update destroy]
+  resource :unit_conversions, actions: %i[index show create update destroy]
+  resource :supplier_products, actions: %i[index show create update destroy my_products]
+  resource :listings, actions: %i[index show create update destroy activate pause sold_out my_listings listings_by_supplier]
+  resource :request_for_quotations, actions: %i[index show create update destroy send_rfq close respond my_rfqs filter]
+  resource :rfq_items, actions: %i[index show create update destroy]
+  resource :quotations, actions: %i[index show create update destroy accept reject send_quotation my_quotes filter]
+  resource :quotation_items, actions: %i[index show create update destroy]
+  resource :orders, actions: %i[index show create update destroy confirm cancel complete my_orders filter]
+  resource :order_items, actions: %i[index show create update destroy]
+  resource :delivery_orders, actions: %i[
+    index show create update destroy pickup start_delivery complete_delivery mark_failed accept summary
+    my_driver_deliveries filter convert_orders
+  ]
+  resource :delivery_stops, actions: %i[index show create update destroy verify]
+  resource :delivery_order_items, actions: %i[index show create update destroy receiver_confirm report_issue dispute_delivery]
+  resource :delivery_vehicles, actions: %i[index show create update destroy]
+  resource :locations, actions: %i[get_location]
+end
 
-  delivery_order.delivery_order_items.create!(
-    order_item: retailer_order.order_items.first,
-    pickup_address: pickup_address,
-    dropoff_address: retailer_address
-  )
+user_role = Dscf::Core::Role.find_or_create_by!(code: "USER") do |role|
+  role.name = "User"
+  role.active = true
+end
+user_role.update!(name: "User", active: true)
 
-  delivery_order.delivery_order_items.create!(
-    order_item: extra_order.order_items.first,
-    pickup_address: pickup_address,
-    dropoff_address: extra_address
-  )
+marketplace_permissions = Dscf::Core::Permission.where(engine: "dscf-marketplace")
 
-  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
+marketplace_permissions.find_each do |permission|
+  Dscf::Core::RolePermission.find_or_create_by!(role: user_role, permission: permission)
 end
+
+puts "✅ Seeded #{marketplace_permissions.count} marketplace permissions and assigned to USER role."

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.7.0".freeze
+    VERSION = "0.7.2".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Asrat
@@ -453,6 +453,23 @@ files:
 - app/models/dscf/marketplace/supplier_product.rb
 - app/models/dscf/marketplace/unit.rb
 - app/models/dscf/marketplace/unit_conversion.rb
+- app/policies/dscf/marketplace/category_policy.rb
+- app/policies/dscf/marketplace/delivery_order_item_policy.rb
+- app/policies/dscf/marketplace/delivery_order_policy.rb
+- app/policies/dscf/marketplace/delivery_stop_policy.rb
+- app/policies/dscf/marketplace/delivery_vehicle_policy.rb
+- app/policies/dscf/marketplace/listing_policy.rb
+- app/policies/dscf/marketplace/location_policy.rb
+- app/policies/dscf/marketplace/order_item_policy.rb
+- app/policies/dscf/marketplace/order_policy.rb
+- app/policies/dscf/marketplace/product_policy.rb
+- app/policies/dscf/marketplace/quotation_item_policy.rb
+- app/policies/dscf/marketplace/quotation_policy.rb
+- app/policies/dscf/marketplace/request_for_quotation_policy.rb
+- app/policies/dscf/marketplace/rfq_item_policy.rb
+- app/policies/dscf/marketplace/supplier_product_policy.rb
+- app/policies/dscf/marketplace/unit_conversion_policy.rb
+- app/policies/dscf/marketplace/unit_policy.rb
 - app/serializers/dscf/marketplace/category_serializer.rb
 - app/serializers/dscf/marketplace/delivery_order_item_serializer.rb
 - app/serializers/dscf/marketplace/delivery_order_serializer.rb
@@ -512,6 +529,8 @@ files:
 - db/migrate/20251006055948_change_default_payment_method_on_orders.rb
 - db/migrate/20251130143731_create_dscf_marketplace_delivery_stops.rb
 - db/migrate/20251130144500_add_delivery_stop_to_delivery_order_items.rb
+- db/migrate/20260310120000_add_active_and_description_to_dscf_core_roles.rb
+- db/migrate/20260310122000_add_missing_fields_to_dscf_core_user_roles.rb
 - db/seeds.rb
 - lib/dscf/marketplace.rb
 - lib/dscf/marketplace/engine.rb