dscf-marketplace 0.1.9 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5af5705a5f167b0e7f9f34ae086a62f92528d0634e53ca1b50e1ddd0894934b
-  data.tar.gz: c53e6675625b7a1225ed8cdaaf977e940325ff9d9fe934f84a47517b22b82302
+  metadata.gz: 70190000bbbdf144579c8e6c27608664b18a4a8460ac43350f9dc1162c355b0a
+  data.tar.gz: 1e661035af4d825af27418bf07a7342eaa641d39ea6e20fd1cc62dd64aecbd75
 SHA512:
-  metadata.gz: 69d7b1dc54ca8c0df0177243a8a9c2b9e410348b7aaf53464890c07f90c2e13a0c9313805992db5e7f80962c771cde51ab7889046fb93a7ad7c4d07c532880ad
-  data.tar.gz: c00490bed736cc44c717edc3cbb64de8f2ebac369fd6f1ec98ecf24f44d4c00d07b52aeda5062d04663ecd079948890d0fe160721c2f2295272790b588bde568
+  metadata.gz: 1a1fb37f55cd3d15a6a89098f435dd8f7797748440dff0f68aac15be45a92c1e3b7807ef2307013846cdab795153a8b956fdc50eaa569424a9ec88695f77763e
+  data.tar.gz: a18369805514a3d9d24562ada719551baf8e06621a5bb5b806afafd900f8245dbdc16568f6514ec77953055c6faece98fa937961ba05a28d9c8aaed853393828

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

@@ -0,0 +1,34 @@
+module Dscf
+  module Marketplace
+    class BusinessesController < ApplicationController
+      include Dscf::Core::Common
+
+      def has_business
+        has_business = current_user&.businesses&.exists? || false
+        render_success("business.success.has_business_check", data: {has_business: has_business})
+      end
+
+      private
+
+      def model_params
+        params.require(:business).permit(
+          :name, :description, :contact_email, :contact_phone, :tin_number,
+          :business_type_id, :user_id
+        )
+      end
+
+      def eager_loaded_associations
+        [ :business_type, :user ]
+      end
+
+      def default_serializer_includes
+        {
+          index: [ :business_type, :user ],
+          show: [ :business_type, :user ],
+          create: [ :business_type, :user ],
+          update: [ :business_type, :user ]
+        }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,64 @@
+module Dscf
+  module Marketplace
+    class DeliveryOrderItemsController < ApplicationController
+      include Dscf::Core::Common
+
+      def receiver_confirm
+        @obj = find_record
+        if @obj.receiver_confirm!(params[:confirmed_quantity], params[:notes], current_user&.id)
+          render_success("delivery_order_items.success.receiver_confirmed", data: @obj)
+        else
+          render_error("delivery_order_items.errors.receiver_confirm_failed")
+        end
+      end
+
+      def report_issue
+        @obj = find_record
+        issue_type = params[:issue_type]
+        quantity = params[:quantity]
+        description = params[:description]
+
+        if @obj.report_issue!(issue_type, quantity, description, current_user&.id)
+          render_success("delivery_order_items.success.issue_reported", data: @obj)
+        else
+          render_error("delivery_order_items.errors.report_issue_failed")
+        end
+      end
+
+      def dispute_delivery
+        @obj = find_record
+        reason = params[:reason]
+
+        if @obj.dispute_delivery!(reason, current_user&.id)
+          render_success("delivery_order_items.success.delivery_disputed", data: @obj)
+        else
+          render_error("delivery_order_items.errors.dispute_delivery_failed")
+        end
+      end
+
+      private
+
+      def model_params
+        params.require(:delivery_order_item).permit(
+          :delivery_order_id, :order_item_id, :pickup_address_id, :dropoff_address_id,
+          :quantity, :status, :pickup_verified_quantity, :dropoff_verified_quantity,
+          :damaged_quantity, :missing_quantity, :receiver_confirmed_by,
+          :receiver_confirmed_at, :receiver_notes, :handoff_checklist_completed
+        )
+      end
+
+      def eager_loaded_associations
+        [ :delivery_order, :order_item, :pickup_address, :dropoff_address ]
+      end
+
+      def default_serializer_includes
+        {
+          index: [ :delivery_order, :order_item ],
+          show: [ :delivery_order, :order_item, :pickup_address, :dropoff_address ],
+          create: [ :delivery_order, :order_item ],
+          update: [ :delivery_order, :order_item ]
+        }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,72 @@
+module Dscf
+  module Marketplace
+    class DeliveryOrdersController < ApplicationController
+      include Dscf::Core::Common
+
+      def index
+        @objs = DeliveryOrder.all
+        render_success("delivery_orders.index.success", data: @objs, serializer_options: {include: default_serializer_includes[:index]})
+      end
+
+      def pickup
+        @obj = find_record
+        if @obj.pickup!
+          render_success("delivery_orders.success.picked_up", data: @obj)
+        else
+          render_error("delivery_orders.errors.pickup_failed")
+        end
+      end
+
+      def start_delivery
+        @obj = find_record
+        if @obj.start_delivery!
+          render_success("delivery_orders.success.delivery_started", data: @obj)
+        else
+          render_error("delivery_orders.errors.start_delivery_failed")
+        end
+      end
+
+      def complete_delivery
+        @obj = find_record
+        if @obj.complete_delivery!
+          render_success("delivery_orders.success.delivery_completed", data: @obj)
+        else
+          render_error("delivery_orders.errors.complete_delivery_failed")
+        end
+      end
+
+      def mark_failed
+        @obj = find_record
+        reason = params[:reason]
+        if @obj.mark_failed!(reason)
+          render_success("delivery_orders.success.marked_failed", data: @obj)
+        else
+          render_error("delivery_orders.errors.mark_failed_failed")
+        end
+      end
+
+      private
+
+      def model_params
+        params.require(:delivery_order).permit(
+          :driver_id, :pickup_address_id, :delivery_vehicle_id, :status,
+          :vehicle_type, :estimated_delivery_price, :actual_delivery_price,
+          :estimated_delivery_time, :actual_delivery_time, :delivery_notes
+        )
+      end
+
+      def eager_loaded_associations
+        [ :driver, :pickup_address, :delivery_vehicle, :delivery_order_items, :marketplace_orders ]
+      end
+
+      def default_serializer_includes
+        {
+          index: [ :driver, :pickup_address, :delivery_vehicle ],
+          show: [ :driver, :pickup_address, :delivery_vehicle, :delivery_order_items, :marketplace_orders ],
+          create: [ :driver, :pickup_address, :delivery_vehicle ],
+          update: [ :driver, :pickup_address, :delivery_vehicle ]
+        }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module Dscf
+  module Marketplace
+    class DeliveryVehiclesController < ApplicationController
+      include Dscf::Core::Common
+
+      private
+
+      def model_params
+        params.require(:delivery_vehicle).permit(
+          :driver_id, :plate_number, :vehicle_type, :year, :brand, :model, :color
+        )
+      end
+
+      def eager_loaded_associations
+        [ :driver, :delivery_orders ]
+      end
+
+      def default_serializer_includes
+        {
+          index: [ :driver ],
+          show: [ :driver, :delivery_orders ],
+          create: [ :driver ],
+          update: [ :driver ]
+        }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+module Dscf
+  module Marketplace
+    class OrderItemsController < ApplicationController
+      include Dscf::Core::Common
+
+      private
+
+      def model_params
+        params.require(:order_item).permit(
+          :order_id, :quotation_item_id, :listing_id,
+          :product_id, :unit_id, :quantity, :unit_price, :status
+        )
+      end
+
+      def eager_loaded_associations
+        [ :order, :quotation_item, :listing, :product, :unit ]
+      end
+
+      def default_serializer_includes
+        {
+          index: [ :product, :unit ],
+          show: [ :order, :quotation_item, :listing, :product, :unit ],
+          create: [ :product, :unit ],
+          update: [ :product, :unit ]
+        }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module Dscf
+  module Marketplace
+    class QuotationItemsController < ApplicationController
+      include Dscf::Core::Common
+
+      private
+
+      def model_params
+        params.require(:quotation_item).permit(
+          :quotation_id, :rfq_item_id, :product_id, :unit_id, :quantity, :unit_price
+        )
+      end
+
+      def eager_loaded_associations
+        [ :quotation, :rfq_item, :product, :unit ]
+      end
+
+      def default_serializer_includes
+        {
+          index: [ :quotation, :rfq_item, :product, :unit ],
+          show: [ :quotation, :rfq_item, :product, :unit ],
+          create: [ :quotation, :rfq_item, :product, :unit ],
+          update: [ :quotation, :rfq_item, :product, :unit ]
+        }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module Dscf
+  module Marketplace
+    class RfqItemsController < ApplicationController
+      include Dscf::Core::Common
+
+      private
+
+      def model_params
+        params.require(:rfq_item).permit(
+          :request_for_quotation_id, :product_id, :unit_id, :quantity, :notes
+        )
+      end
+
+      def eager_loaded_associations
+        [ :request_for_quotation, :product, :unit, :quotation_items ]
+      end
+
+      def default_serializer_includes
+        {
+          index: [ :request_for_quotation, :product, :unit ],
+          show: [ :request_for_quotation, :product, :unit, :quotation_items ],
+          create: [ :request_for_quotation, :product, :unit ],
+          update: [ :request_for_quotation, :product, :unit ]
+        }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+module Dscf
+  module Marketplace
+    class SupplierProductsController < ApplicationController
+      include Dscf::Core::Common
+
+      private
+
+      def model_params
+        params.require(:supplier_product).permit(
+          :business_id, :product_id, :supplier_price, :available_quantity,
+          :minimum_order_quantity, :status
+        )
+      end
+
+      def eager_loaded_associations
+        [ :business, :product, :listings ]
+      end
+
+      def default_serializer_includes
+        {
+          index: [ :business, :product ],
+          show: [ :business, :product, :listings ],
+          create: [ :business, :product ],
+          update: [ :business, :product ]
+        }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module Dscf
+  module Marketplace
+    class UnitConversionsController < ApplicationController
+      include Dscf::Core::Common
+
+      private
+
+      def model_params
+        params.require(:unit_conversion).permit(
+          :from_unit_id, :to_unit_id, :conversion_factor, :notes
+        )
+      end
+
+      def eager_loaded_associations
+        [ :from_unit, :to_unit ]
+      end
+
+      def default_serializer_includes
+        {
+          index: [ :from_unit, :to_unit ],
+          show: [ :from_unit, :to_unit ],
+          create: [ :from_unit, :to_unit ],
+          update: [ :from_unit, :to_unit ]
+        }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+module Dscf
+  module Marketplace
+    class UnitsController < ApplicationController
+      include Dscf::Core::Common
+
+      private
+
+      def model_params
+        params.require(:unit).permit(:code, :name, :unit_type)
+      end
+
+      def eager_loaded_associations
+        [ :unit_conversions ]
+      end
+
+      def default_serializer_includes
+        {
+          index: [ :unit_conversions ],
+          show: [ :unit_conversions ],
+          create: [],
+          update: []
+        }
+      end
+    end
+  end
+end

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

@@ -23,6 +23,12 @@ module Dscf::Marketplace
       %w[id driver_id pickup_address_id delivery_vehicle_id status vehicle_type estimated_delivery_price actual_delivery_price estimated_delivery_time actual_delivery_time delivery_notes created_at updated_at]
     end
 
+    # Override ransack to handle JSON fields
+    def self.ransack(params = {}, options = {})
+      params ||= {}
+      super(params.except("optimized_route"), options)
+    end
+
     def self.ransackable_associations(_auth_object = nil)
       %w[driver pickup_address delivery_vehicle delivery_order_items marketplace_orders]
     end

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

@@ -13,13 +13,10 @@ module Dscf
       validates :unit_id, presence: true
       validates :unit_price, numericality: {greater_than: 0}, allow_nil: true
       validates :subtotal, numericality: {greater_than_or_equal_to: 0}, allow_nil: true
-
       validate :product_matches_rfq_item
       validate :unit_compatible_with_product
-      before_save :calculate_subtotal, if: :unit_price_changed?
-
-      # Only validate subtotal calculation if both unit_price and quantity are present
       validate :subtotal_matches_calculation, if: :should_validate_subtotal?
+      before_save :calculate_subtotal, if: :should_recalculate_subtotal?
 
       scope :priced, -> { where.not(unit_price: nil) }
       scope :unpriced, -> { where(unit_price: nil) }
@@ -76,8 +73,7 @@ module Dscf
       def matches_rfq_request?
         return false unless rfq_item
 
-        product_id == rfq_item.product_id &&
-          unit_id == rfq_item.unit_id
+        product_id == rfq_item.product_id && unit_id == rfq_item.unit_id
       end
 
       def can_create_order?
@@ -89,8 +85,35 @@ module Dscf
       def calculate_subtotal
         return unless unit_price && quantity
 
-        self.subtotal = unit_price * quantity
+        self.subtotal = (unit_price * quantity).round(2)
+      end
+
+      # Calculate subtotal automatically if not set
+      def calculated_subtotal
+        return subtotal if subtotal.present?
+        return nil unless unit_price && quantity
+
+        (unit_price * quantity).round(2)
+      end
+
+      # Override subtotal setter to allow validation to work
+      def subtotal=(value)
+        # Allow any value to be set for validation purposes
+        super
       end
+      public :subtotal=
+
+      # Override subtotal getter to calculate if not set
+      def subtotal
+        stored_value = super
+        # If we have a stored value (including 0), return it
+        # Only calculate if it's nil and we have the required fields
+        return stored_value unless stored_value.nil?
+        return nil unless unit_price && quantity
+
+        (unit_price * quantity).round(2)
+      end
+      public :subtotal
 
       def product_matches_rfq_item
         return unless rfq_item_id && product_id
@@ -111,14 +134,23 @@ module Dscf
       def subtotal_matches_calculation
         return unless should_validate_subtotal?
 
-        expected_subtotal = unit_price * quantity
-        unless subtotal == expected_subtotal
+        # Calculate what the subtotal should be based on current unit_price and quantity
+        expected_subtotal = (unit_price * quantity).round(2)
+
+        # If subtotal is stored and doesn't match, that's an error
+        # If subtotal is nil, we'll let the before_save callback handle it
+        if subtotal.present? && subtotal.round(2) != expected_subtotal
           errors.add(:subtotal, "must equal unit_price * quantity")
         end
       end
 
       def should_validate_subtotal?
-        unit_price.present? && quantity.present? && subtotal.present?
+        # Only validate if subtotal is explicitly set and we have unit_price and quantity
+        unit_price.present? && quantity.present? && subtotal.present? && subtotal_changed?
+      end
+
+      def should_recalculate_subtotal?
+        unit_price_changed? || quantity_changed?
       end
     end
   end

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

@@ -0,0 +1,11 @@
+module Dscf
+  module Marketplace
+    class BusinessSerializer < ActiveModel::Serializer
+      attributes :id, :name, :description, :contact_email, :contact_phone,
+        :tin_number, :created_at, :updated_at
+
+      belongs_to :business_type
+      belongs_to :user
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module Dscf
+  module Marketplace
+    class DeliveryOrderItemSerializer < ActiveModel::Serializer
+      attributes :id, :delivery_order_id, :order_item_id, :pickup_address_id, :dropoff_address_id,
+        :quantity, :status, :pickup_verified_quantity, :dropoff_verified_quantity,
+        :damaged_quantity, :missing_quantity, :receiver_confirmed_by,
+        :receiver_confirmed_at, :receiver_notes, :handoff_checklist_completed,
+        :created_at, :updated_at, :product_name, :unit_name, :verification_complete?,
+        :has_discrepancy?, :discrepancy_amount, :requires_resolution?
+
+      belongs_to :delivery_order
+      belongs_to :order_item
+      belongs_to :pickup_address
+      belongs_to :dropoff_address
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module Dscf
+  module Marketplace
+    class DeliveryOrderSerializer < ActiveModel::Serializer
+      attributes :id, :driver_id, :pickup_address_id, :delivery_vehicle_id, :status,
+        :vehicle_type, :estimated_delivery_price, :actual_delivery_price,
+        :estimated_delivery_time, :actual_delivery_time, :delivery_notes,
+        :created_at, :updated_at, :total_items, :total_orders, :delivery_duration,
+        :on_time?, :all_handoffs_confirmed?
+
+      belongs_to :driver
+      belongs_to :pickup_address
+      belongs_to :delivery_vehicle
+      has_many :delivery_order_items
+      has_many :marketplace_orders
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+module Dscf
+  module Marketplace
+    class DeliveryVehicleSerializer < ActiveModel::Serializer
+      attributes :id, :driver_id, :plate_number, :vehicle_type, :year, :brand,
+        :model, :color, :created_at, :updated_at, :display_name,
+        :total_deliveries, :success_rate
+
+      belongs_to :driver
+      has_many :delivery_orders
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Dscf
+  module Marketplace
+    class OrderItemSerializer < ActiveModel::Serializer
+      attributes :id, :order_id, :quotation_item_id, :listing_id,
+        :product_id, :unit_id, :quantity, :unit_price,
+        :status, :created_at, :updated_at,
+        :subtotal, :product_name, :unit_name
+
+      belongs_to :order
+      belongs_to :quotation_item
+      belongs_to :listing
+      belongs_to :product
+      belongs_to :unit
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Dscf
+  module Marketplace
+    class QuotationItemSerializer < ActiveModel::Serializer
+      attributes :id, :quotation_id, :rfq_item_id, :product_id, :unit_id, :quantity,
+        :unit_price, :subtotal, :created_at, :updated_at, :product_name,
+        :product_sku, :unit_name, :unit_code, :rfq_requested_quantity,
+        :quantity_difference, :quantity_difference_percentage, :price_per_base_unit,
+        :matches_rfq_request?, :can_create_order?
+
+      belongs_to :quotation
+      belongs_to :rfq_item
+      belongs_to :product
+      belongs_to :unit
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module Dscf
+  module Marketplace
+    class RfqItemSerializer < ActiveModel::Serializer
+      attributes :id, :request_for_quotation_id, :product_id, :unit_id, :quantity, :notes,
+        :created_at, :updated_at, :product_name, :product_sku, :unit_name,
+        :unit_code, :quotation_count, :has_quotations?, :quoted_price_range
+
+      belongs_to :request_for_quotation
+      belongs_to :product
+      belongs_to :unit
+      has_many :quotation_items
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module Dscf
+  module Marketplace
+    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
+
+      belongs_to :business
+      belongs_to :product
+      has_many :listings
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Dscf
+  module Marketplace
+    class UnitConversionSerializer < ActiveModel::Serializer
+      attributes :id, :from_unit_id, :to_unit_id, :conversion_factor, :notes,
+        :created_at, :updated_at, :reverse_conversion_factor, :description
+
+      belongs_to :from_unit
+      belongs_to :to_unit
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+module Dscf
+  module Marketplace
+    class UnitSerializer < ActiveModel::Serializer
+      attributes :id, :code, :name, :unit_type, :created_at, :updated_at, :display_name
+
+      has_many :unit_conversions
+    end
+  end
+end

data/config/locales/en.yml

@@ -241,6 +241,18 @@ 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"
+
   # Global fallback messages
   operations:
     success:

data/config/routes.rb

@@ -16,6 +16,12 @@ Dscf::Marketplace::Engine.routes.draw do
 
   resources :unit_conversions
 
+  resources :businesses do
+    collection do
+      get "has_business"
+    end
+  end
+
   # Trading Models
   resources :supplier_products do
     resources :listings, only: [ :index ]
@@ -39,7 +45,7 @@ Dscf::Marketplace::Engine.routes.draw do
     end
   end
 
-  resources :rfq_items, only: [ :show, :update, :destroy ]
+  resources :rfq_items, only: [ :index, :show, :update, :create, :destroy ]
 
   resources :quotations do
     resources :quotation_items, only: [ :index, :create ]
@@ -50,7 +56,7 @@ Dscf::Marketplace::Engine.routes.draw do
     end
   end
 
-  resources :quotation_items, only: [ :show, :update, :destroy ]
+  resources :quotation_items, only: [ :index, :show, :update, :create, :destroy ]
 
   # Order Management
   resources :orders do
@@ -62,7 +68,7 @@ Dscf::Marketplace::Engine.routes.draw do
     end
   end
 
-  resources :order_items, only: [ :show, :update ]
+  resources :order_items, only: [ :index, :show, :update, :create, :destroy ]
 
   # Delivery System
   resources :delivery_orders do
@@ -75,7 +81,7 @@ Dscf::Marketplace::Engine.routes.draw do
     end
   end
 
-  resources :delivery_order_items, only: [ :show, :update ] do
+  resources :delivery_order_items, only: [ :index, :show, :update, :create ] do
     member do
       post "receiver_confirm"
       post "report_issue"

data/lib/dscf/marketplace/version.rb

@@ -1,5 +1,5 @@
 module Dscf
   module Marketplace
-    VERSION = "0.1.9".freeze
+    VERSION = "0.2.1".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,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dscf-marketplace
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.1
 platform: ruby
 authors:
 - Asrat
 bindir: bin
 cert_chain: []
-date: 2025-09-01 00:00:00.000000000 Z
+date: 2025-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -417,12 +417,22 @@ files:
 - MIT-LICENSE
 - Rakefile
 - app/controllers/dscf/marketplace/application_controller.rb
+- app/controllers/dscf/marketplace/businesses_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
@@ -441,12 +451,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/business_serializer.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