spree_cm_commissioner 1.8.0.pre.deploy.pre.demo → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c35795a4846afff06697c40726a7cba898af9f4055b50b213d679a65731c087
-  data.tar.gz: e3d6368170092b5cf1a572c20c0a5fe9cb062a40f92ca54065206d9b52b60d40
+  metadata.gz: '0788ffeb87d1c46c1f4744a776a0fb2cef13d206f43a36eaa9b80c3b0020678a'
+  data.tar.gz: f78da29a145dfb3d1f29eb3ec14b766edd4f45832a9ca61ba082e762f008490f
 SHA512:
-  metadata.gz: 43a82e2d5a436a577a2f56308b48b69931924d90fc9503ca68965dff10edfcccc11e31afffda9cc3788c3b5a1992b158df486ecd4c00b71c4d88918946b7c157
-  data.tar.gz: ccd67cabb34cf5ab3f07f9a9b056707065c02ef941e92a4a058ae63383f59c9729e897a84208a138190be469f74d5feebee9f65ce464dda6ef1c6af1c4a0b85b
+  metadata.gz: 46a102addf52edcaa69f92f88d4172782edee7f0eb174d7eb9f467a5301177dae472d01cd0492fdcc11f3170717f8e45eff3f4e5d113779dee4cfec31d496d0f
+  data.tar.gz: 0f2e3e69f2e93f6a9c04593f24bd8beeeb7609913549dce842263a17ec2653fcb1f236b5a0fe6400fb2b766e068139bf0b7ad2c6d33fd238912baee1c4860f3a

data/.github/workflows/test_and_build_gem.yml

@@ -48,25 +48,25 @@ jobs:
           gem install bundler
           bundle install --jobs 4 --retry 3
 
-      # - name: Quality
-      #   env:
-      #     DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
-      #   run: |
-      #     bundle exec rubocop
+      - name: Quality
+        env:
+          DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
+        run: |
+          bundle exec rubocop
 
-      # - name: Security
-      #   env:
-      #     DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
-      #   run: |
-      #     bundle exec brakeman
+      - name: Security
+        env:
+          DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
+        run: |
+          bundle exec brakeman
 
-      # - name: Run test
-      #   env:
-      #     DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
+      - name: Run test
+        env:
+          DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
 
-      #   if: github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'develop'
-      #   run: |
-      #     bundle exec rake
+        if: github.event_name == 'pull_request' && github.event.pull_request.base.ref == 'develop'
+        run: |
+          bundle exec rake
 
       # 2405-build-and-publish-gem
       # - name: Rename long migration files

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (1.8.0.pre.deploy.pre.demo)
+    spree_cm_commissioner (1.8.1)
       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/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/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/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

@@ -48,6 +48,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/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/overrides/spree/admin/taxons/edit/title.html.erb.deface

@@ -1,6 +1,8 @@
 <!-- replace "erb[silent]:contains('unless @taxon.root?')" closing_selector "erb[silent]:contains('end')" -->
 
-    <%if @taxon.depth !=1 %>
-  / <%= link_to @taxon.parent.name, spree.edit_admin_taxonomy_taxon_url(@taxonomy,@taxon.parent.id) %>
+    <%if @taxon.depth !=1 && @taxon.parent.present? %>
+  / <%= link_to @taxon.parent.name, spree.edit_admin_taxonomy_taxon_url(@taxonomy,@taxon.parent.id)   %>
     <%end%>
-  / <%= @taxon.name %>
+  <% unless @taxon.root? %>
+  / <%= @taxon.name %>
+  <% end %>

data/app/serializers/spree/v2/organizer/asset_serializer.rb

@@ -0,0 +1,11 @@
+module Spree
+  module V2
+    module Organizer
+      class AssetSerializer < BaseSerializer
+        include ::Spree::Api::V2::ImageTransformationConcern
+
+        attributes :alt, :original_url, :position, :styles
+      end
+    end
+  end
+end

data/app/serializers/spree/v2/organizer/invite_serializer.rb

@@ -0,0 +1,11 @@
+module Spree
+  module V2
+    module Organizer
+      class InviteSerializer < BaseSerializer
+        attributes :token, :expires_at
+        belongs_to :taxon, serializer: Spree::V2::Organizer::TaxonSerializer
+        belongs_to :inviter, serializer: Spree::V2::Organizer::UserSerializer
+      end
+    end
+  end
+end

data/app/serializers/spree/v2/organizer/taxon_serializer.rb

@@ -0,0 +1,10 @@
+module Spree
+  module V2
+    module Organizer
+      class TaxonSerializer < BaseSerializer
+        attributes :name
+        has_one :app_banner, serializer: Spree::V2::Organizer::AssetSerializer
+      end
+    end
+  end
+end

data/app/serializers/spree/v2/organizer/user_serializer.rb

@@ -0,0 +1,9 @@
+module Spree
+  module V2
+    module Organizer
+      class UserSerializer < BaseSerializer
+        attributes :first_name, :last_name, :email
+      end
+    end
+  end
+end

data/app/serializers/spree/v2/tenant/s3_signed_url_serializer.rb

@@ -0,0 +1,9 @@
+module Spree
+  module V2
+    module Tenant
+      class S3SignedUrlSerializer < BaseSerializer
+        attribute :host, :fields, :url
+      end
+    end
+  end
+end

data/app/serializers/spree/v2/tenant/user_profile_serializer.rb

@@ -0,0 +1,8 @@
+module Spree
+  module V2
+    module Tenant
+      class UserProfileSerializer < Spree::V2::Tenant::AssetSerializer
+      end
+    end
+  end
+end

data/app/views/spree/admin/classifications/index.html.erb

@@ -2,7 +2,7 @@
   <%= link_to Spree.t(:taxonomies), spree.admin_taxonomies_url %> /
 
   <%= link_to @taxonomy.root.name, spree.edit_admin_taxonomy_url(@taxonomy) %>
-  <%if @taxon.depth !=1 %>
+  <%if @taxon.depth !=1 && @taxon.parent.present? %>
       / <%= link_to @taxon.parent.name, spree.edit_admin_taxonomy_taxon_url(@taxonomy,@taxon.parent.id) %>
     <%end%>
   <% unless @taxon.root? %>

data/app/views/spree/admin/guest_card_classes/index.html.erb

@@ -2,7 +2,7 @@
   <%= link_to Spree.t(:taxonomies), spree.admin_taxonomies_url %> /
 
   <%= link_to @taxonomy.root.name, spree.edit_admin_taxonomy_url(@taxonomy) %>
-  <%if @taxon.depth !=1 %>
+  <%if @taxon.depth !=1 && @taxon.parent.present? %>
       / <%= link_to @taxon.parent.name, spree.edit_admin_taxonomy_taxon_url(@taxonomy,@taxon.parent.id) %>
     <%end%>
   <% unless @taxon.root? %>

data/app/views/spree/admin/taxon_vendors/index.html.erb

@@ -2,7 +2,7 @@
   <%= link_to Spree.t(:taxonomies), spree.admin_taxonomies_url %> /
 
   <%= link_to @taxonomy.root.name, spree.edit_admin_taxonomy_url(@taxonomy) %>
-    <%if @taxon.depth !=1 %>
+    <%if @taxon.depth !=1 && @taxon.parent.present? %>
       / <%= link_to @taxon.parent.name, spree.edit_admin_taxonomy_taxon_url(@taxonomy,@taxon.parent.id) %>
     <%end%>
   <% unless @taxon.root? %>

data/app/views/spree/admin/user_events/_users.html.erb

@@ -2,7 +2,7 @@
   <%= link_to Spree.t(:taxonomies), spree.admin_taxonomies_url %> /
 
   <%= link_to @taxonomy.root.name, spree.edit_admin_taxonomy_url(@taxonomy) %>
-  <%if @taxon.depth !=1 %>
+  <%if @taxon.depth !=1 && @taxon.parent.present? %>
       / <%= link_to @taxon.parent.name, spree.edit_admin_taxonomy_taxon_url(@taxonomy,@taxon.parent.id) %>
     <%end%>
   <% unless @taxon.root? %>

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

@@ -0,0 +1,82 @@
+<style>
+  body, table, td {
+      font-family: 'Poppins', Arial, sans-serif;
+      margin: 0;
+      padding: 0;
+    }
+
+  .content-wrapper {
+    max-width: 500px;
+    margin: 0 auto;
+    border: 1px solid grey;
+    border-top: none;
+  }
+
+  .main-content{
+    padding-top: 10px;
+    padding-bottom: 25px;
+  }
+
+  .logo {
+    display: block;
+    width: 150px;
+    margin-top: 10px;
+    margin-bottom: 20px;
+  }
+
+  .heading-1 {
+    font-size: 24px;
+    text-align: center;
+    line-height: 1.4;
+    margin-bottom: 15px;
+  }
+
+  .bar-large {
+    height: 10px;
+    background-color:  #5D54D9;
+    margin-bottom: 20px;
+
+  }
+
+  .bar-thin {
+    height: 3px;
+    height: 1px;
+    background-color: grey;
+    width: 100%;
+    margin: 20px auto;
+  }
+
+  .heading-2 {
+    font-size: 16px;
+    text-align: center;
+    line-height: 1.5;
+  }
+
+  .title-bold {
+    font-weight: bold;
+    color: #000;
+  }
+
+  .action-button {
+    display: inline-block;
+    background-color: #5D54D9;
+    border-radius: 24px;
+    font-size: 14px;
+    width: 222px;
+    height: 50px;
+    text-align: center;
+    line-height: 50px;
+    text-decoration: none;
+    cursor: pointer;
+    margin: 15px 0;
+    color: white !important;
+    text-decoration: none;
+  }
+
+  .heading-3 {
+    font-size: 12px;
+    text-align: center;
+    color: #888;
+  }
+</style>
+

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

@@ -0,0 +1,33 @@
+<table role="presentation" cellspacing="0" cellpadding="0" border="0" align="center" width="100%">
+  <tr>
+    <td align="center">
+      <div class="content-wrapper">
+        <div class="bar-large"></div>
+        <div class="main-content">
+            <div class="content">
+              <div><%= image_tag "mailer/bookme-plus_light.svg", class: "logo" %></div>
+              <div class="heading-1">
+                Become a part of the <br> event <strong> <%= @invite_user_event.invite.taxon.name %> </strong>
+              </div>
+              <div class="bar-thin"></div>
+              <div class="heading-2">
+                <%= @invite_user_event.invite.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>
+              <div style="text-align: center;">
+                <a href="<%= @invite_user_event.invite.invite_url %>" class="action-button">
+                  Get Started
+                </a>
+              </div>
+              <div class="heading-3">
+                Please note that this invitation will expire<br>
+                in <%= ((@invite_user_event.invite.expires_at - Time.current) / 1.hour).round %> hours.
+              </div>
+            </div>
+        </div>
+      </div>
+    </td>
+  </tr>
+</table>
+

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

@@ -0,0 +1,15 @@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <meta name="x-apple-disable-message-reformatting"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <link href="https://fonts.googleapis.com/css2?family=Poppins&display=swap" rel="stylesheet">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+    <%= render partial: 'spree_cm_commissioner/crew_invite_mailer/mailer_stylesheets' %>
+  </head>
+   <body>
+      <%= yield %>
+  </body>
+</html>

data/config/locales/en.yml

@@ -564,4 +564,11 @@ en:
     update_success: Option Type updated successfully.
   user_roles_assigner:
     user_not_found: 'User not found'
-    roles_empty: 'Roles are empty'
+    roles_empty: 'Roles are empty'
+  invite:
+    url_not_found: 'Invite link not found or have been expired'
+    accept_fail: 'Failed to accept invite'
+    url_expired: 'Invitation link is expired'
+    already_invited: 'Failed: User already invited to event'
+    update_fail: 'Failed: to Update invite user'
+

data/config/locales/km.yml

@@ -408,4 +408,11 @@ km:
         not_found: 'រកមិនឃើញរូបភាព'
   user_roles_assigner:
     user_not_found: 'រកមិនឃើញអ្នកប្រើប្រាស់'
-    roles_empty: 'តួនាទីគឺទទេ'
+    roles_empty: 'តួនាទីគឺទទេ'
+
+  invite:
+    url_not_found: 'រកមិនឃើញតំណអញ្ជើញ ឬផុតកំណត់ហើយ'
+    accept_fail: 'បរាជ័យក្នុងការទទួលយកការអញ្ជើញ'
+    url_expired: 'តំណ​អញ្ជើញ​បាន​ផុត​កំណត់'
+    already_invited: 'បរាជ័យ៖ អ្នកប្រើប្រាស់បានអញ្ជើញចូលរួមព្រឹត្តិការណ៍រួចហើយ'
+    update_fail: 'បរាជ័យ៖ ធ្វើបច្ចុប្បន្នភាពអ្នកប្រើប្រាស់អញ្ជើញ'

data/config/routes.rb

@@ -441,6 +441,7 @@ Spree::Core::Engine.add_routes do
         end
         resources :images
         resource :s3_signed_urls
+        resources :invites
       end
 
       namespace :tenant do
@@ -480,6 +481,8 @@ Spree::Core::Engine.add_routes do
         end
 
         resources :user_account_linkages, only: %i[index create destroy]
+        resource :s3_signed_urls
+        resource :profile_images, only: %i[update destroy]
       end
 
       namespace :storefront do

data/db/migrate/20250304101907_create_spree_cm_commissioner_invite.rb

@@ -0,0 +1,12 @@
+class CreateSpreeCmCommissionerInvite < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cm_invites, if_not_exists: true do |t|
+      t.string :token, null: false, unique: true
+      t.datetime :expires_at
+      t.string :type
+      t.references :inviter, null: false, foreign_key: { to_table: :spree_users }, index: true
+      t.references :taxon, null: false, foreign_key: { to_table: :spree_taxons }, index: true
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250304101946_create_spree_cm_commissioner_invite_user_taxon.rb

@@ -0,0 +1,11 @@
+class CreateSpreeCmCommissionerInviteUserTaxon < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cm_invite_user_taxons, if_not_exists: true do |t|
+      t.references :invite, foreign_key: { to_table: :cm_invites }, null: true, index: true
+      t.references :user_taxon,  foreign_key: { to_table: :cm_user_taxons }, null: true, index: true
+      t.string :email, index: true
+      t.datetime :confirmed_at
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250307013422_add_parent_id_to_cm_place.rb

@@ -0,0 +1,9 @@
+class AddParentIdToCmPlace < ActiveRecord::Migration[7.0]
+  def change
+    unless column_exists?(:cm_places, :parent_id)
+      add_column :cm_places, :parent_id, :integer, null: true
+      add_foreign_key :cm_places, :cm_places, column: :parent_id
+      add_index :cm_places, :parent_id
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :invite, class: SpreeCmCommissioner::Invite do
+    token { SecureRandom.hex(16) }
+    taxon { create(:taxon) }
+    inviter { create(:user) }
+  end
+end

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

@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :invite_user_event, class: SpreeCmCommissioner::InviteUserEvent do
+    invite { create(:invite) }
+  end
+end

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

@@ -147,6 +147,36 @@ FactoryBot.define do
       presentation { 'seat-number-positions' }
     end
 
+    trait :origin do
+      attr_type { :origin }
+      name { 'origin' }
+      presentation { 'origin' }
+    end
+
+    trait :destination do
+      attr_type { :destination }
+      name { 'destination' }
+      presentation { 'destination' }
+    end
+
+    trait :departure_time do
+      attr_type { :time }
+      name { 'departure-time' }
+      presentation { 'departure-time' }
+    end
+
+    trait :vehicle do
+      attr_type { :vehicle_id }
+      name { 'vehicle' }
+      presentation { 'vehicle' }
+    end
+
+    trait :allow_seat_selection do
+      attr_type { :boolean }
+      name { 'allow-seat-selection' }
+      presentation { 'allow-seat-selection' }
+    end
+
     initialize_with { Spree::OptionType.where(name: name).first_or_initialize }
   end
 end

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

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :user_event, class: SpreeCmCommissioner::UserEvent do
+    taxon { create(:taxon) }
+    user { create(:user) }
+  end
+end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '1.8.0-deploy-demo'.freeze
+  VERSION = '1.8.1'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 1.8.0.pre.deploy.pre.demo
+  version: 1.8.1
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-06 00:00:00.000000000 Z
+date: 2025-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -578,6 +578,7 @@ files:
 - app/assets/images/cm-wifi-icon.svg
 - app/assets/images/mailer/bed.png
 - app/assets/images/mailer/bookme-plus.png
+- app/assets/images/mailer/bookme-plus_light.svg
 - app/assets/images/mailer/calendar.png
 - app/assets/images/mailer/envelope.png
 - app/assets/images/mailer/event-mailer-bg.png
@@ -743,6 +744,7 @@ files:
 - app/controllers/spree/api/v2/operator/taxons_controller.rb
 - app/controllers/spree/api/v2/organizer/base_controller.rb
 - app/controllers/spree/api/v2/organizer/images_controller.rb
+- app/controllers/spree/api/v2/organizer/invites_controller.rb
 - app/controllers/spree/api/v2/organizer/s3_signed_urls_controller.rb
 - app/controllers/spree/api/v2/organizer/ticket_images_controller.rb
 - app/controllers/spree/api/v2/organizer/tickets_controller.rb
@@ -822,6 +824,8 @@ files:
 - 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/s3_signed_urls_controller.rb
 - app/controllers/spree/api/v2/tenant/taxons_controller.rb
 - app/controllers/spree/api/v2/tenant/user_account_linkages_controller.rb
 - app/controllers/spree/api/v2/tenant/user_device_tokens_controller.rb
@@ -940,6 +944,7 @@ files:
 - app/interactors/spree_cm_commissioner/check_in_destroyer.rb
 - app/interactors/spree_cm_commissioner/confirm_pin_code_checker.rb
 - app/interactors/spree_cm_commissioner/conversion_pre_calculator.rb
+- app/interactors/spree_cm_commissioner/crew_inviter.rb
 - app/interactors/spree_cm_commissioner/customer_content_notification_creator.rb
 - app/interactors/spree_cm_commissioner/customer_notification_cron_executor.rb
 - app/interactors/spree_cm_commissioner/customer_notification_sender.rb
@@ -980,6 +985,7 @@ files:
 - app/interactors/spree_cm_commissioner/pin_code_creator.rb
 - app/interactors/spree_cm_commissioner/pin_code_generator.rb
 - app/interactors/spree_cm_commissioner/pin_code_sender.rb
+- app/interactors/spree_cm_commissioner/profile_image_destroyer.rb
 - app/interactors/spree_cm_commissioner/profile_image_updater.rb
 - app/interactors/spree_cm_commissioner/recaptcha_token_validator.rb
 - app/interactors/spree_cm_commissioner/sms.rb
@@ -1053,6 +1059,7 @@ files:
 - app/jobs/spree_cm_commissioner/webhook_subscriber_orders_sender_job.rb
 - app/mailers/spree/order_mailer_decorator.rb
 - app/mailers/spree_cm_commissioner/application_mailer.rb
+- app/mailers/spree_cm_commissioner/crew_invite_mailer.rb
 - app/mailers/spree_cm_commissioner/pin_code_mailer.rb
 - app/models/.gitkeep
 - app/models/concerns/spree_cm_commissioner/homepage_section_bitwise.rb
@@ -1094,6 +1101,7 @@ files:
 - app/models/spree_cm_commissioner/check_in_record.rb
 - app/models/spree_cm_commissioner/classification_decorator.rb
 - app/models/spree_cm_commissioner/configuration.rb
+- app/models/spree_cm_commissioner/crew_invite.rb
 - app/models/spree_cm_commissioner/customer.rb
 - app/models/spree_cm_commissioner/customer_notification.rb
 - app/models/spree_cm_commissioner/customer_promotion_rule.rb
@@ -1131,6 +1139,9 @@ files:
 - app/models/spree_cm_commissioner/image_methods_decorator.rb
 - app/models/spree_cm_commissioner/import.rb
 - app/models/spree_cm_commissioner/imports/import_order.rb
+- app/models/spree_cm_commissioner/invite.rb
+- app/models/spree_cm_commissioner/invite_user_event.rb
+- app/models/spree_cm_commissioner/invite_user_taxon.rb
 - app/models/spree_cm_commissioner/invoice.rb
 - app/models/spree_cm_commissioner/line_item_decorator.rb
 - app/models/spree_cm_commissioner/line_item_seat.rb
@@ -1392,10 +1403,14 @@ files:
 - app/serializers/.gitkeep
 - app/serializers/concerns/spree_cm_commissioner/api/v2/resource_serializer_concern_decorator.rb
 - app/serializers/spree/api/v2/platform/create_date_specific_item_adjustment_serializer.rb
+- app/serializers/spree/v2/organizer/asset_serializer.rb
 - app/serializers/spree/v2/organizer/base_serializer.rb
 - app/serializers/spree/v2/organizer/image_serializer.rb
+- app/serializers/spree/v2/organizer/invite_serializer.rb
 - app/serializers/spree/v2/organizer/s3_signed_url_serializer.rb
+- app/serializers/spree/v2/organizer/taxon_serializer.rb
 - app/serializers/spree/v2/organizer/ticket_serializer.rb
+- app/serializers/spree/v2/organizer/user_serializer.rb
 - app/serializers/spree/v2/storefront/accommodation_serializer.rb
 - app/serializers/spree/v2/storefront/address_serializer_decorator.rb
 - app/serializers/spree/v2/storefront/cart_serializer_decorator.rb
@@ -1431,10 +1446,12 @@ files:
 - app/serializers/spree/v2/tenant/homepage_section_relatable_serializer.rb
 - app/serializers/spree/v2/tenant/homepage_section_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/taxon_serializer.rb
 - app/serializers/spree/v2/tenant/taxonomy_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
 - app/serializers/spree/v2/tenant/user_serializer.rb
 - app/serializers/spree/v2/tenant/vendor_image_serializer.rb
 - app/serializers/spree/v2/tenant/vendor_serializer.rb
@@ -1924,7 +1941,10 @@ files:
 - app/views/spree/transit/vendors/_form.html.erb
 - app/views/spree/transit/vendors/_tabs.html.erb
 - app/views/spree/transit/vendors/edit.html.erb
+- app/views/spree_cm_commissioner/crew_invite_mailer/_mailer_stylesheets.html.erb
+- app/views/spree_cm_commissioner/crew_invite_mailer/send_crew_invite_email.html.erb
 - app/views/spree_cm_commissioner/guest_cards/show.html.erb
+- app/views/spree_cm_commissioner/layouts/crew_invite_mailer.html.erb
 - app/views/spree_cm_commissioner/layouts/line_item_mailer.html.erb
 - app/views/spree_cm_commissioner/layouts/order_mailer.html.erb
 - app/views/spree_cm_commissioner/layouts/telegram.html.erb
@@ -2228,7 +2248,10 @@ files:
 - db/migrate/20250217075228_add_indexes_to_cm_guests.rb
 - db/migrate/20250220021751_remove_unique_constraint_from_email_in_spree_users.rb
 - db/migrate/20250226092650_add_index_to_email_in_spree_users.rb
+- db/migrate/20250304101907_create_spree_cm_commissioner_invite.rb
+- db/migrate/20250304101946_create_spree_cm_commissioner_invite_user_taxon.rb
 - db/migrate/20250304155234_add_meta_data_to_spree_vendors.rb
+- db/migrate/20250307013422_add_parent_id_to_cm_place.rb
 - docker-compose.yml
 - docs/option_types/attr_types.md
 - docs/private_key.pem
@@ -2281,6 +2304,8 @@ files:
 - lib/spree_cm_commissioner/test_helper/factories/homepage_section_relatable_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/id_card_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/image_factory.rb
+- lib/spree_cm_commissioner/test_helper/factories/invite_factory.rb
+- lib/spree_cm_commissioner/test_helper/factories/invite_user_event_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/line_item_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/line_item_seat_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/notification_factory.rb
@@ -2312,6 +2337,7 @@ files:
 - 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/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
 - lib/spree_cm_commissioner/test_helper/factories/user_identity_provider_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/variant_factory.rb
@@ -2363,9 +2389,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