spree_cm_commissioner 1.18.0.pre.pre4 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9434e61388125711a726ff9ad637afc01b90c3dcffe3c1329b1aee6eff3d090
-  data.tar.gz: f4305e64f869e0a1827b3b26be7df5640a933271342ca3c8470ccf5b17aa3447
+  metadata.gz: 2c10fd2782b1a1ac7ecab5d27e02a49212f8e816f8f2325fadbcd717fe9882e9
+  data.tar.gz: 3b1b296e3403e5dd040063c19a3ac4952afafb617af17cd2ca924ea8df25de23
 SHA512:
-  metadata.gz: 5536482b79e3c889c16da6a9a8e0f3f8788efea9e3399a8fb1a3686b8225888116c3f9c0ea302a06de214d752681f08507b8efaf33f661fe5189d6646f9207b5
-  data.tar.gz: ec06d66f7f0506e35a662ee75529a2aafaf010b417457f8046c70f7cb5ed5c5b1b5bd096d7afdd3dcb93825a8ecd759354eb454beeb7e66d014b095f2e0bb189
+  metadata.gz: 1f31cf8a9073664246d505c0494b2da2dc6565ec14c57fae06f34320039a478af4d8a1e0ee5eb1e68c42a5de37baf393bee0e791f7d9dfb8fd2b66356f143566
+  data.tar.gz: e29ba3d6d3e2d8343209260edd69117fe67c14ea1c20c13891b6cd9930f044467daa7b2fffaff51ab27db42e98eb7f43a85254e33a4644927e3eb61a1e9d742f

data/Gemfile.lock

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

data/app/controllers/concerns/spree_cm_commissioner/content_cachable.rb

@@ -6,9 +6,8 @@ module SpreeCmCommissioner
       after_action :set_cache_control_for_cdn
     end
 
-    # Override This Method based on your UseCase
     def max_age
-      ENV.fetch('CONTENT_CACHE_MAX_AGE', 1.day.to_i).to_i
+      ENV.fetch('CONTENT_CACHE_MAX_AGE', '180')
     end
 
     def set_cache_control_for_cdn

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

@@ -38,25 +38,27 @@ module Spree
           def update
             spree_authorize! :update, spree_current_order, order_token
 
-            begin
-              if guest_params[:guest_dynamic_fields_attributes]
-                resource.guest_dynamic_fields.destroy_all
+            if guest_params[:guest_dynamic_fields_attributes]
+              resource.guest_dynamic_fields.destroy_all
 
-                guest_params[:guest_dynamic_fields_attributes].each do |attr|
-                  field = build_dynamic_field(attr)
-                  field.save!
+              guest_params[:guest_dynamic_fields_attributes].each do |attr|
+                field = resource.guest_dynamic_fields.build(attr.except(:id))
+
+                if field.dynamic_field.requires_dynamic_field_options?
+                  option = field.dynamic_field.dynamic_field_options.find_by(id: field.value)
+                  field.dynamic_field_option = option if option
                 end
+
+                field.save!
               end
+            end
 
-              resource.assign_attributes(guest_params.except(:guest_dynamic_fields_attributes))
+            resource.assign_attributes(guest_params.except(:guest_dynamic_fields_attributes))
 
-              if resource.save
-                render_serialized_payload { serialize_resource(resource) }
-              else
-                render_error_payload(resource.errors, 400)
-              end
-            rescue ActiveRecord::RecordInvalid => e
-              render_error_payload(e.record.errors, 400)
+            if resource.save
+              render_serialized_payload { serialize_resource(resource) }
+            else
+              render_error_payload(resource, 400)
             end
           end
 
@@ -94,17 +96,6 @@ module Spree
               guest_dynamic_fields_attributes: %i[id dynamic_field_id dynamic_field_option_id value _destroy]
             )
           end
-
-          def build_dynamic_field(attr)
-            field = resource.guest_dynamic_fields.build(attr.except(:id))
-
-            if field.dynamic_field.requires_dynamic_field_options?
-              option = field.dynamic_field.dynamic_field_options.find_by(id: field.value)
-              field.dynamic_field_option = option if option
-            end
-
-            field
-          end
         end
       end
     end

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

@@ -27,8 +27,6 @@ module Spree
           end
 
           def complete
-            return render_serialized_payload { serialized_current_order } if spree_current_order.confirm? || spree_current_order.complete?
-
             spree_authorize! :update, spree_current_order, order_token
 
             result = complete_service.call(order: spree_current_order)

data/app/controllers/spree_cm_commissioner/api/v2/storefront/checkout_controller_decorator.rb

@@ -6,17 +6,6 @@ module SpreeCmCommissioner
           def self.prepended(base)
             base.include SpreeCmCommissioner::OrderConcern
           end
-
-          # Override Spree's default behavior:
-          # By default, Spree raises an error if `complete` is called on a completed or confirmed order.
-          # We want to allow this call to succeed, so the API can be used both to:
-          # - complete the order (if it's not yet complete), or
-          # - return the latest state of a confirmed or completed order without raising a forbidden error.
-          def complete
-            return render_serialized_payload { serialized_current_order } if spree_current_order.confirm? || spree_current_order.complete?
-
-            super
-          end
         end
       end
     end

data/app/controllers/spree_cm_commissioner/well_known_controller.rb

@@ -3,42 +3,18 @@ module SpreeCmCommissioner
     before_action :identify_request_source
     rescue_from StandardError, with: :handle_error
 
-    def assetlinks_json
-      render_platform_link(:android)
-    end
-
-    def apple_app_site_association
-      render_platform_link(:ios)
-    end
-
-    private
-
-    def render_platform_link(platform)
-      fetcher_class = platform_link_finder(platform)
-
-      result = fetcher_class.call(
-        store: @store,
-        tenant: @tenant,
-        refreshed: params[:_refreshed].present?
-      )
-
-      if result.success? && result.contents.present?
-        render json: result.contents
+    def show
+      case params[:id]
+      when 'assetlinks.json'
+        render_preference(:preferred_assetlinks)
+      when 'apple-app-site-association'
+        render_preference(:preferred_apple_app_site_association)
       else
         render_not_found
       end
     end
 
-    def platform_link_finder(platform)
-      case platform
-      when :android
-        SpreeCmCommissioner::AssetLinksFetcher
-      when :ios
-        SpreeCmCommissioner::AppleAppSiteAssociationFetcher
-      else
-        render_not_found
-      end
-    end
+    private
 
     def identify_request_source
       host = params[:original_host].presence || request.host.downcase
@@ -49,6 +25,16 @@ module SpreeCmCommissioner
       @tenant = result.tenant
     end
 
+    def render_preference(preference_key)
+      if @store&.send(preference_key).present?
+        render json: @store.send(preference_key)
+      elsif @tenant&.send(preference_key).present?
+        render json: @tenant.send(preference_key)
+      else
+        render_not_found
+      end
+    end
+
     def render_not_found
       render json: { error: 'Not found' }, status: :not_found
     end

data/app/models/spree_cm_commissioner/pin_code.rb

@@ -2,7 +2,7 @@ module SpreeCmCommissioner
   class PinCode < SpreeCmCommissioner::Base
     has_secure_token
 
-    enum contact_type: { 'phone_number' => 0, 'email' => 1, 'telegram' => 2 }
+    enum contact_type: { 'phone_number' => 0, 'email' => 1 }
 
     validates :code, length: { maximum: 6 }
     validates :contact, presence: true
@@ -130,8 +130,7 @@ module SpreeCmCommissioner
         'SpreeCmCommissioner::PinCodeMobileConfirm' => I18n.t('pincode.readable_type.confirmation_code'),
         'SpreeCmCommissioner::PinCodeUpdateUserLogin' => I18n.t('pincode.readable_type.update_user_login'),
         'SpreeCmCommissioner::PinCodeEmailConfirm' => I18n.t('pincode.readable_type.confirmation_code'),
-        'SpreeCmCommissioner::OtpCode' => I18n.t('pincode.readable_type.otp_code'),
-        'SpreeCmCommissioner::PinCodeTelegram' => I18n.t('pincode.readable_type.telegram_verification')
+        'SpreeCmCommissioner::OtpCode' => I18n.t('pincode.readable_type.otp_code')
       }
     end
 

data/app/models/spree_cm_commissioner/vendor_decorator.rb

@@ -78,7 +78,6 @@ module SpreeCmCommissioner
       base.has_many :invoices, class_name: 'SpreeCmCommissioner::Invoice', dependent: :destroy
       base.has_many :subscriptions, through: :customers, class_name: 'SpreeCmCommissioner::Subscription'
       base.has_many :subscription_orders, through: :subscriptions, class_name: 'Spree::Order', source: :orders
-      base.has_many :promotion_categories, class_name: 'Spree::PromotionCategory', foreign_key: :vendor_id, dependent: :destroy
 
       base.has_many :homepage_section_relatables,
                     class_name: 'SpreeCmCommissioner::HomepageSectionRelatable',

data/config/locales/en.yml

@@ -547,7 +547,6 @@ en:
       update_user_login: "update user code"
       contact_update: "update contact code"
       otp_code: "OTP code"
-      telegram_verification: "telegram code"
 
   notifications:
     spree_cm_commissioner:

data/config/routes.rb

@@ -669,6 +669,5 @@ Rails.application.routes.draw do
   get 'o/:id', to: 'spree_cm_commissioner/orders#show', as: 'order'
   get 'li/:id', to: 'spree_cm_commissioner/line_item_qr_images#show', as: 'line_item_qr_image'
   get 'g/:id', to: 'spree_cm_commissioner/guest_cards#show', as: 'guest_cards'
-  get '.well-known/assetlinks.json', to: 'spree_cm_commissioner/well_known#assetlinks_json'
-  get '.well-known/apple-app-site-association', to: 'spree_cm_commissioner/well_known#apple_app_site_association'
+  get '.well-known/:id', to: 'spree_cm_commissioner/well_known#show', constraints: { id: /(assetlinks\.json|apple-app-site-association)/ }
 end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '1.18.0-pre4'.freeze
+  VERSION = '1.18.0'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 1.18.0.pre.pre4
+  version: 1.18.0
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-11 00:00:00.000000000 Z
+date: 2025-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -1038,9 +1038,7 @@ files:
 - app/interactors/spree_cm_commissioner/account_linkage.rb
 - app/interactors/spree_cm_commissioner/account_recover.rb
 - app/interactors/spree_cm_commissioner/account_updater.rb
-- app/interactors/spree_cm_commissioner/apple_app_site_association_fetcher.rb
 - app/interactors/spree_cm_commissioner/apply_service_availability.rb
-- app/interactors/spree_cm_commissioner/asset_links_fetcher.rb
 - app/interactors/spree_cm_commissioner/base_interactor.rb
 - app/interactors/spree_cm_commissioner/bib_number_swapper.rb
 - app/interactors/spree_cm_commissioner/chatrace_order_creator.rb
@@ -1109,7 +1107,6 @@ files:
 - app/interactors/spree_cm_commissioner/subscriptions_order_creator.rb
 - app/interactors/spree_cm_commissioner/subscriptions_order_cron_executor.rb
 - app/interactors/spree_cm_commissioner/subscriptions_prepaid_order_creator.rb
-- app/interactors/spree_cm_commissioner/telegram_chats_auto_finder.rb
 - app/interactors/spree_cm_commissioner/telegram_chats_finder.rb
 - app/interactors/spree_cm_commissioner/telegram_debug_pin_code_sender.rb
 - app/interactors/spree_cm_commissioner/telegram_notification_sender.rb
@@ -1304,7 +1301,6 @@ files:
 - app/models/spree_cm_commissioner/pin_code_mobile_confirm.rb
 - app/models/spree_cm_commissioner/pin_code_otp.rb
 - app/models/spree_cm_commissioner/pin_code_registration.rb
-- app/models/spree_cm_commissioner/pin_code_telegram.rb
 - app/models/spree_cm_commissioner/pin_code_update_user_login.rb
 - app/models/spree_cm_commissioner/place.rb
 - app/models/spree_cm_commissioner/product_completion_step.rb
@@ -1324,7 +1320,6 @@ files:
 - app/models/spree_cm_commissioner/promotion/rules/guest_occupations.rb
 - app/models/spree_cm_commissioner/promotion/rules/vendors.rb
 - app/models/spree_cm_commissioner/promotion/rules/weekend.rb
-- app/models/spree_cm_commissioner/promotion_category_decorator.rb
 - app/models/spree_cm_commissioner/promotion_decorator.rb
 - app/models/spree_cm_commissioner/property_decorator.rb
 - app/models/spree_cm_commissioner/prototype_decorator.rb
@@ -1359,7 +1354,6 @@ files:
 - app/models/spree_cm_commissioner/taxon_web_banner.rb
 - app/models/spree_cm_commissioner/taxonomy_decorator.rb
 - app/models/spree_cm_commissioner/telegram_bot.rb
-- app/models/spree_cm_commissioner/telegram_chat.rb
 - app/models/spree_cm_commissioner/tenant.rb
 - app/models/spree_cm_commissioner/transactional_email.rb
 - app/models/spree_cm_commissioner/trip.rb
@@ -2523,11 +2517,9 @@ files:
 - db/migrate/20250611023548_add_country_code_to_guests.rb
 - db/migrate/20250612035937_add_intel_phone_number_to_guests.rb
 - db/migrate/20250616084219_add_description_to_cm_vendor_place.rb
-- db/migrate/20250630103536_create_cm_telegram_chats.rb
 - db/migrate/20250701093203_add_configurations_to_cm_dynamic_field.rb
 - db/migrate/20250702091305_add_dynamic_field_option_to_guest_dynamic_field.rb
 - db/migrate/20250702091935_add_status_to_dynamic_field_option.rb
-- db/migrate/20250707032008_add_vendor_id_to_spree_category.rb
 - docker-compose.yml
 - docs/option_types/attr_types.md
 - docs/private_key.pem
@@ -2680,9 +2672,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

data/app/interactors/spree_cm_commissioner/apple_app_site_association_fetcher.rb

@@ -1,27 +0,0 @@
-module SpreeCmCommissioner
-  class AppleAppSiteAssociationFetcher < BaseInteractor
-    delegate :store, :tenant, :refreshed, to: :context
-
-    def call
-      key = cache_key
-
-      CmAppLogger.log(label: 'LOOKING_UP_CACHE', data: { cache_key: key })
-
-      Rails.cache.delete(key) if refreshed
-
-      context.contents = Rails.cache.fetch(key) do
-        CmAppLogger.log(label: 'CACHE_MISS', data: { cache_key: key })
-        resource.preferred_apple_app_site_association
-      end
-    end
-
-    def cache_key
-      updated_at = tenant&.updated_at || store&.updated_at
-      "well_known:apple-app-site-association:#{resource.class.name}:#{resource.id}:#{updated_at}"
-    end
-
-    def resource
-      tenant || store
-    end
-  end
-end

data/app/interactors/spree_cm_commissioner/asset_links_fetcher.rb

@@ -1,27 +0,0 @@
-module SpreeCmCommissioner
-  class AssetLinksFetcher < BaseInteractor
-    delegate :store, :tenant, :refreshed, to: :context
-
-    def call
-      key = cache_key
-
-      CmAppLogger.log(label: 'LOOKING_UP_CACHE', data: { cache_key: key })
-
-      Rails.cache.delete(key) if refreshed
-
-      context.contents = Rails.cache.fetch(key) do
-        CmAppLogger.log(label: 'CACHE_MISS', data: { cache_key: key })
-        resource.preferred_assetlinks
-      end
-    end
-
-    def cache_key
-      updated_at = tenant&.updated_at || store&.updated_at
-      "well_known:assetlinks.json:#{resource.class.name}:#{resource.id}:#{updated_at}"
-    end
-
-    def resource
-      tenant || store
-    end
-  end
-end

data/app/interactors/spree_cm_commissioner/telegram_chats_auto_finder.rb

@@ -1,144 +0,0 @@
-module SpreeCmCommissioner
-  class TelegramChatsAutoFinder < BaseInteractor
-    delegate :contact, :pin_code, to: :context
-
-    def call
-      context.chats = []
-      context.verified_chat_ids = []
-
-      updates = fetch_updates
-
-      if updates['result'].any?
-        updates['result'].sort_by { |u| u['update_id'] }.reverse.each do |update|
-          handle_message_update(update) if update['message']
-          handle_channel_post_update(update) if update['channel_post']
-          handle_chat_member_update(update) if update['my_chat_member']
-        end
-      end
-      context.fail!(message: 'No pin codes verified') if context.verified_chat_ids.empty?
-    end
-
-    private
-
-    def handle_chat_member_update(update)
-      chat = update.dig('my_chat_member', 'chat')
-      return unless chat
-
-      chat_data = {
-        id: chat['id'],
-        title: chat['title'] || 'Unnamed Chat',
-        type: chat['type']
-      }
-
-      return if context.chats.any? { |c| c[:id] == chat_data[:id] }
-
-      db_chat = SpreeCmCommissioner::TelegramChat.find_or_initialize_by(chat_id: chat_data[:id])
-      is_new_chat = db_chat.new_record?
-      db_chat.update(chat_title: chat_data[:title], chat_type: chat_data[:type])
-      context.chats << chat_data
-      message = "👋Hello! This is Bookme+ bot.\n\nPlease enter the 6-digit PIN code displayed in your portal."
-      send_message(chat_data[:id], message) if is_new_chat
-    end
-
-    def handle_channel_post_update(update)
-      message = update['channel_post']
-      process_pin_code_message(message)
-    end
-
-    def handle_message_update(update)
-      message = update['message']
-      process_pin_code_message(message)
-    end
-
-    def process_pin_code_message(message)
-      chat_id = message.dig('chat', 'id')
-      text = message['text']&.strip
-
-      return unless valid_pin_code?(text, chat_id)
-
-      pin_code_record = find_pin_code_record
-      return unless pin_code_record
-
-      vendor = find_vendor
-      return unless vendor
-
-      chat = update_telegram_chat(message, chat_id)
-      return unless chat
-
-      handle_successful_verification(chat, vendor, pin_code_record)
-    end
-
-    def valid_pin_code?(text, chat_id)
-      text && chat_id && text == pin_code
-    end
-
-    def find_pin_code_record
-      pin_code_record = SpreeCmCommissioner::PinCodeTelegram.find_by(code: pin_code, contact: contact)
-      unless pin_code_record
-        context.fail!(message: "Pin code #{pin_code} not found for contact #{contact}")
-        return nil
-      end
-      pin_code_record
-    end
-
-    def find_vendor
-      vendor = Spree::Vendor.find_by(id: contact)
-      unless vendor
-        context.fail!(message: "Vendor not found for contact #{contact}")
-        return nil
-      end
-      vendor
-    end
-
-    def update_telegram_chat(message, chat_id)
-      chat = SpreeCmCommissioner::TelegramChat.find_or_initialize_by(chat_id: chat_id)
-      unless chat.update(
-        chat_title: message.dig('chat', 'title') || 'Unnamed Chat',
-        chat_type: message.dig('chat', 'type')
-      )
-        context.fail!(message: "Failed to update chat: #{chat.errors.full_messages.join(', ')}")
-        return nil
-      end
-
-      context.chats << { id: chat.chat_id, title: chat.chat_title, type: chat.chat_type }
-      chat
-    end
-
-    def handle_successful_verification(chat, vendor, pin_code_record)
-      return if chat.vendor && chat.vendor != vendor
-
-      update_vendor_preferences(vendor, chat)
-      chat.update(active: true, vendor: vendor)
-      expire_pin_code(pin_code_record)
-      send_success_message(chat.chat_id, vendor.name)
-      context.verified_chat_ids << chat.chat_id
-    end
-
-    def update_vendor_preferences(vendor, chat)
-      vendor.update(
-        preferred_telegram_chat_id: chat.chat_id,
-        preferred_telegram_chat_name: chat.chat_title,
-        preferred_telegram_chat_type: chat.chat_type
-      )
-    end
-
-    def expire_pin_code(pin_code_record)
-      pin_code_record.expire
-      pin_code_record.save
-    end
-
-    def send_success_message(chat_id, vendor_name)
-      message = "✅ PIN code verified successfully! This chat is now connected to <b>#{vendor_name}</b>.\n\n" \
-                'All completed orders will be sent to this chat.'
-      send_message(chat_id, message)
-    end
-
-    def fetch_updates
-      ::Telegram.bot.get_updates
-    end
-
-    def send_message(chat_id, text)
-      ::Telegram.bot.send_message(chat_id: chat_id, text: text, parse_mode: 'HTML')
-    end
-  end
-end

data/app/models/spree_cm_commissioner/pin_code_telegram.rb

@@ -1,28 +0,0 @@
-module SpreeCmCommissioner
-  class PinCodeTelegram < PinCode
-    before_validation :set_telegram_attrs, on: :create
-    validates :contact, presence: true, numericality: { only_integer: true }, if: :telegram?
-
-    belongs_to :vendor, class_name: 'Spree::Vendor', foreign_key: 'contact', primary_key: 'id'
-
-    def telegram?
-      true
-    end
-
-    def expires_in_seconds
-      5 * 60
-    end
-
-    def expired?
-      expired_at < Time.zone.now
-    end
-
-    private
-
-    def set_telegram_attrs
-      self.contact_type = :telegram
-      self.type = 'SpreeCmCommissioner::PinCodeTelegram'
-      self.expired_at = Time.zone.now + expires_in_seconds unless expired_at
-    end
-  end
-end

data/app/models/spree_cm_commissioner/promotion_category_decorator.rb

@@ -1,11 +0,0 @@
-module SpreeCmCommissioner
-  module PromotionCategoryDecorator
-    def self.prepended(base)
-      base.belongs_to :vendor, class_name: 'Spree::Vendor', optional: true
-    end
-  end
-end
-
-unless Spree::PromotionCategory.included_modules.include?(SpreeCmCommissioner::PromotionCategoryDecorator)
-  Spree::PromotionCategory.prepend(SpreeCmCommissioner::PromotionCategoryDecorator)
-end

data/app/models/spree_cm_commissioner/telegram_chat.rb

@@ -1,6 +0,0 @@
-module SpreeCmCommissioner
-  class TelegramChat < Base
-    belongs_to :vendor, class_name: 'Spree::Vendor'
-    validates :chat_id, presence: true, uniqueness: true
-  end
-end

data/db/migrate/20250630103536_create_cm_telegram_chats.rb

@@ -1,13 +0,0 @@
-class CreateCmTelegramChats < ActiveRecord::Migration[7.0]
-  def change
-    create_table :cm_telegram_chats, if_not_exists: true do |t|
-      t.bigint :chat_id, null: false
-      t.string :chat_title
-      t.string :chat_type
-      t.boolean :active, default: false
-      t.references :vendor, foreign_key: { to_table: :spree_vendors }
-      t.timestamps
-    end
-    add_index :cm_telegram_chats, :chat_id, unique: true, if_not_exists: true
-  end
-end

data/db/migrate/20250707032008_add_vendor_id_to_spree_category.rb

@@ -1,7 +0,0 @@
-class AddVendorIdToSpreeCategory < ActiveRecord::Migration[7.0]
-  def change
-    unless column_exists?(:spree_promotion_categories, :vendor_id)
-      add_reference :spree_promotion_categories, :vendor, index: true, foreign_key: { to_table: :spree_vendors }
-    end
-  end
-end