spree_cm_commissioner 2.1.5.pre.pre1 → 2.1.5.pre.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d85338c01f8051cd2aff1de565907e13f401f0044b766cca7738056f1089a7d1
-  data.tar.gz: 32b15e97d40db31db7749ee684bb02f3b01bfaa44afc32bc79d1a259960fae50
+  metadata.gz: d8486b28317774d671766e586870afa3396fc006efd21ea825bdc6769985e4be
+  data.tar.gz: 60df005650d9f053548a82bb7aa3818dd36e3b6aec8773a5fe05c3c5bf7d5d5a
 SHA512:
-  metadata.gz: 3a2d72ee902e1a625713777268aa727d2c92e25cea7a912bd799dd999d4e99f0c7ec5eeb2e5cce49575205d4e01606cf0aa4776e5844074348728ce00eaa4efd
-  data.tar.gz: 5dc5ad4f7c7ff9121503d09fa49e67903b15cc86e21cbd468494fa2119ca758712410c3bb3896a1fa6013bb7e9429b793e6dac1856a676c67caf928950a8b271
+  metadata.gz: 16f526c38a5084769158d1a1cf643c77458f9a031adb21911f6b6699b2cd9421cb865d2de8d200bb7d4649aa30f79ef98273283aebf51a09ce25b45eeb1ae0c4
+  data.tar.gz: 894f3c5cb26b1506042a35a3fc36ac7d09b40828ee242715a47d83dc4141dcfb9ddcde3603e6a233b92df6aefab59ad0873778fa9f1ee286041ba262e6f95e9c

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.pre4)
       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/guests_controller.rb

@@ -9,6 +9,9 @@ module Spree
           # raise 404 when no order
           before_action :ensure_order
 
+          rescue_from ActiveRecord::RecordInvalid, with: :handle_record_invalid
+          rescue_from ActiveRecord::RecordNotFound, with: :handle_record_not_found
+
           # override
           def model_class
             SpreeCmCommissioner::Guest
@@ -100,6 +103,14 @@ module Spree
               dynamic_fields_attributes: guest_params[:guest_dynamic_fields_attributes]
             )
           end
+
+          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/models/concerns/spree_cm_commissioner/user_identity.rb

@@ -39,8 +39,7 @@ module SpreeCmCommissioner
         login = login.downcase
         parser = PhoneNumberParser.call(phone_number: login)
 
-        scope = Spree.user_class.all
-        scope = scope.where(tenant_id: tenant_id) if tenant_id.present?
+        scope = tenant_id.present? ? Spree.user_class.by_tenant(tenant_id) : Spree.user_class.by_non_tenant
 
         if parser.intel_phone_number.present?
           scope.find_by(intel_phone_number: parser.intel_phone_number)

data/app/models/spree_cm_commissioner/guest.rb

@@ -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 || []
 

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/user_decorator.rb

@@ -32,6 +32,7 @@ module SpreeCmCommissioner
       base.has_secure_password :confirm_pin_code, validations: false
 
       base.multi_tenant :tenant, class_name: 'SpreeCmCommissioner::Tenant'
+
       base.scope :by_tenant, -> (tenant_id) { where(tenant_id: tenant_id) }
       base.scope :by_non_tenant, -> { where(tenant_id: nil) }
       base.scope :vendor_users, -> (vendor_id) { joins(:role_users => :role).where(spree_roles: { vendor_id: vendor_id }).distinct }

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/guest_serializer.rb

@@ -13,7 +13,6 @@ 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
 

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,7 +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
 

data/db/migrate/20250902092904_add_section_to_cm_product_dynamic_fields.rb

@@ -0,0 +1,5 @@
+class AddSectionToCmProductDynamicFields < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_product_dynamic_fields, :section, :integer, if_not_exists: true
+  end
+end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.1.5-pre1'.freeze
+  VERSION = '2.1.5-pre4'.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.pre4
 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
@@ -977,7 +977,6 @@ files:
 - 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
@@ -2746,6 +2745,7 @@ files:
 - db/migrate/20250827022757_create_spree_cm_commissioner_check_in_rules.rb
 - db/migrate/20250827032901_add_check_in_session_to_check_ins.rb
 - db/migrate/20250827083828_add_unique_index_on_guest_id_check_in_session_id_to_cm_check_ins.rb
+- db/migrate/20250902092904_add_section_to_cm_product_dynamic_fields.rb
 - db/migrate/20250903085931_add_importable_to_cm_imports.rb
 - db/migrate/20250911100738_drop_cm_variant_blocks.rb
 - db/migrate/20250911100835_add_variant_id_to_cm_blocks.rb

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