spree_cm_commissioner 1.9.2 → 1.10.0.pre.pre

data/app/views/spree_cm_commissioner/crew_invite_mailer/_mailer_stylesheets.html.erb

@@ -23,8 +23,8 @@
     line-height: 1.4;
     margin-top: 10px;
     margin-bottom: 15px;
-    padding-left: 8px;
-    padding-right: 8px;
+    padding-left: 5px;
+    padding-right: 5px;
 
   }
 

data/app/views/spree_cm_commissioner/crew_invite_mailer/send_crew_invite_email.html.erb

@@ -13,7 +13,7 @@
               </div>
               <div class="bar-thin"></div>
               <div class="heading-2">
-                <%= @invite_user_event.invite.inviter.full_name.presence || @invite_user_event.invite.inviter.email %> invites you to join the <br>
+                <%= @invite_user_event.inviter.full_name.presence || @invite_user_event.inviter.email %> invites you to join the <br>
                 <span class="title-bold">Check-in Crew</span> for the event <br>
                 <%= @invite_user_event.invite.taxon.name %>
               </div>

data/config/initializers/user_manager_decorator.rb

@@ -0,0 +1,26 @@
+require 'firebase-admin-sdk'
+
+module Firebase
+  module Admin
+    module Auth
+      module UserManagerDecorator
+        def get_user_by_sub(query)
+          sub = query[:sub]
+          return if sub.blank?
+
+          payload = {
+            federatedUserId: {
+              providerId: 'google.com',
+              rawId: sub
+            }
+          }
+          response = @client.post(with_path('accounts:lookup'), payload).body
+          users = response['users'] if response
+          UserRecord.new(users[0]) if users.is_a?(Array) && users.any?
+        end
+      end
+    end
+  end
+end
+
+Firebase::Admin::Auth::UserManager.prepend(Firebase::Admin::Auth::UserManagerDecorator)

data/config/routes.rb

@@ -16,6 +16,7 @@ Spree::Core::Engine.add_routes do
       end
     end
 
+    resources :events
     resources :promotions do
       resources :custom_dates_rules, controller: :promotion_custom_dates_rules, only: %i[edit update] do
         member do
@@ -137,7 +138,11 @@ Spree::Core::Engine.add_routes do
         end
       end
 
-      resources :stock_managements
+      resources :stock_managements do
+        collection do
+          get :calendar
+        end
+      end
 
       resources :product_completion_steps do
         collection do
@@ -518,6 +523,8 @@ Spree::Core::Engine.add_routes do
       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
@@ -543,7 +550,10 @@ 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]
+        resources :accommodations, only: %i[index show] do
+          resources :variants, only: %i[index show], module: :accommodations
+        end
+
         resources :line_items, only: %i[index show]
         resources :account_checker
         resource :account_recovers, only: [:update]

data/db/migrate/20250304293518_create_cm_inventory_items.rb

@@ -0,0 +1,21 @@
+class CreateCmInventoryItems < ActiveRecord::Migration[7.0]
+  def up
+    create_table :cm_inventory_items, if_not_exists: true do |t|
+      t.integer :variant_id
+      t.date :inventory_date
+      t.integer :max_capacity, default: 0, null: false
+      t.integer :quantity_available, default: 0, null: false
+      t.integer :product_type, default: 0, null: false
+
+      t.timestamps
+    end
+
+    add_index :cm_inventory_items, :variant_id, if_not_exists: true
+    add_index :cm_inventory_items, :inventory_date, if_not_exists: true
+    add_index :cm_inventory_items, [:variant_id, :inventory_date], unique: true, if_not_exists: true
+  end
+
+  def down
+    drop_table :cm_inventory_items
+  end
+end

data/db/migrate/20250425084929_add_description_to_spree_prototypes.rb

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

data/db/migrate/20250425085938_add_preferences_to_spree_prototypes.rb

@@ -0,0 +1,5 @@
+class AddPreferencesToSpreePrototypes < ActiveRecord::Migration[7.0]
+  def change
+    add_column :spree_prototypes, :preferences, :text, if_not_exists: true
+  end
+end

data/db/migrate/20250428025645_add_slug_to_spree_prototypes.rb

@@ -0,0 +1,6 @@
+class AddSlugToSpreePrototypes < ActiveRecord::Migration[7.0]
+  def change
+    add_column :spree_prototypes, :slug, :string, if_not_exists: true
+    add_index :spree_prototypes, :slug, unique: true, if_not_exists: true
+  end
+end

data/db/migrate/20250429094228_add_lock_version_to_cm_inventory_items.rb

@@ -0,0 +1,5 @@
+class AddLockVersionToCmInventoryItems < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_inventory_items, :lock_version, :integer, default: 0, null: false
+  end
+end

data/docker-compose.yml

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

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

@@ -40,8 +40,8 @@ module SpreeCmCommissioner
                          after: %r{//= require spree/backend}, verbose: true
 
         # For NPM support
-        template 'app/javascript/spree_cm_commissioner/utilities.js'
-        inject_into_file 'app/javascript/spree-dashboard.js', "\nimport \"./spree_cm_commissioner/utilities.js\"",
+        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
       end
 

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

@@ -6,3 +6,7 @@ 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/cached_inventory_item.rb

@@ -0,0 +1,23 @@
+module SpreeCmCommissioner
+  class CachedInventoryItem
+    attr_reader :inventory_key, :active, :quantity_available, :inventory_item_id, :variant_id
+
+    def initialize(inventory_key:, active:, quantity_available:, inventory_item_id:, variant_id:)
+      @inventory_key = inventory_key
+      @active = active
+      @quantity_available = quantity_available
+      @inventory_item_id = inventory_item_id
+      @variant_id = variant_id
+    end
+
+    def active?
+      active
+    end
+
+    def to_h
+      instance_variables.each_with_object({}) do |var, hash|
+        hash[var.to_s.delete('@').to_sym] = instance_variable_get(var)
+      end
+    end
+  end
+end

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:, options:)
+    def initialize(from_date:, to_date:, title: nil, options: nil)
       @from_date = from_date
       @to_date = to_date
       @title = title
@@ -23,5 +23,15 @@ 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/inventory_item_factory.rb

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :cm_inventory_item, class: SpreeCmCommissioner::InventoryItem do
+    variant { create(:variant) }
+    max_capacity { 10 }
+    quantity_available { 10 }
+    product_type { 'accommodation' }
+    inventory_date { Date.today }
+  end
+end

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

@@ -1,19 +1,40 @@
 FactoryBot.define do
   factory :cm_base_variant, parent: :base_variant do
+    is_master { false }
+
     transient do
       total_inventory { 10 }
+      backorderable { false }
     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)
     end
   end
 
-  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
+  factory :cm_variant, parent: :cm_base_variant do
+    product { create(: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!
     end
   end
 
@@ -24,12 +45,13 @@ 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
+
     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/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '1.9.2'.freeze
+  VERSION = '1.10.0-pre'.freeze
 
   module_function
 

data/lib/spree_cm_commissioner.rb

@@ -19,6 +19,7 @@ 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'
@@ -44,3 +45,36 @@ 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/create_default_non_permanent_inventory_items.rake

@@ -0,0 +1,16 @@
+# recommend to be used in schedule.yml & manually access in /sidekiq/cron
+namespace :spree_cm_commissioner do
+  desc 'Create default inventory items for non-permanent stock products'
+  task create_default_non_permanent_inventory_items: :environment do
+    Spree::Variant.active.with_non_permanent_stock.find_each do |variant|
+      total_purchases = variant.complete_line_items.sum(:quantity).to_i || 0
+      max_capacity = variant.total_on_hand || 0
+      quantity_available = [max_capacity - total_purchases, 0].max
+
+      variant.create_default_non_permanent_inventory_item!(
+        max_capacity: max_capacity,
+        quantity_available: quantity_available
+      )
+    end
+  end
+end

data/lib/tasks/fetch_email.rake

@@ -0,0 +1,7 @@
+# recommend to be used in schedule.yml & manually access in /sidekiq/cron
+namespace :spree_cm_commissioner do
+  desc 'Fetch email from firebase'
+  task fetch_email: :environment do
+    SpreeCmCommissioner::FirebaseEmailFetcherJob.perform_now
+  end
+end

data/lib/tasks/generate_inventory_items.rake

@@ -0,0 +1,7 @@
+# recommend to be used in schedule.yml & schedule run it everyday
+namespace :spree_cm_commissioner do
+  desc 'Generate inventory items for permanent_stock variants.'
+  task generate_inventory_items: :environment do
+    SpreeCmCommissioner::Stock::PermanentInventoryItemsGeneratorJob.perform_now
+  end
+end

data/spree_cm_commissioner.gemspec

@@ -54,6 +54,11 @@ 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'