dscf-marketplace 0.2.7 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b374eba7361b8c758484bc9424ca026e43e5be805bf073073cfc33f113d63c8
-  data.tar.gz: 0dbd00825791a10d4305db34c648d3e5d3d297b066c14dcd0b9f344ade29e32f
+  metadata.gz: f51a5b893502ce6049f446264e9b3c7bab06887f7a8364a70d8a80c247470cc9
+  data.tar.gz: 05306e10728b7fcf42b05e8a80387e7d7833a8c7e54f5abd8fa4295cf1c1d5bc
 SHA512:
-  metadata.gz: 292f84ae8497ade0754a27e868a5ffc2848e50f9805c29516a2388bedaf93fd5216efec2694300658652388c81ebc7f73c663279dcbddbc13699cd11baec3e3d
-  data.tar.gz: 238c5be87bd5c1a50d7f2972f4be6a28818e96aabd5b64af9e77d43de60b61daf07aef5300190d9c03d263d8fabce6c9be618a1e47ac63a2b0db6e2fbf1654ba
+  metadata.gz: 9438af1ce5588f183b3421199c0b9e656576d2cd89aa89d6a0e9b8e5c552dab0030df18f185e896b2ffcb53b79bf548e03bb1c348c8928b52b706840ede268cd
+  data.tar.gz: '0948cb5588ba6f5a5c7d1e572b992a6d96fde59d0944c7c505aa0e630c0018d35a21cd9613191e0434c24b880b0a3117f60fe782d61ee836797356a041b22749'

data/app/controllers/concerns/dscf/marketplace/nested_creatable.rb

@@ -0,0 +1,47 @@
+module Dscf::Marketplace::NestedCreatable
+  extend ActiveSupport::Concern
+
+  included do
+    # Override the create method from Dscf::Core::Common
+    def create
+      obj = @clazz.new(model_params)
+      assign_current_user(obj) if respond_to?(:assign_current_user)
+
+      if obj.save
+        obj = @clazz.includes(eager_loaded_associations).find(obj.id) if eager_loaded_associations.present?
+
+        includes = serializer_includes_for_action(:create)
+        options = {include: includes} if includes.present?
+
+        # Get success message from locales
+        model_name = @clazz.name.demodulize.underscore
+        message_key = "#{model_name}.success.create"
+        message = I18n.t(message_key, default: "#{model_name.titleize} created successfully")
+
+        # Include associated items in response for orders
+        if model_name == "order" && obj.respond_to?(:order_items)
+          render_success(message, data: obj, order_items: obj.order_items, serializer_options: options, status: :created)
+        else
+          render_success(message, data: obj, serializer_options: options, status: :created)
+        end
+      else
+        Rails.logger.error("#{model_name} save failed: #{obj.errors.full_messages}")
+
+        # Get error message from locales
+        error_key = "#{model_name}.errors.create"
+        error_message = I18n.t(error_key, default: "Failed to create #{model_name}")
+
+        render_error(error_message, status: :unprocessable_entity)
+      end
+    rescue => e
+      render_error(e.message)
+    end
+  end
+
+  private
+
+  def assign_current_user(obj)
+    obj.user = current_user if obj.respond_to?(:user=)
+    obj.ordered_by = current_user if obj.respond_to?(:ordered_by=)
+  end
+end

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

@@ -2,6 +2,7 @@ module Dscf
   module Marketplace
     class OrdersController < ApplicationController
       include Dscf::Core::Common
+      include Dscf::Marketplace::NestedCreatable
 
       def confirm
         @obj = find_record
@@ -49,7 +50,8 @@ module Dscf
       def model_params
         params.require(:order).permit(
           :quotation_id, :listing_id, :user_id, :ordered_by_id, :ordered_to_id, :delivery_order_id,
-          :order_type, :status, :fulfillment_type
+          :order_type, :status, :fulfillment_type,
+          order_items_attributes: [ :id, :quotation_item_id, :listing_id, :product_id, :unit_id, :quantity, :unit_price, :status, :_destroy ]
         )
       end
 

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

@@ -2,6 +2,7 @@ module Dscf
   module Marketplace
     class QuotationsController < ApplicationController
       include Dscf::Core::Common
+      include Dscf::Marketplace::NestedCreatable
 
       def accept
         @obj = find_record
@@ -47,7 +48,8 @@ module Dscf
       def model_params
         params.require(:quotation).permit(
           :request_for_quotation_id, :business_id, :total_price,
-          :delivery_date, :valid_until, :status, :notes
+          :delivery_date, :valid_until, :status, :notes,
+          quotation_items_attributes: [ :id, :rfq_item_id, :product_id, :unit_id, :quantity, :unit_price, :subtotal, :_destroy ]
         )
       end
 

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

@@ -2,6 +2,7 @@ module Dscf
   module Marketplace
     class RequestForQuotationsController < ApplicationController
       include Dscf::Core::Common
+      include Dscf::Marketplace::NestedCreatable
 
       def send_rfq
         @obj = find_record
@@ -37,7 +38,8 @@ module Dscf
 
       def model_params
         params.require(:request_for_quotation).permit(
-          :user_id, :selected_quotation_id, :status, :notes
+          :user_id, :selected_quotation_id, :status, :notes,
+          rfq_items_attributes: [ :id, :product_id, :unit_id, :quantity, :notes, :_destroy ]
         )
       end
 

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

@@ -11,6 +11,7 @@ module Dscf::Marketplace
     belongs_to :ordered_to, class_name: "Dscf::Core::Business"
     belongs_to :delivery_order, optional: true
     has_many :order_items, dependent: :destroy
+    accepts_nested_attributes_for :order_items, allow_destroy: true
 
     validates :order_type, presence: true
     validates :status, presence: true

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

@@ -6,6 +6,7 @@ module Dscf
 
       has_many :quotation_items, class_name: "Dscf::Marketplace::QuotationItem", dependent: :destroy
       has_one :order, class_name: "Dscf::Marketplace::Order", dependent: :destroy
+      accepts_nested_attributes_for :quotation_items, allow_destroy: true
 
       validates :request_for_quotation_id, presence: true
       validates :business_id, presence: true

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

@@ -6,6 +6,7 @@ module Dscf
 
       has_many :rfq_items, class_name: "Dscf::Marketplace::RfqItem", dependent: :destroy
       has_many :quotations, class_name: "Dscf::Marketplace::Quotation", dependent: :destroy
+      accepts_nested_attributes_for :rfq_items, allow_destroy: true
 
       validates :user_id, presence: true
       enum :status, {draft: 0, sent: 1, responded: 2, selected: 3, closed: 4}, default: :draft

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

@@ -1,28 +1,24 @@
 module Dscf::Marketplace
   class SupplierProduct < ApplicationRecord
-    # References
     belongs_to :business, class_name: "Dscf::Core::Business"
     belongs_to :product, class_name: "Dscf::Marketplace::Product"
 
-    # Relationships
+    delegate :name, :description, :thumbnail_url, :images_urls, to: :product, allow_nil: true
+
     has_many :listings, class_name: "Dscf::Marketplace::Listing"
     has_many :order_items, class_name: "Dscf::Marketplace::OrderItem"
 
-    # Status enum
     enum :status, {active: 0, inactive: 1, discontinued: 2}, default: :active
 
-    # Validations
     validates :supplier_price, numericality: {greater_than: 0}, presence: true
     validates :available_quantity, numericality: {greater_than_or_equal_to: 0}
     validates :minimum_order_quantity, numericality: {greater_than: 0}, allow_nil: true
 
-    # Scopes
     scope :active, -> { where(status: :active) }
     scope :in_stock, -> { where("available_quantity > 0") }
     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

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

@@ -3,7 +3,8 @@ module Dscf
     class SupplierProductSerializer < ActiveModel::Serializer
       attributes :id, :business_id, :product_id, :supplier_price, :available_quantity,
         :minimum_order_quantity, :status, :created_at, :updated_at,
-        :in_stock?, :price_per_unit, :display_name
+        :in_stock?, :price_per_unit, :display_name, :name, :description,
+        :thumbnail_url, :images_urls
 
       belongs_to :business
       belongs_to :product

data/config/locales/en.yml

@@ -89,7 +89,7 @@ en:
       update: "Failed to update supplier product"
       destroy: "Failed to delete supplier product"
 
-  listing:
+  listings:
     success:
       index: "Listings retrieved successfully"
       show: "Listing details retrieved successfully"

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.2.7".freeze
+    VERSION = "0.2.9".freeze
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.9
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2025-09-03 00:00:00.000000000 Z
+date: 2025-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -416,6 +416,7 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - Rakefile
+- app/controllers/concerns/dscf/marketplace/nested_creatable.rb
 - app/controllers/dscf/marketplace/application_controller.rb
 - app/controllers/dscf/marketplace/businesses_controller.rb
 - app/controllers/dscf/marketplace/categories_controller.rb