spree_cm_commissioner 1.13.0 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3da0bd043e4ceca1f57afecc1bab6fbc58c960ba296f7fffa42b449a2475f8f8
-  data.tar.gz: 974c8e19e026fa90254594447a9735be039371ae6d0bc11a24c9cdf3b86dfd8c
+  metadata.gz: a83f128539c20da0667aaa913954b8d686df38054b90ea51ede36b2967a96c4b
+  data.tar.gz: 46fa67f9aff722e83efd60ae52bb640f5ba9b2576294625a3c07093cbf0c2784
 SHA512:
-  metadata.gz: 4b1d418758d9880e50dd1481b095f4cad76cc106ca0a950b694d2a87c053bf7f48655029c52939f33bf099db0a7d84048f0482d488a20ac720f1b6f8015a687e
-  data.tar.gz: 93b3ffb94424ba4a4ed46e5cde3303dc33c54a58417dd1a0750a5cb56d3638778d1fa5ceb75cf812617c33e12ae3c38c6402b7719ddfa53b2ce9567a8bb860e4
+  metadata.gz: d48ff6f2945c262955121a7f7144c5fc4ad53afa23bb2b093baaefd985346276a60b82de985b1912ec5a8fb64e6e86d37eb163638c2261446c2f85945165c3df
+  data.tar.gz: 7e21994489d8d36559a632a0008a92ecf9902c95be865190624173b89e1c8ad6146f405744971dbd448935cf9a9557b60401f34b6d211ce833eca61880082719

data/Gemfile.lock

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

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

@@ -16,9 +16,12 @@ module Spree
             return render_error(:fully_claimed) if @invite_guest.fully_claimed?
 
             guest = @line_item.guests.new(guest_params)
+            guest.event_id = @invite_guest.event_id
 
             if guest.save
               @invite_guest.update(claimed_status: :claimed) if @line_item.guests.count == @invite_guest.quantity
+              send_guest_claimed_invitation_telegram_alert_to_vendor(guest)
+
               render json: SpreeCmCommissioner::V2::Storefront::GuestSerializer.new(guest.reload).serializable_hash
             else
               render_error_payload(guest.errors.full_messages.to_sentence)
@@ -27,6 +30,23 @@ module Spree
 
           private
 
+          def send_guest_claimed_invitation_telegram_alert_to_vendor(guest)
+            title = '📣 --- [NEW GUEST CLAIMED INVITATION] ---' # Style/StringLiterals
+            chat_id = guest.event.vendor.preferred_telegram_chat_id
+            return if chat_id.blank?
+
+            factory = SpreeCmCommissioner::InviteGuestClaimedTelegramMessageFactory.new(
+              title: title,
+              order: @invite_guest.order,
+              vendor: guest.event.vendor
+            )
+            SpreeCmCommissioner::TelegramNotificationSenderJob.perform_later(
+              chat_id: chat_id,
+              message: factory.message,
+              parse_mode: factory.parse_mode
+            )
+          end
+
           def load_invite_guest_by_token
             @invite_guest = SpreeCmCommissioner::InviteGuest.find_by(token: params[:id])
           rescue ActiveRecord::RecordNotFound

data/app/factory/spree_cm_commissioner/invite_guest_claimed_telegram_message_factory.rb

@@ -0,0 +1,120 @@
+# 🎟️ --- [TICKET CLAIMED] ---
+#
+# Order Number:
+# <code>R621016753</code>
+#
+# ✅ <b>Ticket Successfully Claimed!</b>
+#
+# [ x1 ]
+# <b>5km Running Ticket</b>
+# <i>👉 Distance: 5km, T-shirt: M</i>
+# <i>🗓️ Nov 15, 2023</i>
+# <i>🏪 Temple Run with Sai</i>
+#
+# [ x2 ]
+# <b>5km Running Ticket</b>
+# <i>👉 Distance: 5km, T-shirt: S</i>
+# <i>🗓️ Nov 15, 2023 -> Nov 17, 2023</i>
+# <i>🏪 Temple Run with Sai</i>
+#
+# <b>🙍 Claimed By</b>
+# Name: Vaneath Awesome
+# Tel: <code>+85570760548</code>
+# Email: <code>admin_dev@cm.com</code>
+
+module SpreeCmCommissioner
+  class InviteGuestClaimedTelegramMessageFactory < TelegramMessageFactory
+    attr_reader :order, :vendor, :show_details_link
+
+    def initialize(title:, order:, subtitle: nil, show_details_link: nil, vendor: nil)
+      @order = order
+      @vendor = vendor
+      @show_details_link = show_details_link || false
+
+      super(title: title, subtitle: subtitle)
+    end
+
+    def selected_line_items
+      return order.line_items.for_vendor(vendor) if vendor.present?
+
+      order.line_items
+    end
+
+    # override
+    def body
+      text = []
+      text << "Order Number:\n<code>#{order.number}</code>\n"
+      text << "\n✅ <b>Ticket Successfully Claimed!</b>\n"
+      text << selected_line_items.map { |item| line_item_content(item) }.compact.join("\n\n")
+      text.compact.join("\n")
+    end
+
+    def line_item_content(line_item)
+      text = []
+
+      text << bold(line_item.product.name.to_s)
+      text << "Quantity: #{line_item.quantity}"
+      text << italic("👉 #{line_item.options_text}") if line_item.options_text.present?
+      text << italic(pretty_date_for(line_item)) if pretty_date_for(line_item).present?
+      text << italic("🏪 #{line_item.vendor.name}") if line_item.vendor&.name.present? && vendor.blank?
+
+      text.compact.join("\n")
+    end
+
+    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)
+
+      if from_date == to_date
+        "🗓️ #{from_date}"
+      else
+        "🗓️ #{from_date} -> #{to_date}"
+      end
+    end
+
+    # override
+    def footer
+      text = []
+
+      text << bold('🙍 Claimed By')
+      text << "Name: #{order.name}"
+      text << "Tel: #{inline_code(order.intel_phone_number || order.phone_number)}"
+      text << "Email: #{inline_code(order.email)}" if order.email.present?
+
+      if show_details_link && order.guests.any?
+        text << ''
+        text << 'View Tickets:'
+        text += generate_guests_links(order.guests)
+      end
+
+      text.compact.join("\n")
+    end
+
+    # Result:
+    # | No. A24 | No. A24 |
+    # | No. A24 | No. A24 |
+    # | No. A24 | No. A24 |
+    # | No. A24 | No. A24 |
+    # | No. A24 | No. A24 |
+    # | No. A24 |
+    def generate_guests_links(guests, guests_per_row = 2)
+      rows = (guests.size.to_f / guests_per_row).ceil
+      formatted_rows = []
+
+      rows.times do |i|
+        row_guests = guests.slice(i * guests_per_row, guests_per_row)
+        formatted_row = row_guests.map do |guest|
+          button_label = guest.seat_number.present? ? "No. #{guest.seat_number}" : "No. #{guest.formatted_bib_number || 'N/A'}"
+          link = Rails.application.routes.url_helpers.guest_cards_url(guest.token)
+          "| <a href='#{link}'>#{button_label}</a>"
+        end.join(' ')
+
+        formatted_rows << ("#{formatted_row} |")
+      end
+
+      formatted_rows
+    end
+  end
+end

data/app/finders/spree_cm_commissioner/products/find_decorator.rb

@@ -0,0 +1,16 @@
+module SpreeCmCommissioner
+  module Products
+    module FindDecorator
+      # override: to return only visble products
+      def by_taxons(products)
+        return products unless taxons?
+
+        products.joins(:classifications).where(::Spree::Classification.table_name => { taxon_id: taxons, visible: true })
+      end
+    end
+  end
+end
+
+unless Spree::Products::Find.included_modules.include?(SpreeCmCommissioner::Products::FindDecorator)
+  Spree::Products::Find.prepend(SpreeCmCommissioner::Products::FindDecorator)
+end

data/app/helpers/spree_cm_commissioner/transit/trip_helper.rb

@@ -0,0 +1,12 @@
+module SpreeCmCommissioner
+  module Transit
+    module TripHelper
+      def parse_time(time, timezone = nil)
+        return nil if time.blank?
+
+        formatted_time = Time.zone.parse(time.to_s)
+        timezone ? formatted_time.in_time_zone(timezone) : formatted_time
+      end
+    end
+  end
+end

data/app/models/spree_cm_commissioner/cms_page_decorator.rb

@@ -2,8 +2,23 @@ module SpreeCmCommissioner
   module CmsPageDecorator
     def self.prepended(base)
       base.belongs_to :tenant, class_name: 'SpreeCmCommissioner::Tenant'
+
+      base.validates :slug,
+                     uniqueness: {
+                       scope: %i[tenant_id deleted_at],
+                       allow_nil: true,
+                       case_sensitive: true
+                     }
     end
   end
 end
 
-Spree::CmsPage.prepend(SpreeCmCommissioner::CmsPageDecorator) unless Spree::CmsPage.included_modules.include?(SpreeCmCommissioner::CmsPageDecorator)
+unless Spree::CmsPage.included_modules.include?(SpreeCmCommissioner::CmsPageDecorator)
+  # remove old :slug validations
+  Spree::CmsPage._validators.reject! { |key, _| key == :slug }
+  Spree::CmsPage._validate_callbacks.each do |c|
+    c.filter.attributes.delete(:slug) if c.filter.respond_to?(:attributes)
+  end
+
+  Spree::CmsPage.prepend(SpreeCmCommissioner::CmsPageDecorator)
+end

data/app/queries/spree_cm_commissioner/trip_query.rb

@@ -1,21 +1,23 @@
 module SpreeCmCommissioner
   class TripQuery
-    attr_reader :origin_id, :destination_id, :travel_date
+    include SpreeCmCommissioner::Transit::TripHelper
 
-    def initialize(origin_id:, destination_id:, travel_date: Time.zone.now)
+    attr_reader :origin_id, :destination_id, :travel_date, :params
+
+    def initialize(origin_id:, destination_id:, travel_date:, params: {})
       @origin_id = origin_id
       @destination_id = destination_id
       @travel_date = travel_date
+      @travel_date = Time.zone.now if travel_date.to_date == Time.zone.now.to_date
+      @params = params
     end
 
     def call
-      trips = direct_trips
-      connections = connected_trips if trips.size < 3
-
-      trip_results = trips.map { |trip| SpreeCmCommissioner::TripQueryResult.new([trip]) }
+      return [] if travel_date.to_date < Date.current
 
-      trip_results += connections if connections
-      trip_results
+      direct_results = direct_trips.map { |trip| SpreeCmCommissioner::TripQueryResult.new([trip]) }
+      connected_results = connected_trips || []
+      direct_results + connected_results
     end
 
     def direct_trips
@@ -38,7 +40,12 @@ module SpreeCmCommissioner
                .joins('INNER JOIN cm_trip_stops AS drop_off ON drop_off.trip_id = spree_variants.id AND drop_off.stop_type = 1')
                .joins('INNER JOIN spree_vendors AS vendors ON vendors.id = spree_variants.vendor_id')
                .joins('INNER JOIN spree_products AS routes ON routes.id = spree_variants.product_id')
-               .where('boarding.stop_id = ? AND drop_off.stop_id = ?', origin_id, destination_id)
+      result = result.where(vendors: { id: params[:vendor_id] }) if params[:vendor_id].present?
+      result = result.where('boarding.stop_id = ? AND drop_off.stop_id = ?', origin_id, destination_id)
+                     .where('trips.departure_time > ? AND trips.departure_time <= ?',
+                            travel_date.strftime('%H:%M:%S'),
+                            travel_date.end_of_day.strftime('%H:%M:%S')
+                           )
 
       result.map do |trip|
         trip_result_options = {
@@ -53,7 +60,7 @@ module SpreeCmCommissioner
           destination_id: trip[:destination_id],
           destination: trip[:destination],
           vehicle_id: trip[:vehicle_id],
-          departure_time: trip[:departure_time],
+          departure_time: parse_time(trip[:departure_time]),
           duration: trip[:duration]
         }
         SpreeCmCommissioner::TripResult.new(trip_result_options)
@@ -63,17 +70,17 @@ module SpreeCmCommissioner
     def connected_trips # rubocop:disable Metrics/MethodLength
       result = SpreeCmCommissioner::TripConnection
                .joins('
-                 INNER JOIN spree_variants variant1 ON variant1.id = cm_trip_connections.from_trip_id
-                 INNER JOIN spree_variants variant2 ON variant2.id = cm_trip_connections.to_trip_id
-                 INNER JOIN spree_products AS routes1 ON routes1.id = variant1.product_id
-                 INNER JOIN spree_products AS routes2 ON routes2.id = variant2.product_id
-                 INNER JOIN cm_trips AS trip1 ON trip1.variant_id = cm_trip_connections.from_trip_id
-                 INNER JOIN cm_trips AS trip2 ON trip2.variant_id = cm_trip_connections.to_trip_id
-                 INNER JOIN cm_trip_stops trip1_origin ON trip1_origin.trip_id = variant1.id AND trip1_origin.stop_type = 0
-                 INNER JOIN cm_trip_stops trip2_origin ON trip2_origin.trip_id = variant2.id AND trip2_origin.stop_type = 0
-                 INNER JOIN cm_trip_stops trip2_destination ON trip2_destination.trip_id = variant2.id AND trip2_destination.stop_type = 1
-                 INNER JOIN spree_vendors AS vendor1 ON vendor1.id = variant1.vendor_id
-                 INNER JOIN spree_vendors AS vendor2 ON vendor2.id = variant2.vendor_id'
+                INNER JOIN spree_variants variant1 ON variant1.id = cm_trip_connections.from_trip_id
+                INNER JOIN spree_variants variant2 ON variant2.id = cm_trip_connections.to_trip_id
+                INNER JOIN spree_products AS routes1 ON routes1.id = variant1.product_id
+                INNER JOIN spree_products AS routes2 ON routes2.id = variant2.product_id
+                INNER JOIN cm_trips AS trip1 ON trip1.variant_id = cm_trip_connections.from_trip_id
+                INNER JOIN cm_trips AS trip2 ON trip2.variant_id = cm_trip_connections.to_trip_id
+                INNER JOIN cm_trip_stops trip1_origin ON trip1_origin.trip_id = variant1.id AND trip1_origin.stop_type = 0
+                INNER JOIN cm_trip_stops trip2_origin ON trip2_origin.trip_id = variant2.id AND trip2_origin.stop_type = 0
+                INNER JOIN cm_trip_stops trip2_destination ON trip2_destination.trip_id = variant2.id AND trip2_destination.stop_type = 1
+                INNER JOIN spree_vendors AS vendor1 ON vendor1.id = variant1.vendor_id
+                INNER JOIN spree_vendors AS vendor2 ON vendor2.id = variant2.vendor_id'
                      )
                .select('cm_trip_connections.id AS id,
                         trip1.variant_id AS trip1_id,
@@ -97,8 +104,11 @@ module SpreeCmCommissioner
                         trip2_origin.stop_name AS trip2_origin,
                         trip2_destination.stop_name AS trip2_destination,
                         vendor2.name AS trip2_vendor_name'
-                      ).where('trip1_origin.stop_id = ? AND trip2_destination.stop_id = ?', origin_id, destination_id
-                      ).uniq
+                      ).where('trip1_origin.stop_id = ? AND trip2_destination.stop_id = ?', origin_id, destination_id)
+      result = result.where('vendor1.id = ? OR vendor2.id = ?', params[:vendor_id], params[:vendor_id]) if params[:vendor_id].present?
+      result = result.where('trip1.departure_time > ? AND trip1.departure_time <= ?', travel_date.strftime('%H:%M:%S'),
+                            travel_date.end_of_day.strftime('%H:%M:%S')
+      ).uniq
 
       return [] if result.blank?
 
@@ -113,7 +123,7 @@ module SpreeCmCommissioner
           trip_id: trip[:trip1_id],
           origin_id: trip[:trip1_origin_id],
           destination_id: trip[:trip1_destination_id],
-          departure_time: trip[:trip1_departure_time],
+          departure_time: parse_time(trip[:trip1_departure_time]),
           duration: trip[:trip1_duration],
           vendor_name: trip[:trip1_vendor_name],
           route_name: trip[:route1_name],
@@ -126,7 +136,7 @@ module SpreeCmCommissioner
           trip_id: trip[:trip2_id],
           origin_id: trip[:trip2_origin_id],
           destination_id: trip[:trip2_destination_id],
-          departure_time: trip[:trip2_departure_time],
+          departure_time: parse_time(trip[:trip2_departure_time]),
           duration: trip[:trip2_duration],
           vendor_name: trip[:trip2_vendor_name],
           route_name: trip[:route2_name],

data/db/migrate/20250528073748_remove_unique_slug_index_on_spree_cms_pages.rb

@@ -0,0 +1,12 @@
+class RemoveUniqueSlugIndexOnSpreeCmsPages < ActiveRecord::Migration[7.0]
+  def change
+    if index_exists?(:spree_cms_pages,
+      [:slug, :store_id, :deleted_at],
+      unique: true,
+      name: "index_spree_cms_pages_on_slug_and_store_id_and_deleted_at")
+
+      remove_index :spree_cms_pages,
+                   name: "index_spree_cms_pages_on_slug_and_store_id_and_deleted_at"
+    end
+  end
+end

data/db/migrate/20250528074043_add_unique_index_on_slug_tenant_id_deleted_at_to_spree_cms_pages.rb

@@ -0,0 +1,13 @@
+class AddUniqueIndexOnSlugTenantIdDeletedAtToSpreeCmsPages < ActiveRecord::Migration[7.0]
+  def change
+    unless index_exists?(:spree_cms_pages,
+      [:slug, :tenant_id, :deleted_at],
+      unique: true,
+      name: "index_spree_cms_pages_on_slug_and_tenant_id_and_deleted_at")
+
+      add_index :spree_cms_pages, [:slug, :tenant_id, :deleted_at],
+                unique: true,
+                name: "index_spree_cms_pages_on_slug_and_tenant_id_and_deleted_at"
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+FactoryBot.define do
+  factory :cm_cms_page, class: 'Spree::CmsPage' do
+    sequence(:slug) { |n| "page-slug-#{n}" }
+    title { "Sample Page Title" }
+    association :store, factory: :store
+    locale { 'en' }
+    type { 'Spree::Cms::Pages::StandardPage' }
+    tenant { nil }
+    deleted_at { nil }
+  end
+end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '1.13.0'.freeze
+  VERSION = '1.14.0'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.14.0
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-27 00:00:00.000000000 Z
+date: 2025-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -961,12 +961,14 @@ files:
 - app/errors/spree_cm_commissioner/unauthorized_event_error.rb
 - app/errors/spree_cm_commissioner/unauthorized_vendor_error.rb
 - app/exception_notifier/spree_cm_commissioner/telegram_notifier.rb
+- app/factory/spree_cm_commissioner/invite_guest_claimed_telegram_message_factory.rb
 - app/factory/spree_cm_commissioner/order_telegram_message_factory.rb
 - app/factory/spree_cm_commissioner/telegram_message_factory.rb
 - app/finders/spree_cm_commissioner/line_items/find_by_variant_decorator.rb
 - app/finders/spree_cm_commissioner/orders/find.rb
 - app/finders/spree_cm_commissioner/orders/find_by_state.rb
 - app/finders/spree_cm_commissioner/payment_methods/group_by_bank.rb
+- app/finders/spree_cm_commissioner/products/find_decorator.rb
 - app/helpers/spree/admin/base_helper_decorator.rb
 - app/helpers/spree/admin/google_wallets_helper.rb
 - app/helpers/spree/base_helper_decorator.rb
@@ -985,6 +987,7 @@ files:
 - app/helpers/spree_cm_commissioner/pin_code_sender_helper.rb
 - app/helpers/spree_cm_commissioner/telegram/base_helper.rb
 - app/helpers/spree_cm_commissioner/transit/service_calendars_helper.rb
+- app/helpers/spree_cm_commissioner/transit/trip_helper.rb
 - app/interactors/spree_cm_commissioner/accommodation_search_detail.rb
 - app/interactors/spree_cm_commissioner/account_deletion.rb
 - app/interactors/spree_cm_commissioner/account_deletion_cron_executor.rb
@@ -2423,6 +2426,8 @@ files:
 - db/migrate/20250520044533_add_event_to_spree_line_items.rb
 - db/migrate/20250521024345_add_tenant_id_to_cm_waiting_room_sessions.rb
 - db/migrate/20250521095539_add_kyc_to_spree_variants.rb
+- db/migrate/20250528073748_remove_unique_slug_index_on_spree_cms_pages.rb
+- db/migrate/20250528074043_add_unique_index_on_slug_tenant_id_deleted_at_to_spree_cms_pages.rb
 - docker-compose.yml
 - docs/option_types/attr_types.md
 - docs/private_key.pem
@@ -2456,6 +2461,7 @@ files:
 - lib/spree_cm_commissioner/test_helper/factories/back_image_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/branch_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/check_in_factory.rb
+- lib/spree_cm_commissioner/test_helper/factories/cms_page_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/country_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/customer_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/customer_notification_factory.rb