spree_cm_commissioner 2.8.3 → 2.8.4.pre.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0774f6d0c4fad7ae396f14326fd6d0965164b74d89f355c3966bc8d1fd9563f9
-  data.tar.gz: 002d84c9f1273b54f01d5a25bdecc5f3b475a12e07b32d8e1846c19107fe776f
+  metadata.gz: 6b4cb4f14de6554d09bdd97872267ca1f23e73d144401b49a8969203e601b910
+  data.tar.gz: 454758bb34c6df3a4f1e2272b65bb19f57e7d829c06c045d7f748a72a56cb42f
 SHA512:
-  metadata.gz: 260d54db1f9dd63dbfef02edf2944d02e2c582972b8903815462e438be9cbfb6f5561a7b4a4b64c2cda4af18908c8c7a91958213c06764d1f7ee4d8e2c16dec3
-  data.tar.gz: 003d6ecd547b0215851266f06e823f2f7c5e7a8da35f5b4a8051784855a4d095d088b79f700dcadca8820d561d7a9989a3ee0d9eb7940943c3c5777cc7a4742c
+  metadata.gz: 3dea963b405471ddcf3a1b7819bab6d7ffca7b76f0567b6a0092262b5b8d980db83fc052c4913f06ff42921727bc4168c2c044beeeb38ddc65ef242071918f34
+  data.tar.gz: f9a841e7c01222124a041e65adf42b7e6d57b53fdc8e731c08e595dbceb601fb45fbe7ef6850df709d454b75220c4e58da2af1f8c2d0bb37d58ab00bc4c2031c

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.8.3)
+    spree_cm_commissioner (2.8.4.pre.pre1)
       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/system/waiting_room_controller.rb

@@ -4,7 +4,10 @@ module Spree
       class WaitingRoomController < Spree::Admin::BaseController
         def show
           @fetcher = SpreeCmCommissioner::WaitingRoomSystemMetadataFetcher.new
+          @lobby_fetcher = SpreeCmCommissioner::WaitingRoomLobbyMetadataFetcher.new
+
           @fetcher.load_document_data
+          @lobby_fetcher.load_document_data
 
           @active_sesions_count = SpreeCmCommissioner::WaitingRoomSession.active.count
         end
@@ -29,6 +32,18 @@ module Spree
 
           redirect_back fallback_location: admin_system_waiting_room_path
         end
+
+        def publish_lobby_path
+          result = SpreeCmCommissioner::WaitingRoom::PublishLobbyPath.call
+
+          if result.success?
+            flash[:success] = "Published waiting guests records path: #{result.value[:records_path]}"
+          else
+            flash[:error] = result.error.to_s
+          end
+
+          redirect_back fallback_location: admin_system_waiting_room_path
+        end
       end
     end
   end

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

@@ -27,6 +27,10 @@ module Spree
         remove_asset(@taxon.home_banner)
       end
 
+      def remove_ad_banner
+        remove_asset(@taxon.ad_banner)
+      end
+
       def remove_video_banner
         remove_asset(@taxon.video_banner)
       end
@@ -48,6 +52,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_ad_banner(attachment: permitted_resource_params.delete(:ad_banner)) if permitted_resource_params[:ad_banner]
         @taxon.build_video_banner(attachment: permitted_resource_params.delete(:video_banner)) if permitted_resource_params[:video_banner]
       end
     end

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/guests_controller.rb

@@ -31,13 +31,15 @@ module Spree
           def create
             spree_authorize! :update, spree_current_order, order_token
 
-            resource = scope.new(guest_params)
+            result = SpreeCmCommissioner::Cart::CreateGuest.call(
+              line_item: parent,
+              options: guest_params
+            )
 
-            if resource.save
-              resource.save_and_move_to_next_stage
-              render_serialized_payload(201) { serialize_resource(resource) }
+            if result.success?
+              render_serialized_payload(201) { serialize_resource(result.value) }
             else
-              render_error_payload(resource.errors, 422)
+              render_error_payload(result.value.errors, 422)
             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/transit/draft_orders_controller.rb

@@ -11,6 +11,7 @@ module Spree
             # - inbound_date: Date of inbound transit (optional)
             # - outbound_legs: Array of outbound leg details (required)
             # - inbound_legs: Array of inbound leg details (optional)
+            # - include_return: Whether to add the trip's "return included" add-on as a line item (optional)
             def create
               @outbound_legs = params[:outbound_legs].is_a?(Array) && params[:outbound_legs].any? ? build_legs(:outbound, params[:outbound_legs]) : []
               @inbound_legs  = params[:inbound_legs].is_a?(Array) && params[:inbound_legs].any? ? build_legs(:inbound, params[:inbound_legs]) : []
@@ -20,7 +21,8 @@ module Spree
                 inbound_date: params[:inbound_date]&.to_date,
                 outbound_legs: @outbound_legs,
                 inbound_legs: @inbound_legs,
-                user: spree_current_user
+                user: spree_current_user,
+                include_return: ActiveModel::Type::Boolean.new.cast(params[:include_return])
               )
 
               if result.success?

data/app/controllers/spree/api/v2/tenant/transit/draft_orders_controller.rb

@@ -11,6 +11,7 @@ module Spree
             # - inbound_date: Date of inbound transit (optional)
             # - outbound_legs: Array of outbound leg details (required)
             # - inbound_legs: Array of inbound leg details (optional)
+            # - include_return: Whether to add the trip's "return included" add-on as a line item (optional)
             def create
               @outbound_legs = params[:outbound_legs].is_a?(Array) && params[:outbound_legs].any? ? build_legs(:outbound, params[:outbound_legs]) : []
               @inbound_legs  = params[:inbound_legs].is_a?(Array) && params[:inbound_legs].any? ? build_legs(:inbound, params[:inbound_legs]) : []
@@ -20,7 +21,8 @@ module Spree
                 inbound_date: params[:inbound_date]&.to_date,
                 outbound_legs: @outbound_legs,
                 inbound_legs: @inbound_legs,
-                user: spree_current_user
+                user: spree_current_user,
+                include_return: ActiveModel::Type::Boolean.new.cast(params[:include_return])
               )
 
               if result.success?

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/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

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

@@ -0,0 +1,32 @@
+module SpreeCmCommissioner
+  module Admin
+    module TicketTransfersHelper
+      def ticket_transfer_state_badge(state)
+        badge_class = case state
+                      when 'pending' then 'badge-warning'
+                      when 'accepted' then 'badge-info'
+                      when 'completed' then 'badge-success'
+                      when 'rejected' then 'badge-danger'
+                      when 'expired' then 'badge-danger' # rubocop:disable Lint/DuplicateBranch
+                      when 'cancelled' then 'badge-secondary'
+                      else 'badge-secondary' # rubocop:disable Lint/DuplicateBranch
+                      end
+
+        content_tag(:span, state.humanize, class: "badge #{badge_class}")
+      end
+
+      def ticket_transfer_settlement_status_badge(ticket_transfer)
+        badge_class = case ticket_transfer.settlement_status
+                      when 'pending' then 'badge-warning'
+                      when 'ready' then 'badge-info'
+                      when 'disputed' then 'badge-danger'
+                      when 'resolved' then 'badge-primary'
+                      when 'completed' then 'badge-success'
+                      else 'badge-secondary'
+                      end
+
+        content_tag(:span, ticket_transfer.settlement_status.humanize, class: "badge #{badge_class}")
+      end
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/pin_code_sender.rb

@@ -6,7 +6,7 @@ module  SpreeCmCommissioner
       context.fail!(message: I18n.t('pincode_sender.pincode.blank')) if context.pin_code.nil?
 
       if context.pin_code.phone_number?
-        send_sms
+        send_phone_otp
       else
         send_email
       end
@@ -16,18 +16,73 @@ module  SpreeCmCommissioner
 
     private
 
-    def send_sms
+    # Channel selection for phone-number OTPs lives here so the routing is
+    # easy to find and reason about. Telegram Gateway is primary; SMS is the fallback.
+    def send_phone_otp
+      if telegram_gateway_available?
+        send_via_telegram_gateway
+      else
+        send_via_sms
+      end
+    end
+
+    def telegram_gateway_available?
+      return false unless telegram_gateway_enabled?
+      return false if telegram_gateway_api_key.blank?
+
+      ability = telegram_gateway_adapter.check_send_ability(context.pin_code.contact)
+      context.telegram_gateway_request_id = ability.request_id if ability.ok?
+      ability.ok?
+    rescue TelegramGatewayAdapter::Error, Faraday::Error
+      false
+    end
+
+    def send_via_telegram_gateway
       from_number = sms_from_number
       return if from_number.blank?
 
-      options = {
+      # Save the chosen channel + the Telegram request_id synchronously so
+      # (a) the API response already reflects the channel for the mobile UI,
+      # (b) verification can reach Telegram even if the user submits the OTP
+      #     before the async send job has run. For Telegram-delivered codes
+      #     the `code` column stores Telegram's request_id (Telegram generates
+      #     and holds the actual OTP).
+      context.pin_code.update!(
+        delivery_channel: :telegram_gateway,
+        code: context.telegram_gateway_request_id
+      )
+
+      SpreeCmCommissioner::TelegramGateway::PinCodeSenderJob.perform_later(
+        pin_code_id: context.pin_code.id,
+        from: from_number,
+        request_id: context.telegram_gateway_request_id,
+        tenant_id: context.pin_code&.application&.tenant_id
+      )
+    end
+
+    def send_via_sms
+      from_number = sms_from_number
+      return if from_number.blank?
+
+      SpreeCmCommissioner::SmsPinCodeJob.perform_later(
+        pin_code_id: context.pin_code.id,
         from: from_number,
         to: context.pin_code.contact,
         body: I18n.t('pincode_sender.sms.body', code: context.pin_code.code, readable_type: context.pin_code.readable_type),
         tenant_id: context.pin_code&.application&.tenant_id
-      }
+      )
+    end
+
+    def telegram_gateway_enabled?
+      ENV['TELEGRAM_GATEWAY_ENABLED'] == 'yes'
+    end
 
-      SpreeCmCommissioner::SmsPinCodeJob.perform_later(options)
+    def telegram_gateway_api_key
+      @telegram_gateway_api_key ||= ENV.fetch('TELEGRAM_GATEWAY_API_KEY', nil)
+    end
+
+    def telegram_gateway_adapter
+      @telegram_gateway_adapter ||= TelegramGatewayAdapter::Client.new
     end
 
     def sms_from_number
@@ -38,6 +93,8 @@ module  SpreeCmCommissioner
     end
 
     def send_email
+      context.pin_code.update!(delivery_channel: :email)
+
       SpreeCmCommissioner::PinCodeMailer.send_pin_code(
         context.pin_code.id,
         context.pin_code.readable_type,