spree_cm_commissioner 2.8.3.pre.pre5 → 2.8.3.pre.pre7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 145ade12d325f15a3f1963b4fd75e56093cbb182e1f3ac115d0101c0c6cad285
-  data.tar.gz: e47239cbfa8a359ce7e0b0ed2f73e5270876f679d3047a2d88be89493683004a
+  metadata.gz: 6453df013c8c48c7750f2c78315a47a008d71d2d08a18a627e6f23d1cb8e0564
+  data.tar.gz: d28c67f073a707a50fe3f44a6bb6c9184fe3403ffc6909585137b73ae8305c39
 SHA512:
-  metadata.gz: '06134389566fe49ae2dfe58a65919130cc57dcf43694d33af480d2930d517cfbba1ba97c7714f0b011cdb063a9a7d1611dc205fdcce1cf7f77fd4618c6d9ffd9'
-  data.tar.gz: 60d6491f501f2baa87fb971bee6a906f3180425d9f72917462adc2d266c0f3302a44bf532c39fe9885b3b965d7c94fdae9b158d0c7bc9263879b2d2e43197e23
+  metadata.gz: 18c051ff735f3af699821c909d430921a245cae3ba50bf798db8a5e7d20decab213b2432855d28ad22283e9fbdc17e45326a78e14e6c6a9f42d332be94a91b45
+  data.tar.gz: 37cbb8aea0043989a2eac1ade7f2184aa71d8a57349c1fd9978c2147787a65aa80134be083cf48d3e9074134eccb3e91197694dca20098140340276333b71e5a

data/.env.example

@@ -34,6 +34,7 @@ DISTANCE_SIGNING_KEY=hei********************VY
 
 # Cache durations (in seconds) for different content types
 # See: app/controllers/concerns/spree_cm_commissioner/content_cachable.rb
+CACHE_AUTO_INVALIDATION_DISABLED="" # Set to yes to disable CDN cache invalidation entirely (kill switch)
 CACHE_CDN_MAX_AGE=86400 # CDN/server-side cache duration for all responses
 CACHE_STATIC_MAX_AGE=86400 # Static content (countries, provinces, seat layouts, CMS pages) - 1 day
 CACHE_SEMI_STATIC_MAX_AGE=3600 # Semi-static content (menus, homepage backgrounds, routes) - 1 hour

data/Gemfile.lock

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

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

@@ -55,7 +55,7 @@ module Spree
         if result.success?
           flash[:success] = "Guest #{@guest.full_name} has been checked in."
         else
-          flash[:error] = result.message.to_s.titleize
+          flash[:error] = result.error.value.to_s.titleize
         end
 
         redirect_to collection_url

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

@@ -0,0 +1,25 @@
+module Spree
+  module Admin
+    class OrderTicketTransfersController < Spree::Admin::ResourceController
+      include Spree::Admin::OrderConcern
+
+      helper SpreeCmCommissioner::Admin::TicketTransfersHelper
+
+      before_action :load_order
+
+      def show
+        @ticket_transfer = model_class.includes(:order, from_guest: :event).find(params[:id])
+      end
+
+      private
+
+      def model_class
+        SpreeCmCommissioner::TicketTransfer
+      end
+
+      def object_name
+        'spree_cm_commissioner_ticket_transfer'
+      end
+    end
+  end
+end

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

@@ -92,7 +92,7 @@ module Spree
                                                                                                 .call
                                                                                                 .index_by(&:inventory_item_id)
         @reserved_stocks = Spree::LineItem
-                           .complete
+                           .affecting_inventory
                            .where(variant_id: @variants.pluck(:id))
                            .group('spree_line_items.variant_id')
                            .sum(:quantity)

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

@@ -0,0 +1,47 @@
+module Spree
+  module Admin
+    class TicketTransferRulesController < Spree::Admin::ResourceController
+      def index
+        @search = model_class.ransack(params[:q])
+        @ticket_transfer_rules = @search.result
+                                        .order(ruleable_type: :asc, ruleable_id: :asc, currency: :asc)
+                                        .page(params[:page])
+                                        .per(25)
+      end
+
+      private
+
+      def model_class
+        SpreeCmCommissioner::TicketTransferRule
+      end
+
+      def object_name
+        'spree_cm_commissioner_ticket_transfer_rule'
+      end
+
+      def collection_url
+        admin_ticket_transfer_rules_url
+      end
+
+      def location_after_save
+        edit_admin_ticket_transfer_rule_path(@object)
+      end
+
+      def permitted_resource_params
+        params.require(:spree_cm_commissioner_ticket_transfer_rule).permit(
+          :ruleable_type,
+          :ruleable_id,
+          :active,
+          :currency,
+          :fee_percentage,
+          :fee_flat_amount,
+          :cooldown_hours,
+          :max_transfers_per_ticket,
+          :event_cutoff_hours,
+          :min_price,
+          :max_price
+        )
+      end
+    end
+  end
+end

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

@@ -0,0 +1,61 @@
+module Spree
+  module Admin
+    class TicketTransfersController < Spree::Admin::ResourceController
+      helper SpreeCmCommissioner::Admin::TicketTransfersHelper
+
+      def index
+        @search = model_class.includes(:from_user, :to_user, :from_guest).ransack(params[:q])
+        @ticket_transfers = @search.result.order(created_at: :desc).page(params[:page]).per(15)
+      end
+
+      def show
+        @ticket_transfer = model_class.includes(:order, from_guest: [:event, { line_item: :order }]).find(params[:id])
+      end
+
+      def state_changes
+        @ticket_transfer = model_class.find(params[:id])
+        @state_changes = @ticket_transfer.state_changes.includes(:user).order(created_at: :desc)
+      end
+
+      def cancel
+        @ticket_transfer = model_class.find(params[:id])
+        result = SpreeCmCommissioner::TicketTransfers::Cancel.call(
+          ticket_transfer: @ticket_transfer,
+          acting_user: try_spree_current_user
+        )
+
+        if result.success?
+          flash[:success] = 'Ticket transfer has been cancelled' # rubocop:disable Rails/I18nLocaleTexts
+        else
+          flash[:error] = result.error.value
+        end
+        redirect_to admin_ticket_transfer_path(@ticket_transfer)
+      end
+
+      def update_settlement_status
+        @ticket_transfer = model_class.find(params[:id])
+        new_status = params[:settlement_status]
+
+        unless @ticket_transfer.purchase? && @ticket_transfer.completed?
+          flash[:error] = 'Settlement status can only be updated for completed purchase transfers' # rubocop:disable Rails/I18nLocaleTexts
+          redirect_to admin_ticket_transfer_path(@ticket_transfer)
+          return
+        end
+
+        if @ticket_transfer.update(settlement_status: new_status)
+          @ticket_transfer.log_settlement_status_changes(user_id: try_spree_current_user&.id)
+          flash[:success] = "Settlement status updated to #{new_status}"
+        else
+          flash[:error] = @ticket_transfer.errors.full_messages.to_sentence.presence || 'Failed to update settlement status'
+        end
+        redirect_to admin_ticket_transfer_path(@ticket_transfer)
+      end
+
+      private
+
+      def model_class
+        SpreeCmCommissioner::TicketTransfer
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/storefront/account/recipients_controller.rb

@@ -0,0 +1,32 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        module Account
+          class RecipientsController < ::Spree::Api::V2::ResourceController
+            before_action :require_spree_current_user
+
+            def show
+              identifier = params[:q].to_s.strip
+              return render_error_payload('Missing q parameter', 400) if identifier.blank?
+
+              user = SpreeCmCommissioner::RecipientSearcherQuery.new(identifier, MultiTenant.current_tenant_id).call
+
+              if user
+                render_serialized_payload { serialize_resource(user) }
+              else
+                render_error_payload('User not found', 404)
+              end
+            end
+
+            private
+
+            def resource_serializer
+              SpreeCmCommissioner::V2::Storefront::RecipientSerializer
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/storefront/ticket_transfer_acceptances_controller.rb

@@ -0,0 +1,32 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        class TicketTransferAcceptancesController < ::Spree::Api::V2::ResourceController
+          before_action :require_spree_current_user
+
+          def create
+            ticket_transfer = SpreeCmCommissioner::TicketTransfer.find_by!(token: params[:ticket_transfer_id])
+
+            result = SpreeCmCommissioner::TicketTransfers::Accept.call(
+              ticket_transfer: ticket_transfer,
+              buyer: spree_current_user
+            )
+
+            if result.success?
+              render_serialized_payload(201) { serialize_resource(result.value[:ticket_transfer]) }
+            else
+              render_error_payload(result.error)
+            end
+          end
+
+          private
+
+          def resource_serializer
+            SpreeCmCommissioner::V2::Storefront::TicketTransferSerializer
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/storefront/ticket_transfers_controller.rb

@@ -0,0 +1,117 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        class TicketTransfersController < ::Spree::Api::V2::ResourceController
+          before_action :require_spree_current_user
+
+          def index
+            render_serialized_payload do
+              serialize_collection(paginated_collection)
+            end
+          end
+
+          def show
+            ticket_transfer = model_class.includes(:order, from_guest: [:event, { line_item: :product }]).find_by!(token: params[:id])
+            return render_error_payload(I18n.t('ticket_transfer.unauthorized_view'), 403) unless authorized_to_view?(ticket_transfer)
+
+            render_serialized_payload { serialize_resource(ticket_transfer) }
+          end
+
+          def preview_rule
+            result = SpreeCmCommissioner::TicketTransfers::PreviewRule.call(
+              from_guest_id: params[:guest_id],
+              currency: params[:currency] || 'USD'
+            )
+
+            if result.success?
+              render json: { data: result.value }
+            else
+              render_error_payload(result.error)
+            end
+          end
+
+          def create
+            result = SpreeCmCommissioner::TicketTransfers::Initiate.call(
+              from_user_id: spree_current_user.id,
+              to_user_id: ticket_transfer_params[:to_user_id],
+              from_guest_id: ticket_transfer_params[:guest_id],
+              price: ticket_transfer_params[:price] || 0,
+              currency: ticket_transfer_params[:currency] || 'USD',
+              expires_at: ticket_transfer_params[:expires_at],
+              transfer_type: ticket_transfer_params[:transfer_type] || 'purchase'
+            )
+
+            if result.success?
+              render_serialized_payload(201) { serialize_resource(result.value[:ticket_transfer]) }
+            else
+              render_error_payload(result.error)
+            end
+          end
+
+          def cancel
+            ticket_transfer = model_class.find_by!(token: params[:id])
+
+            result = SpreeCmCommissioner::TicketTransfers::Cancel.call(
+              ticket_transfer: ticket_transfer,
+              acting_user: spree_current_user
+            )
+
+            if result.success?
+              render_serialized_payload { serialize_resource(result.value[:ticket_transfer]) }
+            else
+              render_error_payload(result.error)
+            end
+          end
+
+          def reject
+            ticket_transfer = model_class.find_by!(token: params[:id])
+
+            result = SpreeCmCommissioner::TicketTransfers::Reject.call(
+              ticket_transfer: ticket_transfer,
+              acting_user: spree_current_user
+            )
+
+            if result.success?
+              render_serialized_payload { serialize_resource(result.value[:ticket_transfer]) }
+            else
+              render_error_payload(result.error)
+            end
+          end
+
+          private
+
+          def model_class
+            SpreeCmCommissioner::TicketTransfer
+          end
+
+          def collection
+            SpreeCmCommissioner::TicketTransfer.includes(:order,
+                                                         from_guest: [:event, { line_item: :product }]
+                                                        ).where(from_user_id: spree_current_user.id)
+          end
+
+          def resource_serializer
+            SpreeCmCommissioner::V2::Storefront::TicketTransferSerializer
+          end
+
+          def collection_serializer
+            SpreeCmCommissioner::V2::Storefront::TicketTransferSerializer
+          end
+
+          def ticket_transfer_params
+            params.require(:ticket_transfer).permit(:to_user_id, :guest_id, :price, :currency, :expires_at, :transfer_type)
+          end
+
+          # When sending to a specific user, only sender and that buyer can access.
+          def authorized_to_view?(ticket_transfer)
+            return true if ticket_transfer.to_user_id.blank?
+
+            current_user_id = spree_current_user&.id
+            ticket_transfer.from_user_id == current_user_id || ticket_transfer.to_user_id == current_user_id
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/storefront/trip_search_controller.rb

@@ -39,7 +39,6 @@ module Spree
               params[:date],
               params[:route_type],
               params[:vendor_id],
-              params[:featured],
               params[:number_of_guests],
               resource_includes&.sort&.join(','),
               sparse_fields&.sort&.join(','),
@@ -65,8 +64,7 @@ module Spree
               'trips.vendor',
               'trips.vendor.logo',
               'trips.vehicle_type',
-              'trips.vehicle_type.vehicle_photos',
-              'trips.amenities'
+              'trips.vehicle_type.vehicle_photos'
             ]
           end
 
@@ -100,7 +98,11 @@ module Spree
 
           # override
           def serializer_params
-            params.permit(:include).to_hash
+            super.merge(
+              exclude_vendor_kind_option_types: true,
+              exclude_vendor_kind_option_values: true,
+              exclude_vehicle_type_amenities: true
+            )
           end
 
           # override

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

@@ -14,7 +14,7 @@ module Spree
           end
 
           def scope
-            current_season.episodes.includes(:voting_sessions)
+            current_season.episodes.where(product_type: :show_episode).includes(:voting_sessions, :vote_packages)
           end
 
           def current_season

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

@@ -25,6 +25,17 @@ module Spree
           def resource_serializer
             Spree::V2::Tenant::TripSerializer
           end
+
+          # override
+          def serializer_params
+            super.merge(
+              include_details: include_details?
+            )
+          end
+
+          def include_details?
+            params.fetch(:include_details, 'true') == 'true'
+          end
         end
       end
     end

data/app/controllers/spree_cm_commissioner/admin/orders_controller_decorator.rb

@@ -40,9 +40,13 @@ module SpreeCmCommissioner
 
       # override
       def cancel
-        internal_note = params.dig(:order, :internal_note)
-        @order.canceled_by(try_spree_current_user, cancellation_reason: internal_note)
-        flash[:success] = Spree.t(:order_canceled)
+        if @order.guests_in_transfer?
+          flash[:error] = Spree.t('admin.orders.cannot_cancel_guest_transfer')
+        else
+          internal_note = params.dig(:order, :internal_note)
+          @order.canceled_by(try_spree_current_user, cancellation_reason: internal_note)
+          flash[:success] = Spree.t(:order_canceled)
+        end
         redirect_back fallback_location: spree.edit_admin_order_url(@order)
       end
 

data/app/factory/spree_cm_commissioner/event_telegram_message_factory.rb

@@ -0,0 +1,68 @@
+# 🎉 ---[Event]---
+#
+# 📋 Event: {{event.name}}
+#
+# 👤 Organizer: {{vendor.name}}
+#
+# 🗓️ Start Date: {{from_date}}
+# 🗓️ End Date: {{to_date}}
+# 🔗 URL: ......
+#
+module SpreeCmCommissioner
+  class EventTelegramMessageFactory < TelegramMessageFactory
+    attr_reader :event
+
+    def initialize(event:)
+      @event = event
+
+      title = "✨ #{event.name} ✨"
+
+      super(title: title)
+    end
+
+    def body
+      [
+        event_name_line,
+        organizer_line,
+        [start_date_line, end_date_line].compact.join("\n"),
+        event_url_line
+      ].compact_blank.join("\n\n")
+    end
+
+    private
+
+    def event_name_line
+      "📋 Event: #{event.name}" if event.name.present?
+    end
+
+    def organizer_line
+      return if event.vendor&.name.blank?
+
+      "👤 Organizer: #{bold(event.vendor.name)}"
+    end
+
+    def start_date_line
+      return if event.from_date.blank?
+
+      "🗓️ Start Date: #{pretty_datetime(event.from_date)}"
+    end
+
+    def end_date_line
+      return if event.to_date.blank?
+
+      "🗓️ End Date: #{pretty_datetime(event.to_date)}"
+    end
+
+    def pretty_datetime(date)
+      return '' if date.blank?
+
+      date.strftime('%b %d, %Y · %H:%M')
+    end
+
+    def event_url_line
+      return if event.event_url.blank?
+
+      "🔗 URL: #{event.event_url}"
+    end
+  end
+end

data/app/factory/spree_cm_commissioner/order_telegram_message_factory.rb

@@ -48,7 +48,7 @@ module SpreeCmCommissioner
     end
 
     def line_item_content(line_item)
-      return intercity_taxi_line_item_content(line_item) if intercity_taxi?(line_item)
+      return transit_line_item_content(line_item) if line_item.transit?
 
       text = []
 
@@ -64,8 +64,8 @@ module SpreeCmCommissioner
     def pretty_date_for(line_item)
       return nil unless line_item.date_present?
 
-      from_date = pretty_date(line_item.from_date)
-      to_date = pretty_date(line_item.to_date)
+      from_date = pretty_datetime(line_item.from_date)
+      to_date = pretty_datetime(line_item.to_date)
 
       if from_date == to_date
         "🗓️ #{from_date}"
@@ -84,7 +84,7 @@ module SpreeCmCommissioner
       text << "Email: #{inline_code(order.email)}" if order.email.present?
       text << "Delivery Address: #{formatted_shipping_address.presence || 'N/A'}" if order.delivery_required?
 
-      append_intercity_taxi_footer(text) if intercity_taxi_order?
+      append_transit_footer(text) if transit_order?
 
       if show_details_link && order.guests.any?
         text << ''
@@ -132,12 +132,12 @@ module SpreeCmCommissioner
 
     private
 
-    def intercity_taxi?(line_item)
-      trip_for(line_item)&.intercity_taxi?
+    def transit_order?
+      selected_line_items.any?(&:transit?)
     end
 
     def intercity_taxi_order?
-      selected_line_items.any? { |li| intercity_taxi?(li) }
+      selected_line_items.any? { |li| trip_for(li)&.intercity_taxi? }
     end
 
     def trip_for(line_item)
@@ -147,10 +147,10 @@ module SpreeCmCommissioner
       @trip_cache[line_item.trip_id] ||= SpreeCmCommissioner::Trip.find_by(id: line_item.trip_id)
     end
 
-    def intercity_taxi_line_item_content(line_item)
+    def transit_line_item_content(line_item)
       text = []
-      route_text = taxi_route_text(line_item)
-      departure_text = taxi_departure_text(line_item)
+      route_text = transit_route_text(line_item)
+      departure_text = transit_departure_text(line_item)
       text << bold('🚗 Trip Details')
       text << "Route: #{route_text}" if route_text.present?
       text << "Passengers: #{line_item.passenger_count || line_item.quantity}"
@@ -159,7 +159,7 @@ module SpreeCmCommissioner
       text.compact.join("\n")
     end
 
-    def taxi_route_text(line_item)
+    def transit_route_text(line_item)
       trip = trip_for(line_item)
       return line_item.product.name if trip.blank?
 
@@ -171,21 +171,35 @@ module SpreeCmCommissioner
       vehicle.present? ? "#{parts} (#{vehicle})" : parts
     end
 
-    def taxi_departure_text(line_item)
+    def transit_departure_text(line_item)
       return nil unless line_item.date_present?
 
       line_item.from_date.strftime('%b %d, %Y · %H:%M')
     end
 
     def nationality_text
-      values = order.saved_guests.map { |sg| sg.nationality&.name.presence || sg.nationality_group&.humanize }.compact.uniq
-      return nil if values.empty?
+      grouped = order.saved_guests.group_by { |sg| sg.nationality_group&.humanize }
+      grouped.delete(nil)
+      return nil if grouped.empty?
 
-      values.join(', ')
+      grouped.map { |nationality_group, guests| customer_type_summary(nationality_group, guests) }.join(', ')
     end
 
-    def append_intercity_taxi_footer(text)
-      text << "Nationality: #{nationality_text}" if nationality_text.present?
+    # e.g. "Local (Adult x1, Child x1)". age_group is NOT NULL, so it is always present.
+    def customer_type_summary(nationality_group, guests)
+      age_breakdown = guests
+                      .group_by { |sg| sg.age_group.humanize }
+                      .map { |age_group, age_guests| "#{age_group} x#{age_guests.count}" }
+                      .join(', ')
+
+      "#{nationality_group} (#{age_breakdown})"
+    end
+
+    def append_transit_footer(text)
+      nationality = nationality_text
+      text << "Nationality: #{nationality}" if nationality.present?
+
+      return unless intercity_taxi_order?
 
       pickup = selected_line_items.filter_map(&:pickup_map_place).first
       dropoff = selected_line_items.filter_map(&:dropoff_map_place).first

data/app/factory/spree_cm_commissioner/telegram_message_factory.rb

@@ -46,5 +46,11 @@ module SpreeCmCommissioner
 
       date.to_date.strftime('%b %d, %Y')
     end
+
+    def pretty_datetime(datetime)
+      return '' if datetime.blank?
+
+      datetime&.in_time_zone&.strftime('%b %d, %Y - %H:%M')
+    end
   end
 end

data/app/helpers/spree_cm_commissioner/admin/guest_helper.rb

@@ -61,6 +61,16 @@ module SpreeCmCommissioner
           'badge-info'
         end
       end
+
+      def guest_state_badge(guest)
+        badge_class = case guest.state
+                      when 'active' then 'badge-success'
+                      when 'locked' then 'badge-warning'
+                      when 'transferred' then 'badge-secondary'
+                      else 'badge-info'
+                      end
+        content_tag(:span, guest.state.humanize, class: "badge #{badge_class}")
+      end
     end
   end
 end