spree_cm_commissioner 1.8.10 → 1.9.1

data/config/routes.rb

@@ -483,7 +483,9 @@ Spree::Core::Engine.add_routes do
           patch  :associate
         end
         resource :cart_guests, only: %i[create destroy]
-        resources :guests, only: %i[create update show]
+        resources :guests, only: %i[create update show] do
+          resources :id_cards, only: %i[create update destroy]
+        end
 
         resource :checkout, controller: :checkout, only: %i[update] do
           patch  :next
@@ -508,11 +510,16 @@ Spree::Core::Engine.add_routes do
         resource :profile_images, only: %i[update destroy]
         resources :line_items, only: %i[index show]
         resources :guest_card_classes
+        resources :tickets, only: :index
+
+        resource :reset_passwords, only: [:update]
+        resource :change_passwords, only: [:update]
+        resource :user_contacts, only: [:update]
       end
 
       namespace :storefront do
         resources :waiting_room_sessions, only: :create
-
+        resources :vattanac_banks, only: %i[create]
         resource :cart, controller: :cart, only: %i[show create destroy] do
           patch :restart_checkout_flow
         end

data/db/migrate/20250328072717_add_description_to_spree_roles.rb

@@ -1,5 +1,5 @@
 class AddDescriptionToSpreeRoles < ActiveRecord::Migration[7.0]
   def change
-    add_column :spree_roles, :description, :text
+    add_column :spree_roles, :description, :text, if_not_exists: true
   end
 end

data/db/migrate/20250328072841_add_vendor_id_to_spree_roles.rb

@@ -1,6 +1,6 @@
 class AddVendorIdToSpreeRoles < ActiveRecord::Migration[7.0]
   def change
     add_column :spree_roles, :vendor_id, :integer, if_not_exists: true
-    add_index :spree_roles, :vendor_id
+    add_index :spree_roles, :vendor_id, if_not_exists: true
   end
 end

data/db/migrate/20250403025619_add_presentation_to_spree_role.rb

@@ -0,0 +1,5 @@
+class AddPresentationToSpreeRole < ActiveRecord::Migration[7.0]
+  def change
+    add_column :spree_roles, :presentation, :string, if_not_exists: true
+  end
+end

data/db/migrate/20250403042255_add_unique_constraint_to_name_in_spree_roles.rb

@@ -0,0 +1,7 @@
+class AddUniqueConstraintToNameInSpreeRoles < ActiveRecord::Migration[7.0]
+  def change
+    unless index_exists?(:spree_roles, :name, unique: true)
+      add_index :spree_roles, :name, unique: true
+    end
+  end
+end

data/db/migrate/20250407092556_add_variant_id_to_cm_trips.rb

@@ -0,0 +1,7 @@
+class AddVariantIdToCmTrips < ActiveRecord::Migration[7.0]
+  def change
+    unless column_exists?(:cm_trips, :variant_id)
+      add_reference :cm_trips, :variant, foreign_key: { to_table: :spree_variants }
+    end
+  end
+end

data/lib/spree_cm_commissioner/test_helper/factories/product_factory.rb

@@ -50,6 +50,15 @@ FactoryBot.define do
         trip.permanent_stock = 10
         trip.stock_items = [create(:stock_item, variant: trip, stock_location: route.vendor.stock_locations.first)]
         trip.stock_items.first.adjust_count_on_hand(10)
+
+        # option types
+        route.option_types << create(:cm_option_type, :origin)
+        route.option_types << create(:cm_option_type, :destination)
+        route.option_types << create(:cm_option_type, :departure_time)
+        route.option_types << create(:cm_option_type, :duration_in_hours)
+        route.option_types << create(:cm_option_type, :duration_in_minutes)
+        route.option_types << create(:cm_option_type, :allow_seat_selection)
+        route.option_types << create(:cm_option_type, :vehicle)
       end
     end
 

data/lib/spree_cm_commissioner/test_helper/factories/role_permission_factory.rb

@@ -0,0 +1,11 @@
+FactoryBot.define do
+  factory :permission, class: 'SpreeCmCommissioner::Permission' do
+    entry { 'organizer/events' }
+    action { 'view_events' }
+  end
+
+  factory :role_permission, class: 'SpreeCmCommissioner::RolePermission' do
+    association :role, factory: :role
+    association :permission, factory: :permission
+  end
+end

data/lib/spree_cm_commissioner/test_helper/factories/trip_factory.rb

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :trip_connection, class: 'SpreeCmCommissioner::TripConnection' do
+    association :from_trip, factory: :variant
+    association :to_trip, factory: :variant
+  end
+end

data/lib/spree_cm_commissioner/test_helper/factories/user_identity_provider_factory.rb

@@ -8,5 +8,9 @@ FactoryBot.define do
     trait :telegram do
       identity_type { SpreeCmCommissioner::UserIdentityProvider.identity_types[:telegram] }
     end
+
+    trait :vattanac_bank do
+      identity_type { SpreeCmCommissioner::UserIdentityProvider.identity_types[:vattanac_bank] }
+    end
   end
 end

data/lib/spree_cm_commissioner/trip_query_result.rb

@@ -0,0 +1,14 @@
+module SpreeCmCommissioner
+  class TripQueryResult
+    attr_reader :trips, :connection_id
+
+    def initialize(trips, connection_id: nil)
+      @trips = Array(trips)
+      @connection_id = connection_id
+    end
+
+    def direct?
+      @trips.size == 1
+    end
+  end
+end

data/lib/spree_cm_commissioner/user_session_jwt_token.rb

@@ -0,0 +1,5 @@
+module SpreeCmCommissioner
+  class UserSessionJwtToken
+    extend JwtToken
+  end
+end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '1.8.10'.freeze
+  VERSION = '1.9.1'.freeze
 
   module_function
 

data/lib/spree_cm_commissioner.rb

@@ -15,7 +15,9 @@ require 'spree_cm_commissioner/s3_url_generator'
 require 'spree_cm_commissioner/jwt_token'
 require 'spree_cm_commissioner/line_item_jwt_token'
 require 'spree_cm_commissioner/order_jwt_token'
+require 'spree_cm_commissioner/user_session_jwt_token'
 require 'spree_cm_commissioner/trip_result'
+require 'spree_cm_commissioner/trip_query_result'
 require 'spree_cm_commissioner/trip_seat_layout_result'
 
 require 'activerecord_multi_tenant'

data/spree_cm_commissioner.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'aws-sdk-ecs'
   s.add_dependency 'google-cloud-firestore'
   s.add_dependency 'google-cloud-recaptcha_enterprise'
+  s.add_dependency 'firebase-admin-sdk', '~> 0.3.1'
   s.add_dependency 'jwt', '>= 2.5.0'
   s.add_dependency 'elasticsearch', '~> 8.5'
   s.add_dependency 'interactor', '~> 3.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 1.8.10
+  version: 1.9.1
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-07 00:00:00.000000000 Z
+date: 2025-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: firebase-admin-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -827,6 +841,7 @@ files:
 - app/controllers/spree/api/v2/storefront/user_profiles_controller.rb
 - app/controllers/spree/api/v2/storefront/user_promotion_controller.rb
 - app/controllers/spree/api/v2/storefront/user_registration_with_pin_codes_controller.rb
+- app/controllers/spree/api/v2/storefront/vattanac_banks_controller.rb
 - app/controllers/spree/api/v2/storefront/vendor_photos_controller.rb
 - app/controllers/spree/api/v2/storefront/waiting_room_sessions_controller.rb
 - app/controllers/spree/api/v2/storefront/wished_items_controller.rb
@@ -840,19 +855,24 @@ files:
 - app/controllers/spree/api/v2/tenant/cart_controller.rb
 - app/controllers/spree/api/v2/tenant/cart_guests_controller.rb
 - app/controllers/spree/api/v2/tenant/cart_payment_method_groups_controller.rb
+- app/controllers/spree/api/v2/tenant/change_passwords_controller.rb
 - app/controllers/spree/api/v2/tenant/checkout_controller.rb
 - app/controllers/spree/api/v2/tenant/customer_notifications_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
 - app/controllers/spree/api/v2/tenant/line_items_controller.rb
 - app/controllers/spree/api/v2/tenant/notifications_controller.rb
 - app/controllers/spree/api/v2/tenant/pin_code_checkers_controller.rb
 - app/controllers/spree/api/v2/tenant/pin_code_generators_controller.rb
 - app/controllers/spree/api/v2/tenant/products_controller.rb
 - app/controllers/spree/api/v2/tenant/profile_images_controller.rb
+- app/controllers/spree/api/v2/tenant/reset_passwords_controller.rb
 - app/controllers/spree/api/v2/tenant/s3_signed_urls_controller.rb
 - app/controllers/spree/api/v2/tenant/taxons_controller.rb
+- app/controllers/spree/api/v2/tenant/tickets_controller.rb
 - app/controllers/spree/api/v2/tenant/user_account_linkages_controller.rb
+- app/controllers/spree/api/v2/tenant/user_contacts_controller.rb
 - app/controllers/spree/api/v2/tenant/user_device_tokens_controller.rb
 - app/controllers/spree/api/v2/tenant/user_registration_with_pin_codes_controller.rb
 - app/controllers/spree/api/v2/tenant/vendors_controller.rb
@@ -915,6 +935,7 @@ files:
 - app/controllers/spree_cm_commissioner/admin/orders_controller_decorator.rb
 - app/controllers/spree_cm_commissioner/admin/payments_controller_decorator.rb
 - app/controllers/spree_cm_commissioner/admin/products_controller_decorator.rb
+- app/controllers/spree_cm_commissioner/admin/roles_controller_decorator.rb
 - app/controllers/spree_cm_commissioner/admin/user_sessions_controller_decorator.rb
 - app/controllers/spree_cm_commissioner/admin/variants_controller_decorator.rb
 - app/controllers/spree_cm_commissioner/api/v2/storefront/cart_controller_decorator.rb
@@ -980,6 +1001,7 @@ files:
 - app/interactors/spree_cm_commissioner/enqueue_cart/add_item_status_marker.rb
 - app/interactors/spree_cm_commissioner/event_qr_generator.rb
 - app/interactors/spree_cm_commissioner/existing_account_checker.rb
+- app/interactors/spree_cm_commissioner/firebase_email_fetcher.rb
 - app/interactors/spree_cm_commissioner/firebase_id_token_provider.rb
 - app/interactors/spree_cm_commissioner/google_places_fetcher.rb
 - app/interactors/spree_cm_commissioner/guest_id_card_manager.rb
@@ -1043,6 +1065,8 @@ files:
 - app/interactors/spree_cm_commissioner/user_registration_with_id_token.rb
 - app/interactors/spree_cm_commissioner/user_roles_assigner.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/vattanac_bank_initiator.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
@@ -1386,6 +1410,7 @@ files:
 - app/overrides/spree/admin/taxons/edit/title.html.erb.deface
 - app/overrides/spree/admin/users/_form/fields.html.erb.deface
 - app/overrides/spree/admin/users/_form/profile_pic.html.erb.deface
+- app/overrides/spree/admin/users/_form/roles_fields.html.erb.deface
 - app/overrides/spree/admin/users/_tabs/tabs.html.erb.deface
 - app/overrides/spree/admin/users/index/body.html.erb.deface
 - app/overrides/spree/admin/users/index/headers.html.erb.deface
@@ -1422,6 +1447,8 @@ files:
 - app/queries/spree_cm_commissioner/pie_chart_event_aggregator_queries.rb
 - app/queries/spree_cm_commissioner/subscription_orders_query.rb
 - 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
@@ -1485,6 +1512,7 @@ files:
 - app/serializers/spree/v2/tenant/guest_serializer.rb
 - app/serializers/spree/v2/tenant/homepage_section_relatable_serializer.rb
 - app/serializers/spree/v2/tenant/homepage_section_serializer.rb
+- app/serializers/spree/v2/tenant/id_card_serializer.rb
 - app/serializers/spree/v2/tenant/image_serializer.rb
 - app/serializers/spree/v2/tenant/line_item_serializer.rb
 - app/serializers/spree/v2/tenant/notification_serializer.rb
@@ -1493,12 +1521,15 @@ 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/reset_password_serializer.rb
 - app/serializers/spree/v2/tenant/role_serializer.rb
 - app/serializers/spree/v2/tenant/s3_signed_url_serializer.rb
 - app/serializers/spree/v2/tenant/stock_item_serializer.rb
 - app/serializers/spree/v2/tenant/stock_location_serializer.rb
 - app/serializers/spree/v2/tenant/taxon_serializer.rb
 - app/serializers/spree/v2/tenant/taxonomy_serializer.rb
+- app/serializers/spree/v2/tenant/ticket_serializer.rb
+- app/serializers/spree/v2/tenant/user_contact_serializer.rb
 - app/serializers/spree/v2/tenant/user_device_token_serializer.rb
 - app/serializers/spree/v2/tenant/user_identity_provider_serializer.rb
 - app/serializers/spree/v2/tenant/user_profile_serializer.rb
@@ -1563,6 +1594,7 @@ files:
 - app/services/sms_adapter/base.rb
 - app/services/sms_adapter/plasgate.rb
 - app/services/sms_adapter/twillio.rb
+- app/services/spree_cm_commissioner/aes_encryption_service.rb
 - app/services/spree_cm_commissioner/cart/add_guest.rb
 - app/services/spree_cm_commissioner/cart/destroy_decorator.rb
 - app/services/spree_cm_commissioner/cart/recalculate_decorator.rb
@@ -1595,6 +1627,9 @@ files:
 - app/services/spree_cm_commissioner/orders/generate_commissions_decorator.rb
 - app/services/spree_cm_commissioner/organizer/export_guest_csv_service.rb
 - app/services/spree_cm_commissioner/penalty_calculator.rb
+- app/services/spree_cm_commissioner/role_permissions_constructor.rb
+- 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/user_authenticator.rb
 - app/services/spree_cm_commissioner/vehicle_option_value_creator.rb
@@ -2318,9 +2353,12 @@ files:
 - db/migrate/20250328072717_add_description_to_spree_roles.rb
 - db/migrate/20250328072841_add_vendor_id_to_spree_roles.rb
 - db/migrate/20250328072947_remove_unique_constraint_from_name_in_spree_roles.rb
+- db/migrate/20250403025619_add_presentation_to_spree_role.rb
 - db/migrate/20250403040036_install_blazer.rb
+- db/migrate/20250403042255_add_unique_constraint_to_name_in_spree_roles.rb
 - db/migrate/20250403083001_create_spree_cm_commissioner_taxon_blazer_query.rb
 - db/migrate/20250404050117_add_archived_at_to_spree_orders.rb
+- db/migrate/20250407092556_add_variant_id_to_cm_trips.rb
 - docker-compose.yml
 - docs/option_types/attr_types.md
 - docs/private_key.pem
@@ -2393,6 +2431,7 @@ 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/role_permission_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
@@ -2406,6 +2445,7 @@ 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/transit_place_factory.rb
+- lib/spree_cm_commissioner/test_helper/factories/trip_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
@@ -2421,8 +2461,10 @@ 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/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/customer_notification_cron_scheduler.rake
 - lib/tasks/ensure_event_for_guests.rake