dscf-marketplace 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c6753e6a99d5fcd1f3a5f3c81e9ea36bef71439a4eb3840ed3f7d8f4deb1f5f
-  data.tar.gz: edbf169441292502b45e8d67ab61bee187816d574a17e27c6b8a0a4bfb4b4bf5
+  metadata.gz: 2f8934e507e46d96767591f68f26790969449c058d6eb4a21dd5af54448d383e
+  data.tar.gz: 24b96ff375ebc4893b38e57e7afc84f4f28a7e7e4120b58d992c03481802bbc8
 SHA512:
-  metadata.gz: 367c4df2d4a125126c527c123668eafd975fb52a7082a2f792e69bfbacf6978ecaac8742a745470a2eca82c9db13ee6da6dfa847c434a999e9343c6dbdaed7f5
-  data.tar.gz: 5199ecec95982d83a2fb842c95921ff2037cd479f3f0127dc0d930a3c471dea767e743898ff9dc1a1df0c18b3dcff75a15fbe8eab91b04e21665f3f46e7149d7
+  metadata.gz: 444ee5aa9c80f4db2a8f86c2873466a97fc51f9bdc91923e5e6bf7ea5652427986769878fc0834f0acd43cfae58af3bac62bb3ab1e44d3f341da4dcd96c284ae
+  data.tar.gz: 8f0e2a29a64b6fa9e770564ecbd9f6217955e3b7a37b7e7af4965728f52b21c30e01b0e7c47e09d102a3ea8610eed7d8fc1d027958030354cf205d68221fdddd

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

@@ -48,21 +48,21 @@ module Dscf
 
       def model_params
         params.require(:order).permit(
-          :quotation_id, :listing_id, :user_id, :delivery_order_id,
+          :quotation_id, :listing_id, :user_id, :ordered_by_id, :ordered_to_id, :delivery_order_id,
           :order_type, :status, :fulfillment_type
         )
       end
 
       def eager_loaded_associations
-        [ :quotation, :listing, :user, :delivery_order, :order_items ]
+        [ :quotation, :listing, :user, :ordered_by, :ordered_to, :delivery_order, :order_items ]
       end
 
       def default_serializer_includes
         {
-          index: [ :user, :quotation, :listing ],
-          show: [ :user, :quotation, :listing, :delivery_order, :order_items ],
-          create: [ :user, :quotation, :listing ],
-          update: [ :user, :quotation, :listing ]
+          index: [ :user, :ordered_by, :ordered_to, :quotation, :listing ],
+          show: [ :user, :ordered_by, :ordered_to, :quotation, :listing, :delivery_order, :order_items ],
+          create: [ :user, :ordered_by, :ordered_to, :quotation, :listing ],
+          update: [ :user, :ordered_by, :ordered_to, :quotation, :listing ]
         }
       end
     end

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

@@ -6,25 +6,29 @@ module Dscf::Marketplace
 
     belongs_to :quotation, optional: true
     belongs_to :listing, optional: true
-    belongs_to :user, class_name: "Dscf::Core::User"
+    belongs_to :user, class_name: "Dscf::Core::User" # Keep for backward compatibility
+    belongs_to :ordered_by, class_name: "Dscf::Core::User"
+    belongs_to :ordered_to, class_name: "Dscf::Core::Business"
     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
+    validates :user, presence: true # Keep for backward compatibility
+    validates :ordered_by, presence: true
+    validates :ordered_to, 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]
+      %w[id quotation_id listing_id user_id ordered_by_id ordered_to_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]
+      %w[quotation listing user ordered_by ordered_to delivery_order order_items]
     end
 
     def self.create_from_quotation(quotation)
@@ -34,7 +38,9 @@ module Dscf::Marketplace
         order_type: :rfq_based,
         status: :pending,
         quotation: quotation,
-        user: quotation.request_for_quotation.user,
+        user: quotation.request_for_quotation.user, # Keep for backward compatibility
+        ordered_by: quotation.request_for_quotation.user,
+        ordered_to: quotation.business,
         total_amount: quotation.total_price
       )
 
@@ -59,7 +65,9 @@ module Dscf::Marketplace
         order_type: :direct_listing,
         status: :pending,
         listing: listing,
-        user: user,
+        user: user, # Keep for backward compatibility
+        ordered_by: user,
+        ordered_to: listing.business,
         total_amount: listing.price * quantity
       )
 

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

@@ -57,13 +57,13 @@ module Dscf
 
       def thumbnail_url
         return nil unless thumbnail.attached?
-        Rails.application.routes.url_helpers.rails_blob_url(thumbnail, only_path: true)
+        Rails.application.routes.url_helpers.rails_blob_url(thumbnail, host: Rails.application.config.action_mailer.default_url_options[:host])
       end
 
       def images_urls
         return [] unless images.attached?
         images.map do |image|
-          Rails.application.routes.url_helpers.rails_blob_url(image, only_path: true)
+          Rails.application.routes.url_helpers.rails_blob_url(image, host: Rails.application.config.action_mailer.default_url_options[:host])
         end
       end
     end

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

@@ -140,7 +140,9 @@ module Dscf
           order_type: :rfq_based,
           status: :pending,
           quotation: self,
-          user: request_for_quotation.user,
+          user: request_for_quotation.user, # Keep for backward compatibility
+          ordered_by: request_for_quotation.user,
+          ordered_to: business,
           total_amount: total_price
         )
 

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

@@ -1,13 +1,15 @@
 module Dscf
   module Marketplace
     class OrderSerializer < ActiveModel::Serializer
-      attributes :id, :quotation_id, :listing_id, :user_id, :delivery_order_id,
+      attributes :id, :quotation_id, :listing_id, :user_id, :ordered_by_id, :ordered_to_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 :ordered_by
+      belongs_to :ordered_to
       belongs_to :delivery_order
       has_many :order_items
     end

data/app/services/dscf/marketplace/my_resource_service.rb

@@ -6,8 +6,8 @@ module Dscf
       end
 
       def my_orders(params = {})
-        orders = Dscf::Marketplace::Order.where(user: @current_user)
-          .includes(:quotation, :listing, :user, :delivery_order, :order_items)
+        orders = Dscf::Marketplace::Order.where(ordered_by: @current_user)
+          .includes(:quotation, :listing, :user, :ordered_by, :ordered_to, :delivery_order, :order_items)
 
         apply_filters(orders, params)
       end

data/config/environments/production.rb

@@ -0,0 +1,6 @@
+# Set the host for URL generation
+config.action_mailer.default_url_options = { host: 'dscf.bitscollege.edu.et' }
+config.action_controller.default_url_options = { host: 'dscf.bitscollege.edu.et' }
+
+# Optional: Force HTTPS if needed
+config.force_ssl = true

data/config/locales/en.yml

@@ -75,6 +75,20 @@ en:
       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"
+
   listing:
     success:
       index: "Listings retrieved successfully"
@@ -82,6 +96,9 @@ en:
       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"
@@ -96,12 +113,16 @@ en:
       create: "RFQ created successfully"
       update: "RFQ updated successfully"
       destroy: "RFQ deleted successfully"
+      sent: "RFQ sent successfully"
+      closed: "RFQ closed 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"
 
   rfq_item:
     success:
@@ -127,6 +148,7 @@ en:
       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"
@@ -136,6 +158,7 @@ en:
       accept: "Failed to accept quotation"
       reject: "Failed to reject quotation"
       send_quotation: "Failed to send quotation"
+      sent: "Failed to send quotation"
 
   quotation_item:
     success:
@@ -161,6 +184,7 @@ en:
       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"
@@ -169,6 +193,7 @@ en:
       destroy: "Failed to delete order"
       confirm: "Failed to confirm order"
       cancel: "Failed to cancel order"
+      complete: "Failed to complete order"
 
   order_item:
     success:
@@ -207,6 +232,29 @@ en:
       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"
+      index.success: "Delivery orders retrieved 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"
+
   delivery_order_item:
     success:
       index: "Delivery order items retrieved successfully"
@@ -227,6 +275,26 @@ en:
       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"
@@ -241,17 +309,35 @@ en:
       update: "Failed to update delivery vehicle"
       destroy: "Failed to delete delivery vehicle"
 
-  # Authentication
-  auth:
-    success:
-      otp_sent: "OTP sent successfully"
-    errors:
-      invalid_fin: "Invalid FIN number"
-
   # 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"
+    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"
+
+  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:
@@ -263,4 +349,5 @@ en:
   errors:
     validation_failed: "Validation failed"
     operation_failed: "Operation failed"
-    record_not_found: "Record not found"
+    record_not_found: "Record not found"
+    supplier_not_found: "Supplier not found"

data/db/migrate/20250903061154_add_ordered_fields_to_orders.rb

@@ -0,0 +1,12 @@
+class AddOrderedFieldsToOrders < ActiveRecord::Migration[8.0]
+  def change
+    add_column :dscf_marketplace_orders, :ordered_by_id, :bigint
+    add_column :dscf_marketplace_orders, :ordered_to_id, :bigint
+
+    add_foreign_key :dscf_marketplace_orders, :dscf_core_users, column: :ordered_by_id
+    add_foreign_key :dscf_marketplace_orders, :dscf_core_businesses, column: :ordered_to_id
+
+    add_index :dscf_marketplace_orders, :ordered_by_id, name: "ordered_by_id_on_dm_orders_idx"
+    add_index :dscf_marketplace_orders, :ordered_to_id, name: "ordered_to_id_on_dm_orders_idx"
+  end
+end

data/db/migrate/20250903061306_populate_ordered_fields_for_existing_orders.rb

@@ -0,0 +1,34 @@
+class PopulateOrderedFieldsForExistingOrders < ActiveRecord::Migration[8.0]
+  def up
+    # Populate ordered_by_id from user_id for existing orders
+    execute <<-SQL
+      UPDATE dscf_marketplace_orders
+      SET ordered_by_id = user_id
+      WHERE ordered_by_id IS NULL AND user_id IS NOT NULL
+    SQL
+
+    # Populate ordered_to_id for RFQ-based orders
+    execute <<-SQL
+      UPDATE dscf_marketplace_orders
+      SET ordered_to_id = dscf_marketplace_quotations.business_id
+      FROM dscf_marketplace_quotations
+      WHERE dscf_marketplace_orders.quotation_id = dscf_marketplace_quotations.id
+        AND dscf_marketplace_orders.ordered_to_id IS NULL
+        AND dscf_marketplace_orders.order_type = 0
+    SQL
+
+    # Populate ordered_to_id for direct listing orders
+    execute <<-SQL
+      UPDATE dscf_marketplace_orders
+      SET ordered_to_id = dscf_marketplace_listings.business_id
+      FROM dscf_marketplace_listings
+      WHERE dscf_marketplace_orders.listing_id = dscf_marketplace_listings.id
+        AND dscf_marketplace_orders.ordered_to_id IS NULL
+        AND dscf_marketplace_orders.order_type = 1
+    SQL
+  end
+
+  def down
+    # No need to rollback data population
+  end
+end

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.2.4".freeze
+    VERSION = "0.2.5".freeze
   end
 end

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

@@ -3,19 +3,27 @@ FactoryBot.define do
     order_type { :rfq_based }
     status { :pending }
     fulfillment_type { :self_pickup }
-    association :user, factory: :dscf_core_user
+    association :user, factory: :dscf_core_user # Keep for backward compatibility
+    association :ordered_to, factory: :dscf_core_business
     association :quotation, factory: :dscf_marketplace_quotation
     listing { nil }
 
+    # Ensure ordered_by is set to the same as user for backward compatibility
+    after(:build) do |order|
+      order.ordered_by = order.user
+    end
+
     trait :rfq_based do
       order_type { :rfq_based }
       association :quotation, factory: :dscf_marketplace_quotation
+      # ordered_to will be set from quotation.business in the model
     end
 
     trait :direct_listing do
       order_type { :direct_listing }
       association :listing, factory: :dscf_marketplace_listing
       quotation { nil }
+      # ordered_to will be set from listing.business in the model
     end
 
     trait :self_pickup do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2025-09-02 00:00:00.000000000 Z
+date: 2025-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -469,6 +469,7 @@ files:
 - app/serializers/dscf/marketplace/unit_conversion_serializer.rb
 - app/serializers/dscf/marketplace/unit_serializer.rb
 - app/services/dscf/marketplace/my_resource_service.rb
+- config/environments/production.rb
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20250827172043_create_dscf_marketplace_categories.rb
@@ -493,6 +494,8 @@ files:
 - db/migrate/20250901074746_add_delivery_order_to_orders.rb
 - db/migrate/20250901075511_add_delivery_vehicle_to_delivery_orders.rb
 - db/migrate/20250901080134_add_fulfillment_type_to_orders.rb
+- db/migrate/20250903061154_add_ordered_fields_to_orders.rb
+- db/migrate/20250903061306_populate_ordered_fields_for_existing_orders.rb
 - lib/dscf/marketplace.rb
 - lib/dscf/marketplace/engine.rb
 - lib/dscf/marketplace/version.rb