dscf-marketplace 0.1.7 → 0.1.9

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

@@ -0,0 +1,70 @@
+module Dscf
+  module Marketplace
+    class DeliveryVehicle < ApplicationRecord
+      enum :vehicle_type, {motorcycle: 0, car: 1, van: 2, truck: 3}
+
+      belongs_to :driver, class_name: "Dscf::Core::User"
+      has_many :delivery_orders, dependent: :nullify
+
+      validates :driver_id, presence: true
+      validates :plate_number, presence: true, uniqueness: true
+      validates :vehicle_type, presence: true
+      validates :year, numericality: {greater_than: 1900, less_than_or_equal_to: Time.current.year + 1}, allow_nil: true
+      validates :brand, length: {maximum: 50}, allow_blank: true
+      validates :model, length: {maximum: 50}, allow_blank: true
+      validates :color, length: {maximum: 30}, allow_blank: true
+
+      # Ransack configuration for secure filtering
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[id driver_id plate_number vehicle_type year brand model color created_at updated_at]
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[driver delivery_orders]
+      end
+
+      def motorcycle?
+        vehicle_type == "motorcycle"
+      end
+
+      def car?
+        vehicle_type == "car"
+      end
+
+      def van?
+        vehicle_type == "van"
+      end
+
+      def truck?
+        vehicle_type == "truck"
+      end
+
+      def display_name
+        brand_and_model = [ brand.presence, model.presence ].compact.join(" ")
+        brand_and_model = nil if brand_and_model.blank?
+        "#{brand_and_model} (#{plate_number})".strip
+      end
+
+      def active_deliveries
+        delivery_orders.where.not(status: [ :delivered, :failed ])
+      end
+
+      def completed_deliveries
+        delivery_orders.where(status: :delivered)
+      end
+
+      def failed_deliveries
+        delivery_orders.where(status: :failed)
+      end
+
+      def total_deliveries
+        delivery_orders.count
+      end
+
+      def success_rate
+        return 0 if total_deliveries.zero?
+        (completed_deliveries.count.to_f / total_deliveries * 100).round(2)
+      end
+    end
+  end
+end

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

@@ -21,6 +21,15 @@ module Dscf::Marketplace
     scope :by_business, ->(business_id) { where(business_id: business_id) }
     scope :owned_by, ->(business) { where(business: business) }
 
+    # Ransack configuration for secure filtering
+    def self.ransackable_attributes(_auth_object = nil)
+      %w[id business_id supplier_product_id price quantity status created_at updated_at]
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      %w[business supplier_product order_items]
+    end
+
     # Custom methods
     def total_value
       price * quantity

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

@@ -2,19 +2,31 @@ module Dscf::Marketplace
   class Order < ApplicationRecord
     enum :order_type, {rfq_based: 0, direct_listing: 1}
     enum :status, {pending: 0, confirmed: 1, processing: 2, completed: 3, cancelled: 4}
+    enum :fulfillment_type, {self_pickup: 0, delivery: 1}
 
     belongs_to :quotation, optional: true
     belongs_to :listing, optional: true
     belongs_to :user, class_name: "Dscf::Core::User"
+    belongs_to :delivery_order, optional: true
     has_many :order_items, dependent: :destroy
 
     validates :order_type, presence: true
     validates :status, presence: true
+    validates :fulfillment_type, presence: true
     validates :user, presence: true
     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 delivery_order_id order_type status fulfillment_type total_amount created_at updated_at]
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      %w[quotation listing user delivery_order order_items]
+    end
+
     def self.create_from_quotation(quotation)
       return nil unless quotation.accepted?
 
@@ -81,6 +93,29 @@ module Dscf::Marketplace
       end
     end
 
+    # Fulfillment type methods
+    def self_pickup?
+      fulfillment_type == "self_pickup"
+    end
+
+    def delivery?
+      fulfillment_type == "delivery"
+    end
+
+    def requires_delivery_order?
+      delivery? && !completed?
+    end
+
+    def can_be_completed?
+      if self_pickup?
+        # Self-pickup orders can be completed immediately after confirmation
+        confirmed? || processing?
+      else
+        # Delivery orders require delivery_order association
+        delivery_order.present? && delivery_order.delivered?
+      end
+    end
+
     def confirm!
       return false unless pending?
 

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

@@ -15,10 +15,27 @@ module Dscf::Marketplace
     validates :unit, presence: true
     validate :quotation_item_or_listing_present
 
+    # Ransack configuration for secure filtering
+    def self.ransackable_attributes(_auth_object = nil)
+      %w[id order_id quotation_item_id listing_id product_id unit_id quantity unit_price status created_at updated_at]
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      %w[order quotation_item listing product unit]
+    end
+
     def subtotal
       quantity * unit_price
     end
 
+    def product_name
+      product&.name
+    end
+
+    def unit_name
+      unit&.name
+    end
+
     private
 
     def quotation_item_or_listing_present

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

@@ -27,6 +27,15 @@ module Dscf
       scope :by_category, ->(category_id) { where(category_id: category_id) }
       scope :by_unit, ->(unit_id) { where(unit_id: unit_id) }
 
+      # Ransack configuration for secure filtering
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[id sku name description category_id unit_id base_price base_quantity business_only created_at updated_at]
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[category unit supplier_products listings order_items rfq_items quotation_items]
+      end
+
       def display_name
         "#{name} (#{sku})"
       end

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

@@ -22,6 +22,15 @@ module Dscf
       scope :valid_quotations, -> { where("valid_until > ?", Time.current) }
       scope :expired_quotations, -> { where("valid_until <= ?", Time.current) }
 
+      # Ransack configuration for secure filtering
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[id request_for_quotation_id business_id total_price delivery_date valid_until status notes created_at updated_at]
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[request_for_quotation business quotation_items order]
+      end
+
       def calculate_total_price
         self.total_price = quotation_items.sum(&:subtotal).to_f
       end

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

@@ -6,8 +6,6 @@ module Dscf
       belongs_to :product, class_name: "Dscf::Marketplace::Product"
       belongs_to :unit, class_name: "Dscf::Marketplace::Unit"
 
-
-
       validates :quotation_id, presence: true
       validates :rfq_item_id, presence: true
       validates :product_id, presence: true
@@ -28,6 +26,15 @@ module Dscf
       scope :by_product, ->(product_id) { where(product_id: product_id) }
       scope :by_unit, ->(unit_id) { where(unit_id: unit_id) }
 
+      # Ransack configuration for secure filtering
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[id quotation_id rfq_item_id product_id unit_id quantity unit_price subtotal created_at updated_at]
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[quotation rfq_item product unit]
+      end
+
       def product_name
         product&.name
       end
@@ -70,7 +77,7 @@ module Dscf
         return false unless rfq_item
 
         product_id == rfq_item.product_id &&
-        unit_id == rfq_item.unit_id
+          unit_id == rfq_item.unit_id
       end
 
       def can_create_order?

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

@@ -14,6 +14,15 @@ module Dscf
       validate :selected_quotation_belongs_to_this_rfq
       scope :by_user, ->(user_id) { where(user_id: user_id) }
 
+      # Ransack configuration for secure filtering
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[id user_id selected_quotation_id status notes created_at updated_at]
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[user selected_quotation rfq_items quotations]
+      end
+
       def draft?
         status == "draft"
       end

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

@@ -18,6 +18,15 @@ module Dscf
       scope :by_product, ->(product_id) { where(product_id: product_id) }
       scope :by_unit, ->(unit_id) { where(unit_id: unit_id) }
 
+      # Ransack configuration for secure filtering
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[id request_for_quotation_id product_id unit_id quantity notes created_at updated_at]
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[request_for_quotation product unit quotation_items]
+      end
+
       def product_name
         product&.name
       end

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

@@ -22,6 +22,15 @@ module Dscf::Marketplace
     scope :by_business, ->(business_id) { where(business_id: business_id) }
     scope :by_product, ->(product_id) { where(product_id: product_id) }
 
+    # Ransack configuration for secure filtering
+    def self.ransackable_attributes(_auth_object = nil)
+      %w[id business_id product_id supplier_price available_quantity minimum_order_quantity status created_at updated_at]
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      %w[business product listings order_items]
+    end
+
     # Custom methods
     def in_stock?
       available_quantity > 0

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

@@ -24,6 +24,15 @@ module Dscf
 
       scope :by_type, ->(type) { where(unit_type: unit_types[type]) }
 
+      # Ransack configuration for secure filtering
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[id code name unit_type created_at updated_at]
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[unit_conversions products supplier_products listings order_items rfq_items quotation_items]
+      end
+
       def display_name
         "#{name} (#{code})"
       end

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

@@ -11,6 +11,15 @@ module Dscf
 
       validate :units_must_be_different
 
+      # Ransack configuration for secure filtering
+      def self.ransackable_attributes(_auth_object = nil)
+        %w[id from_unit_id to_unit_id conversion_factor notes created_at updated_at]
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w[from_unit to_unit]
+      end
+
       def units_must_be_different
         return unless from_unit_id && to_unit_id
 

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

@@ -0,0 +1,11 @@
+module Dscf
+  module Marketplace
+    class CategorySerializer < ActiveModel::Serializer
+      attributes :id, :name, :description, :parent_id, :created_at, :updated_at
+
+      belongs_to :parent, serializer: CategorySerializer
+      has_many :subcategories, serializer: CategorySerializer
+      has_many :products
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module Dscf
+  module Marketplace
+    class ListingSerializer < ActiveModel::Serializer
+      attributes :id, :business_id, :supplier_product_id, :price, :quantity,
+        :status, :created_at, :updated_at, :total_value, :margin,
+        :margin_percentage, :available?
+
+      belongs_to :business
+      belongs_to :supplier_product
+      has_many :order_items
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module Dscf
+  module Marketplace
+    class OrderSerializer < ActiveModel::Serializer
+      attributes :id, :quotation_id, :listing_id, :user_id, :delivery_order_id,
+        :order_type, :status, :fulfillment_type, :total_amount,
+        :created_at, :updated_at
+
+      belongs_to :quotation
+      belongs_to :listing
+      belongs_to :user
+      belongs_to :delivery_order
+      has_many :order_items
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module Dscf
+  module Marketplace
+    class ProductSerializer < ActiveModel::Serializer
+      attributes :id, :sku, :name, :description, :category_id, :unit_id,
+        :base_price, :base_quantity, :business_only, :created_at, :updated_at,
+        :display_name, :price_per_unit, :thumbnail_url, :images_urls
+
+      belongs_to :category
+      belongs_to :unit
+      has_many :supplier_products
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module Dscf
+  module Marketplace
+    class QuotationSerializer < ActiveModel::Serializer
+      attributes :id, :request_for_quotation_id, :business_id, :total_price,
+        :delivery_date, :valid_until, :status, :notes, :created_at,
+        :updated_at, :days_until_expiry, :delivery_in_days, :complete?
+
+      belongs_to :request_for_quotation
+      belongs_to :business
+      has_many :quotation_items
+      has_one :order
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module Dscf
+  module Marketplace
+    class RequestForQuotationSerializer < ActiveModel::Serializer
+      attributes :id, :user_id, :selected_quotation_id, :status, :notes,
+        :created_at, :updated_at, :total_items, :has_responses?
+
+      belongs_to :user
+      belongs_to :selected_quotation
+      has_many :rfq_items
+      has_many :quotations
+    end
+  end
+end

data/config/locales/en.yml

@@ -0,0 +1,254 @@
+# DSCF Marketplace Locale File
+# This file contains I18n messages for automatic message resolution
+# Pattern: {model_name}.{success|errors}.{action_name}
+
+en:
+  # Core Models
+  category:
+    success:
+      index: "Categories retrieved successfully"
+      show: "Category details retrieved successfully"
+      create: "Category created successfully"
+      update: "Category updated successfully"
+      destroy: "Category deleted successfully"
+    errors:
+      index: "Failed to retrieve categories"
+      show: "Failed to retrieve category details"
+      create: "Failed to create category"
+      update: "Failed to update category"
+      destroy: "Failed to delete category"
+
+  product:
+    success:
+      index: "Products retrieved successfully"
+      show: "Product details retrieved successfully"
+      create: "Product created successfully"
+      update: "Product updated successfully"
+      destroy: "Product deleted successfully"
+    errors:
+      index: "Failed to retrieve products"
+      show: "Failed to retrieve product details"
+      create: "Failed to create product"
+      update: "Failed to update product"
+      destroy: "Failed to delete product"
+
+  unit:
+    success:
+      index: "Units retrieved successfully"
+      show: "Unit details retrieved successfully"
+      create: "Unit created successfully"
+      update: "Unit updated successfully"
+      destroy: "Unit deleted successfully"
+    errors:
+      index: "Failed to retrieve units"
+      show: "Failed to retrieve unit details"
+      create: "Failed to create unit"
+      update: "Failed to update unit"
+      destroy: "Failed to delete unit"
+
+  unit_conversion:
+    success:
+      index: "Unit conversions retrieved successfully"
+      show: "Unit conversion details retrieved successfully"
+      create: "Unit conversion created successfully"
+      update: "Unit conversion updated successfully"
+      destroy: "Unit conversion deleted successfully"
+    errors:
+      index: "Failed to retrieve unit conversions"
+      show: "Failed to retrieve unit conversion details"
+      create: "Failed to create unit conversion"
+      update: "Failed to update unit conversion"
+      destroy: "Failed to delete unit conversion"
+
+  # Trading Models
+  supplier_product:
+    success:
+      index: "Supplier products retrieved successfully"
+      show: "Supplier product details retrieved successfully"
+      create: "Supplier product created successfully"
+      update: "Supplier product updated successfully"
+      destroy: "Supplier product deleted successfully"
+    errors:
+      index: "Failed to retrieve supplier products"
+      show: "Failed to retrieve supplier product details"
+      create: "Failed to create supplier product"
+      update: "Failed to update supplier product"
+      destroy: "Failed to delete supplier product"
+
+  listing:
+    success:
+      index: "Listings retrieved successfully"
+      show: "Listing details retrieved successfully"
+      create: "Listing created successfully"
+      update: "Listing updated successfully"
+      destroy: "Listing deleted successfully"
+    errors:
+      index: "Failed to retrieve listings"
+      show: "Failed to retrieve listing details"
+      create: "Failed to create listing"
+      update: "Failed to update listing"
+      destroy: "Failed to delete listing"
+
+  request_for_quotation:
+    success:
+      index: "RFQs retrieved successfully"
+      show: "RFQ details retrieved successfully"
+      create: "RFQ created successfully"
+      update: "RFQ updated successfully"
+      destroy: "RFQ deleted successfully"
+    errors:
+      index: "Failed to retrieve RFQs"
+      show: "Failed to retrieve RFQ details"
+      create: "Failed to create RFQ"
+      update: "Failed to update RFQ"
+      destroy: "Failed to delete RFQ"
+
+  rfq_item:
+    success:
+      index: "RFQ items retrieved successfully"
+      show: "RFQ item details retrieved successfully"
+      create: "RFQ item created successfully"
+      update: "RFQ item updated successfully"
+      destroy: "RFQ item deleted successfully"
+    errors:
+      index: "Failed to retrieve RFQ items"
+      show: "Failed to retrieve RFQ item details"
+      create: "Failed to create RFQ item"
+      update: "Failed to update RFQ item"
+      destroy: "Failed to delete RFQ item"
+
+  quotation:
+    success:
+      index: "Quotations retrieved successfully"
+      show: "Quotation details retrieved successfully"
+      create: "Quotation created successfully"
+      update: "Quotation updated successfully"
+      destroy: "Quotation deleted successfully"
+      accept: "Quotation accepted successfully"
+      reject: "Quotation rejected successfully"
+      send_quotation: "Quotation sent successfully"
+    errors:
+      index: "Failed to retrieve quotations"
+      show: "Failed to retrieve quotation details"
+      create: "Failed to create quotation"
+      update: "Failed to update quotation"
+      destroy: "Failed to delete quotation"
+      accept: "Failed to accept quotation"
+      reject: "Failed to reject quotation"
+      send_quotation: "Failed to send quotation"
+
+  quotation_item:
+    success:
+      index: "Quotation items retrieved successfully"
+      show: "Quotation item details retrieved successfully"
+      create: "Quotation item created successfully"
+      update: "Quotation item updated successfully"
+      destroy: "Quotation item deleted successfully"
+    errors:
+      index: "Failed to retrieve quotation items"
+      show: "Failed to retrieve quotation item details"
+      create: "Failed to create quotation item"
+      update: "Failed to update quotation item"
+      destroy: "Failed to delete quotation item"
+
+  # Order Models
+  order:
+    success:
+      index: "Orders retrieved successfully"
+      show: "Order details retrieved successfully"
+      create: "Order created successfully"
+      update: "Order updated successfully"
+      destroy: "Order deleted successfully"
+      confirm: "Order confirmed successfully"
+      cancel: "Order cancelled successfully"
+    errors:
+      index: "Failed to retrieve orders"
+      show: "Failed to retrieve order details"
+      create: "Failed to create order"
+      update: "Failed to update order"
+      destroy: "Failed to delete order"
+      confirm: "Failed to confirm order"
+      cancel: "Failed to cancel order"
+
+  order_item:
+    success:
+      index: "Order items retrieved successfully"
+      show: "Order item details retrieved successfully"
+      create: "Order item created successfully"
+      update: "Order item updated successfully"
+      destroy: "Order item deleted successfully"
+    errors:
+      index: "Failed to retrieve order items"
+      show: "Failed to retrieve order item details"
+      create: "Failed to create order item"
+      update: "Failed to update order item"
+      destroy: "Failed to delete order item"
+
+  # Delivery Models
+  delivery_order:
+    success:
+      index: "Delivery orders retrieved successfully"
+      show: "Delivery order details retrieved successfully"
+      create: "Delivery order created successfully"
+      update: "Delivery order updated successfully"
+      destroy: "Delivery order deleted successfully"
+      pickup: "Delivery order picked up successfully"
+      start_delivery: "Delivery started successfully"
+      complete_delivery: "Delivery completed successfully"
+      mark_failed: "Delivery marked as failed"
+    errors:
+      index: "Failed to retrieve delivery orders"
+      show: "Failed to retrieve delivery order details"
+      create: "Failed to create delivery order"
+      update: "Failed to update delivery order"
+      destroy: "Failed to delete delivery order"
+      pickup: "Failed to pickup delivery order"
+      start_delivery: "Failed to start delivery"
+      complete_delivery: "Failed to complete delivery"
+      mark_failed: "Failed to mark delivery as failed"
+
+  delivery_order_item:
+    success:
+      index: "Delivery order items retrieved successfully"
+      show: "Delivery order item details retrieved successfully"
+      create: "Delivery order item created successfully"
+      update: "Delivery order item updated successfully"
+      destroy: "Delivery order item deleted successfully"
+      receiver_confirm: "Item confirmed by receiver successfully"
+      report_issue: "Issue reported successfully"
+      dispute_delivery: "Delivery disputed successfully"
+    errors:
+      index: "Failed to retrieve delivery order items"
+      show: "Failed to retrieve delivery order item details"
+      create: "Failed to create delivery order item"
+      update: "Failed to update delivery order item"
+      destroy: "Failed to delete delivery order item"
+      receiver_confirm: "Failed to confirm item"
+      report_issue: "Failed to report issue"
+      dispute_delivery: "Failed to dispute delivery"
+
+  delivery_vehicle:
+    success:
+      index: "Delivery vehicles retrieved successfully"
+      show: "Delivery vehicle details retrieved successfully"
+      create: "Delivery vehicle created successfully"
+      update: "Delivery vehicle updated successfully"
+      destroy: "Delivery vehicle deleted successfully"
+    errors:
+      index: "Failed to retrieve delivery vehicles"
+      show: "Failed to retrieve delivery vehicle details"
+      create: "Failed to create delivery vehicle"
+      update: "Failed to update delivery vehicle"
+      destroy: "Failed to delete delivery vehicle"
+
+  # Global fallback messages
+  operations:
+    success:
+      completed: "Operation completed successfully"
+    errors:
+      failed: "Operation failed"
+
+  errors:
+    validation_failed: "Validation failed"
+    operation_failed: "Operation failed"
+    record_not_found: "Record not found"