spree_cm_commissioner 2.1.2 → 2.1.3.pre.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee0ae4eae84a0969d4e124d27edbd5f05f82439960fe814dab8221f9e7b486da
-  data.tar.gz: fce2acf06b539cd00604bc66d1ae0bb2b951c20a3d1769b1a37405b3b0bbe986
+  metadata.gz: 1b1bf8bbc92e68f9c6d475925cb6e45f64468be42f63495f6f0934ff396a8335
+  data.tar.gz: ebddd7396af6d5036a13656da0dd17f12c4b003bc2166bb62b8f008befdb1704
 SHA512:
-  metadata.gz: aae15d8c9a0c90580e07999aaea7c06410ac052c8570c9a5849864b40e871c979458932e222ea734c8fb433eb6d4923a6985a8d98e8fe6c66e775e66881e0edd
-  data.tar.gz: d6caf18d6baed70edf799ec7a719254fb144ce882bafe5fbdebcb3930913946e72191a53327803b0c016263e5fb4a0f6b6929309afa3ea602c15a635dc83c1e8
+  metadata.gz: e500edd2aaf333240d9cccdd410af03ddcf896853daa8eb2129320a60ecdc4b73097da3bc9f4aed9f7b7a74c3736a65dd97ac21e6927b383139f906426cf146d
+  data.tar.gz: 68c69b704746da48c93773dffce024b68c7274adde41e2f14b4a4f453eff876e8a0e422fc96067506c1a6a7b64c4c71cc4f34eddd3c99d45616aeb781d6a2e34

data/Gemfile.lock

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

data/README.md

@@ -116,7 +116,6 @@ ACCOMMODATION_MAX_STAY_DAYS = 10
 DEFAULT_TELEGRAM_BOT_API_TOKEN = ""
 
 PIN_CODE_DEBUG_NOTIFIY_TELEGRAM_ENABLE="yes"
-RECAPTCHA_TOKEN_VALIDATOR_ENABLE="yes"
 
 EXCEPTION_NOTIFY_ENABLE="yes" # yes or no
 EXCEPTION_TELEGRAM_BOT_TOKEN=""

data/app/controllers/spree/api/v2/storefront/pin_code_generators_controller.rb

@@ -3,22 +3,6 @@ module Spree
     module V2
       module Storefront
         class PinCodeGeneratorsController < ::Spree::Api::V2::ResourceController
-          before_action :validate_recaptcha, only: [:create]
-
-          def validate_recaptcha
-            return unless ENV['RECAPTCHA_TOKEN_VALIDATOR_ENABLE'] == 'yes'
-
-            context = SpreeCmCommissioner::RecaptchaTokenValidator.call(
-              token: params[:recaptcha_token],
-              action: params[:recaptcha_action],
-              site_key: params[:recaptcah_site_key]
-            )
-
-            return if context.success?
-
-            render_error_payload(context.message, 400)
-          end
-
           # :phone_number, :email, :type, :tenant
           def create
             context = SpreeCmCommissioner::PinCodeGenerator.call(pin_code_attrs)

data/app/controllers/spree/api/v2/storefront/pin_code_otp_generators_controller.rb

@@ -3,22 +3,6 @@ module Spree
     module V2
       module Storefront
         class PinCodeOtpGeneratorsController < ::Spree::Api::V2::ResourceController
-          before_action :validate_recaptcha, only: [:create]
-
-          def validate_recaptcha
-            return unless ENV['RECAPTCHA_TOKEN_VALIDATOR_ENABLE'] == 'yes'
-
-            context = SpreeCmCommissioner::RecaptchaTokenValidator.call(
-              token: params[:recaptcha_token],
-              action: params[:recaptcha_action],
-              site_key: params[:recaptcah_site_key]
-            )
-
-            return if context.success?
-
-            render_error_payload(context.message, 400)
-          end
-
           # :phone_number, :email, :type, :recaptcha_token, :recaptcha_action, :recaptcah_site_key
           def create
             options = otp_attrs

data/app/controllers/spree/api/v2/storefront/vattanac_banks_controller.rb

@@ -14,7 +14,7 @@ module Spree
             else
               render json: {
                 message: 'FAILED',
-                error: result.error
+                error: result.message
               }, status: result.status || :unprocessable_entity
             end
           end

data/app/interactors/spree_cm_commissioner/vattanac_bank_initiator.rb

@@ -66,7 +66,7 @@ module SpreeCmCommissioner
 
     def find_existing_user
       user_data = context.user_data
-      intel_phone = normalized_phone_number(user_data['intel_phone'])
+      intel_phone = normalized_phone_number(user_data['phoneNum'])
 
       context.user = Spree::User.by_non_tenant.find_by(
         'email = :email OR intel_phone_number = :intel_phone',

data/app/models/concerns/spree_cm_commissioner/guest_seat_updater.rb

@@ -0,0 +1,45 @@
+module SpreeCmCommissioner
+  class GuestSeatUpdater < BaseInteractor
+    delegate :line_item,
+             :guest,
+             :block_id,
+             :updated_by, to: :context
+
+    def call
+      context.fail!(errors: 'Updated user is required') if updated_by.blank?
+      context.fail!(errors: 'Line item not found') unless line_item
+      context.fail!(errors: 'Guest not found') unless guest
+      context.fail!(errors: 'Block ID is required') if block_id.blank?
+
+      if block_id.present? && !block_belongs_to_variant?(block_id, line_item.variant_id)
+        context.fail!(errors: "Variant change is not allowed — seat can only be updated for the same variant #{line_item.variant_id}")
+      end
+
+      ActiveRecord::Base.transaction do
+        update_seat_for_guest
+      end
+    rescue StandardError => e
+      raise if defined?(Interactor::Failure) && e.is_a?(Interactor::Failure)
+
+      context.fail!(errors: e.message)
+    end
+
+    def update_seat_for_guest
+      reserve_block = SpreeCmCommissioner::ReservedBlock.find_by(
+        guest_id: guest.id,
+        block_id: guest.block_id
+      )
+      reserve_block.update!(block_id: block_id, updated_by_id: updated_by.id) if reserve_block && reserve_block.block_id != block_id
+
+      guest.update!(block_id: block_id) if guest.block_id != block_id && block_id.present?
+
+      line_item
+    end
+
+    def block_belongs_to_variant?(block_id, variant_id)
+      return false unless block_id.present? && variant_id.present?
+
+      SpreeCmCommissioner::VariantBlock.exists?(variant_id: variant_id, block_id: block_id)
+    end
+  end
+end

data/app/queries/spree_cm_commissioner/trip_query.rb

@@ -88,6 +88,7 @@ module SpreeCmCommissioner
         id: trip&.id,
         departure_time: trip&.departure_time,
         duration: trip&.duration,
+        distance: trip&.distance,
         allow_seat_selection: trip&.allow_seat_selection,
         route_type: trip&.route_type,
         origin_place: {

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

@@ -0,0 +1,11 @@
+module Spree
+  module V2
+    module Tenant
+      class ProductSerializer < Spree::V2::Storefront::ProductSerializer
+        # This serializer extends the Storefront ProductSerializer
+        # to include any additional attributes or relationships needed
+        # for the Tenant context.
+      end
+    end
+  end
+end

data/app/serializers/spree_cm_commissioner/v2/storefront/trip_result_serializer.rb

@@ -5,7 +5,7 @@ module SpreeCmCommissioner
         set_type :trip_result
 
         attributes :origin_place, :destination_place, :boarding, :drop_off, :price, :compare_at_amount, :currency, :quantity_available, :max_capacity,
-                   :allow_seat_selection, :departure_time, :route_type
+                   :allow_seat_selection, :departure_time, :route_type, :distance
         attribute :duration_in_hms, &:duration_in_hms
         attribute :arrival_time, &:arrival_time
         belongs_to :vendor, serializer: ::SpreeCmCommissioner::V2::Storefront::TripVendorSerializer

data/lib/spree_cm_commissioner/trip_result.rb

@@ -4,7 +4,7 @@ module SpreeCmCommissioner
                   :departure_time, :duration, :route_type,
                   :vehicle_id, :vehicle, :vendor_id, :vendor,
                   :quantity_available, :max_capacity, :boarding, :drop_off,
-                  :product_id, :amenities, :price, :compare_at_amount, :currency
+                  :product_id, :amenities, :price, :compare_at_amount, :currency, :distance
 
     def initialize(options = {})
       options.each do |key, value|

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.1.2'.freeze
+  VERSION = '2.1.3-beta'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3.pre.beta
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-29 00:00:00.000000000 Z
+date: 2025-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -1289,6 +1289,7 @@ files:
 - app/mailers/spree_cm_commissioner/team_invite_mailer.rb
 - app/models/.gitkeep
 - app/models/concerns/spree_cm_commissioner/event_check_in_flowable.rb
+- app/models/concerns/spree_cm_commissioner/guest_seat_updater.rb
 - app/models/concerns/spree_cm_commissioner/homepage_section_bitwise.rb
 - app/models/concerns/spree_cm_commissioner/json_preference_validator.rb
 - app/models/concerns/spree_cm_commissioner/kyc_bitwise.rb
@@ -1750,6 +1751,7 @@ 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_serializer.rb
 - app/serializers/spree/v2/tenant/reset_password_serializer.rb
 - app/serializers/spree/v2/tenant/role_serializer.rb
 - app/serializers/spree/v2/tenant/s3_signed_url_serializer.rb
@@ -2885,9 +2887,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