dscf-marketplace 0.1.8 → 0.2.0

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"

data/config/routes.rb

@@ -1,2 +1,87 @@
 Dscf::Marketplace::Engine.routes.draw do
+  # Core Models
+  resources :categories do
+    resources :products, only: [ :index ]
+    get "subcategories", on: :member
+  end
+
+  resources :products do
+    resources :listings, only: [ :index ]
+    get "supplier_products", on: :member
+  end
+
+  resources :units do
+    resources :unit_conversions, only: [ :index ]
+  end
+
+  resources :unit_conversions
+
+  # Trading Models
+  resources :supplier_products do
+    resources :listings, only: [ :index ]
+  end
+
+  resources :listings do
+    member do
+      post "activate"
+      post "pause"
+      post "sold_out"
+    end
+  end
+
+  # RFQ System
+  resources :request_for_quotations do
+    resources :rfq_items, only: [ :index, :create ]
+    resources :quotations, only: [ :index ]
+    member do
+      post "send_rfq"
+      post "close"
+    end
+  end
+
+  resources :rfq_items, only: [ :index, :show, :update, :create, :destroy ]
+
+  resources :quotations do
+    resources :quotation_items, only: [ :index, :create ]
+    member do
+      post "accept"
+      post "reject"
+      post "send_quotation"
+    end
+  end
+
+  resources :quotation_items, only: [ :index, :show, :update, :create, :destroy ]
+
+  # Order Management
+  resources :orders do
+    resources :order_items, only: [ :index ]
+    member do
+      post "confirm"
+      post "cancel"
+      post "complete"
+    end
+  end
+
+  resources :order_items, only: [ :index, :show, :update, :create, :destroy ]
+
+  # Delivery System
+  resources :delivery_orders do
+    resources :delivery_order_items, only: [ :index ]
+    member do
+      post "pickup"
+      post "start_delivery"
+      post "complete_delivery"
+      post "mark_failed"
+    end
+  end
+
+  resources :delivery_order_items, only: [ :index, :show, :update, :create ] do
+    member do
+      post "receiver_confirm"
+      post "report_issue"
+      post "dispute_delivery"
+    end
+  end
+
+  resources :delivery_vehicles
 end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.1.8".freeze
+    VERSION = "0.2.0".freeze
   end
 end

data/spec/factories/dscf/marketplace/delivery_order_items.rb

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :dscf_marketplace_delivery_order_item, class: "Dscf::Marketplace::DeliveryOrderItem" do
     association :delivery_order, factory: :dscf_marketplace_delivery_order
-    association :order_item, factory: :dscf_marketplace_order_item
+    association :order_item, factory: [ :dscf_marketplace_order_item, :from_listing ]
     pickup_address { create(:dscf_core_address) }
     dropoff_address { create(:dscf_core_address) }
     quantity { 10.0 }

data/spec/factories/dscf/marketplace/quotation_items.rb

@@ -10,8 +10,8 @@ FactoryBot.define do
 
     after(:build) do |item|
       # Only calculate subtotal if it's not explicitly set
-      if item.subtotal.nil? && item.unit_price && item.quantity
-        item.subtotal = item.unit_price * item.quantity
+      if item[:subtotal].nil? && item.unit_price && item.quantity
+        item.subtotal = (item.unit_price * item.quantity).round(2)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - Asrat
@@ -417,6 +417,21 @@ files:
 - MIT-LICENSE
 - Rakefile
 - app/controllers/dscf/marketplace/application_controller.rb
+- app/controllers/dscf/marketplace/categories_controller.rb
+- app/controllers/dscf/marketplace/delivery_order_items_controller.rb
+- app/controllers/dscf/marketplace/delivery_orders_controller.rb
+- app/controllers/dscf/marketplace/delivery_vehicles_controller.rb
+- app/controllers/dscf/marketplace/listings_controller.rb
+- app/controllers/dscf/marketplace/order_items_controller.rb
+- app/controllers/dscf/marketplace/orders_controller.rb
+- app/controllers/dscf/marketplace/products_controller.rb
+- app/controllers/dscf/marketplace/quotation_items_controller.rb
+- app/controllers/dscf/marketplace/quotations_controller.rb
+- app/controllers/dscf/marketplace/request_for_quotations_controller.rb
+- app/controllers/dscf/marketplace/rfq_items_controller.rb
+- app/controllers/dscf/marketplace/supplier_products_controller.rb
+- app/controllers/dscf/marketplace/unit_conversions_controller.rb
+- app/controllers/dscf/marketplace/units_controller.rb
 - app/jobs/dscf/marketplace/application_job.rb
 - app/mailers/dscf/marketplace/application_mailer.rb
 - app/models/dscf/marketplace/application_record.rb
@@ -435,6 +450,22 @@ files:
 - app/models/dscf/marketplace/supplier_product.rb
 - app/models/dscf/marketplace/unit.rb
 - app/models/dscf/marketplace/unit_conversion.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
+- app/serializers/dscf/marketplace/delivery_vehicle_serializer.rb
+- app/serializers/dscf/marketplace/listing_serializer.rb
+- app/serializers/dscf/marketplace/order_item_serializer.rb
+- app/serializers/dscf/marketplace/order_serializer.rb
+- app/serializers/dscf/marketplace/product_serializer.rb
+- app/serializers/dscf/marketplace/quotation_item_serializer.rb
+- app/serializers/dscf/marketplace/quotation_serializer.rb
+- app/serializers/dscf/marketplace/request_for_quotation_serializer.rb
+- app/serializers/dscf/marketplace/rfq_item_serializer.rb
+- app/serializers/dscf/marketplace/supplier_product_serializer.rb
+- app/serializers/dscf/marketplace/unit_conversion_serializer.rb
+- app/serializers/dscf/marketplace/unit_serializer.rb
+- config/locales/en.yml
 - config/routes.rb
 - db/migrate/20250827172043_create_dscf_marketplace_categories.rb
 - db/migrate/20250827173526_update_dscf_marketplace_categories_indexes.rb