spree_cm_commissioner 1.11.0.pre.pre3 → 1.12.0

data/config/locales/en.yml

@@ -482,6 +482,39 @@ en:
       booking_details: "Booking Details"
     crew_invite_mailer:
       subject: "You're Invited to Join the Check-In Crew for %{event_name}!"
+    event_engagement_mailer:
+      organizer:
+        subject: "Let's Lead the Way for %{event_name}!"
+        header_title: "Let's Lead the Way! 🚀✨"
+        header_subtitle: "Engaging Our Community for %{event_name}"
+        hello: "Hello <strong>%{event_name}</strong> Team"
+        intro: "Our event is here, and we have an incredible opportunity to create buzz, inspire engagement, and build meaningful connections! By being actively present and sharing updates, highlights, and memorable moments, we can keep the momentum going and engage both current participants and future ones."
+        impact_title: "Here's How We Can Make an Impact:"
+        impact_post_highlights: "<strong>Post Daily Highlights</strong> – Share standout moments, quotes, and insights to keep participants excited and to show others what they’re missing."
+        impact_engage_posts: "<strong>Engage with Participants’ Posts</strong> – Like, share, and comment on posts by our participants! Responding to their experiences will make them feel valued and connected!"
+        impact_sneak_peek: "<strong>Create Sneak-Peek and Behind-the-Scenes Content</strong> – Showcase what goes into making this event happen, from setup to speaker interviews, to add a human touch and build excitement."
+        impact_go_live: "<strong>Go Live!</strong> – Host a quick live session or story on our social media to share the energy in real time. It could be an event walkthrough, an inspiring session, or even interviews with attendees or speakers."
+        impact_hashtag: "<strong>Use #%{hashtag}</strong> – Keep everything connected with our event’s hashtag, and tag any relevant profiles or partners to expand reach."
+        share_now: "Share Now"
+        closing_visibility: "Our visibility and engagement will not only enhance participants’ experiences but also lay the groundwork for more attendees and support in the future!"
+        closing_call_to_action: "Let’s make %{event_name} unforgettable, both in person and online! ✨"
+        signature_best: "Best,"
+        signature_team: "%{event_name} Team"
+      participant:
+        subject: "Let’s Spread the Word! 📣 Join Us in Amplifying Our Event’s Impact! 🌍✨"
+        header_title: "Let’s Spread the Word! 📣"
+        header_subtitle: "Join Us in Amplifying %{event_name}’s Impact! 🌍✨"
+        hello: "Hello <strong>%{event_name}</strong> Participant!"
+        intro: "We’re thrilled to have you with us for %{event_name}! Together, let’s make this event resonate far and wide! 📢 As—we come together for a healthier, more connected world, we invite you to join us in spreading the word. Sharing your experience can help amplify the impact, inspire others, and create new opportunities for networking and connection."
+        impact_title: "Here’s how you can help:"
+        impact_share_experience: "<strong>Share your Experience</strong>: Post photos, videos, and your thoughts with the hashtag #%{hashtag}."
+        impact_create_awareness: "<strong>Create Awareness for Our Cause</strong>: Tell others why this cause matters to you and why it should matter to them. <em>“In a gentle way, you can shake the world.”</em> — Mahatma Gandhi."
+        impact_tag_us: "<strong>Tag Us</strong>: In your posts to connect with our event community!"
+        impact_invite_others: "<strong>Invite Others</strong>: Tag friends or colleagues who should join in and be part of the conversation!"
+        share_now: "Share Now"
+        closing: "Let’s make a difference together. Every post counts, and with each share, we’re bringing more visibility to our shared cause. 🌟"
+        closing_thank_you: "Thank you for your passion and support!"
+        signature_regards: "Warm regards,"
 
   invoice:
     empty_info: "<b>Invoice</b> not create yet"
@@ -532,6 +565,7 @@ en:
     cannot_delete_account: "You cannot delete this account because you own a special role"
   kyc:
     note: "<b>Note:</b> Select Required KYC Field For this Product"
+    variant_note: "<b>Note:</b> Select Required Guest Information Field For this Variant"
     allowed_upload_later: "<b>Allow upload later:</b> Check this box if you allow to upload later"
   video_on_demand:
     quality:
@@ -570,6 +604,8 @@ en:
   user_roles_assigner:
     user_not_found: 'User not found'
     roles_empty: 'Roles are empty'
+    roles_required: 'Roles are required'
+    user_already_assigned: 'User already assigned to this vendor'
   invite:
     url_not_found: 'Invite link not found or have been expired'
     accept_fail: 'Failed to accept invite'

data/config/locales/km.yml

@@ -411,6 +411,8 @@ km:
   user_roles_assigner:
     user_not_found: 'រកមិនឃើញអ្នកប្រើប្រាស់'
     roles_empty: 'តួនាទីគឺទទេ'
+    roles_required: 'តួនាទីត្រូវបានទាមទារ'
+    user_already_assigned: 'អ្នកប្រើប្រាស់បានបង្កើតតួនាទីរួចហើយ'
 
   invite:
     url_not_found: 'រកមិនឃើញតំណអញ្ជើញ ឬផុតកំណត់ហើយ'

data/config/routes.rb

@@ -138,11 +138,7 @@ Spree::Core::Engine.add_routes do
         end
       end
 
-      resources :stock_managements do
-        collection do
-          get :calendar
-        end
-      end
+      resources :stock_managements
 
       resources :product_completion_steps do
         collection do
@@ -520,11 +516,12 @@ Spree::Core::Engine.add_routes do
         resource :reset_passwords, only: [:update]
         resource :change_passwords, only: [:update]
         resource :user_contacts, only: [:update]
+
+        resources :cms_pages, only: %i[index show]
+        resources :waiting_room_sessions, only: :create
       end
 
       namespace :storefront do
-        resources :inventory_item
-
         resources :waiting_room_sessions, only: :create
         resources :vattanac_banks, only: %i[create]
         resource :cart, controller: :cart, only: %i[show create destroy] do
@@ -550,10 +547,7 @@ Spree::Core::Engine.add_routes do
         resource :cart_guests, only: %i[create destroy]
         resources :cart_payment_method_groups, only: %i[index]
 
-        resources :accommodations, only: %i[index show] do
-          resources :variants, only: %i[index show], module: :accommodations
-        end
-
+        resources :accommodations, only: %i[index show]
         resources :line_items, only: %i[index show]
         resources :account_checker
         resource :account_recovers, only: [:update]

data/db/migrate/20250509033437_create_spree_cm_commissioner_transactional_emails.rb

@@ -0,0 +1,12 @@
+class CreateSpreeCmCommissionerTransactionalEmails < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cm_transactional_emails, if_not_exists: true do |t|
+      t.references :taxon, null: true, foreign_key: { to_table: :spree_taxons }
+      t.references :recipient, polymorphic: true, null: false
+      t.datetime :sent_at
+
+      t.timestamps
+    end
+    add_index :cm_transactional_emails, [:taxon_id, :recipient_type, :recipient_id], unique: true, if_not_exists: true, name: 'idx_transactional_email_taxon_recipient'
+  end
+end

data/db/migrate/20250509075429_add_max_order_quantity_to_spree_product.rb

@@ -0,0 +1,5 @@
+class AddMaxOrderQuantityToSpreeProduct < ActiveRecord::Migration[7.0]
+  def change
+    add_column :spree_products, :max_order_quantity, :integer, if_not_exists: true
+  end
+end

data/db/migrate/20250512075319_add_tenant_id_to_spree_cms_pages.rb

@@ -0,0 +1,6 @@
+class AddTenantIdToSpreeCmsPages < ActiveRecord::Migration[7.0]
+  def change
+    add_column :spree_cms_pages, :tenant_id, :integer, if_not_exists: true
+    add_index :spree_cms_pages, :tenant_id, if_not_exists: true
+  end
+end

data/db/migrate/20250520042602_add_event_to_spree_products.rb

@@ -0,0 +1,7 @@
+class AddEventToSpreeProducts < ActiveRecord::Migration[7.0]
+  def change
+    unless column_exists?(:spree_products, :event_id)
+      add_reference :spree_products, :event, index: true
+    end
+  end
+end

data/db/migrate/20250520044533_add_event_to_spree_line_items.rb

@@ -0,0 +1,7 @@
+class AddEventToSpreeLineItems < ActiveRecord::Migration[7.0]
+  def change
+    unless column_exists?(:spree_line_items, :event_id)
+      add_reference :spree_line_items, :event, index: true
+    end
+  end
+end

data/db/migrate/20250521024345_add_tenant_id_to_cm_waiting_room_sessions.rb

@@ -0,0 +1,6 @@
+class AddTenantIdToCmWaitingRoomSessions < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_waiting_room_sessions, :tenant_id, :integer, if_not_exists: true
+    add_index :cm_waiting_room_sessions, :tenant_id, if_not_exists: true
+  end
+end

data/db/migrate/20250521095539_add_kyc_to_spree_variants.rb

@@ -0,0 +1,5 @@
+class AddKycToSpreeVariants < ActiveRecord::Migration[7.0]
+  def change
+    add_column :spree_variants, :kyc, :integer, if_not_exists: true
+  end
+end

data/docker-compose.yml

@@ -20,7 +20,7 @@ services:
 
     volumes:
       - .:/gem
-      - ./vendor/bundle:/gem/vendor/bundle
+      - /gem/vendor/bundle
 
     # depends_on:
     #   - db

data/lib/generators/spree_cm_commissioner/install/install_generator.rb

@@ -40,17 +40,9 @@ module SpreeCmCommissioner
                          after: %r{//= require spree/backend}, verbose: true
 
         # For NPM support
-        if File.exist?(File.join(destination_root, 'app/javascript/spree_dashboard'))
-          template 'app/javascript/spree_dashboard/spree_cm_commissioner/utilities.js'
-          inject_into_file 'app/javascript/spree_dashboard/spree-dashboard.js', "\nimport \"./spree_cm_commissioner/utilities.js\"",
-                           after: %r{import "@spree/dashboard"}, verbose: true
-        else
-          Logger.new($stdout).debug <<~MSG
-            SpreeCmCommissioner: JavaScript files for the dashboard are missing.
-            Please move your JavaScript files to the appropriate location in
-            app/javascript/spree_dashboard.
-          MSG
-        end
+        template 'app/javascript/spree_cm_commissioner/utilities.js'
+        inject_into_file 'app/javascript/spree-dashboard.js', "\nimport \"./spree_cm_commissioner/utilities.js\"",
+                         after: %r{import "@spree/dashboard"}, verbose: true
       end
 
       def install_telegram_web_bot

data/lib/generators/spree_cm_commissioner/install/templates/app/javascript/{spree_dashboard/spree_cm_commissioner → spree_cm_commissioner}/utilities.js

@@ -6,7 +6,3 @@ const $ = jquery;
 document.addEventListener("spree:load", function () {
   $('[data-toggle="popover"]').popover();
 });
-
-document.documentElement.addEventListener("turbo:frame-load", (event) => {
-  $('[data-toggle="popover"]').popover();
-});

data/lib/spree_cm_commissioner/calendar_event.rb

@@ -2,7 +2,7 @@ module SpreeCmCommissioner
   class CalendarEvent
     attr_reader :from_date, :to_date, :title, :options
 
-    def initialize(from_date:, to_date:, title: nil, options: nil)
+    def initialize(from_date:, to_date:, title:, options:)
       @from_date = from_date
       @to_date = to_date
       @title = title
@@ -23,15 +23,5 @@ module SpreeCmCommissioner
         )
       end
     end
-
-    def self.from_inventory_items(inventory_items)
-      inventory_items.map do |item|
-        CalendarEvent.new(
-          from_date: item.inventory_date,
-          to_date: item.inventory_date,
-          options: { inventory_item: item }
-        )
-      end
-    end
   end
 end

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

@@ -17,7 +17,7 @@ FactoryBot.define do
     end
 
     factory :cm_product_homepage_section_relatable do
-      relatable { create(:cm_product) }
+      relatable { create(:product) }
     end
 
     factory :cm_taxon_homepage_section_relatable do

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

@@ -16,7 +16,7 @@ FactoryBot.define do
     variant { product.master }
 
     factory :cm_need_confirmation_line_item do
-      product { create(:cm_product, need_confirmation: true) }
+      product { create(:product, need_confirmation: true) }
     end
 
     factory :cm_kyc_line_item do

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

@@ -1,19 +1,6 @@
 FactoryBot.define do
-  factory :cm_product_in_stock, parent: :product_in_stock do
-    product_type { :ecommerce }
-  end
-
-  factory :cm_product_with_option_types, parent: :product_with_option_types do
-    product_type { :ecommerce }
-  end
-
-  factory :cm_base_product, parent: :base_product do
-    product_type { :ecommerce }
-  end
-
-  factory :cm_product, parent: :product do
+  factory :cm_product, parent: :base_product do
     vendor { Spree::Vendor.first || create(:cm_vendor) }
-    product_type { :ecommerce }
 
     before(:create) do |product|
       create(:stock_location) unless Spree::StockLocation.any?
@@ -98,7 +85,7 @@ FactoryBot.define do
         option_value2 = create(:cm_option_value, presentation: "#{evaluator.due_date} Days", name: evaluator.due_date.to_s, option_type: product.option_types[1])
         option_value3 = create(:cm_option_value, presentation: "#{evaluator.payment_option}", name: evaluator.payment_option.to_s, option_type: product.option_types[2])
 
-        variant = create(:cm_variant, price: product.price, product: product)
+        variant = create(:variant, price: product.price, product: product)
         variant.option_values = [option_value1, option_value2, option_value3]
         variant.save!
 
@@ -116,7 +103,7 @@ FactoryBot.define do
       end
 
       after(:create) do |product, evaluator|
-        variant = create(:cm_variant, price: product.price, product: product)
+        variant = create(:variant, price: product.price, product: product)
         variant.save!
 
         variant.stock_items.first.adjust_count_on_hand(evaluator.total_inventory)
@@ -149,12 +136,12 @@ FactoryBot.define do
           create(:cm_option_value, presentation: 'Yes', name: '1', option_type: product.option_types.find_by(name: 'bib-pre-generation-on-create'))
         end
 
-        variant1 = create(:cm_variant, price: product.price, product: product)
+        variant1 = create(:variant, price: product.price, product: product)
         variant1.option_values = [option_value1]
         variant1.option_values << bib_pre_generation_option_value if evaluator.bib_pre_generation_on_create
         variant1.save!
 
-        variant2 = create(:cm_variant, price: product.price, product: product)
+        variant2 = create(:variant, price: product.price, product: product)
         variant2.option_values = [option_value2]
         variant2.option_values << bib_pre_generation_option_value if evaluator.bib_pre_generation_on_create
         variant2.save!

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :cm_role, class: 'Spree::Role' do
+    sequence(:name) { |n| "Role_#{n}" }
+    presentation { 'test' }
+    vendor_id { nil }
+  end
+end

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

@@ -24,8 +24,8 @@ FactoryBot.define do
         # variant will add itself to all stock_locations in an after_create
         # creating a product will automatically create a master variant
         store = Spree::Store.first || create(:store)
-        product_1 = create(:cm_product, stores: [store])
-        product_2 = create(:cm_product, stores: [store])
+        product_1 = create(:product, stores: [store])
+        product_2 = create(:product, stores: [store])
 
         stock_location.stock_items.where(variant_id: product_1.master.id).first.adjust_count_on_hand(10)
         stock_location.stock_items.where(variant_id: product_2.master.id).first.adjust_count_on_hand(20)

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

@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :cm_taxon_home_banner, class: SpreeCmCommissioner::TaxonHomeBanner do
+    attachment { Rack::Test::UploadedFile.new(Spree::Core::Engine.root.join('spec', 'fixtures', 'files', 'icon_256x256.png'), 'image/jpeg') }
+  end
+end

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

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :cm_transactional_email, class: SpreeCmCommissioner::TransactionalEmail do
+    recipient_id { 1 }
+    recipient_type { 'Spree::User'}
+  end
+end

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

@@ -1,53 +1,19 @@
 FactoryBot.define do
   factory :cm_base_variant, parent: :base_variant do
-    is_master { false }
-    product { create(:cm_product) }
-
     transient do
       total_inventory { 10 }
-      backorderable { false }
-      pregenerate_inventory_items { true }
-      pre_inventory_days { nil } # optional for permanent only
     end
 
     after :create do |variant, evaluator|
       variant.stock_items.first.adjust_count_on_hand(evaluator.total_inventory)
-      variant.stock_items.update_all(backorderable: evaluator.backorderable)
-
-      # stock_items is created then enqueue create inventory items job
-      # but we want to create inventory items directly in this factory without waiting for job
-      if evaluator.pregenerate_inventory_items
-        if variant.permanent_stock?
-          SpreeCmCommissioner::Stock::PermanentInventoryItemsGenerator.call(variant_ids: [variant.id], pre_inventory_days: evaluator.pre_inventory_days || 3)
-        else
-          variant.create_default_non_permanent_inventory_item! unless variant.default_inventory_item_exist?
-        end
-      end
     end
   end
 
-  factory :cm_variant, parent: :cm_base_variant do
-    product { create(:cm_product) }
-
-    transient do
-      number_of_adults { nil }
-      number_of_kids { nil }
-    end
-
-    after(:create) do |variant, evaluator|
-      if evaluator.number_of_adults.present?
-        number_of_adults = create(:cm_option_type, :number_of_adults)
-        variant.product.option_types << number_of_adults
-        variant.option_values << create(:cm_option_value, presentation: evaluator.number_of_adults, name: evaluator.number_of_adults, option_type: number_of_adults)
-      end
-
-      if evaluator.number_of_kids.present?
-        number_of_kids = create(:cm_option_type, :number_of_kids)
-        variant.product.option_types << number_of_kids
-        variant.option_values << create(:cm_option_value, presentation: evaluator.number_of_kids, name: evaluator.number_of_kids, option_type: number_of_kids)
-      end
-
-      variant.save!
+  factory :cm_variant, parent: :variant do
+    product do
+      stock_locations = [create(:stock_location)]
+      product = create(:product, vendor: create(:active_vendor, stock_locations: stock_locations))
+      product
     end
   end
 
@@ -58,13 +24,12 @@ FactoryBot.define do
       duration { "1" }
       route { }
     end
-
     before(:create) do |trip, evaluator|
       trip.product = evaluator.route
 
       trip.option_values = [evaluator.departure_time, evaluator.duration]
-    end
 
+    end
     after(:create) do |trip, evaluator|
       trip.stock_items = [create(:stock_item, variant: trip, stock_location: evaluator.product.vendor.stock_locations.first)]
       trip.stock_items.first.adjust_count_on_hand(10)

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

@@ -30,7 +30,7 @@ FactoryBot.define do
         if vendor.primary_product_type == :accommodation
           product = create(:cm_accommodation_product, vendor: vendor, total_inventory: evaluator.total_inventory)
         else
-          product = create(:cm_product, vendor: vendor, product_type: vendor.primary_product_type)
+          product = create(:product, vendor: vendor, product_type: vendor.primary_product_type)
           product.master.stock_items.first.adjust_count_on_hand(evaluator.total_inventory)
         end
 

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '1.11.0-pre3'.freeze
+  VERSION = '1.12.0'.freeze
 
   module_function
 

data/lib/spree_cm_commissioner.rb

@@ -19,7 +19,6 @@ 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 'spree_cm_commissioner/cached_inventory_item'
 
 require 'activerecord_multi_tenant'
 require 'google/cloud/recaptcha_enterprise'
@@ -45,36 +44,3 @@ require 'cm_app_logger'
 require 'counter_culture'
 
 require 'byebug' if Rails.env.development? || Rails.env.test?
-
-module SpreeCmCommissioner
-  class << self
-    # Allows overriding the default Redis connection pool with a custom one
-    attr_writer :redis_pool
-
-    def redis_pool
-      @redis_pool ||= default_redis_pool
-    end
-
-    # Resets the Redis pool, useful for testing or reinitialization
-    def reset_redis_pool
-      @redis_pool = nil
-    end
-
-    private
-
-    def default_redis_pool
-      pool_size = ENV.fetch('REDIS_POOL_SIZE', '5').to_i
-      timeout = ENV.fetch('REDIS_TIMEOUT', '5').to_i
-      redis_url = ENV.fetch('REDIS_URL', 'redis://localhost:6379/12')
-
-      ConnectionPool.new(size: pool_size, timeout: timeout) do
-        Redis.new(url: redis_url, timeout: timeout)
-      end
-    end
-  end
-
-  # Provides a configuration block for customizing SpreeCmCommissioner settings
-  def self.configure
-    yield self
-  end
-end

data/lib/tasks/ensure_event_for_product_line_item_guests.rake

@@ -0,0 +1,7 @@
+# recommend to be used in schedule.yml & manually access in /sidekiq/cron
+namespace :spree_cm_commissioner do
+  desc 'Ensure event for product variant line items.'
+  task ensure_event_for_product_line_item_guests: :environment do
+    SpreeCmCommissioner::EnsureEventForProductLineItemGuestsJob.perform_now
+  end
+end

data/lib/tasks/update_invalid_self_root_places.rake

@@ -0,0 +1,9 @@
+namespace :spree_cm_commissioner do
+  desc 'Update invalid self-root places...'
+  task update_invalid_self_root_places: :environment do
+    SpreeCmCommissioner::Place.where('id = parent_id').find_each do |place|
+      place.update_columns(parent_id: nil) # rubocop:disable Rails/SkipsModelValidations
+    end
+    puts '✓ Fixed self-root places'
+  end
+end

data/lib/tasks/update_orphan_root_places.rake

@@ -2,6 +2,7 @@ namespace :spree_cm_commissioner do
   desc 'Update orphan root places...'
   task update_orphan_root_places: :environment do
     count = SpreeCmCommissioner::Place.where(parent_id: 0).update_all(parent_id: nil) # rubocop:disable Rails/SkipsModelValidations
+    SpreeCmCommissioner::Place.where(parent_id: nil).update_all(depth: 0) # rubocop:disable Rails/SkipsModelValidations
     puts "#{count} orphan root places updated."
   end
 end

data/spree_cm_commissioner.gemspec

@@ -54,11 +54,6 @@ Gem::Specification.new do |s|
   s.add_dependency "rqrcode", "~> 2.0"
   s.add_dependency "premailer-rails"
   s.add_dependency 'counter_culture', '~> 3.2'
-  # Redis
-  s.add_dependency 'redis'
-  s.add_dependency 'redis-rails'
-  s.add_dependency 'connection_pool'
-
   s.add_development_dependency 'pg'
   s.add_development_dependency 'spree_dev_tools'
   s.add_dependency 'blazer', '~> 3.0.4'