spree_cm_commissioner 2.1.1 → 2.1.3.pre.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98200b6520e80906b028296c9226090ef2d61e33838da49bdda8bf2dd3e1a65d
-  data.tar.gz: fbfcb39d2331a14519c5b8a59b3b2f8147126e804660fb093e96e6409256bd85
+  metadata.gz: 1b1bf8bbc92e68f9c6d475925cb6e45f64468be42f63495f6f0934ff396a8335
+  data.tar.gz: ebddd7396af6d5036a13656da0dd17f12c4b003bc2166bb62b8f008befdb1704
 SHA512:
-  metadata.gz: 16b4707677a81711846bbc5b8f1d272531d6364e9a84d0f1d4a22c7b472e23e77cd9eeb7920cfdaa16a675237c6e092bd77368d9971ba7d4252592a9d80f9d6b
-  data.tar.gz: ad7adc2b96e483948ad15e8760a910ae424c3d4534b2d2e16be10347a355aaf221a056365359cc646d81c51bf01d45220716377df4b848fb3cf7abbb10ccbe81
+  metadata.gz: e500edd2aaf333240d9cccdd410af03ddcf896853daa8eb2129320a60ecdc4b73097da3bc9f4aed9f7b7a74c3736a65dd97ac21e6927b383139f906426cf146d
+  data.tar.gz: 68c69b704746da48c93773dffce024b68c7274adde41e2f14b4a4f453eff876e8a0e422fc96067506c1a6a7b64c4c71cc4f34eddd3c99d45616aeb781d6a2e34

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.1.1)
+    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/intercity_taxi_order_creator.rb

@@ -63,13 +63,15 @@ module SpreeCmCommissioner
     def process_line_items_attributes(params)
       date_param = raw_params[:date] || Date.current.to_s
 
+      load_variant
+
       params[:line_items_attributes].each_value do |item|
         pickup_time_minutes = item[:from_date]
         combined_datetime = "#{date_param} #{pickup_time_minutes}"
 
         item[:from_date] = combined_datetime
         item[:to_date] = combined_datetime
-        item[:variant_id] = load_variant
+        item[:variant_id] = @variant.id
         item[:vendor_id] = current_vendor.id
         item[:quantity] = 1
         item[:currency] = 'USD'
@@ -100,7 +102,7 @@ module SpreeCmCommissioner
     end
 
     def load_variant
-      trip.product.master.id
+      @variant = trip.product.variants.first
     end
   end
 end

data/app/interactors/spree_cm_commissioner/trip_stops_creator.rb

@@ -0,0 +1,56 @@
+module SpreeCmCommissioner
+  class TripStopsCreator < BaseInteractor
+    delegate :trip, :origin_place, :destination_place, :departure_time, :duration_seconds, to: :context
+
+    def call
+      validate_context!
+
+      ActiveRecord::Base.transaction do
+        create_origin_stop
+        create_destination_stop
+      end
+    end
+
+    private
+
+    def validate_context!
+      context.fail!(message: 'Trip is missing') unless trip
+      context.fail!(message: 'Origin place is missing') unless origin_place
+      context.fail!(message: 'Destination place is missing') unless destination_place
+      context.fail!(message: 'Departure time is missing') unless departure_time
+      context.fail!(message: 'Duration (seconds) is missing') unless duration_seconds
+    end
+
+    def create_origin_stop
+      attributes = {
+        trip: trip,
+        stop_place: origin_place,
+        location_place: origin_place,
+        stop_type: :boarding
+      }
+
+      attributes[:departure_time] = departure_time
+
+      origin_trip_stop = SpreeCmCommissioner::TripStop.new(attributes)
+
+      context.fail!(message: origin_trip_stop.errors.full_messages.to_sentence) unless origin_trip_stop.save
+      context.origin_trip_stop = origin_trip_stop
+    end
+
+    def create_destination_stop
+      attributes = {
+        trip: trip,
+        stop_place: destination_place,
+        location_place: destination_place,
+        stop_type: :drop_off
+      }
+
+      attributes[:arrival_time] = departure_time + duration_seconds.seconds
+
+      destination_trip_stop = SpreeCmCommissioner::TripStop.new(attributes)
+
+      context.fail!(message: destination_trip_stop.errors.full_messages.to_sentence) unless destination_trip_stop.save
+      context.destination_trip_stop = destination_trip_stop
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/vattanac_bank_initiator.rb

@@ -66,9 +66,12 @@ module SpreeCmCommissioner
 
     def find_existing_user
       user_data = context.user_data
+      intel_phone = normalized_phone_number(user_data['phoneNum'])
 
-      context.user = Spree::User.find_by(
-        'email = ? OR phone_number = ?', user_data['email'], user_data['phoneNum']
+      context.user = Spree::User.by_non_tenant.find_by(
+        'email = :email OR intel_phone_number = :intel_phone',
+        email: user_data['email'],
+        intel_phone: intel_phone
       )
     end
 
@@ -84,6 +87,7 @@ module SpreeCmCommissioner
         last_name: user_data['lastName'],
         email: user_data['email'],
         phone_number: user_data['phoneNum'],
+        intel_phone_number: normalized_phone_number(user_data['phoneNum']),
         password: SecureRandom.base64(16),
         user_identity_providers: [identity]
       )
@@ -119,6 +123,10 @@ module SpreeCmCommissioner
       context.data = signed_data
     end
 
+    def normalized_phone_number(phone_number)
+      SpreeCmCommissioner::PhoneNumberParser.call(phone_number: phone_number).intel_phone_number
+    end
+
     def session_id
       payload = { user_id: context.user.id }
       SpreeCmCommissioner::UserSessionJwtToken.encode(payload, context.user.reload.secure_token)

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/models/concerns/spree_cm_commissioner/option_type_attr_type.rb

@@ -42,8 +42,7 @@ module SpreeCmCommissioner
       'bib-pre-generation-on-create' => 'boolean',
       'seat-number-positions' => 'array',
       'seat-type' => 'string',
-      'intercity-taxi' => 'string',
-      'pickup-time' => 'integer'
+      'intercity-taxi' => 'string'
     }.freeze
 
     included do

data/app/models/spree_cm_commissioner/user_decorator.rb

@@ -33,6 +33,7 @@ module SpreeCmCommissioner
 
       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 }
 
       base.whitelisted_ransackable_attributes = %w[email first_name last_name gender phone_number]

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.1'.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.1
+  version: 2.1.3.pre.beta
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-28 00:00:00.000000000 Z
+date: 2025-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -1206,6 +1206,7 @@ files:
 - 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/trip_stops_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
@@ -1288,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
@@ -1749,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
@@ -2720,7 +2723,6 @@ files:
 - 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
@@ -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

data/db/migrate/20250807040000_generate_pickup_time_integer_option_values.rb

@@ -1,71 +0,0 @@
-class GeneratePickupTimeIntegerOptionValues < ActiveRecord::Migration[7.0]
-  def up
-    generate_time_option_values(
-      option_type_name: 'pickup-time',
-      option_type_presentation: 'Pickup Time',
-      start_time: '00:00',
-      end_time: '23:45',
-      interval_minutes: 15
-    )
-  end
-
-  def down
-    remove_time_option_values('pickup-time')
-  end
-
-  private
-
-  def generate_time_option_values(option_type_name:, option_type_presentation:, start_time:, end_time:, interval_minutes:)
-    option_type = Spree::OptionType.find_by(name: option_type_name)
-    unless option_type
-      option_type = Spree::OptionType.new(name: option_type_name, presentation: option_type_presentation)
-      option_type.save(validate: false)
-    end
-
-    # Ensure correct attributes and scope
-    option_type.update_columns(attr_type: 'integer', kind: 'variant')
-
-    Spree::OptionValue.where(option_type_id: option_type.id).delete_all
-
-    time_slots = []
-    current_time = parse_time(start_time)
-    end_time_parsed = parse_time(end_time)
-
-    while current_time <= end_time_parsed
-      time_slots << current_time
-      current_time += interval_minutes.minutes
-    end
-
-    rows = []
-    time_slots.each_with_index do |time, index|
-      minutes_since_midnight = (time.hour * 60) + time.min
-      rows << {
-        name: minutes_since_midnight.to_s,
-        presentation: minutes_since_midnight.to_s,
-        position: index,
-        option_type_id: option_type.id,
-        created_at: Time.current,
-        updated_at: Time.current
-      }
-    end
-
-    Spree::OptionValue.insert_all(rows) if rows.any?
-    puts "Created #{rows.size} #{option_type_name} option values as integer minutes since midnight"
-  end
-
-  def remove_time_option_values(option_type_name)
-    option_type = Spree::OptionType.find_by(name: option_type_name)
-    return unless option_type
-
-    count = Spree::OptionValue.where(option_type_id: option_type.id).count
-    Spree::OptionValue.where(option_type_id: option_type.id).delete_all
-    option_type.delete
-    puts "Removed #{option_type_name} option type and #{count} option values"
-  end
-
-  def parse_time(time_string)
-    Time.zone.parse("2000-01-01 #{time_string}")
-  end
-end
-
-