spree_cm_commissioner 2.1.0.pre.pre2 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a327dc0e2f40dd0da82e2f110b079f4ff3a81bec76974745c82a27a37b273c63
-  data.tar.gz: 8ce2e93eaec4b8c005818e0c321430d598e3318a647b4caea08945b02291c785
+  metadata.gz: ee0ae4eae84a0969d4e124d27edbd5f05f82439960fe814dab8221f9e7b486da
+  data.tar.gz: fce2acf06b539cd00604bc66d1ae0bb2b951c20a3d1769b1a37405b3b0bbe986
 SHA512:
-  metadata.gz: 923d60bccd00c23a3a6ad8b7ff8ea05b9204fd9f871f3664a24e7d761adc7fe75275ff850efedbe5c34454af4561d3c8830f29f6dc43450052ec90fb37cc45ca
-  data.tar.gz: f5abc2ec078ab65c637f2f368d35d4d0b7c3d7337c7d9cddc13c94177f46b55e06bb39288eaab00087c3f6b4cfb6bdf4d2bf07fe5bdc29916500ad2481a153c3
+  metadata.gz: aae15d8c9a0c90580e07999aaea7c06410ac052c8570c9a5849864b40e871c979458932e222ea734c8fb433eb6d4923a6985a8d98e8fe6c66e775e66881e0edd
+  data.tar.gz: d6caf18d6baed70edf799ec7a719254fb144ce882bafe5fbdebcb3930913946e72191a53327803b0c016263e5fb4a0f6b6929309afa3ea602c15a635dc83c1e8

data/Gemfile.lock

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

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

@@ -18,7 +18,7 @@ module Spree
 
           # override
           def resource
-            @resource ||= collection.find_by!(slug: params[:id])
+            @resource ||= Spree::Vendor.by_vendor_id!(params[:id])
           end
 
           # override
@@ -38,6 +38,8 @@ module Spree
 
           # override
           def required_schema
+            return nil unless action_name == 'index'
+
             SpreeCmCommissioner::AccommodationRequestSchema
           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['intel_phone'])
 
-      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/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/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.1.0-pre2'.freeze
+  VERSION = '2.1.2'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.1.0.pre.pre2
+  version: 2.1.2
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-28 00:00:00.000000000 Z
+date: 2025-08-29 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
@@ -2720,7 +2721,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 +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: 1.3.1
+      version: '0'
 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
-
-