spree_cm_commissioner 2.1.5.pre.pre1 → 2.1.5.pre.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d85338c01f8051cd2aff1de565907e13f401f0044b766cca7738056f1089a7d1
-  data.tar.gz: 32b15e97d40db31db7749ee684bb02f3b01bfaa44afc32bc79d1a259960fae50
+  metadata.gz: 06e22965144e75388dd801148c7d38580aee08856973332edc2c40ad31f6772a
+  data.tar.gz: 1b33b7d645b36c9ccf42444dfa09aa7826a43d9c8e2a3dd0aaaa6d1668f6643d
 SHA512:
-  metadata.gz: 3a2d72ee902e1a625713777268aa727d2c92e25cea7a912bd799dd999d4e99f0c7ec5eeb2e5cce49575205d4e01606cf0aa4776e5844074348728ce00eaa4efd
-  data.tar.gz: 5dc5ad4f7c7ff9121503d09fa49e67903b15cc86e21cbd468494fa2119ca758712410c3bb3896a1fa6013bb7e9429b793e6dac1856a676c67caf928950a8b271
+  metadata.gz: 781da351e0880acf7f46fbbc060844a31f26b322d781fc17ad1da51ac4a3e7d0a9c991d2fb4921ec1cc1e89a255c2abf9457c3bf7c163108838b199cb9865054
+  data.tar.gz: 6322d9ef0cca35c6d225cb91917cb3e49a6a96221b60025103f09f607658eaf0c797d0d37f6ad44b3c183a5f7c8d6a64afd0326de016047cf005dfb8ae200b4b

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.1.5.pre.pre1)
+    spree_cm_commissioner (2.1.5.pre.pre3)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront

data/app/controllers/spree/api/v2/tenant/base_controller.rb

@@ -4,8 +4,6 @@ module Spree
       module Tenant
         class BaseController < ::Spree::Api::V2::ResourceController
           include Spree::Api::V2::CollectionOptionsHelpers
-          rescue_from ActiveRecord::RecordInvalid, with: :handle_record_invalid
-          rescue_from ActiveRecord::RecordNotFound, with: :handle_record_not_found
 
           set_current_tenant_through_filter
           before_action :require_tenant
@@ -26,16 +24,6 @@ module Spree
           def scope
             raise 'scope should be implemented in a sub-class'
           end
-
-          private
-
-          def handle_record_invalid(exception)
-            render_error_payload(exception.record.errors, 422)
-          end
-
-          def handle_record_not_found(exception)
-            render_error_payload({ base: [exception.message] }, 404)
-          end
         end
       end
     end

data/app/controllers/spree/api/v2/tenant/cart_controller.rb

@@ -156,7 +156,7 @@ module Spree
           end
 
           def resource_serializer
-            Spree::V2::Tenant::CartSerializer
+            Spree::Api::Dependencies.storefront_cart_serializer.constantize
           end
 
           def create_service

data/app/controllers/spree/api/v2/tenant/checkout_controller.rb

@@ -67,7 +67,7 @@ module Spree
           end
 
           def resource_serializer
-            Spree::V2::Tenant::CartSerializer
+            Spree::Api::Dependencies.storefront_cart_serializer.constantize
           end
 
           def next_service

data/app/controllers/spree/api/v2/tenant/guests_controller.rb

@@ -27,28 +27,23 @@ module Spree
           def create
             spree_authorize! :update, spree_current_order, order_token
 
-            resource = scope.new(guest_params.except(:guest_dynamic_fields_attributes))
+            resource = scope.new(guest_params)
 
-            ActiveRecord::Base.transaction do
-              resource.save!
-              run_dynamic_fields(resource)
-              resource.save_and_move_to_next_stage
+            if resource.save
+              render_serialized_payload(201) { serialize_resource(resource) }
+            else
+              render_error_payload(resource.errors, 400)
             end
-
-            render_serialized_payload(201) { serialize_resource(resource) }
           end
 
           def update
             spree_authorize! :update, spree_current_order, order_token
 
-            ActiveRecord::Base.transaction do
-              run_dynamic_fields(resource) if guest_params[:guest_dynamic_fields_attributes]
-              resource.assign_attributes(guest_params.except(:guest_dynamic_fields_attributes))
-              resource.save!
-              resource.save_and_move_to_next_stage
+            if resource.update(guest_params)
+              render_serialized_payload { serialize_resource(resource) }
+            else
+              render_error_payload(resource, 400)
             end
-
-            render_serialized_payload { serialize_resource(resource) }
           end
 
           private
@@ -83,21 +78,7 @@ module Spree
               :address,
               :other_organization,
               :expectation,
-              :upload_later,
-              guest_dynamic_fields_attributes: %i[
-                id
-                dynamic_field_id
-                dynamic_field_option_id
-                value
-                _destroy
-              ]
-            )
-          end
-
-          def run_dynamic_fields(resource)
-            SpreeCmCommissioner::GuestDynamicFieldsManager.call(
-              resource: resource,
-              dynamic_fields_attributes: guest_params[:guest_dynamic_fields_attributes]
+              :upload_later
             )
           end
         end

data/app/models/spree_cm_commissioner/guest.rb

@@ -40,7 +40,7 @@ module SpreeCmCommissioner
 
     has_many :state_changes, as: :stateful, class_name: 'Spree::StateChange'
     has_many :guest_dynamic_fields, dependent: :destroy, class_name: 'SpreeCmCommissioner::GuestDynamicField'
-    accepts_nested_attributes_for :guest_dynamic_fields, allow_destroy: true, reject_if: :reject_guest_dynamic_field?
+    accepts_nested_attributes_for :guest_dynamic_fields, allow_destroy: true
 
     belongs_to :event, class_name: 'Spree::Taxon'
 
@@ -51,7 +51,8 @@ module SpreeCmCommissioner
     preference :telegram_user_verified_at, :string
 
     before_validation :set_event_id
-    before_validation :assign_seat_number, if: -> { bib_number.present? }
+    before_validation :assign_seat_number_with_bib, if: -> { bib_number.present? }
+    before_validation :assign_seat_number_with_block, if: -> { will_save_change_to_block_id? }
 
     before_create :generate_bib, if: -> { line_item.reload && variant.bib_pre_generation_on_create? }
 
@@ -147,13 +148,17 @@ module SpreeCmCommissioner
       self.event_id ||= line_item&.event_id
     end
 
-    def assign_seat_number
+    def assign_seat_number_with_block
+      self.seat_number = block.present? ? block.label : nil
+    end
+
+    def assign_seat_number_with_bib
       return if seat_number.present? # avoid reassign seat to guest
 
-      assign_seat_number!
+      assign_seat_number_with_bib!
     end
 
-    def assign_seat_number!
+    def assign_seat_number_with_bib!
       index = bib_number - 1
       positions = line_item.variant.seat_number_positions || []
 
@@ -397,11 +402,6 @@ module SpreeCmCommissioner
 
       required_fields.reject { |field| filled_ids.include?(field.id) }
     end
-
-    def reject_guest_dynamic_field?(attributes)
-      # Reject if dynamic_field_id is blank or if _destroy is true
-      attributes[:dynamic_field_id].blank? || ActiveModel::Type::Boolean.new.cast(attributes[:_destroy])
-    end
   end
 end
 # rubocop:enable Metrics/ClassLength

data/app/models/spree_cm_commissioner/guest_dynamic_field.rb

@@ -46,10 +46,6 @@ module SpreeCmCommissioner
       return if dynamic_field.blank? || dynamic_field_option.blank?
       return if dynamic_field_option.dynamic_field_id == dynamic_field_id
 
-      # Only validate if both dynamic_field and dynamic_field_option are persisted
-      # This prevents validation errors during creation when associations might not be fully loaded
-      return if dynamic_field.new_record? || dynamic_field_option.new_record?
-
       errors.add(:dynamic_field_option, 'must belong to the same dynamic field')
     end
 

data/app/models/spree_cm_commissioner/line_item_decorator.rb

@@ -29,6 +29,7 @@ module SpreeCmCommissioner
       base.before_create :add_due_date, if: :subscription?
 
       base.validate :ensure_not_exceed_max_quantity_per_order, if: -> { variant&.max_quantity_per_order.present? }
+      base.validate :ensure_all_guests_have_blocks, if: -> { variant&.blocks&.any? }
 
       base.whitelisted_ransackable_associations |= %w[guests order]
       base.whitelisted_ransackable_attributes |= %w[number to_date from_date vendor_id]
@@ -217,7 +218,13 @@ module SpreeCmCommissioner
     private
 
     def ensure_not_exceed_max_quantity_per_order
-      errors.add(:quantity, 'exceeded_max_quantity_per_order') if quantity > variant.max_quantity_per_order
+      errors.add(:quantity, I18n.t('line_item.validation.exceeded_max_quantity_per_order')) if quantity > variant.max_quantity_per_order
+    end
+
+    def ensure_all_guests_have_blocks
+      return if number_of_guests == guests.map(&:block_id).compact.uniq.size
+
+      errors.add(:base, I18n.t('line_item.validation.seats_are_required'))
     end
 
     def update_vendor_id

data/app/models/spree_cm_commissioner/taxon_decorator.rb

@@ -155,10 +155,6 @@ module SpreeCmCommissioner
       ::SpreeCmCommissioner::EventLineItemsDateSyncerJob.perform_later(id)
     end
 
-    def seat_layout
-      nil
-    end
-
     private
 
     def normalize_custom_redirect_url

data/app/models/spree_cm_commissioner/trip.rb

@@ -1,6 +1,5 @@
 module SpreeCmCommissioner
   class Trip < Base
-    include ::Spree::Metadata
     include SpreeCmCommissioner::RouteType
 
     attr_accessor :hours, :minutes, :seconds

data/app/models/spree_cm_commissioner/vehicle.rb

@@ -1,6 +1,5 @@
 module SpreeCmCommissioner
   class Vehicle < Base
-    include ::Spree::Metadata
     include SpreeCmCommissioner::VehicleType
 
     # seat_layout_id:

data/app/serializers/spree/v2/tenant/cart_serializer.rb

@@ -1,30 +1,7 @@
 module Spree
   module V2
     module Tenant
-      class CartSerializer < BaseSerializer
-        attributes :number, :item_total, :total, :ship_total, :adjustment_total, :created_at,
-                   :updated_at, :completed_at, :included_tax_total, :additional_tax_total, :display_additional_tax_total,
-                   :display_included_tax_total, :tax_total, :currency, :state, :token, :email,
-                   :display_item_total, :display_ship_total, :display_adjustment_total, :display_tax_total,
-                   :promo_total, :display_promo_total, :item_count, :special_instructions, :display_total,
-                   :pre_tax_item_amount, :display_pre_tax_item_amount, :pre_tax_total, :display_pre_tax_total,
-                   :shipment_state, :payment_state, :public_metadata,
-                   :phone_number, :intel_phone_number, :country_code, :request_state, :channel
-
-        belongs_to :user, serializer: Spree::V2::Tenant::UserSerializer
-        belongs_to :billing_address,
-                   id_method_name: :bill_address_id,
-                   serializer: :address,
-                   record_type: :address
-
-        has_many :promotions, object_method_name: :valid_promotions, id_method_name: :valid_promotion_ids,
-                              serializer: Spree::V2::Storefront::PromotionSerializer
-
-        has_many :variants, serializer: Spree::V2::Tenant::VariantSerializer
-        has_many :products, serializer: Spree::V2::Tenant::ProductSerializer
-        has_many :line_items, serializer: Spree::V2::Tenant::LineItemSerializer
-        has_many :payments, serializer: Spree::V2::Storefront::PaymentSerializer
-        has_many :guests, serializer: Spree::V2::Tenant::GuestSerializer
+      class CartSerializer < Spree::V2::Storefront::CartSerializer
       end
     end
   end

data/app/serializers/spree/v2/tenant/guest_serializer.rb

@@ -13,9 +13,7 @@ module Spree
 
         belongs_to :occupation, serializer: Spree::V2::Tenant::TaxonSerializer
         belongs_to :nationality, serializer: Spree::V2::Tenant::TaxonSerializer
-        belongs_to :line_item, serializer: Spree::V2::Tenant::LineItemSerializer
         has_one :id_card, serializer: Spree::V2::Tenant::IdCardSerializer
-        has_many :guest_dynamic_fields, serializer: Spree::V2::Tenant::GuestDynamicFieldSerializer
 
         # allowed_checkout updates frequently
         cache_options store: nil

data/app/serializers/spree/v2/tenant/product_serializer.rb

@@ -5,9 +5,6 @@ module Spree
         # This serializer extends the Storefront ProductSerializer
         # to include any additional attributes or relationships needed
         # for the Tenant context.
-
-        # Overrided dynamic fields relationship of the parent serializer(Storefront).
-        has_many :dynamic_fields, serializer: Spree::V2::Tenant::DynamicFieldSerializer
       end
     end
   end

data/config/initializers/spree_permitted_attributes.rb

@@ -2,11 +2,13 @@ module Spree
   module PermittedAttributes
     @@vendor_attributes << :logo
 
+    # Permitted all guest attributes for now as permitting only some guest attributes is not working by design
+    # of spree add_item service, if we want to only permit some guest attributes,
+    # we need to override most part of add_item service.
     @@line_item_attributes += %i[
       from_date
       to_date
-      line_item_seats_attributes
-      date
+      guests_attributes
     ]
 
     @@user_attributes += %i[

data/config/locales/en.yml

@@ -49,16 +49,16 @@ en:
     empty_info: "No vendor information available."
 
   telegram_bot:
-      empty_info: "No <b>Telegram Bot</b> found"
+    empty_info: "No <b>Telegram Bot</b> found"
 
   guest_card_classes:
     empty_info: "No guest card classes information available."
     background_image: "Background Image"
   guest_dynamic_field:
-      errors:
-        pre_registration_required: "is required before ticket issuance"
-        post_registration_required: "must be completed after purchase"
-        during_check_in_required: "is required during check-in"
+    errors:
+      pre_registration_required: "is required before ticket issuance"
+      post_registration_required: "must be completed after purchase"
+      during_check_in_required: "is required during check-in"
   google_wallet:
     note: "Click <b>Create</b> or <b> Update</b> to connect to Google Wallet after filled all information "
     google_wallet_class_created: "Google Wallet class created successfully."
@@ -105,6 +105,12 @@ en:
       out_of_stock: "%{variant_name} is out of stock"
     product_kind_option_types:
       empty_info: "<b>Note:</b> Set service option types to service first. To edit, go to <b>Details</b> tab > <b>Option Types</b>"
+
+  line_item:
+    validation:
+      exceeded_max_quantity_per_order: "Exceeded maximum quantity per order"
+      seats_are_required: "Seats are required for all guests"
+
   vectors:
     icons:
       info_rules: 'Only allow <b>%{allow_extensions}</b> files. Icons are stored inside "images/" folder, eg. app/assets/images/backend-adjust.svg.'
@@ -152,8 +158,8 @@ en:
   orders:
     total: "Total: %{orders_count} invoices"
     update_order_status:
-      success: 'Order Status update successfully'
-      fail: 'Order Status fail to update '
+      success: "Order Status update successfully"
+      fail: "Order Status fail to update "
 
   account_deletion:
     title:
@@ -193,7 +199,7 @@ en:
     send_failed_or_method_not_support: "Send failed or method not support"
     subscribe: "Use Service"
     full_name: "name"
-    store_credits: 'Credits'
+    store_credits: "Credits"
     address: "Address"
     billing_address: "Billing Address"
     shipping_address: "Shipping Address"
@@ -280,9 +286,9 @@ en:
       match_any: "Some line items must from selected age group"
       match_all: "All line items must from selected age group"
     billing:
-      six_month_discount: '6 Months discount'
+      six_month_discount: "6 Months discount"
       twelve_month_discount: "12 Months discount"
-      penalty_rate: 'Penalty Rate in %'
+      penalty_rate: "Penalty Rate in %"
       penalty_label: "Penalty Label"
       customer_id: "Customer ID"
       subscription:
@@ -343,11 +349,11 @@ en:
           fails: "Invoice for this month is already exist "
         customers: "Customers"
         apply_promotion:
-         success: "Promotion Created"
-         fails: "Promotion Creation Failed"
+          success: "Promotion Created"
+          fails: "Promotion Creation Failed"
         delete_promotion:
-         success: "Promotion deleted"
-         fails: "Promotion Deletion Failed"
+          success: "Promotion deleted"
+          fails: "Promotion Deletion Failed"
       service_start_date: "Service Start Date"
       export: "Export"
       select_year: "Select Year"
@@ -602,30 +608,29 @@ en:
 
   variant_availability:
     item_available_instock: Only 1 item available in stock.
-    items_available_instock:  Only %{available_quantity} items available in stock.
-    items_out_of_stock:  Item out of Stock.
+    items_available_instock: Only %{available_quantity} items available in stock.
+    items_out_of_stock: Item out of Stock.
 
   account_link:
     failure: "Failed to link your %{identity_type} account: %{reason}"
   s3:
     image:
       upload:
-        fail: 'Failed to fetch the image'
-        not_found: 'Image not found'
+        fail: "Failed to fetch the image"
+        not_found: "Image not found"
   amenity:
     update_success: Option Type updated successfully.
   user_roles_assigner:
-    user_not_found: 'User not found'
-    roles_empty: 'Roles are empty'
-    roles_required: 'Roles are required'
-    user_already_assigned: 'User already assigned to this vendor'
+    user_not_found: "User not found"
+    roles_empty: "Roles are empty"
+    roles_required: "Roles are required"
+    user_already_assigned: "User already assigned to this vendor"
   invite:
-    url_not_found: 'Invite link not found or have been expired'
-    accept_fail: 'Failed to accept invite'
-    url_expired: 'Invitation link is expired'
-    already_invited: 'Failed: User already invited to event'
-    update_fail: 'Failed: to Update invite user'
+    url_not_found: "Invite link not found or have been expired"
+    accept_fail: "Failed to accept invite"
+    url_expired: "Invitation link is expired"
+    already_invited: "Failed: User already invited to event"
+    update_fail: "Failed: to Update invite user"
   event_blazer_queries:
-    success: 'Event saved Successfully'
-    fail: 'Event already saved'
-
+    success: "Event saved Successfully"
+    fail: "Event already saved"

data/config/locales/km.yml

@@ -55,7 +55,7 @@ km:
     empty_info: "មិនមានព័ត៌មានអំពីអ្នកលក់ទេ"
 
   telegram_bot:
-      empty_info: "No <b>Telegram Bot</b> found"
+    empty_info: "No <b>Telegram Bot</b> found"
 
   guest_card_classes:
     empty_info: "មិនមានព័ត៌មានអំពីកាតភ្ញៀវទេ"
@@ -97,6 +97,11 @@ km:
     product_kind_option_types:
       empty_info: "<b>ចំណាំ:</b> កំណត់ប្រភេទសម្រាប់ផលិតផល. ដើម្បីកែប្រែ, សូមចូលទៅ <b>លម្អិត</b> tab > <b>ប្រភេទ</b>"
 
+  line_item:
+    validation:
+      exceeded_max_quantity_per_order: "លើសពីបរិមាណអតិបរមាក្នុងមួយការបញ្ជាទិញ"
+      seats_are_required: "ត្រូវការលេខកៅអីសម្រាប់ភ្ញៀវទាំងអស់"
+
   subscription:
     validation:
       out_of_range: "Subscription date is out of range."
@@ -174,7 +179,7 @@ km:
     send_failed_or_method_not_support: "Send failed or method not support"
     subscribe: "ប្រើសេវាកម្ម"
     full_name: "ឈ្មោះពេញ"
-    store_credits: 'Credits'
+    store_credits: "Credits"
     address: "អាសយដ្ឋាន"
     billing_address: "អាសយដ្ឋានទូទាត់"
     shipping_address: "អាសយដ្ឋានប្រើ​ប្រាស់"
@@ -252,9 +257,9 @@ km:
       match_any: "Some line items must from selected age group"
       match_all: "All line items must from selected age group"
     billing:
-      six_month_discount: 'Six Month discount'
+      six_month_discount: "Six Month discount"
       twelve_month_discount: "Twelve Month discount"
-      penalty_rate: 'ការផាកពិន័យគិតជាភាគរយ'
+      penalty_rate: "ការផាកពិន័យគិតជាភាគរយ"
       code: "code"
       name: "name"
       logo: "logo"
@@ -400,29 +405,29 @@ km:
 
   variant_availability:
     item_available_instock: ទំនិញក្នុងស្តុកមានតែ 1 ប៉ុណ្ណោះ
-    items_available_instock:  ទំនិញក្នុងស្តុកមានតែ %{available_quantity} ប៉ុណ្ណោះ
-    items_out_of_stock:  ទំនិញអស់ពីស្តុក
+    items_available_instock: ទំនិញក្នុងស្តុកមានតែ %{available_quantity} ប៉ុណ្ណោះ
+    items_out_of_stock: ទំនិញអស់ពីស្តុក
 
   account_link:
     failure: "បរាជ័យក្នុងការភ្ជាប់គណនី %{identity_type}: %{reason}"
   s3:
     image:
       upload:
-        fail: 'បានបរាជ័យក្នុងការទាញយករូបភាព'
-        not_found: 'រកមិនឃើញរូបភាព'
+        fail: "បានបរាជ័យក្នុងការទាញយករូបភាព"
+        not_found: "រកមិនឃើញរូបភាព"
   user_roles_assigner:
-    user_not_found: 'រកមិនឃើញអ្នកប្រើប្រាស់'
-    roles_empty: 'តួនាទីគឺទទេ'
-    roles_required: 'តួនាទីត្រូវបានទាមទារ'
-    user_already_assigned: 'អ្នកប្រើប្រាស់បានបង្កើតតួនាទីរួចហើយ'
+    user_not_found: "រកមិនឃើញអ្នកប្រើប្រាស់"
+    roles_empty: "តួនាទីគឺទទេ"
+    roles_required: "តួនាទីត្រូវបានទាមទារ"
+    user_already_assigned: "អ្នកប្រើប្រាស់បានបង្កើតតួនាទីរួចហើយ"
 
   invite:
-    url_not_found: 'រកមិនឃើញតំណអញ្ជើញ ឬផុតកំណត់ហើយ'
-    accept_fail: 'បរាជ័យក្នុងការទទួលយកការអញ្ជើញ'
-    url_expired: 'តំណ​អញ្ជើញ​បាន​ផុត​កំណត់'
-    already_invited: 'បរាជ័យ៖ អ្នកប្រើប្រាស់បានអញ្ជើញចូលរួមព្រឹត្តិការណ៍រួចហើយ'
-    update_fail: 'បរាជ័យ៖ ធ្វើបច្ចុប្បន្នភាពអ្នកប្រើប្រាស់អញ្ជើញ'
+    url_not_found: "រកមិនឃើញតំណអញ្ជើញ ឬផុតកំណត់ហើយ"
+    accept_fail: "បរាជ័យក្នុងការទទួលយកការអញ្ជើញ"
+    url_expired: "តំណ​អញ្ជើញ​បាន​ផុត​កំណត់"
+    already_invited: "បរាជ័យ៖ អ្នកប្រើប្រាស់បានអញ្ជើញចូលរួមព្រឹត្តិការណ៍រួចហើយ"
+    update_fail: "បរាជ័យ៖ ធ្វើបច្ចុប្បន្នភាពអ្នកប្រើប្រាស់អញ្ជើញ"
 
   event_blazer_queries:
-    success: 'បានរក្សាទុកព្រឹត្តិការណ៍ដោយជោគជ័យ'
-    fail: 'បានរក្សាទុកព្រឹត្តិការណ៍រួចហើយs'
+    success: "បានរក្សាទុកព្រឹត្តិការណ៍ដោយជោគជ័យ"
+    fail: "បានរក្សាទុកព្រឹត្តិការណ៍រួចហើយs"

data/config/routes.rb

@@ -507,10 +507,6 @@ Spree::Core::Engine.add_routes do
           resources :id_cards, only: %i[create update destroy]
         end
 
-        resources :dynamic_fields, only: :index
-        resources :product_dynamic_fields, only: :index
-        resources :dynamic_field_options, only: :index
-
         resource :checkout, controller: :checkout, only: %i[update] do
           patch  :next
           patch  :advance

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.1.5-pre1'.freeze
+  VERSION = '2.1.5-pre3'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.1.5.pre.pre1
+  version: 2.1.5.pre.pre3
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-15 00:00:00.000000000 Z
+date: 2025-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -976,8 +976,6 @@ files:
 - app/controllers/spree/api/v2/tenant/checkout_controller.rb
 - app/controllers/spree/api/v2/tenant/cms_pages_controller.rb
 - app/controllers/spree/api/v2/tenant/customer_notifications_controller.rb
-- app/controllers/spree/api/v2/tenant/dynamic_field_options_controller.rb
-- app/controllers/spree/api/v2/tenant/dynamic_fields_controller.rb
 - app/controllers/spree/api/v2/tenant/guests_controller.rb
 - app/controllers/spree/api/v2/tenant/homepage_sections_controller.rb
 - app/controllers/spree/api/v2/tenant/id_cards_controller.rb
@@ -986,7 +984,6 @@ files:
 - app/controllers/spree/api/v2/tenant/order_histories_controller.rb
 - app/controllers/spree/api/v2/tenant/pin_code_checkers_controller.rb
 - app/controllers/spree/api/v2/tenant/pin_code_generators_controller.rb
-- app/controllers/spree/api/v2/tenant/product_dynamic_fields_controller.rb
 - app/controllers/spree/api/v2/tenant/products_controller.rb
 - app/controllers/spree/api/v2/tenant/profile_images_controller.rb
 - app/controllers/spree/api/v2/tenant/reset_passwords_controller.rb
@@ -1145,7 +1142,6 @@ files:
 - app/interactors/spree_cm_commissioner/firebase_email_fetcher_cron_executor.rb
 - app/interactors/spree_cm_commissioner/firebase_id_token_provider.rb
 - app/interactors/spree_cm_commissioner/google_places_fetcher.rb
-- app/interactors/spree_cm_commissioner/guest_dynamic_fields_manager.rb
 - app/interactors/spree_cm_commissioner/guest_id_card_manager.rb
 - app/interactors/spree_cm_commissioner/guest_seat_updater.rb
 - app/interactors/spree_cm_commissioner/host_matcher.rb
@@ -1745,10 +1741,7 @@ files:
 - app/serializers/spree/v2/tenant/cart_serializer.rb
 - app/serializers/spree/v2/tenant/customer_notification_serializer.rb
 - app/serializers/spree/v2/tenant/digital_link_serializer.rb
-- app/serializers/spree/v2/tenant/dynamic_field_option_serializer.rb
-- app/serializers/spree/v2/tenant/dynamic_field_serializer.rb
 - app/serializers/spree/v2/tenant/guest_card_class_serializer.rb
-- app/serializers/spree/v2/tenant/guest_dynamic_field_serializer.rb
 - app/serializers/spree/v2/tenant/guest_serializer.rb
 - app/serializers/spree/v2/tenant/homepage_section_relatable_serializer.rb
 - app/serializers/spree/v2/tenant/homepage_section_serializer.rb
@@ -1761,7 +1754,6 @@ files:
 - app/serializers/spree/v2/tenant/order_serializer.rb
 - app/serializers/spree/v2/tenant/payment_method_group_serializer.rb
 - app/serializers/spree/v2/tenant/payment_method_serializer.rb
-- app/serializers/spree/v2/tenant/product_dynamic_field_serializer.rb
 - app/serializers/spree/v2/tenant/product_serializer.rb
 - app/serializers/spree/v2/tenant/reset_password_serializer.rb
 - app/serializers/spree/v2/tenant/role_serializer.rb

data/app/controllers/spree/api/v2/tenant/dynamic_field_options_controller.rb

@@ -1,32 +0,0 @@
-module Spree
-  module Api
-    module V2
-      module Tenant
-        class DynamicFieldOptionsController < BaseController
-          # override
-          def collection
-            return @collection if defined?(@collection)
-            return SpreeCmCommissioner::DynamicFieldOption.none if params[:dynamic_field_id].blank?
-
-            @collection = SpreeCmCommissioner::DynamicFieldOption
-                          .where(dynamic_field_id: params[:dynamic_field_id])
-                          .active
-                          .order(position: :asc)
-
-            @collection = @collection.where('value LIKE ?', "%#{params[:query]}%") if params[:query].present?
-            @collection
-          end
-
-          # override
-          def collection_serializer
-            Spree::V2::Tenant::DynamicFieldOptionSerializer
-          end
-
-          def model_class
-            SpreeCmCommissioner::DynamicFieldOption
-          end
-        end
-      end
-    end
-  end
-end

data/app/controllers/spree/api/v2/tenant/dynamic_fields_controller.rb

@@ -1,38 +0,0 @@
-module Spree
-  module Api
-    module V2
-      module Tenant
-        class DynamicFieldsController < BaseController
-          before_action :load_product, only: :index
-
-          # override
-          def collection
-            return @collection if defined?(@collection)
-
-            dynamic_fields = @product.dynamic_fields.includes(:dynamic_field_options)
-            if params[:phase].present?
-              requested_phase = params[:phase].to_s
-              if SpreeCmCommissioner::DynamicField.data_fill_stages.key?(requested_phase)
-                dynamic_fields = dynamic_fields.where(data_fill_stage: requested_phase)
-              end
-            end
-
-            @collection = dynamic_fields.order(:position)
-          end
-
-          private
-
-          def load_product
-            return render_error_payload({ error: 'product_id is required' }, 400) if params[:product_id].blank?
-
-            @product ||= Spree::Product.find(params[:product_id])
-          end
-
-          def collection_serializer
-            Spree::V2::Tenant::DynamicFieldSerializer
-          end
-        end
-      end
-    end
-  end
-end

data/app/controllers/spree/api/v2/tenant/product_dynamic_fields_controller.rb

@@ -1,41 +0,0 @@
-module Spree
-  module Api
-    module V2
-      module Tenant
-        class ProductDynamicFieldsController < BaseController
-          before_action :load_product, only: :index
-
-          # override
-          def collection
-            return @collection if defined?(@collection)
-
-            product_dynamic_fields = @product.product_dynamic_fields.includes(dynamic_field: :dynamic_field_options)
-
-            if params[:phase].present?
-              requested_phase = params[:phase].to_s
-              if SpreeCmCommissioner::DynamicField.data_fill_stages.key?(requested_phase)
-                product_dynamic_fields = product_dynamic_fields.joins(:dynamic_field)
-                                                               .where(dynamic_field: { data_fill_stage: requested_phase })
-                                                               .order(:position)
-              end
-            end
-
-            @collection = product_dynamic_fields.order(:section)
-          end
-
-          private
-
-          def load_product
-            return render_error_payload({ error: 'product_id is required' }, 400) if params[:product_id].blank?
-
-            @product ||= Spree::Product.find(params[:product_id])
-          end
-
-          def collection_serializer
-            Spree::V2::Tenant::ProductDynamicFieldSerializer
-          end
-        end
-      end
-    end
-  end
-end

data/app/interactors/spree_cm_commissioner/guest_dynamic_fields_manager.rb

@@ -1,33 +0,0 @@
-module SpreeCmCommissioner
-  class GuestDynamicFieldsManager < BaseInteractor
-    delegate :resource, :dynamic_fields_attributes, to: :context
-
-    def call
-      return if dynamic_fields_attributes.blank?
-
-      dynamic_fields_attributes.each { |attr| upsert_or_destroy_field(attr) }
-    end
-
-    private
-
-    def upsert_or_destroy_field(attr)
-      if attr[:_destroy] == '1' && attr[:id].present?
-        resource.guest_dynamic_fields.find_by(id: attr[:id])&.destroy!
-        return
-      end
-
-      return if attr[:dynamic_field_id].blank?
-
-      field = attr[:id].present? ? resource.guest_dynamic_fields.find(attr[:id]) : resource.guest_dynamic_fields.build
-      field.assign_attributes(attr.except(:id, :_destroy))
-      associate_dynamic_field_option(field)
-      field.save!
-    end
-
-    def associate_dynamic_field_option(field)
-      return unless field.value.to_s.match?(/\A\d+\z/)
-
-      field.dynamic_field_option = field.dynamic_field.dynamic_field_options.find_by(id: field.value.to_i)
-    end
-  end
-end

data/app/serializers/spree/v2/tenant/dynamic_field_option_serializer.rb

@@ -1,9 +0,0 @@
-module Spree
-  module V2
-    module Tenant
-      class DynamicFieldOptionSerializer < BaseSerializer
-        attributes :id, :value, :dynamic_field_id, :status, :position
-      end
-    end
-  end
-end

data/app/serializers/spree/v2/tenant/dynamic_field_serializer.rb

@@ -1,11 +0,0 @@
-module Spree
-  module V2
-    module Tenant
-      class DynamicFieldSerializer < BaseSerializer
-        attributes :id, :label, :data_type, :vendor_id, :multiple_select, :position, :data_fill_stage
-
-        has_many :dynamic_field_options, serializer: Spree::V2::Tenant::DynamicFieldOptionSerializer
-      end
-    end
-  end
-end

data/app/serializers/spree/v2/tenant/guest_dynamic_field_serializer.rb

@@ -1,12 +0,0 @@
-module Spree
-  module V2
-    module Tenant
-      class GuestDynamicFieldSerializer < BaseSerializer
-        attributes :id, :value, :guest_id, :dynamic_field_id, :dynamic_field_option_id, :created_at, :updated_at
-
-        belongs_to :dynamic_field, serializer: Spree::V2::Tenant::DynamicFieldSerializer
-        belongs_to :dynamic_field_option, serializer: Spree::V2::Tenant::DynamicFieldOptionSerializer
-      end
-    end
-  end
-end

data/app/serializers/spree/v2/tenant/product_dynamic_field_serializer.rb

@@ -1,11 +0,0 @@
-module Spree
-  module V2
-    module Tenant
-      class ProductDynamicFieldSerializer < BaseSerializer
-        attributes :id, :product_id, :dynamic_field_id, :section
-
-        belongs_to :dynamic_field, serializer: Spree::V2::Tenant::DynamicFieldSerializer
-      end
-    end
-  end
-end