dscf-marketplace 0.4.9 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1be088af008133e035bb4105841c75b2494d643f118a5ac0b544ee48d814a8f
-  data.tar.gz: 537236ff3a6f19bca0b2637d494cb99645503e55b6f8439353f66d848d61d949
+  metadata.gz: 970168fad6eeaa65aea2d633e4110571888e00812265a72e8fe178ee53c8568e
+  data.tar.gz: 2a20e939a16fdccf0ee6f438344c2956dd1d8754848ff9400818abc1d94f1370
 SHA512:
-  metadata.gz: 574bb86d948fe06ae0061e8a53b8cb75e46feb9d3622543dcea484d60fe41ec720353404599ebaf86bc3354cbbddaada5a7f8a2078d6a9dd8403e5f85183e623
-  data.tar.gz: 819de25b5217151b17e0c8ad5a9633348f3d0e6a3770a990d9abe01901c22ea2465c6bf42a4fffcf14fd003ae23ee12ef634dba698ea47dfa15f566494f3450e
+  metadata.gz: 032ee02b4ab06a992ec4b7192ccb390a33ba6c960505d4b919a525dacb4d9d0d55e7a8f08c967907ec59dc5aa0cbaa843a8122ef7529ab4626f8debe63e40da7
+  data.tar.gz: 935e7358e7fd6c76e5e692bb4ec080dd25e19ac5ecd6a21880dcb46aa8f316a2f95e8cadfd0b4fd8d409878c2cb21abca8d8b091a8d9052da11cc7783e039517

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

@@ -59,7 +59,7 @@ module Dscf
       def eager_loaded_associations
         [
           :business_type, :user, :documents,
-          reviews: {reviewed_by: :user}
+          reviews: {reviewed_by: :user_profile}
         ]
       end
 
@@ -67,16 +67,22 @@ module Dscf
         {
           index: [
             :business_type, :user, :documents,
-            reviews: {reviewed_by: :user}
+            {
+              reviews: {reviewed_by: :user_profile}
+            }
           ],
           show: [
             :business_type, :user, :documents,
-            reviews: {reviewed_by: :user}
+            {
+              reviews: {reviewed_by: :user_profile}
+            }
           ],
           create: [ :business_type, :user, :documents, :reviews ],
           update: [
             :business_type, :user, :documents,
-            reviews: {reviewed_by: :user}
+            {
+              reviews: {reviewed_by: :user_profile}
+            }
           ]
         }
       end

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

@@ -8,7 +8,7 @@ module Dscf
       belongs_to :user
       has_many :documents
 
-      has_many :reviews
+      has_many :reviews, serializer: Dscf::Core::ReviewSerializer
     end
   end
 end

data/config/locales/en.yml

@@ -4,7 +4,6 @@
 # Pattern: {model_name}.{success|errors}.{action_name} - using plural for controller consistency
 
 en:
-# Core Models
   category:
     success:
       index: "Categories retrieved successfully"
@@ -61,7 +60,6 @@ en:
       update: "Failed to update unit conversion"
       destroy: "Failed to delete unit conversion"
 
-  # Trading Models
   supplier_product:
     success:
       index: "Supplier products retrieved successfully"
@@ -107,7 +105,6 @@ en:
       update: "Failed to update listing"
       destroy: "Failed to delete listing"
 
-  # RFQ Models (Added plural keys to match controller)
   request_for_quotations:
     success:
       index: "RFQs retrieved successfully"
@@ -121,14 +118,13 @@ en:
     errors:
       index: "Failed to retrieve RFQs"
       show: "Failed to retrieve RFQ details"
-      create_failed: "Failed to create RFQ" # Key fix: Matches render_error("request_for_quotations.errors.create_failed")
+      create_failed: "Failed to create RFQ"
       update: "Failed to update RFQ"
       destroy: "Failed to delete RFQ"
       send_failed: "Failed to send RFQ"
       close_failed: "Failed to close RFQ"
       respond_failed: "Failed to respond to RFQ"
 
-  # Singular fallback for consistency
   request_for_quotation:
     success:
       index: "RFQs retrieved successfully"
@@ -199,7 +195,6 @@ en:
       update: "Failed to update quotation item"
       destroy: "Failed to delete quotation item"
 
-  # Order Models
   order:
     success:
       index: "Orders retrieved successfully"
@@ -234,28 +229,27 @@ en:
       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"
+    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_orders:
     success:
@@ -344,7 +338,6 @@ en:
       update: "Failed to update delivery vehicle"
       destroy: "Failed to delete delivery vehicle"
 
-  # Business
   business:
     success:
       has_business_check: "Business check completed successfully"
@@ -353,7 +346,6 @@ en:
       create: "Business created successfully"
       update: "Business updated successfully"
       destroy: "Business deleted successfully"
-      # ✅ ADD: Review actions
       approve: "Business approved successfully"
       reject: "Business rejected successfully"
       request_modification: "Modification requested for business successfully"
@@ -364,7 +356,6 @@ en:
       create: "Failed to create business"
       update: "Failed to update business"
       destroy: "Failed to delete business"
-      # ✅ ADD: Review action errors
       approve: "Failed to approve business"
       reject: "Failed to reject business"
       request_modification: "Failed to request modification for business"
@@ -384,7 +375,6 @@ en:
       update: "Failed to update business"
       destroy: "Failed to delete business"
 
-  # Global fallback messages
   operations:
     success:
       completed: "Operation completed successfully"
@@ -396,7 +386,6 @@ en:
     operation_failed: "Operation failed"
     record_not_found: "Record not found"
     supplier_not_found: "Supplier not found"
-    # Added for common validation errors to show full messages
     activerecord:
       errors:
         messages:
@@ -426,4 +415,4 @@ en:
           url: "is not a valid URL"
           email: "is not a valid email"
           format: "is invalid"
-          required: "can't be blank"
+          required: "can't be blank"

data/config/locales/en.yml.backup

@@ -0,0 +1,426 @@
+# Updated DSCF Marketplace Locale File
+# Added missing keys for request_for_quotations (plural) to match controller usage
+# Ensures full error messages are displayed instead of "Translation missing"
+# Pattern: {model_name}.{success|errors}.{action_name} - using plural for controller consistency
+
+en:
+  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"
+
+  supplier_products:
+    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"
+
+  listings:
+    success:
+      index: "Listings retrieved successfully"
+      show: "Listing details retrieved successfully"
+      create: "Listing created successfully"
+      update: "Listing updated successfully"
+      destroy: "Listing deleted successfully"
+      activated: "Listing activated successfully"
+      paused: "Listing paused successfully"
+      sold_out: "Listing marked as sold out 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"
+
+  # RFQ Models (Added plural keys to match controller)
+  request_for_quotations:
+    success:
+      index: "RFQs retrieved successfully"
+      show: "RFQ details retrieved successfully"
+      create: "RFQ created successfully"
+      update: "RFQ updated successfully"
+      destroy: "RFQ deleted successfully"
+      sent: "RFQ sent successfully"
+      closed: "RFQ closed successfully"
+      responded: "RFQ response sent successfully"
+    errors:
+      index: "Failed to retrieve RFQs"
+      show: "Failed to retrieve RFQ details"
+      create_failed: "Failed to create RFQ" # Key fix: Matches render_error("request_for_quotations.errors.create_failed")
+      update: "Failed to update RFQ"
+      destroy: "Failed to delete RFQ"
+      send_failed: "Failed to send RFQ"
+      close_failed: "Failed to close RFQ"
+      respond_failed: "Failed to respond to RFQ"
+
+  # Singular fallback for consistency
+  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"
+      sent: "RFQ sent successfully"
+      closed: "RFQ closed successfully"
+      responded: "RFQ response sent 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"
+      sent: "Failed to send RFQ"
+      closed: "Failed to close RFQ"
+      responded: "Failed to respond to 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"
+      sent: "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"
+      sent: "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"
+      complete: "Order completed 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"
+      complete: "Failed to complete 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_orders:
+     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"
+       picked_up: "Delivery order picked up successfully"
+       delivery_started: "Delivery started successfully"
+       delivery_completed: "Delivery completed successfully"
+       marked_failed: "Delivery marked as failed"
+       orders_converted: "Orders converted to delivery successfully"
+     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"
+       picked_up: "Failed to pickup delivery order"
+       delivery_started: "Failed to start delivery"
+       delivery_completed: "Failed to complete delivery"
+       marked_failed: "Failed to mark delivery as failed"
+       pickup_failed: "Failed to pickup delivery order"
+       start_delivery_failed: "Failed to start delivery"
+       complete_delivery_failed: "Failed to complete delivery"
+       mark_failed_failed: "Failed to mark delivery as failed"
+       convert_orders_missing_params: "Missing required parameters: order_ids, vehicle_type, and pickup_address_id"
+       pickup_address_not_found: "Pickup address not found"
+       orders_not_found: "Some orders were not found"
+       orders_conversion_failed: "Failed to convert orders to delivery"
+       convert_orders_failed: "Unexpected error during order conversion"
+       access_denied: "Access denied"
+
+   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_order_items:
+     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_confirmed: "Item confirmed by receiver successfully"
+       issue_reported: "Issue reported successfully"
+       delivery_disputed: "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_confirmed: "Failed to confirm item"
+       issue_reported: "Failed to report issue"
+       delivery_disputed: "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"
+
+  # Business
+  business:
+    success:
+      has_business_check: "Business check completed successfully"
+       index: "Businesses retrieved successfully"
+       show: "Business details retrieved successfully"
+       create: "Business created successfully"
+       update: "Business updated successfully"
+       destroy: "Business deleted successfully"
+       approve: "Business approved successfully"
+       reject: "Business rejected successfully"
+       request_modification: "Modification requested for business successfully"
+      resubmit: "Business resubmitted successfully"
+    errors:
+       index: "Failed to retrieve businesses"
+       show: "Failed to retrieve business details"
+       create: "Failed to create business"
+       update: "Failed to update business"
+       destroy: "Failed to delete business"
+       approve: "Failed to approve business"
+       reject: "Failed to reject business"
+       request_modification: "Failed to request modification for business"
+      resubmit: "Failed to resubmit business"
+
+  businesses:
+    success:
+      index: "Businesses retrieved successfully"
+      show: "Business details retrieved successfully"
+      create: "Business created successfully"
+      update: "Business updated successfully"
+      destroy: "Business deleted successfully"
+    errors:
+      index: "Failed to retrieve businesses"
+      show: "Failed to retrieve business details"
+      create: "Failed to create business"
+      update: "Failed to update business"
+      destroy: "Failed to delete business"
+
+  # 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"
+    supplier_not_found: "Supplier not found"
+    # Added for common validation errors to show full messages
+    activerecord:
+      errors:
+        messages:
+          record_invalid: "Validation failed: %{errors}"
+          inclusion: "is not included in the list"
+          confirmation: "doesn't match %{attribute}"
+          accepted: "must be accepted"
+          empty: "can't be empty"
+          blank: "can't be blank"
+          too_short: "is too short (minimum is %{count} characters)"
+          too_long: "is too long (maximum is %{count} characters)"
+          invalid: "is invalid"
+          not_a_number: "is not a number"
+          not_an_integer: "is not an integer"
+          greater_than: "must be greater than %{count}"
+          greater_than_or_equal_to: "must be greater than or equal to %{count}"
+          equal_to: "must be equal to %{count}"
+          less_than: "must be less than %{count}"
+          less_than_or_equal_to: "must be less than or equal to %{count}"
+          other_than: "must be other than %{count}"
+          excluded: "should not be %{object}"
+          taken: "has already been taken"
+          unique: "has already been taken"
+          uniqueness: "has already been taken"
+          present: "must be present"
+          absence: "must be blank"
+          url: "is not a valid URL"
+          email: "is not a valid email"
+          format: "is invalid"
+          required: "can't be blank"

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.4.9".freeze
+    VERSION = "0.5.0".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.0
 platform: ruby
 authors:
 - Asrat
@@ -475,6 +475,7 @@ files:
 - app/services/dscf/marketplace/role_service.rb
 - config/environments/production.rb
 - config/locales/en.yml
+- config/locales/en.yml.backup
 - config/routes.rb
 - db/migrate/20250827172043_create_dscf_marketplace_categories.rb
 - db/migrate/20250827173526_update_dscf_marketplace_categories_indexes.rb