spree_cm_commissioner 1.8.0 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab96626adb3039b207a661fac39be37f1dbc1701de0d79fd54d5c8a43cfaddd1
-  data.tar.gz: 3a2854de4ac4919d3d7db3cea152932ace963fa8217d52c2581c72ecd3e5eae6
+  metadata.gz: 3e00b3e7d79896c88e4956cc766ba9e3538a3c9fd0f68b8835a6c5281bdfef6f
+  data.tar.gz: 421e9a6a7be136d047457d06e1e51822029e05b08e5bf42b9b9410541b234105
 SHA512:
-  metadata.gz: 822fd0f6cf7898c99d1327190518ef5bc23575018ac8482d85a0379e346f863a30bcc9dfacfed365811ad206cb712f34ae55d98a380fe03d4567780c37626a17
-  data.tar.gz: ea9bd64db27d8f7b878448db1a9c35df245e6f6d12ea1511116ed0eb8f951c25f4fb8d03d75b0c051b35e156540d93564cc062e1a204cf2cf35fbf555736f90c
+  metadata.gz: 25a20ae201490fd79949c9b33a74ac4fa7597fffb80a84b8a54dd104dd02a89ead67397bfcfe276e131ad8a2dd95aed691530f8d1eb33c2d99b16982dcbbca3b
+  data.tar.gz: d0f39688eb2ea2f413052b02bf7cfb05d34c020c02704f41175e4f84a994934038e159c10c81f23e3b4f6ede78ea44b3cfa9cbc4092970e5de1cd49a02ab9e14

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.3.5

data/Gemfile.lock

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

data/app/assets/images/mailer/bookme-plus_light.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="408" height="66" fill="none"><path fill="#010304" d="M63.27 27.02c1.4-1.91 2.3-3.95 2.69-6.05l.82-4.51c.87-4.8-.26-8.67-3.38-11.52C60.33 2.14 55.8.72 49.95.72H17.81l-4.76 26.14-2.16 11.82-3.18 17.43c-.5 2.73 0 4.98 1.45 6.69 1.46 1.7 3.6 2.56 6.38 2.56h25.69c6.22 0 11.53-1.53 15.78-4.55 4.31-3.06 6.96-7.21 7.9-12.36l.86-4.69c.54-2.99.09-5.72-1.34-8.14-1.22-2.04-2.96-3.62-5.21-4.7 1.58-1.08 2.94-2.39 4.05-3.91zM51.78 43.77l-.72 3.97c-.31 1.68-1.14 2.93-2.54 3.84-1.47.95-3.47 1.43-5.93 1.43H22.27l2.61-14.31h21.67c1.9 0 3.34.48 4.28 1.44.92.94 1.23 2.13.96 3.65zm.76-25.96-.56 3.06c-.34 1.85-1.11 3.28-2.38 4.37-1.26 1.09-2.71 1.62-4.43 1.62H27.02l2.51-13.77h17.7c1.92 0 3.37.44 4.33 1.32.92.84 1.24 1.96.98 3.4"/><path fill="#010304" d="M44.91 26.87v11.82H.74l2.18-11.82zM114.17 19.64c-2.73-1.55-6.09-2.34-9.98-2.34h-8.11c-3.89 0-7.53.79-10.83 2.34-3.32 1.56-6.12 3.8-8.33 6.65-2.21 2.84-3.66 6.15-4.33 9.81l-1.92 10.55c-.67 3.67-.43 6.96.72 9.77 1.15 2.82 3.13 5.03 5.88 6.56 2.73 1.52 6.09 2.29 9.98 2.29h8.11c3.95 0 7.62-.77 10.91-2.29 3.31-1.53 6.11-3.74 8.31-6.56 2.2-2.81 3.66-6.1 4.33-9.77l1.92-10.55c.67-3.67.42-6.97-.75-9.81-1.17-2.85-3.16-5.08-5.91-6.65M89.63 53.17c-1.89 0-3.25-.66-4.18-2.03-.95-1.4-1.21-3.19-.79-5.49l1.59-8.74c.41-2.26 1.35-4.11 2.8-5.49 1.42-1.37 3.06-2.03 5.01-2.03h7.75c1.94 0 3.34.66 4.27 2.03.94 1.38 1.21 3.23.79 5.49l-1.59 8.74c-.41 2.26-1.35 4.11-2.79 5.49-1.43 1.37-3.1 2.03-5.1 2.03h-7.76M167.9 19.64c-2.73-1.55-6.09-2.34-9.98-2.34h-8.11c-3.89 0-7.54.79-10.83 2.34-3.32 1.56-6.12 3.8-8.33 6.65-2.21 2.84-3.66 6.15-4.33 9.81l-1.92 10.55c-.67 3.67-.43 6.95.72 9.77s3.13 5.03 5.88 6.56c2.73 1.52 6.09 2.29 9.98 2.29h8.11c3.95 0 7.62-.77 10.91-2.29 3.31-1.53 6.11-3.74 8.31-6.56 2.2-2.81 3.66-6.1 4.33-9.77l1.92-10.55c.67-3.67.42-6.97-.75-9.81-1.17-2.85-3.16-5.08-5.91-6.65m-29.51 26.02 1.59-8.74c.41-2.26 1.35-4.11 2.8-5.49 1.43-1.37 3.06-2.03 5.01-2.03h7.75c1.95 0 3.34.66 4.27 2.03.94 1.38 1.21 3.23.79 5.49l-1.59 8.74c-.41 2.26-1.35 4.11-2.8 5.49-1.43 1.37-3.09 2.03-5.1 2.03h-7.75c-1.88 0-3.25-.66-4.18-2.03-.95-1.4-1.21-3.19-.79-5.49M230.08 18.75h-16.44l-19.73 16.82L200.28.63h-13.81l-11.78 64.64h13.81l2.5-13.7 4.64-3.93 10.54 17.63h15.84L206.31 38.7zM265.04 36.88 251.68.63h-12.31l-11.78 64.64h13.72l6.87-37.7 7.91 21.35c.34.92.73 1.73 1.17 2.39l.04.06c.34.52.7.95 1.08 1.28.92.78 2.08 1.18 3.45 1.18h.27c1.37 0 2.68-.4 3.88-1.18.52-.34 1.04-.77 1.52-1.25.68-.65 1.39-1.48 2.12-2.46l15.68-21.35-6.87 37.69h13.72L303.93.64h-12.32l-26.56 36.25zM347.2 22.38c-3-3.37-7.54-5.08-13.48-5.08h-7.21c-3.89 0-7.53.79-10.83 2.34-3.32 1.56-6.12 3.78-8.32 6.6-2.2 2.81-3.66 6.1-4.33 9.77l-2.12 11.63c-.63 3.44-.33 6.54.88 9.2 1.21 2.67 3.22 4.77 5.99 6.23 2.74 1.46 6.1 2.2 9.99 2.2h6.85c3.87 0 7.48-.66 10.71-1.95 3.28-1.32 6.03-3.23 8.17-5.68 1.86-2.12 3.14-4.53 3.83-7.18h-13.8c-.37.67-.94 1.24-1.71 1.74-1.3.83-2.94 1.25-4.87 1.25h-7.03c-1.98 0-3.39-.52-4.31-1.59-.92-1.06-1.21-2.44-.89-4.21l.25-1.39h33.35l1.88-10.33c1.02-5.61 0-10.16-3.01-13.55zm-10.61 13.49H316.7c.45-2.03 1.35-3.68 2.68-4.94 1.42-1.34 3.06-1.99 5.01-1.99h7.3c1.89 0 3.24.61 4.13 1.86.9 1.27 1.15 2.92.77 5.06z"/><path fill="#6444D8" d="m372.06 63.5 8.12-44.57h13.06l-8.12 44.57z"/><path fill="#6444D8" d="M405.25 47.52h-47l2.44-13.22h46.99z"/></svg>

data/app/controllers/spree/admin/taxons_controller_decorator.rb

@@ -21,6 +21,10 @@ module Spree
         remove_asset(@taxon.home_banner)
       end
 
+      def remove_video_banner
+        remove_asset(@taxon.video_banner)
+      end
+
       private
 
       def remove_asset(asset)
@@ -38,6 +42,7 @@ module Spree
         @taxon.build_app_banner(attachment: permitted_resource_params.delete(:app_banner)) if permitted_resource_params[:app_banner]
         @taxon.build_web_banner(attachment: permitted_resource_params.delete(:web_banner)) if permitted_resource_params[:web_banner]
         @taxon.build_home_banner(attachment: permitted_resource_params.delete(:home_banner)) if permitted_resource_params[:home_banner]
+        @taxon.build_video_banner(attachment: permitted_resource_params.delete(:video_banner)) if permitted_resource_params[:video_banner]
       end
     end
   end

data/app/controllers/spree/api/v2/organizer/invites_controller.rb

@@ -0,0 +1,35 @@
+module Spree
+  module Api
+    module V2
+      module Organizer
+        class InvitesController < ::Spree::Api::V2::Organizer::BaseController
+          def show
+            if invite&.url_valid?
+              render_serialized_payload { serialize_resource(invite) }
+            else
+              render_error_payload(I18n.t('invite.url_not_found'))
+            end
+          end
+
+          def update
+            context = invite.confirm(params[:user_id])
+
+            if context.success?
+              render_serialized_payload { serialize_resource(context.invite) }
+            else
+              render_error_payload(context.message || I18n.t('invite.accept_fail'))
+            end
+          end
+
+          def invite
+            @invite ||= SpreeCmCommissioner::Invite.find_by!(token: params[:id])
+          end
+
+          def resource_serializer
+            ::Spree::V2::Organizer::InviteSerializer
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/tenant/customer_notifications_controller.rb

@@ -0,0 +1,20 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class CustomerNotificationsController < BaseController
+          before_action :require_spree_current_user
+
+          def show
+            customer_notification = SpreeCmCommissioner::CustomerNotification.find(params[:id])
+            render_serialized_payload { serialize_resource(customer_notification) }
+          end
+
+          def resource_serializer
+            Spree::V2::Tenant::CustomerNotificationSerializer
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/tenant/line_items_controller.rb

@@ -0,0 +1,56 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class LineItemsController < BaseController
+          around_action :wrap_with_multitenant_without
+
+          def collection
+            if spree_current_user.nil?
+              line_items_by_order_tokens
+            else
+              spree_current_user.line_items.filter_by_event(params[:event])
+            end
+          end
+
+          def show
+            line_item = Spree::LineItem.find(params[:id])
+            render_serialized_payload { serialize_resource(line_item) }
+          end
+
+          private
+
+          def allowed_sort_attributes
+            super << :to_date
+            super << :from_date
+          end
+
+          def resource_serializer
+            Spree::V2::Tenant::LineItemSerializer
+          end
+
+          def collection_serializer
+            Spree::V2::Tenant::LineItemSerializer
+          end
+
+          def line_items_by_order_tokens
+            order_tokens = params[:order_tokens]
+            event = params[:event]
+
+            return Spree::LineItem.none if order_tokens.blank?
+
+            Spree::LineItem.joins(:order)
+                           .where(spree_orders: { token: order_tokens, state: 'complete', user_id: nil, tenant_id: 1 })
+                           .filter_by_event(event)
+                           .page(params[:page])
+                           .per(params[:per_page])
+          end
+
+          def wrap_with_multitenant_without(&block)
+            MultiTenant.without(&block)
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/tenant/notifications_controller.rb

@@ -0,0 +1,55 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class NotificationsController < BaseController
+          before_action :require_spree_current_user
+
+          def collection
+            spree_current_user.notifications.newest_first.user_notifications
+          end
+
+          def serialize_collection(collection)
+            options_data = collection_options(collection).merge(params: serializer_params)
+            options_data[:meta][:unread_count] = collection.select(&:unread?).count
+
+            collection_serializer.new(
+              collection,
+              options_data
+            ).serializable_hash
+          end
+
+          def show
+            notification = SpreeCmCommissioner::Notification.find(params[:id])
+
+            render_serialized_payload { serialize_resource(notification) }
+          end
+
+          def mark_as_read
+            result = SpreeCmCommissioner::NotificationReader.call(id: params[:id])
+
+            return unless result.success?
+
+            head :ok
+          end
+
+          def mark_all_as_read
+            result = SpreeCmCommissioner::NotificationReader.call(user: spree_current_user)
+
+            return unless result.success?
+
+            head :ok
+          end
+
+          def resource_serializer
+            Spree::V2::Tenant::NotificationSerializer
+          end
+
+          def collection_serializer
+            Spree::V2::Tenant::NotificationSerializer
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/tenant/profile_images_controller.rb

@@ -0,0 +1,52 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class ProfileImagesController < BaseController
+          before_action :require_spree_current_user
+          before_action :required_schema_validation!, except: [:destroy]
+
+          def update
+            context = SpreeCmCommissioner::ProfileImageUpdater.call(
+              user: spree_current_user,
+              url: schema.output.fetch(:url)
+            )
+            if context.success?
+              render_serialized_payload { serialize_resource(context.result) }
+            else
+              render_error_payload(context.message)
+            end
+          end
+
+          def destroy
+            context = SpreeCmCommissioner::ProfileImageDestroyer.call(
+              user: spree_current_user
+            )
+            if context.success?
+              render_serialized_payload(204) { serialize_resource(context.result) }
+            else
+              render_error_payload(context.message)
+            end
+          end
+
+          def required_schema_validation!
+            return true if required_schema.nil?
+
+            @schema = required_schema.new(request: request, locale: locale, user: spree_current_user)
+            return true if schema.success?
+
+            raise SchemaValidationError, schema.error_message
+          end
+
+          def required_schema
+            SpreeCmCommissioner::ProfileImageRequestSchema
+          end
+
+          def resource_serializer
+            Spree::V2::Tenant::UserProfileSerializer
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/tenant/s3_signed_urls_controller.rb

@@ -0,0 +1,29 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class S3SignedUrlsController < BaseController
+          def show
+            if resource.error_message.blank?
+              render_serialized_payload { serialize_resource(resource) }
+            else
+              render_error_payload(resource.error_message)
+            end
+          end
+
+          def resource
+            SpreeCmCommissioner::S3PresignedUrlBuilder.call(
+              bucket_name: params[:bucket_name],
+              object_key: params[:object_key],
+              file_name: params[:file_name]
+            )
+          end
+
+          def resource_serializer
+            Spree::V2::Tenant::S3SignedUrlSerializer
+          end
+        end
+      end
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/crew_inviter.rb

@@ -0,0 +1,63 @@
+module SpreeCmCommissioner
+  class CrewInviter < BaseInteractor
+    delegate :id, :invitee_id, to: :context
+
+    def call
+      validate_data
+      assign_role_to_user
+      create_user_event
+      update_invite_user_event
+      context.invite = crew_invite
+    end
+
+    private
+
+    def validate_data
+      if invite_user_event.nil?
+        context.fail!(message: I18n.t('invite.url_not_found'))
+      elsif !invite_user_event.invite.url_valid?
+        context.fail!(message: I18n.t('invite.url_expired'))
+      end
+    end
+
+    def assign_role_to_user
+      return if user.operator?
+
+      role = Spree::Role.find_by(name: 'operator')
+      role_user = Spree::RoleUser.new(user_id: user.id, role_id: role.id)
+      role_user.save
+    end
+
+    def create_user_event
+      @user_event = SpreeCmCommissioner::UserEvent.new(
+        taxon_id: crew_invite.taxon_id,
+        user_id: user.id
+      )
+
+      return if @user_event.save
+
+      context.fail!(message: I18n.t('invite.already_invited'))
+    end
+
+    def update_invite_user_event
+      invite_user_event.user_taxon_id = @user_event.id
+      invite_user_event.confirmed_at = Time.current
+
+      return if @invite_user_event.save
+
+      context.fail!(message: I18n.t('invite.update_fail'))
+    end
+
+    def crew_invite
+      @crew_invite ||= SpreeCmCommissioner::CrewInvite.find(id)
+    end
+
+    def invite_user_event
+      @invite_user_event ||= crew_invite.invite_user_events.find_by(email: user.email, confirmed_at: nil)
+    end
+
+    def user
+      @user ||= Spree::User.find(invitee_id)
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/customer_notification_sender.rb

@@ -55,15 +55,20 @@ module SpreeCmCommissioner
     end
 
     def end_users
+      users_scope = Spree.user_class.where(tenant_id: customer_notification.tenant_id)
+
       if customer_notification.notification_taxons.exists?
         taxon_ids = customer_notification.notification_taxons.pluck(:taxon_id)
-        SpreeCmCommissioner::UsersByEventFetcherQuery
-          .new(taxon_ids)
-          .call
-          .end_users_push_notificable
+        users_scope = SpreeCmCommissioner::UsersByEventFetcherQuery
+                      .new(taxon_ids)
+                      .call
+                      .end_users_push_notificable
+                      .where(tenant_id: customer_notification.tenant_id)
       else
-        Spree.user_class.end_users_push_notificable
+        users_scope = users_scope.end_users_push_notificable
       end
+
+      users_scope
     end
   end
 end

data/app/interactors/spree_cm_commissioner/profile_image_destroyer.rb

@@ -0,0 +1,16 @@
+module SpreeCmCommissioner
+  class ProfileImageDestroyer < BaseInteractor
+    delegate :user, to: :context
+
+    def call
+      profile_image = SpreeCmCommissioner::UserProfile.find_by(viewable: user)
+
+      if profile_image
+        profile_image.destroy
+        context.result = profile_image
+      else
+        context.fail!(message: 'No profile image to delete')
+      end
+    end
+  end
+end

data/app/mailers/spree_cm_commissioner/crew_invite_mailer.rb

@@ -0,0 +1,13 @@
+module SpreeCmCommissioner
+  class CrewInviteMailer < Spree::BaseMailer
+    layout 'spree_cm_commissioner/layouts/crew_invite_mailer'
+
+    def send_crew_invite_email(invite_user_event_id)
+      @invite_user_event = SpreeCmCommissioner::InviteUserEvent.find(invite_user_event_id)
+
+      subject = Spree::Store.default.name.to_s
+
+      mail(from: from_address, to: @invite_user_event.email, subject: subject)
+    end
+  end
+end

data/app/models/concerns/spree_cm_commissioner/option_type_attr_type.rb

@@ -46,7 +46,12 @@ module SpreeCmCommissioner
       'bib-zerofill' => 'integer',
       'bib-display-prefix' => 'boolean',
       'bib-pre-generation-on-create' => 'boolean',
-      'seat-number-positions' => 'array'
+      'seat-number-positions' => 'array',
+      'origin' => 'origin',
+      'destination' => 'destination',
+      'departure-time' => 'time',
+      'vehicle' => 'vehicle_id',
+      'allow-seat-selection' => 'boolean'
     }.freeze
 
     included do

data/app/models/spree_cm_commissioner/crew_invite.rb

@@ -0,0 +1,7 @@
+module SpreeCmCommissioner
+  class CrewInvite < Invite
+    def confirm(invitee_id)
+      SpreeCmCommissioner::CrewInviter.call(id: id, invitee_id: invitee_id)
+    end
+  end
+end

data/app/models/spree_cm_commissioner/invite.rb

@@ -0,0 +1,22 @@
+module SpreeCmCommissioner
+  class Invite < SpreeCmCommissioner::Base
+    belongs_to :taxon, class_name: 'Spree::Taxon'
+    belongs_to :inviter, class_name: 'Spree::User'
+    has_many :invite_user_events, class_name: 'SpreeCmCommissioner::InviteUserEvent', dependent: :destroy
+    scope :active, -> { where('expires_at > ?', Time.current) }
+
+    after_create :set_expiration
+
+    def set_expiration
+      update(expires_at: 3.days.from_now)
+    end
+
+    def invite_url
+      "#{Spree::Store.default.formatted_url}/invite/#{token}?utm_source=email"
+    end
+
+    def url_valid?
+      expires_at.present? && expires_at > Time.current
+    end
+  end
+end

data/app/models/spree_cm_commissioner/invite_user_event.rb

@@ -0,0 +1,5 @@
+module SpreeCmCommissioner
+  class InviteUserEvent < InviteUserTaxon
+    alias_attribute :user_event, :user_taxon
+  end
+end

data/app/models/spree_cm_commissioner/invite_user_taxon.rb

@@ -0,0 +1,11 @@
+module SpreeCmCommissioner
+  class InviteUserTaxon < SpreeCmCommissioner::Base
+    belongs_to :user_taxon, class_name: 'SpreeCmCommissioner::UserTaxon'
+    belongs_to :invite, class_name: 'SpreeCmCommissioner::Invite'
+    after_create :send_crew_invite_email
+
+    def send_crew_invite_email
+      SpreeCmCommissioner::CrewInviteMailer.send_crew_invite_email(id).deliver_later
+    end
+  end
+end

data/app/models/spree_cm_commissioner/line_item_decorator.rb

@@ -24,7 +24,7 @@ module SpreeCmCommissioner
 
       base.validate :ensure_not_exceed_max_quantity_per_order, if: -> { variant&.max_quantity_per_order.present? }
 
-      base.whitelisted_ransackable_associations |= %w[guests]
+      base.whitelisted_ransackable_associations |= %w[guests order]
       base.whitelisted_ransackable_attributes |= %w[number to_date from_date vendor_id]
 
       base.delegate :delivery_required?, :permanent_stock?, :high_demand, :transit?,

data/app/models/spree_cm_commissioner/order_decorator.rb

@@ -42,7 +42,7 @@ module SpreeCmCommissioner
       base.delegate :customer, to: :user, allow_nil: true
 
       base.whitelisted_ransackable_associations |= %w[customer taxon payments invoice]
-      base.whitelisted_ransackable_attributes |= %w[intel_phone_number phone_number email number]
+      base.whitelisted_ransackable_attributes |= %w[intel_phone_number phone_number email number state]
 
       def base.search_by_qr_data!(data)
         token = data.match(/^R\d{9,}-([A-Za-z0-9_\-]+)$/)&.captures

data/app/models/spree_cm_commissioner/place.rb

@@ -13,6 +13,8 @@ module SpreeCmCommissioner
 
     has_many :product_places, class_name: 'SpreeCmCommissioner::ProductPlace', dependent: :destroy
     has_many :products, through: :product_places
+    has_many :children, class_name: 'SpreeCmCommissioner::Place', foreign_key: :parent_id, dependent: :destroy
+    belongs_to :parent, class_name: 'SpreeCmCommissioner::Place', optional: true
 
     def self.ransackable_attributes(auth_object = nil)
       super & %w[name code]

data/app/models/spree_cm_commissioner/product_decorator.rb

@@ -75,6 +75,10 @@ module SpreeCmCommissioner
       taxons.event.first&.parent
     end
 
+    def ticket_url
+      "#{Spree::Store.default.formatted_url}/tickets/#{slug}"
+    end
+
     private
 
     def set_tenant

data/app/models/spree_cm_commissioner/taxon_decorator.rb

@@ -28,6 +28,7 @@ module SpreeCmCommissioner
       base.has_one :web_banner, as: :viewable, dependent: :destroy, class_name: 'SpreeCmCommissioner::TaxonWebBanner'
       base.has_one :app_banner, as: :viewable, dependent: :destroy, class_name: 'SpreeCmCommissioner::TaxonAppBanner'
       base.has_one :home_banner, as: :viewable, dependent: :destroy, class_name: 'SpreeCmCommissioner::TaxonHomeBanner'
+      base.has_one :video_banner, as: :viewable, dependent: :destroy, class_name: 'SpreeCmCommissioner::TaxonVideoBanner'
 
       # Update children association to work with nested set (lft, rgt)
       base.has_many :children, -> { order(:lft) }, class_name: 'Spree::Taxon', foreign_key: :parent_id, dependent: :destroy
@@ -48,6 +49,10 @@ module SpreeCmCommissioner
       base.whitelisted_ransackable_attributes |= %w[kind]
 
       base.enum purchasable_on: { both: 0, web: 1, app: 2 }
+      base.has_many :crew_invites, class_name: 'SpreeCmCommissioner::CrewInvite', dependent: :destroy
+      base.has_many :invite_user_events, through: :user_events, class_name: 'SpreeCmCommissioner::InviteUserEvent'
+
+      base.has_many :line_items, through: :products
     end
     # rubocop:enable Metrics/MethodLength
 

data/app/models/spree_cm_commissioner/taxon_video_banner.rb

@@ -0,0 +1,4 @@
+module SpreeCmCommissioner
+  class TaxonVideoBanner < Video
+  end
+end

data/app/models/spree_cm_commissioner/user_decorator.rb

@@ -67,6 +67,10 @@ module SpreeCmCommissioner
       has_spree_role?('organizer')
     end
 
+    def operator?
+      has_spree_role?('operator')
+    end
+
     def full_name
       [first_name, last_name].compact_blank.join(' ')
     end

data/app/models/spree_cm_commissioner/variant_options.rb

@@ -143,5 +143,28 @@ module SpreeCmCommissioner
     def number_of_guests
       number_of_adults + number_of_kids
     end
+
+    def origin
+      @origin ||= option_value_name_for(option_type_name: 'origin')&.to_i
+    end
+
+    def destination
+      @destination ||= option_value_name_for(option_type_name: 'destination')&.to_i
+    end
+
+    def vehicle
+      @vehicle ||= option_value_name_for(option_type_name: 'vehicle')&.to_i
+    end
+
+    def allow_seat_selection
+      @allow_seat_selection ||= option_value_name_for(option_type_name: 'allow-seat-selection')&.to_i
+    end
+
+    def departure_time
+      @departure_time ||= begin
+        time = option_value_name_for(option_type_name: 'departure-time')
+        Time.zone.parse(time) if time.present?
+      end
+    end
   end
 end

data/app/models/spree_cm_commissioner/video.rb

@@ -0,0 +1,15 @@
+module SpreeCmCommissioner
+  class Video < Spree::Asset
+    include ::Rails.application.routes.url_helpers
+
+    has_one_attached :attachment
+
+    validates :attachment, attached: true, content_type: %r{\Avideo/.*\z}
+
+    default_scope { includes(attachment_attachment: :blob) }
+
+    def original_url
+      cdn_image_url(attachment)
+    end
+  end
+end

data/app/overrides/spree/admin/taxons/_form/assets_form.html.erb.deface

@@ -47,5 +47,24 @@
     form:f,
     classes: ['col-md-5 ml-3']
   %>
+
+  <%= f.field_container :video_banner, direct_upload: true, class: ['col-md-5 ml-3 rounded border p-3'] do %>
+    <% if @taxon.video_banner&.attachment.present? %>
+      <video class="rounded border mb-4 mw-150" style="max-height: 200px" controls>
+        <source src="<%= main_app.rails_blob_url(@taxon.video_banner.attachment) %>" type="<%= @taxon.video_banner.attachment.content_type %>">
+        Your browser does not support the video tag.
+      </video>
+    <% end %>
+
+    <div data-hook="file" class="mb-3" >
+      <%= f.label :video_banner, I18n.t('taxon.video_banner') %>
+      <%= f.label :video_banner, I18n.t('taxon.video_banner_require_size') %>
+      <%= f.file_field :video_banner, required: false, accept: "video/*" %>
+    </div>
+
+    <% if @taxon.video_banner.present? && defined?(remove_video_banner_admin_taxonomy_taxon_url) %>
+      <%= link_to Spree.t(:remove_video), remove_video_banner_admin_taxonomy_taxon_url, method: :delete %>
+    <% end %>
+  <% end %>
 </div>
 

data/app/overrides/spree/admin/taxons/_form/available_on.html.erb.deface

@@ -0,0 +1,18 @@
+<!-- insert_before "erb[loud]:contains('field_container :parent_id')" -->
+
+<div class="form-group">
+  <%= label_tag nil, Spree.t(:available_on) %>
+  <div class="input-group datePickerFrom"
+          data-wrap="true"
+          data-alt-input="true"
+          data-min-date="<%= Time.now.strftime('%Y-%m-%d') %>"
+          data-enable-time="true">
+      <%= f.text_field :available_on,
+                value: @taxon.available_on,
+                placeholder: Spree.t(:select_a_date),
+                class: 'form-control shadow-none',
+                'data-input':'' %>
+
+      <%= render partial: 'spree/admin/shared/cal_close' %>
+    </div>
+</div>