spree_cm_commissioner 2.0.3 → 2.1.0.pre.pre2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.0.pre.pre2
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-11 00:00:00.000000000 Z
+date: 2025-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -464,6 +464,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: paper_trail
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '16.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '16.0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: connection_pool
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -738,7 +794,6 @@ files:
 - app/controllers/concerns/spree_cm_commissioner/events/role_authorization.rb
 - app/controllers/concerns/spree_cm_commissioner/exception_notificable.rb
 - app/controllers/concerns/spree_cm_commissioner/order_concern.rb
-- app/controllers/concerns/spree_cm_commissioner/transit/taxon_bitwise.rb
 - app/controllers/concerns/spree_cm_commissioner/waiting_room_authorization.rb
 - app/controllers/spree/admin/account_deletions_controller.rb
 - app/controllers/spree/admin/base_controller_decorator.rb
@@ -765,8 +820,10 @@ files:
 - app/controllers/spree/admin/id_cards_controller.rb
 - app/controllers/spree/admin/import_existing_orders_controller.rb
 - app/controllers/spree/admin/import_new_orders_controller.rb
+- app/controllers/spree/admin/inventory_items_controller.rb
 - app/controllers/spree/admin/kyc_controller.rb
 - app/controllers/spree/admin/line_items_controller.rb
+- app/controllers/spree/admin/locations_controller.rb
 - app/controllers/spree/admin/master_variant_controller.rb
 - app/controllers/spree/admin/metafields_controller.rb
 - app/controllers/spree/admin/nearby_places_controller.rb
@@ -837,6 +894,7 @@ files:
 - app/controllers/spree/api/v2/platform/seat_number_layouts_controller.rb
 - app/controllers/spree/api/v2/platform/taxons_controller_decorator.rb
 - app/controllers/spree/api/v2/resource_controller_decorator.rb
+- app/controllers/spree/api/v2/storefront/accommodations/variants_controller.rb
 - app/controllers/spree/api/v2/storefront/accommodations_controller.rb
 - app/controllers/spree/api/v2/storefront/account/orders_controller_decorator.rb
 - app/controllers/spree/api/v2/storefront/account/preferred_payment_method_controller.rb
@@ -853,6 +911,7 @@ files:
 - app/controllers/spree/api/v2/storefront/confirm_pin_code_checkers_controller.rb
 - app/controllers/spree/api/v2/storefront/customer_notifications_controller.rb
 - app/controllers/spree/api/v2/storefront/dynamic_field_options_controller.rb
+- app/controllers/spree/api/v2/storefront/dynamic_fields_controller.rb
 - app/controllers/spree/api/v2/storefront/events_controller.rb
 - app/controllers/spree/api/v2/storefront/google_wallet_object_tokens_controller.rb
 - app/controllers/spree/api/v2/storefront/guest_card_classes_controller.rb
@@ -863,6 +922,7 @@ files:
 - app/controllers/spree/api/v2/storefront/homepage_data_controller.rb
 - app/controllers/spree/api/v2/storefront/homepage_sections_controller.rb
 - app/controllers/spree/api/v2/storefront/id_cards_controller.rb
+- app/controllers/spree/api/v2/storefront/inventory_items_controller.rb
 - app/controllers/spree/api/v2/storefront/line_item_qrs_controller.rb
 - app/controllers/spree/api/v2/storefront/line_items_controller.rb
 - app/controllers/spree/api/v2/storefront/nearby_places_controller.rb
@@ -884,6 +944,10 @@ files:
 - app/controllers/spree/api/v2/storefront/reset_passwords_controller.rb
 - app/controllers/spree/api/v2/storefront/s3_signed_urls_controller.rb
 - app/controllers/spree/api/v2/storefront/self_check_in_controller.rb
+- app/controllers/spree/api/v2/storefront/transit/draft_orders_controller.rb
+- app/controllers/spree/api/v2/storefront/trip_places_controller.rb
+- app/controllers/spree/api/v2/storefront/trip_search_controller.rb
+- app/controllers/spree/api/v2/storefront/trips_controller.rb
 - app/controllers/spree/api/v2/storefront/user_account_linkages_controller.rb
 - app/controllers/spree/api/v2/storefront/user_contacts_controller.rb
 - app/controllers/spree/api/v2/storefront/user_deletion_reasons_controller.rb
@@ -1014,7 +1078,8 @@ files:
 - app/factory/spree_cm_commissioner/invite_guest_claimed_telegram_message_factory.rb
 - app/factory/spree_cm_commissioner/order_telegram_message_factory.rb
 - app/factory/spree_cm_commissioner/telegram_message_factory.rb
-- app/finders/spree_cm_commissioner/line_items/find_by_variant_decorator.rb
+- app/finders/spree_cm_commissioner/accommodations/find.rb
+- app/finders/spree_cm_commissioner/accommodations/find_variant.rb
 - app/finders/spree_cm_commissioner/orders/find.rb
 - app/finders/spree_cm_commissioner/orders/find_by_state.rb
 - app/finders/spree_cm_commissioner/payment_methods/group_by_bank.rb
@@ -1050,6 +1115,7 @@ files:
 - app/interactors/spree_cm_commissioner/asset_links_fetcher.rb
 - app/interactors/spree_cm_commissioner/base_interactor.rb
 - app/interactors/spree_cm_commissioner/bib_number_swapper.rb
+- app/interactors/spree_cm_commissioner/billing_address_creator.rb
 - app/interactors/spree_cm_commissioner/chatrace_order_creator.rb
 - app/interactors/spree_cm_commissioner/check_in_bulk_creator.rb
 - app/interactors/spree_cm_commissioner/check_in_destroyer.rb
@@ -1066,9 +1132,11 @@ files:
 - app/interactors/spree_cm_commissioner/customer_promotion_creator.rb
 - app/interactors/spree_cm_commissioner/enqueue_cart/add_item.rb
 - app/interactors/spree_cm_commissioner/enqueue_cart/add_item_status_marker.rb
+- app/interactors/spree_cm_commissioner/ensure_correct_product_type.rb
 - app/interactors/spree_cm_commissioner/event_line_items_date_syncer.rb
 - app/interactors/spree_cm_commissioner/event_qr_generator.rb
 - app/interactors/spree_cm_commissioner/existing_account_checker.rb
+- app/interactors/spree_cm_commissioner/fetch_facebook_user_data.rb
 - app/interactors/spree_cm_commissioner/firebase_email_fetcher.rb
 - app/interactors/spree_cm_commissioner/firebase_email_fetcher_cron_executor.rb
 - app/interactors/spree_cm_commissioner/firebase_id_token_provider.rb
@@ -1079,8 +1147,10 @@ files:
 - app/interactors/spree_cm_commissioner/image_saver.rb
 - app/interactors/spree_cm_commissioner/import_csv_template_downloader.rb
 - app/interactors/spree_cm_commissioner/imported_csv_downloader.rb
+- app/interactors/spree_cm_commissioner/intercity_taxi_order_creator.rb
 - app/interactors/spree_cm_commissioner/international_mobile_formatter.rb
 - app/interactors/spree_cm_commissioner/invalidate_cache_request.rb
+- app/interactors/spree_cm_commissioner/inventory_item_syncer.rb
 - app/interactors/spree_cm_commissioner/invoice_creator.rb
 - app/interactors/spree_cm_commissioner/media/signed_cookie_generator.rb
 - app/interactors/spree_cm_commissioner/media/signed_path_generator.rb
@@ -1116,9 +1186,15 @@ files:
 - app/interactors/spree_cm_commissioner/sms.rb
 - app/interactors/spree_cm_commissioner/sqs/media_convert_job_status.rb
 - app/interactors/spree_cm_commissioner/state_updater.rb
+- app/interactors/spree_cm_commissioner/stock/inventory_item_resetter.rb
+- app/interactors/spree_cm_commissioner/stock/inventory_items_adjuster.rb
+- app/interactors/spree_cm_commissioner/stock/inventory_items_generator.rb
+- app/interactors/spree_cm_commissioner/stock/permanent_inventory_items_generator.rb
+- app/interactors/spree_cm_commissioner/stock/stock_movement_creator.rb
 - app/interactors/spree_cm_commissioner/subscriptions_order_creator.rb
 - app/interactors/spree_cm_commissioner/subscriptions_order_cron_executor.rb
 - app/interactors/spree_cm_commissioner/subscriptions_prepaid_order_creator.rb
+- app/interactors/spree_cm_commissioner/taxi_trip_creator.rb
 - app/interactors/spree_cm_commissioner/telegram_chats_auto_finder.rb
 - app/interactors/spree_cm_commissioner/telegram_chats_finder.rb
 - app/interactors/spree_cm_commissioner/telegram_debug_pin_code_sender.rb
@@ -1128,11 +1204,15 @@ files:
 - app/interactors/spree_cm_commissioner/telegram_web_app_vendor_user_authorizer.rb
 - app/interactors/spree_cm_commissioner/telegram_web_app_vendor_user_checker.rb
 - app/interactors/spree_cm_commissioner/transactional_email_sender.rb
+- app/interactors/spree_cm_commissioner/transit/draft_order_creator.rb
+- app/interactors/spree_cm_commissioner/trip_clone_creator.rb
 - app/interactors/spree_cm_commissioner/unique_device_token_cron_executor.rb
 - app/interactors/spree_cm_commissioner/update_payment_gateway_status.rb
 - app/interactors/spree_cm_commissioner/user_contact_updater.rb
 - app/interactors/spree_cm_commissioner/user_device_token_deregister.rb
 - app/interactors/spree_cm_commissioner/user_device_token_register.rb
+- app/interactors/spree_cm_commissioner/user_fb_token_authenticator.rb
+- app/interactors/spree_cm_commissioner/user_fb_token_checker.rb
 - app/interactors/spree_cm_commissioner/user_forgotten_password_updater.rb
 - app/interactors/spree_cm_commissioner/user_id_token_authenticator.rb
 - app/interactors/spree_cm_commissioner/user_id_token_checker.rb
@@ -1140,10 +1220,13 @@ files:
 - app/interactors/spree_cm_commissioner/user_order_transfer_handler.rb
 - app/interactors/spree_cm_commissioner/user_password_authenticator.rb
 - app/interactors/spree_cm_commissioner/user_pin_code_authenticator.rb
+- app/interactors/spree_cm_commissioner/user_registration_with_fb_token.rb
 - app/interactors/spree_cm_commissioner/user_registration_with_id_token.rb
 - app/interactors/spree_cm_commissioner/user_telegram_web_app_authenticator.rb
 - app/interactors/spree_cm_commissioner/user_vattanac_bank_web_app_authenticator.rb
+- app/interactors/spree_cm_commissioner/variant_block_updater.rb
 - app/interactors/spree_cm_commissioner/vattanac_bank_initiator.rb
+- app/interactors/spree_cm_commissioner/vehicle_updater.rb
 - app/interactors/spree_cm_commissioner/vendor_nearby_place_builder.rb
 - app/interactors/spree_cm_commissioner/vendor_updater.rb
 - app/interactors/spree_cm_commissioner/video_on_demand_creator.rb
@@ -1165,6 +1248,7 @@ files:
 - app/jobs/spree_cm_commissioner/customer_notification_cron_job.rb
 - app/jobs/spree_cm_commissioner/customer_notification_sender_job.rb
 - app/jobs/spree_cm_commissioner/enqueue_cart/add_item_job.rb
+- app/jobs/spree_cm_commissioner/ensure_correct_product_type_job.rb
 - app/jobs/spree_cm_commissioner/ensure_event_for_product_line_item_guests_job.rb
 - app/jobs/spree_cm_commissioner/ensure_event_id_for_guests_job.rb
 - app/jobs/spree_cm_commissioner/event_line_items_date_syncer_job.rb
@@ -1172,6 +1256,7 @@ files:
 - app/jobs/spree_cm_commissioner/firebase_email_fetcher_job.rb
 - app/jobs/spree_cm_commissioner/import_order_job.rb
 - app/jobs/spree_cm_commissioner/invalidate_cache_request_job.rb
+- app/jobs/spree_cm_commissioner/inventory_item_syncer_job.rb
 - app/jobs/spree_cm_commissioner/option_type_variants_public_metadata_updater_job.rb
 - app/jobs/spree_cm_commissioner/option_value_variants_public_metadata_updater_job.rb
 - app/jobs/spree_cm_commissioner/order_complete_telegram_sender_job.rb
@@ -1181,6 +1266,9 @@ files:
 - app/jobs/spree_cm_commissioner/sms_job.rb
 - app/jobs/spree_cm_commissioner/sms_pin_code_job.rb
 - app/jobs/spree_cm_commissioner/state_job.rb
+- app/jobs/spree_cm_commissioner/stock/inventory_items_adjuster_job.rb
+- app/jobs/spree_cm_commissioner/stock/inventory_items_generator_job.rb
+- app/jobs/spree_cm_commissioner/stock/permanent_inventory_items_generator_job.rb
 - app/jobs/spree_cm_commissioner/subscription_order_executor_job.rb
 - app/jobs/spree_cm_commissioner/telegram_debug_pin_code_sender_job.rb
 - app/jobs/spree_cm_commissioner/telegram_notification_sender_job.rb
@@ -1205,10 +1293,12 @@ files:
 - app/models/concerns/spree_cm_commissioner/kyc_bitwise.rb
 - app/models/concerns/spree_cm_commissioner/line_item_durationable.rb
 - app/models/concerns/spree_cm_commissioner/line_item_guests_concern.rb
+- app/models/concerns/spree_cm_commissioner/line_item_transitable.rb
 - app/models/concerns/spree_cm_commissioner/line_items_filter_scope.rb
 - app/models/concerns/spree_cm_commissioner/metafield.rb
 - app/models/concerns/spree_cm_commissioner/option_type_attr_type.rb
 - app/models/concerns/spree_cm_commissioner/option_value_attr_type.rb
+- app/models/concerns/spree_cm_commissioner/order_seatable.rb
 - app/models/concerns/spree_cm_commissioner/order_state_machine.rb
 - app/models/concerns/spree_cm_commissioner/parameterize_name.rb
 - app/models/concerns/spree_cm_commissioner/participation_type_bitwise.rb
@@ -1225,6 +1315,7 @@ files:
 - app/models/concerns/spree_cm_commissioner/user_notification.rb
 - app/models/concerns/spree_cm_commissioner/user_preference.rb
 - app/models/concerns/spree_cm_commissioner/variant_options_concern.rb
+- app/models/concerns/spree_cm_commissioner/vehicle_type.rb
 - app/models/concerns/spree_cm_commissioner/vendor_preference.rb
 - app/models/concerns/spree_cm_commissioner/vendor_promotable.rb
 - app/models/concerns/spree_cm_commissioner/video_on_demand_bitwise.rb
@@ -1237,7 +1328,7 @@ files:
 - app/models/spree_cm_commissioner/back_image.rb
 - app/models/spree_cm_commissioner/base.rb
 - app/models/spree_cm_commissioner/blazer_queryable.rb
-- app/models/spree_cm_commissioner/branch.rb
+- app/models/spree_cm_commissioner/block.rb
 - app/models/spree_cm_commissioner/check_in.rb
 - app/models/spree_cm_commissioner/check_in_ability.rb
 - app/models/spree_cm_commissioner/check_in_record.rb
@@ -1286,6 +1377,8 @@ files:
 - app/models/spree_cm_commissioner/image_methods_decorator.rb
 - app/models/spree_cm_commissioner/import.rb
 - app/models/spree_cm_commissioner/imports/import_order.rb
+- app/models/spree_cm_commissioner/inventory.rb
+- app/models/spree_cm_commissioner/inventory_item.rb
 - app/models/spree_cm_commissioner/invite.rb
 - app/models/spree_cm_commissioner/invite_guest.rb
 - app/models/spree_cm_commissioner/invite_team.rb
@@ -1293,7 +1386,6 @@ files:
 - app/models/spree_cm_commissioner/invite_user_taxon.rb
 - app/models/spree_cm_commissioner/invoice.rb
 - app/models/spree_cm_commissioner/line_item_decorator.rb
-- app/models/spree_cm_commissioner/line_item_seat.rb
 - app/models/spree_cm_commissioner/notification.rb
 - app/models/spree_cm_commissioner/notification_taxon.rb
 - app/models/spree_cm_commissioner/oauth_access_token_decorator.rb
@@ -1301,7 +1393,6 @@ files:
 - app/models/spree_cm_commissioner/option_type_decorator.rb
 - app/models/spree_cm_commissioner/option_value_decorator.rb
 - app/models/spree_cm_commissioner/option_value_vehicle.rb
-- app/models/spree_cm_commissioner/option_value_vehicle_type.rb
 - app/models/spree_cm_commissioner/option_value_vendor.rb
 - app/models/spree_cm_commissioner/order/address_book_decorator.rb
 - app/models/spree_cm_commissioner/order_decorator.rb
@@ -1320,6 +1411,7 @@ files:
 - app/models/spree_cm_commissioner/pin_code_telegram.rb
 - app/models/spree_cm_commissioner/pin_code_update_user_login.rb
 - app/models/spree_cm_commissioner/place.rb
+- app/models/spree_cm_commissioner/price_decorator.rb
 - app/models/spree_cm_commissioner/product_completion_step.rb
 - app/models/spree_cm_commissioner/product_completion_steps/chatrace_telegram.rb
 - app/models/spree_cm_commissioner/product_decorator.rb
@@ -1341,10 +1433,25 @@ files:
 - app/models/spree_cm_commissioner/promotion_decorator.rb
 - app/models/spree_cm_commissioner/property_decorator.rb
 - app/models/spree_cm_commissioner/prototype_decorator.rb
+- app/models/spree_cm_commissioner/redis_stock/cached_inventory_items_builder.rb
+- app/models/spree_cm_commissioner/redis_stock/inventory_updater.rb
+- app/models/spree_cm_commissioner/redis_stock/line_items_cached_inventory_items_builder.rb
+- app/models/spree_cm_commissioner/redis_stock/variant_cached_inventory_items_builder.rb
+- app/models/spree_cm_commissioner/reserved_block.rb
 - app/models/spree_cm_commissioner/role_decorator.rb
 - app/models/spree_cm_commissioner/role_permission.rb
 - app/models/spree_cm_commissioner/s3_presigned_url.rb
 - app/models/spree_cm_commissioner/s3_presigned_url_builder.rb
+- app/models/spree_cm_commissioner/saved_guest.rb
+- app/models/spree_cm_commissioner/seat_layout.rb
+- app/models/spree_cm_commissioner/seat_section.rb
+- app/models/spree_cm_commissioner/seats/blocks_canceler.rb
+- app/models/spree_cm_commissioner/seats/blocks_holder.rb
+- app/models/spree_cm_commissioner/seats/blocks_reserver.rb
+- app/models/spree_cm_commissioner/seats/errors/blocks_are_on_hold_by_other_guest.rb
+- app/models/spree_cm_commissioner/seats/errors/blocks_are_reserved_by_other_guest.rb
+- app/models/spree_cm_commissioner/seats/errors/blocks_are_reserved_by_same_guest.rb
+- app/models/spree_cm_commissioner/seats/errors/unable_to_save_reserved_block_record.rb
 - app/models/spree_cm_commissioner/service_calendar.rb
 - app/models/spree_cm_commissioner/sms_log.rb
 - app/models/spree_cm_commissioner/state_change_decorator.rb
@@ -1353,9 +1460,9 @@ files:
 - app/models/spree_cm_commissioner/stock/availability_validator_decorator.rb
 - app/models/spree_cm_commissioner/stock/inventory_unit_builder_decorator.rb
 - app/models/spree_cm_commissioner/stock/line_item_availability_checker.rb
+- app/models/spree_cm_commissioner/stock/order_availability_checker.rb
 - app/models/spree_cm_commissioner/stock_item_decorator.rb
 - app/models/spree_cm_commissioner/stock_location_decorator.rb
-- app/models/spree_cm_commissioner/stop.rb
 - app/models/spree_cm_commissioner/store_decorator.rb
 - app/models/spree_cm_commissioner/subscription.rb
 - app/models/spree_cm_commissioner/taxon_app_banner.rb
@@ -1385,6 +1492,7 @@ files:
 - app/models/spree_cm_commissioner/user_place.rb
 - app/models/spree_cm_commissioner/user_profile.rb
 - app/models/spree_cm_commissioner/user_taxon.rb
+- app/models/spree_cm_commissioner/variant_block.rb
 - app/models/spree_cm_commissioner/variant_decorator.rb
 - app/models/spree_cm_commissioner/variant_guest_card_class.rb
 - app/models/spree_cm_commissioner/variant_options.rb
@@ -1392,8 +1500,6 @@ files:
 - app/models/spree_cm_commissioner/vehicle.rb
 - app/models/spree_cm_commissioner/vehicle_option_type.rb
 - app/models/spree_cm_commissioner/vehicle_photo.rb
-- app/models/spree_cm_commissioner/vehicle_seat.rb
-- app/models/spree_cm_commissioner/vehicle_type.rb
 - app/models/spree_cm_commissioner/vendor_app_promotion_banner.rb
 - app/models/spree_cm_commissioner/vendor_decorator.rb
 - app/models/spree_cm_commissioner/vendor_logo.rb
@@ -1402,7 +1508,6 @@ files:
 - app/models/spree_cm_commissioner/vendor_photo.rb
 - app/models/spree_cm_commissioner/vendor_place.rb
 - app/models/spree_cm_commissioner/vendor_promotion_rule.rb
-- app/models/spree_cm_commissioner/vendor_stop.rb
 - app/models/spree_cm_commissioner/vendor_web_promotion_banner.rb
 - app/models/spree_cm_commissioner/video.rb
 - app/models/spree_cm_commissioner/video_on_demand.rb
@@ -1449,6 +1554,7 @@ files:
 - app/overrides/spree/admin/products/_form/allow_self_check_in.html.erb.deface
 - app/overrides/spree/admin/products/_form/available_on.html.erb.deface
 - app/overrides/spree/admin/products/_form/discontinue_on.html.erb.deface
+- app/overrides/spree/admin/products/_form/industry_taxons.html.erb.deface
 - app/overrides/spree/admin/products/_form/need_confirmation_checkbox.html.erb.deface
 - app/overrides/spree/admin/products/_form/option_types.html.erb.deface
 - app/overrides/spree/admin/products/_form/product_types.html.erb.deface
@@ -1457,6 +1563,7 @@ files:
 - app/overrides/spree/admin/products/_form/required_self_check_in_location.html.erb.deface
 - app/overrides/spree/admin/products/_form/reveal_description_to_user.html.erb.deface
 - app/overrides/spree/admin/products/_form/subscribable_checkbox.html.erb.deface
+- app/overrides/spree/admin/products/_form/taxons.html.erb.deface
 - app/overrides/spree/admin/products/_form/use_video_as_default.html.erb.deface
 - app/overrides/spree/admin/products/edit/clear_cache_button.html.erb.deface
 - app/overrides/spree/admin/products/index/product_vendor_link.html.erb.deface
@@ -1492,6 +1599,7 @@ files:
 - app/overrides/spree/admin/shared/_product_tabs/video_on_demand.html.erb.deface
 - app/overrides/spree/admin/shared/_store_switcher/store_logo.html.erb.deface
 - app/overrides/spree/admin/shared/_version/deploy_tag_version_badge.html.erb.deface
+- app/overrides/spree/admin/shared/sub_menu/_configuration/locations_tab.html.erb.deface
 - app/overrides/spree/admin/shared/sub_menu/_configuration/menu_items.html.erb.deface
 - app/overrides/spree/admin/shared/sub_menu/_integrations/telegram_bot.html.erb.deface
 - app/overrides/spree/admin/shared/sub_menu/_orders/import_order.html.erb.deface
@@ -1565,17 +1673,16 @@ files:
 - app/queries/spree_cm_commissioner/subscription_revenue_overview_query.rb
 - app/queries/spree_cm_commissioner/tickets_searcher_query.rb
 - app/queries/spree_cm_commissioner/trip_query.rb
-- app/queries/spree_cm_commissioner/trip_search_query.rb
 - app/queries/spree_cm_commissioner/trip_seat_layout_query.rb
 - app/queries/spree_cm_commissioner/users_by_event_fetcher_query.rb
-- app/queries/spree_cm_commissioner/variant_availability/non_permanent_stock_query.rb
-- app/queries/spree_cm_commissioner/variant_availability/permanent_stock_query.rb
-- app/queries/spree_cm_commissioner/vendor_stop_place_query.rb
 - app/request_schemas/spree_cm_commissioner/accommodation_request_schema.rb
 - app/request_schemas/spree_cm_commissioner/application_request_schema.rb
+- app/request_schemas/spree_cm_commissioner/inventory_item_schema.rb
 - app/request_schemas/spree_cm_commissioner/profile_image_request_schema.rb
+- app/request_schemas/spree_cm_commissioner/trip_search_request_schema.rb
 - app/request_schemas/spree_cm_commissioner/user_account_linkage_request_schema.rb
 - app/request_schemas/spree_cm_commissioner/user_profile_request_schema.rb
+- app/request_schemas/spree_cm_commissioner/variant_request_schema.rb
 - app/serializables/spree_cm_commissioner/event_chart.rb
 - app/serializables/spree_cm_commissioner/event_ticket_aggregator.rb
 - app/serializables/spree_cm_commissioner/pie_chart_event_aggregator.rb
@@ -1678,9 +1785,11 @@ files:
 - app/serializers/spree_cm_commissioner/v2/operator/pie_chart_event_aggregator_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/operator/product_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/operator/taxon_serializer.rb
+- app/serializers/spree_cm_commissioner/v2/storefront/amenity_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/asset_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/base_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/bib_card_class_serializer.rb
+- app/serializers/spree_cm_commissioner/v2/storefront/block_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/booking_card_class_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/brand_taxon_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/calculator_serializer.rb
@@ -1698,6 +1807,7 @@ files:
 - app/serializers/spree_cm_commissioner/v2/storefront/homepage_banner_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/homepage_data_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/icon_serializer_decorator.rb
+- app/serializers/spree_cm_commissioner/v2/storefront/inventory_item_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/menu_item_serializer_decorator.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/payment_method_group_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/pin_code_serializer.rb
@@ -1707,12 +1817,25 @@ files:
 - app/serializers/spree_cm_commissioner/v2/storefront/promotion_rule_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/promotion_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/qr_url_serializer.rb
+- app/serializers/spree_cm_commissioner/v2/storefront/reserved_block_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/reset_password_serializer.rb
+- app/serializers/spree_cm_commissioner/v2/storefront/saved_guest_serializer.rb
+- app/serializers/spree_cm_commissioner/v2/storefront/seat_layout_serializer.rb
+- app/serializers/spree_cm_commissioner/v2/storefront/seat_section_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/self_check_in_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/stock_item_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/taxon_include_product_serializer.rb
+- app/serializers/spree_cm_commissioner/v2/storefront/trip_place_serializer.rb
+- app/serializers/spree_cm_commissioner/v2/storefront/trip_query_result_serializer.rb
+- app/serializers/spree_cm_commissioner/v2/storefront/trip_result_serializer.rb
+- app/serializers/spree_cm_commissioner/v2/storefront/trip_serializer.rb
+- app/serializers/spree_cm_commissioner/v2/storefront/trip_stop_serializer.rb
+- app/serializers/spree_cm_commissioner/v2/storefront/trip_variant_serializer.rb
+- app/serializers/spree_cm_commissioner/v2/storefront/trip_vehicle_serializer.rb
+- app/serializers/spree_cm_commissioner/v2/storefront/trip_vendor_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/user_contact_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/user_identity_provider_serializer.rb
+- app/serializers/spree_cm_commissioner/v2/storefront/variant_block_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/vendor_include_product_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/video_serializer.rb
 - app/serializers/spree_cm_commissioner/v2/storefront/waiting_room_session_serializer.rb
@@ -1759,9 +1882,9 @@ files:
 - app/services/spree_cm_commissioner/role_permissions_loader.rb
 - app/services/spree_cm_commissioner/rsa_service.rb
 - app/services/spree_cm_commissioner/seeds/roles_decorator.rb
+- app/services/spree_cm_commissioner/transit/legs_builder_service.rb
 - app/services/spree_cm_commissioner/user_authenticator.rb
 - app/services/spree_cm_commissioner/user_roles_assigner.rb
-- app/services/spree_cm_commissioner/vehicle_option_value_creator.rb
 - app/services/spree_cm_commissioner/waiting_room_system_metadata_fetcher.rb
 - app/services/spree_cm_commissioner/waiting_room_system_metadata_setter.rb
 - app/services/spree_cm_commissioner/webhooks/subscribers/handle_request_decorator.rb
@@ -1854,10 +1977,15 @@ files:
 - app/views/spree/admin/import_new_orders/index.html.erb
 - app/views/spree/admin/import_new_orders/new.html.erb
 - app/views/spree/admin/import_new_orders/show.html.erb
+- app/views/spree/admin/inventory_items/show.html.erb
 - app/views/spree/admin/kyc/_form.html.erb
 - app/views/spree/admin/kyc/edit.html.erb
 - app/views/spree/admin/line_items/_form.html.erb
 - app/views/spree/admin/line_items/edit.html.erb
+- app/views/spree/admin/locations/_form.html.erb
+- app/views/spree/admin/locations/edit.html.erb
+- app/views/spree/admin/locations/index.html.erb
+- app/views/spree/admin/locations/new.html.erb
 - app/views/spree/admin/master_variant/_form.html.erb
 - app/views/spree/admin/master_variant/index.html.erb
 - app/views/spree/admin/metafields/_private_metafields_form.html.erb
@@ -1915,6 +2043,7 @@ files:
 - app/views/spree/admin/shared/sub_menu/_calendar.html.erb
 - app/views/spree/admin/shared/sub_menu/_homepage.html.erb
 - app/views/spree/admin/stock_managements/_variant_stock_items.html.erb
+- app/views/spree/admin/stock_managements/calendar.html.erb
 - app/views/spree/admin/stock_managements/index.html.erb
 - app/views/spree/admin/system/show.html.erb
 - app/views/spree/admin/taxon_childrens/index.html.erb
@@ -2211,6 +2340,7 @@ files:
 - config/initializers/doorkeeper.rb
 - config/initializers/exception_notification.rb
 - config/initializers/google_map.rb
+- config/initializers/paper_trail.rb
 - config/initializers/phonelib.rb
 - config/initializers/premailer_rails.rb
 - config/initializers/recaptcha_enterprise.rb
@@ -2477,6 +2607,7 @@ files:
 - db/migrate/20241219070959_add_page_path_to_cm_waiting_room_sessions.rb
 - db/migrate/20250116081414_remove_active_from_homepage_sections_relatables.rb
 - db/migrate/20250117092553_add_available_on_and_discontinue_on_to_homepage_section_relatables.rb
+- db/migrate/20250122000000_move_route_type_from_vehicles_to_trips.rb
 - db/migrate/20250122083010_create_cm_tenants.rb
 - db/migrate/20250122084511_add_tenant_id_to_spree_vendors.rb
 - db/migrate/20250123162946_add_tenant_id_to_spree_oauth_applications.rb
@@ -2495,6 +2626,7 @@ files:
 - db/migrate/20250304101907_create_spree_cm_commissioner_invite.rb
 - db/migrate/20250304101946_create_spree_cm_commissioner_invite_user_taxon.rb
 - db/migrate/20250304155234_add_meta_data_to_spree_vendors.rb
+- db/migrate/20250304293518_create_cm_inventory_items.rb
 - db/migrate/20250307013422_add_parent_id_to_cm_place.rb
 - db/migrate/20250307073003_add_tenant_id_to_cm_customer_notifications.rb
 - db/migrate/20250307083809_remove_tenant_id_from_cm_notifications.rb
@@ -2515,8 +2647,14 @@ files:
 - db/migrate/20250425084929_add_description_to_spree_prototypes.rb
 - db/migrate/20250425085938_add_preferences_to_spree_prototypes.rb
 - db/migrate/20250428025645_add_slug_to_spree_prototypes.rb
+- db/migrate/20250428092706_add_active_to_cm_customer_notifications.rb
+- db/migrate/20250428103550_remove_tenant_id_and_vendor_id_from_cm_customer_notifications.rb
+- db/migrate/20250429094228_add_lock_version_to_cm_inventory_items.rb
 - db/migrate/20250430091742_create_cm_taxon_option_types.rb
 - db/migrate/20250430092928_create_cm_taxon_option_values.rb
+- db/migrate/20250502025848_add_index_to_spree_products.rb
+- db/migrate/20250502030001_add_product_type_to_spree_variants.rb
+- db/migrate/20250502030002_add_product_type_to_spree_line_items.rb
 - db/migrate/20250506092929_add_trip_count_to_cm_vendor_stops.rb
 - db/migrate/20250509033437_create_spree_cm_commissioner_transactional_emails.rb
 - db/migrate/20250509075429_add_max_order_quantity_to_spree_product.rb
@@ -2533,6 +2671,7 @@ files:
 - db/migrate/20250531074036_create_spree_cm_commissioner_option_value_vehicle.rb
 - db/migrate/20250531074258_create_spree_cm_commissioner_vehicle_option_types.rb
 - db/migrate/20250602094751_add_host_to_cm_tenants.rb
+- db/migrate/20250603035256_add_inventory_item_to_spree_prices.rb
 - db/migrate/20250605024523_add_participation_type_to_spree_taxon.rb
 - db/migrate/20250606020914_create_cm_dynamic_fields.rb
 - db/migrate/20250606020958_create_cm_guest_dynamic_fields.rb
@@ -2543,6 +2682,21 @@ files:
 - db/migrate/20250611023548_add_country_code_to_guests.rb
 - db/migrate/20250612035937_add_intel_phone_number_to_guests.rb
 - db/migrate/20250616084219_add_description_to_cm_vendor_place.rb
+- db/migrate/20250619073724_drop_table_cm_line_item_seats.rb
+- db/migrate/20250619073812_drop_table_cm_vehicle_seats.rb
+- db/migrate/20250619073844_drop_table_cm_vehicle_types.rb
+- db/migrate/20250619073957_drop_table_cm_option_value_vehicle_types.rb
+- db/migrate/20250619082354_remove_unnecessary_fields_from_cm_places.rb
+- db/migrate/20250619082736_remove_route_type_from_spree_products.rb
+- db/migrate/20250619083055_remove_unnecessary_fields_from_spree_taxons.rb
+- db/migrate/20250620083055_remove_variant_id_from_cm_trips.rb
+- db/migrate/20250620090000_update_cm_trip_connections_to_use_cm_trips.rb
+- db/migrate/20250620090001_create_cm_seat_layouts.rb
+- db/migrate/20250620090002_create_cm_seat_sections.rb
+- db/migrate/20250620090003_create_cm_blocks.rb
+- db/migrate/20250624091005_create_cm_reserved_blocks.rb
+- db/migrate/20250626083642_create_cm_variant_blocks.rb
+- db/migrate/20250627023314_add_block_id_to_cm_guests.rb
 - db/migrate/20250630103536_create_cm_telegram_chats.rb
 - db/migrate/20250701093203_add_configurations_to_cm_dynamic_field.rb
 - db/migrate/20250702091305_add_dynamic_field_option_to_guest_dynamic_field.rb
@@ -2555,7 +2709,23 @@ files:
 - db/migrate/20250714121508_rename_cm_taxon_blazer_query_to_blazer_queryables.rb
 - db/migrate/20250714124323_make_cm_blazer_queryables_polymorphic.rb
 - db/migrate/20250715103333_remove_indexes_from_cm_user_identity_providers.rb
+- db/migrate/20250716022821_add_location_reference_to_cm_vendor_places.rb
+- db/migrate/20250716031743_drop_table_cm_vendor_stops.rb
+- db/migrate/20250717023824_add_vendor_reference_to_cm_trips.rb
+- db/migrate/20250717041414_add_location_place_reference_to_cm_trip_stops.rb
+- db/migrate/20250717042539_rename_cm_trip_stops_stop_id_column_to_stop_place_id.rb
+- db/migrate/20250717042707_rename_cm_trips_origin_and_destination_to_origin_place_and_destination_place.rb
 - db/migrate/20250718071620_add_data_fill_stage_to_dynamic_fields.rb
+- db/migrate/20250721080738_add_vehicle_type_to_cm_vehicles.rb
+- db/migrate/20250725092713_add_block_type_to_cm_blocks.rb
+- db/migrate/20250731062816_add_departure_time_and_arrival_time_to_trip_stop.rb
+- db/migrate/20250807033035_create_spree_cm_commissioner_saved_guests.rb
+- db/migrate/20250807040000_generate_pickup_time_integer_option_values.rb
+- db/migrate/20250808054835_add_saved_guest_reference_to_cm_blocks.rb
+- db/migrate/20250812015522_remove_unique_indexes_from_cm_user_identity_providers.rb
+- db/migrate/20250812121745_add_data_fill_stage_phase_to_cm_guests.rb
+- db/migrate/20250814073854_add_call_to_action_to_spree_products.rb
+- db/migrate/20250826013549_add_delete_at_to_cm_customer_notifications.rb
 - docker-compose.yml
 - docs/option_types/attr_types.md
 - docs/private_key.pem
@@ -2570,11 +2740,12 @@ files:
 - docs/webhook/sqs/params_job_submitted.json
 - lib/cm_app_logger.rb
 - lib/generators/spree_cm_commissioner/install/install_generator.rb
-- lib/generators/spree_cm_commissioner/install/templates/app/javascript/spree_cm_commissioner/utilities.js
+- lib/generators/spree_cm_commissioner/install/templates/app/javascript/spree_dashboard/spree_cm_commissioner/utilities.js
 - lib/generators/spree_cm_commissioner/install/templates/config/data/nationalities.yml
 - lib/generators/spree_cm_commissioner/install/templates/vendor/assets/javascript/spree_cm_commissioner/telegram/all.js
 - lib/generators/spree_cm_commissioner/install/templates/vendor/assets/stylesheets/spree_cm_commissioner/telegram/all.css
 - lib/spree_cm_commissioner.rb
+- lib/spree_cm_commissioner/cached_inventory_item.rb
 - lib/spree_cm_commissioner/calendar_event.rb
 - lib/spree_cm_commissioner/engine.rb
 - lib/spree_cm_commissioner/factories.rb
@@ -2588,16 +2759,14 @@ files:
 - lib/spree_cm_commissioner/test_helper/factories/asset_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/back_image_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/blazer_query_factory.rb
-- lib/spree_cm_commissioner/test_helper/factories/branch_factory.rb
+- lib/spree_cm_commissioner/test_helper/factories/block_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/check_in_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/cms_page_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/country_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/customer_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/customer_notification_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/customers_taxons_factory.rb
-- lib/spree_cm_commissioner/test_helper/factories/departure_time_option_type_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/device_token_factory.rb
-- lib/spree_cm_commissioner/test_helper/factories/duration_option_type_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/export_guest_csv_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/front_image_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/guest_factory.rb
@@ -2611,11 +2780,11 @@ files:
 - lib/spree_cm_commissioner/test_helper/factories/homepage_section_relatable_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/id_card_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/image_factory.rb
+- lib/spree_cm_commissioner/test_helper/factories/inventory_item_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/invite_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/invite_guests_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/invite_user_event_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/line_item_factory.rb
-- lib/spree_cm_commissioner/test_helper/factories/line_item_seat_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/notification_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/notification_taxons_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/oauth_access_token_factory.rb
@@ -2631,13 +2800,16 @@ files:
 - lib/spree_cm_commissioner/test_helper/factories/product_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/products_taxons_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/promotion_factory.rb
+- lib/spree_cm_commissioner/test_helper/factories/reserved_block_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/role.rb
 - lib/spree_cm_commissioner/test_helper/factories/role_permission_factory.rb
+- lib/spree_cm_commissioner/test_helper/factories/saved_guest_factory.rb
+- lib/spree_cm_commissioner/test_helper/factories/seat_layout_factory.rb
+- lib/spree_cm_commissioner/test_helper/factories/seat_section_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/service_calendar_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/sms_logs.rb
 - lib/spree_cm_commissioner/test_helper/factories/state_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/stock_location_factory.rb
-- lib/spree_cm_commissioner/test_helper/factories/stop_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/subscription_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/taxon_brand_logo_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/taxon_category_icon.rb
@@ -2647,16 +2819,16 @@ files:
 - lib/spree_cm_commissioner/test_helper/factories/telegram_bot_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/tenant_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/transactional_email_factory.rb
-- lib/spree_cm_commissioner/test_helper/factories/transit_place_factory.rb
+- lib/spree_cm_commissioner/test_helper/factories/trip_connection_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/trip_factory.rb
+- lib/spree_cm_commissioner/test_helper/factories/trip_stop_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/user_deletion_reasons_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/user_event_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/user_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/user_identity_provider_factory.rb
+- lib/spree_cm_commissioner/test_helper/factories/variant_block_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/variant_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/vehicle_factory.rb
-- lib/spree_cm_commissioner/test_helper/factories/vehicle_option_type_factory.rb
-- lib/spree_cm_commissioner/test_helper/factories/vehicle_type_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/vendor_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/vendor_logo_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/vendor_photo_factory.rb
@@ -2664,16 +2836,20 @@ files:
 - lib/spree_cm_commissioner/test_helper/factories/video_on_demand_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/webhook_subscriber_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/webhook_subscriber_rule_factory.rb
+- lib/spree_cm_commissioner/transit/leg.rb
+- lib/spree_cm_commissioner/transit/seat_selection.rb
 - lib/spree_cm_commissioner/trip_query_result.rb
 - lib/spree_cm_commissioner/trip_result.rb
-- lib/spree_cm_commissioner/trip_seat_layout_result.rb
 - lib/spree_cm_commissioner/user_session_jwt_token.rb
 - lib/spree_cm_commissioner/version.rb
+- lib/tasks/create_default_non_permanent_inventory_items.rake
 - lib/tasks/customer_notification_cron_scheduler.rake
+- lib/tasks/ensure_correct_product_type.rake
 - lib/tasks/ensure_event_for_guests.rake
 - lib/tasks/ensure_event_for_product_line_item_guests.rake
 - lib/tasks/ensure_number_for_line_items.rake
 - lib/tasks/fetch_email.rake
+- lib/tasks/generate_inventory_items.rake
 - lib/tasks/kh_location_option_values.rake
 - lib/tasks/kh_provinces.rake
 - lib/tasks/migrate_and_rebuild_place_hierarchy.rake
@@ -2709,9 +2885,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubygems_version: 3.4.1