spree_cm_commissioner 2.3.0.pre.pre10 → 2.3.0.pre.pre12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fd2c90bbaae526fa142b83741b54f05088e5f257445fcd1fb8f1848aa4e5962
-  data.tar.gz: 5d0c437dc6da1c51576d06e8cd5cfb80bffc9faa79802aef8b7ac11dd3e590a0
+  metadata.gz: 693c7855e8dc72dabdde0e8bf436e4dc9f4b7971bc1c09612ad8c454f49a6c79
+  data.tar.gz: d9adba89a30ccd967d3472ca8e7ebf2b11b4fe1a9b1f1a898c765c1b67d642e6
 SHA512:
-  metadata.gz: 6dafc95c2bd6d4733b9a2912faa109c1da958bf0531f8536382bebd34c526fef4fdebf73b8408afa54a9348c060abd5b05072c0f2b8b59baf555f96b2d51566e
-  data.tar.gz: 8ab18278b04a39096144422f64957d73762fe60d268db4314d278b5121f59b007b748937b5864a7533b9bb18884573bf784143a1ef800b9014944ffbdf311d0e
+  metadata.gz: 4104850773bb75da44081c426992256bd439508c0144f7371d3bfebd890fa253996df33f6de1981b4e1ccb7db7050e43a2633b8ff0c763d5b364dc799ed28efd
+  data.tar.gz: 7a76e698a0c34336f0d0805cdefadc84eac6c7a39e1a66d7792ab39ca50b4d3e7d04e1e1c1890462cdf8ae781e585df11636de56dca30efe1194391b935f1797

data/Gemfile.lock

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

data/app/controllers/spree/api/chatrace/guests_controller.rb

@@ -18,9 +18,11 @@ module Spree
           guest.preferred_telegram_user_id = params[:telegram_user_id]
           guest.preferred_telegram_user_verified_at = DateTime.current
 
-          if guest.save
+          # save & generate_completion_steps which will mark status as completed.
+          if guest.save && guest.line_item.generate_completion_steps
             render_serialized_payload { serialize_resource(guest) }
           else
+            guest.errors.merge!(guest.line_item.errors)
             render_error_payload(guest.errors)
           end
         end

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

@@ -16,6 +16,30 @@ module Spree
             render_serialized_payload { serialize_resource(line_item) }
           end
 
+          # PATCH /api/v2/storefront/line_items/1/try_mark_as_completed?order_token=:order_token&position=:position
+          # Attempts to mark a line item completion step as completed based on provided position.
+          def try_mark_as_completed
+            scope = if spree_current_user.nil?
+                      Spree::LineItem.joins(:order).where(spree_orders: { token: params[:order_token] })
+                    else
+                      spree_current_user.line_items
+                    end
+
+            line_item = scope.find(params[:id])
+            step_position = params.fetch(:position, 1).to_i
+
+            result = SpreeCmCommissioner::CompletionSteps::MarkLineItemAsCompleted.call(
+              line_item: line_item,
+              position: step_position
+            )
+
+            if result.success?
+              render_serialized_payload { serialize_resource(result.value) }
+            else
+              render_error_payload(result.error)
+            end
+          end
+
           def allowed_sort_attributes
             super << :to_date
             super << :from_date

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

@@ -18,31 +18,20 @@ module Spree
             render_serialized_payload { serialize_resource(line_item) }
           end
 
-          def mark_as_completed # rubocop:disable Metrics/PerceivedComplexity
+          # TODO: refactor app to pass token here, it is not safe to pass id & update.
+          def mark_as_completed
             line_item = Spree::LineItem.find(params[:id])
+            step_position = params.fetch(:position, 1).to_i
 
-            metadata = (line_item.public_metadata || {}).deep_transform_keys(&:to_s)
-            steps = metadata['completion_steps']
+            result = SpreeCmCommissioner::CompletionSteps::MarkLineItemAsCompleted.call(
+              line_item: line_item,
+              position: step_position
+            )
 
-            if steps.present? && steps.is_a?(Array)
-              step = steps.find { |s| s['position'] == 1 } || steps[0]
-
-              if step
-                if step['action_url'].present?
-                  step['completed'] = true
-                  metadata['completion_steps'] = steps
-                  line_item.public_metadata = metadata
-                  line_item.save!
-
-                  render_serialized_payload { serialize_resource(line_item) }
-                else
-                  render_error_payload('Action url is nil, cannot update to completed')
-                end
-              else
-                render_error_payload('Step with position 1 not found')
-              end
+            if result.success?
+              render_serialized_payload { serialize_resource(result.value) }
             else
-              render_error_payload('completion_steps does not exist for this line_item')
+              render_error_payload(result.error)
             end
           end
 

data/app/errors/spree_cm_commissioner/seats/blocks_are_on_hold_by_other_guest_error.rb

@@ -1,8 +1,19 @@
 module SpreeCmCommissioner
   class Seats::BlocksAreOnHoldByOtherGuestError < StandardError
+    attr_reader :block_label
+
+    def initialize(block_label = nil)
+      @block_label = block_label
+      super()
+    end
+
     # override
     def message
-      I18n.t('line_item.validation.blocks_are_on_hold_by_other_guest')
+      if block_label.present?
+        I18n.t('line_item.validation.blocks_are_on_hold_by_other_guest_with_label', label: block_label)
+      else
+        I18n.t('line_item.validation.blocks_are_on_hold_by_other_guest')
+      end
     end
   end
 end

data/app/errors/spree_cm_commissioner/seats/blocks_are_reserved_by_other_guest_error.rb

@@ -1,8 +1,19 @@
 module SpreeCmCommissioner
   class Seats::BlocksAreReservedByOtherGuestError < StandardError
+    attr_reader :block_label
+
+    def initialize(block_label = nil)
+      @block_label = block_label
+      super()
+    end
+
     # override
     def message
-      I18n.t('line_item.validation.blocks_are_reserved_by_other_guest')
+      if block_label.present?
+        I18n.t('line_item.validation.blocks_are_reserved_by_other_guest_with_label', label: block_label)
+      else
+        I18n.t('line_item.validation.blocks_are_reserved_by_other_guest')
+      end
     end
   end
 end

data/app/errors/spree_cm_commissioner/seats/unable_to_save_reserved_block_record_error.rb

@@ -1,8 +1,19 @@
 module SpreeCmCommissioner
   class Seats::UnableToSaveReservedBlockRecordError < StandardError
+    attr_reader :block_label
+
+    def initialize(block_label = nil)
+      @block_label = block_label
+      super()
+    end
+
     # override
     def message
-      I18n.t('line_item.validation.unable_to_save_reserved_block_record')
+      if block_label.present?
+        I18n.t('line_item.validation.unable_to_save_reserved_block_record_with_label', label: block_label)
+      else
+        I18n.t('line_item.validation.unable_to_save_reserved_block_record')
+      end
     end
   end
 end

data/app/jobs/spree_cm_commissioner/completion_steps/regenerate_for_line_items_job.rb

@@ -0,0 +1,14 @@
+module SpreeCmCommissioner
+  module CompletionSteps
+    class RegenerateForLineItemsJob < ApplicationJob
+      # Thin wrapper that regenerates completion steps for all line items
+      # of a product when a ProductCompletionStep is changed.
+      # ApplicationJob handles error logging via around_perform hook.
+      def perform(options = {})
+        product = Spree::Product.find(options[:product_id])
+
+        SpreeCmCommissioner::CompletionSteps::RegenerateForLineItems.call(product: product)
+      end
+    end
+  end
+end

data/app/models/concerns/spree_cm_commissioner/order_state_machine.rb

@@ -10,6 +10,7 @@ module SpreeCmCommissioner
 
       state_machine.before_transition to: :complete, do: :request, if: :need_confirmation?
       state_machine.before_transition to: :complete, do: :generate_bib_number
+      state_machine.before_transition to: :complete, do: :generate_completion_steps!, if: :product_completion_steps_exist?
 
       state_machine.after_transition to: :complete, do: :precalculate_conversion
       state_machine.after_transition to: :complete, do: :notify_order_complete_app_notification_to_user, unless: :subscription?
@@ -71,6 +72,15 @@ module SpreeCmCommissioner
       end
     end
 
+    def product_completion_steps_exist?
+      product_completion_steps.any?
+    end
+
+    # This is called before complete, which is already wrapped by the transaction of unstock_inventory!
+    def generate_completion_steps!
+      line_items.each(&:generate_completion_steps!)
+    end
+
     def precalculate_conversion
       line_items.each do |item|
         SpreeCmCommissioner::ConversionPreCalculatorJob.perform_later(item.product_id)

data/app/models/concerns/spree_cm_commissioner/store_metadata.rb

@@ -37,16 +37,34 @@ module SpreeCmCommissioner
   module StoreMetadata
     extend ActiveSupport::Concern
 
+    # Custom JSON coder that gracefully handles corrupted JSON data
+    class ResilientJSONCoder
+      def self.dump(obj)
+        JSON.dump(obj)
+      end
+
+      def self.load(json)
+        return {} if json.blank?
+
+        begin
+          JSON.parse(json)
+        rescue JSON::ParserError, TypeError
+          # If JSON is corrupted, return empty hash instead of raising
+          {}
+        end
+      end
+    end
+
     class_methods do # rubocop:disable Metrics/BlockLength
       def store_private_metadata(key, type, default: nil)
-        store :private_metadata, accessors: [key], coder: JSON
+        store :private_metadata, accessors: [key], coder: ResilientJSONCoder
 
         define_metadata_reader(:private_metadata, key, type, default)
         define_metadata_validation(:private_metadata, key, type)
       end
 
       def store_public_metadata(key, type, default: nil)
-        store :public_metadata, accessors: [key], coder: JSON
+        store :public_metadata, accessors: [key], coder: ResilientJSONCoder
 
         define_metadata_reader(:public_metadata, key, type, default)
         define_metadata_validation(:public_metadata, key, type)

data/app/models/spree_cm_commissioner/line_item_decorator.rb

@@ -26,8 +26,6 @@ module SpreeCmCommissioner
 
       base.before_save :update_vendor_id
 
-      base.after_commit :persist_completion_steps_to_public_metadata, on: :create
-
       base.before_create :add_due_date, if: :subscription?
 
       base.validate :ensure_not_exceed_max_quantity_per_order, if: -> { variant&.max_quantity_per_order.present? }
@@ -39,6 +37,8 @@ module SpreeCmCommissioner
       base.delegate :delivery_required?, :high_demand,
                     to: :variant
 
+      base.store_public_metadata :completion_steps, :array
+
       base.accepts_nested_attributes_for :guests, allow_destroy: true
 
       def base.json_api_columns
@@ -66,6 +66,7 @@ module SpreeCmCommissioner
 
     def self.include_modules(base)
       base.include Spree::Core::NumberGenerator.new(prefix: 'L')
+      base.include SpreeCmCommissioner::StoreMetadata
       base.include SpreeCmCommissioner::LineItemDurationable
       base.include SpreeCmCommissioner::LineItemsFilterScope
       base.include SpreeCmCommissioner::LineItemGuestsConcern
@@ -197,8 +198,29 @@ module SpreeCmCommissioner
       "#{order.number}-#{order.token}-L#{id}"
     end
 
-    def completion_steps
-      public_metadata[:completion_steps] || []
+    def generate_completion_steps
+      generate_completion_steps!
+      true
+    rescue StandardError => e
+      CmAppLogger.error(
+        label: "#{self.class.name}#generate_completion_steps",
+        data: {
+          line_item_id: id,
+          order_id: order_id,
+          error_class: e.class.name,
+          error_message: e.message,
+          backtrace: e.backtrace&.first(10)&.join("\n")
+        }
+      )
+      errors.add(:completion_steps, e.message)
+      false
+    end
+
+    def generate_completion_steps!
+      self.completion_steps = product_completion_steps.map do |completion_step|
+        completion_step.construct_hash(line_item: self)
+      end
+      save!
     end
 
     # override
@@ -217,16 +239,6 @@ module SpreeCmCommissioner
 
     private
 
-    def persist_completion_steps_to_public_metadata
-      steps = product_completion_steps.order(:position).map do |pcs|
-        pcs.construct_hash(line_item: self).except(:completed).merge(
-          id: pcs.id,
-          completed: false
-        )
-      end
-      update_column(:public_metadata, (public_metadata || {}).merge(completion_steps: steps)) # rubocop:disable Rails/SkipsModelValidations
-    end
-
     def ensure_not_exceed_max_quantity_per_order
       errors.add(:quantity, I18n.t('line_item.validation.exceeded_max_quantity_per_order')) if quantity > variant.max_quantity_per_order
     end

data/app/models/spree_cm_commissioner/order_decorator.rb

@@ -57,6 +57,7 @@ module SpreeCmCommissioner
       base.has_many :blocks, through: :guests, class_name: 'SpreeCmCommissioner::Block', source: :block
       base.has_many :reserved_blocks, through: :guests, class_name: 'SpreeCmCommissioner::ReservedBlock'
       base.has_many :guest_card_classes, class_name: 'SpreeCmCommissioner::GuestCardClass', through: :variants
+      base.has_many :product_completion_steps, class_name: 'SpreeCmCommissioner::ProductCompletionStep', through: :line_items
 
       base.delegate :customer, to: :user, allow_nil: true
 

data/app/models/spree_cm_commissioner/product_completion_step.rb

@@ -4,9 +4,10 @@ module SpreeCmCommissioner
 
     belongs_to :product, class_name: '::Spree::Product', optional: false
 
-    after_save :propagate_completion_steps_to_line_items
-
-    after_destroy_commit :propagate_completion_steps_to_line_items
+    # When a completion step is changed, regenerate completion steps for all line items
+    # of the product so they reflect the latest step configuration.
+    after_destroy :regenerate_line_items_completion_steps
+    after_save :regenerate_line_items_completion_steps
 
     def action_url_for(_line_item)
       nil
@@ -17,6 +18,8 @@ module SpreeCmCommissioner
     end
 
     def construct_hash(line_item:)
+      existing_data = line_item.completion_steps&.find { |step| step['position'].to_i == position }
+
       {
         title: title,
         type: type&.underscore,
@@ -24,41 +27,15 @@ module SpreeCmCommissioner
         description: description,
         action_label: action_label,
         action_url: action_url_for(line_item),
+        completed_at: existing_data&.dig('completed_at'),
         completed: completed?(line_item)
       }
     end
 
     private
 
-    def propagate_completion_steps_to_line_items
-      product.line_items.find_each do |line_item|
-        propagate_to_line_item(line_item)
-      end
-    end
-
-    def propagate_to_line_item(line_item)
-      current_metadata = line_item.reload.public_metadata || {}
-      stored_steps = Array(current_metadata[:completion_steps])
-
-      fresh_steps = product.product_completion_steps.order(:position).map do |pcs|
-        base_attrs = pcs.construct_hash(line_item: line_item).except(:completed)
-
-        previous =
-          stored_steps.find { |s| s[:id] == pcs.id } ||
-          stored_steps.find { |s| s[:type] == pcs.type&.underscore && s[:position] == pcs.position }
-
-        completed_flag = previous&.dig(:completed) ? true : false
-
-        base_attrs.merge(
-          id: pcs.id,
-          completed: completed_flag
-        )
-      end
-
-      line_item.update_column( # rubocop:disable Rails/SkipsModelValidations
-        :public_metadata,
-        current_metadata.merge(completion_steps: fresh_steps)
-      )
+    def regenerate_line_items_completion_steps
+      SpreeCmCommissioner::CompletionSteps::RegenerateForLineItemsJob.perform_later(product_id: product_id)
     end
   end
 end

data/app/models/spree_cm_commissioner/product_completion_steps/social_entry_url.rb

@@ -1,16 +1,103 @@
 module SpreeCmCommissioner
   module ProductCompletionSteps
     class SocialEntryUrl < ProductCompletionStep
-      # eg. https://t.me/ThePlatformKHBot?start=bookmeplus
+      # Template format examples:
+      # - https://t.me/ThePlatformKHBot?start={order.number}
+      # - https://example.com?guest_name={guests[0].first_name}&phone={guests[0].phone_number}
+      # - https://example.com?line_item_id={line_item.id}&quantity={line_item.quantity}
       preference :entry_point_link, :string
 
+      # Allowed fields per object (excludes private/reference fields like *_id, *_by_id, metadata, etc.)
+      ORDER_ALLOWED_FIELDS = %w[
+        qr_data
+        number
+        state
+        email
+        total
+        item_total
+        created_at
+        completed_at
+        token
+        phone_number
+        country_code
+        currency
+        item_count
+        channel
+      ].freeze
+
+      LINE_ITEM_ALLOWED_FIELDS = %w[
+        qr_data
+        quantity
+        price
+        from_date
+        to_date
+        number
+        remark
+        created_at
+        updated_at
+      ].freeze
+
+      GUEST_ALLOWED_FIELDS = %w[
+        qr_data
+        first_name
+        last_name
+        full_name
+        dob
+        gender
+        age
+        email
+        phone_number
+        address
+        seat_number
+        bib_number
+        bib_prefix
+        bib_index
+        formatted_bib_number
+        token
+        social_contact
+        country_code
+        emergency_contact
+        expectation
+        other_occupation
+        other_organization
+        entry_type
+        upload_later
+        data_fill_stage_phase
+        created_at
+        updated_at
+      ].freeze
+
       # override
-      def action_url_for(_line_item)
-        preferred_entry_point_link.presence
+      def action_url_for(line_item)
+        return nil if preferred_entry_point_link.blank?
+
+        url = preferred_entry_point_link.dup
+
+        # Replace order placeholders: {order.field_name}
+        line_item.order.attributes.each do |field, value|
+          url.gsub!("{order.#{field}}", value.to_s) if ORDER_ALLOWED_FIELDS.include?(field)
+        end
+
+        # Replace line_item placeholders: {line_item.field_name}
+        line_item.attributes.each do |field, value|
+          url.gsub!("{line_item.#{field}}", value.to_s) if LINE_ITEM_ALLOWED_FIELDS.include?(field)
+        end
+
+        # Replace guest placeholders: {guests[index].field_name}
+        line_item.guests.each_with_index do |guest, index|
+          guest.attributes.each do |field, value|
+            url.gsub!("{guests[#{index}].#{field}}", value.to_s) if GUEST_ALLOWED_FIELDS.include?(field)
+          end
+        end
+
+        url
       end
 
-      def completed?(_line_item)
-        false
+      def completed?(line_item)
+        return false if line_item.completion_steps.blank?
+
+        step_data = line_item.completion_steps.find { |step| step['position'].to_s == position.to_s }
+        step_data&.dig('completed_at').present?
       end
     end
   end

data/app/models/spree_cm_commissioner/seats/blocks_canceler.rb

@@ -16,12 +16,13 @@ module SpreeCmCommissioner
 
         ActiveRecord::Base.transaction do
           order.reserved_blocks.each do |reserved_block|
+            block_label = reserved_block.block.label
             reserved_block.assign_attributes(
               status: :canceled,
               expired_at: nil,
               updated_by: @cancel_by
             )
-            raise SpreeCmCommissioner::Seats::UnableToSaveReservedBlockRecordError unless reserved_block.save
+            raise SpreeCmCommissioner::Seats::UnableToSaveReservedBlockRecordError, block_label unless reserved_block.save
           end
         end
       end

data/app/models/spree_cm_commissioner/seats/blocks_holder.rb

@@ -39,10 +39,15 @@ module SpreeCmCommissioner
 
       def hold_specific_block!(inventory_item, guest)
         reserved_block = SpreeCmCommissioner::ReservedBlock.find_or_initialize_by(inventory_item: inventory_item, block: guest.block)
+        block_label = guest.block.label
 
-        raise SpreeCmCommissioner::Seats::BlocksAreReservedByOtherGuestError if reserved_block.reserved? && reserved_block.guest_id != guest.id
+        if reserved_block.reserved? && reserved_block.guest_id != guest.id
+          raise SpreeCmCommissioner::Seats::BlocksAreReservedByOtherGuestError, block_label
+        end
         raise SpreeCmCommissioner::Seats::BlocksAreReservedBySameGuestError if reserved_block.reserved? && reserved_block.guest_id == guest.id
-        raise SpreeCmCommissioner::Seats::BlocksAreOnHoldByOtherGuestError if reserved_block.active_on_hold? && reserved_block.guest_id != guest.id
+        if reserved_block.active_on_hold? && reserved_block.guest_id != guest.id
+          raise SpreeCmCommissioner::Seats::BlocksAreOnHoldByOtherGuestError, block_label
+        end
 
         reserved_block.assign_attributes(
           status: :on_hold,
@@ -52,7 +57,7 @@ module SpreeCmCommissioner
           updated_by: @hold_by
         )
 
-        raise SpreeCmCommissioner::Seats::UnableToSaveReservedBlockRecordError unless reserved_block.save
+        raise SpreeCmCommissioner::Seats::UnableToSaveReservedBlockRecordError, block_label unless reserved_block.save
 
         reserved_block
       end

data/app/models/spree_cm_commissioner/seats/blocks_reserver.rb

@@ -30,10 +30,15 @@ module SpreeCmCommissioner
 
       def reserve_specific_block!(inventory_item, guest)
         reserved_block = SpreeCmCommissioner::ReservedBlock.find_or_initialize_by(inventory_item_id: inventory_item.id, block_id: guest.block_id)
+        block_label = guest.block.label
 
-        raise SpreeCmCommissioner::Seats::BlocksAreReservedByOtherGuestError if reserved_block.reserved? && reserved_block.guest_id != guest.id
+        if reserved_block.reserved? && reserved_block.guest_id != guest.id
+          raise SpreeCmCommissioner::Seats::BlocksAreReservedByOtherGuestError, block_label
+        end
         raise SpreeCmCommissioner::Seats::BlocksAreReservedBySameGuestError if reserved_block.reserved? && reserved_block.guest_id == guest.id
-        raise SpreeCmCommissioner::Seats::BlocksAreOnHoldByOtherGuestError if reserved_block.active_on_hold? && reserved_block.guest_id != guest.id
+        if reserved_block.active_on_hold? && reserved_block.guest_id != guest.id
+          raise SpreeCmCommissioner::Seats::BlocksAreOnHoldByOtherGuestError, block_label
+        end
 
         # mark the block as reserved if not on_hold or lock by anyone but already expired
         reserved_block.assign_attributes(
@@ -44,7 +49,7 @@ module SpreeCmCommissioner
           updated_by: @reserve_by
         )
 
-        raise SpreeCmCommissioner::Seats::UnableToSaveReservedBlockRecordError unless reserved_block.save
+        raise SpreeCmCommissioner::Seats::UnableToSaveReservedBlockRecordError, block_label unless reserved_block.save
       end
     end
   end

data/app/serializers/spree/v2/storefront/order_serializer_decorator.rb

@@ -4,7 +4,7 @@ module Spree
       module OrderSerializerDecorator
         def self.prepended(base)
           base.attribute :has_incomplete_guest_info do |order|
-            order.user.public_metadata['has_incomplete_guest_info'] || false
+            order.user&.public_metadata&.[]('has_incomplete_guest_info') || false
           end
 
           base.attribute :guest_info_status do |order|

data/app/services/spree_cm_commissioner/completion_steps/mark_line_item_as_completed.rb

@@ -0,0 +1,48 @@
+module SpreeCmCommissioner
+  module CompletionSteps
+    class MarkLineItemAsCompleted
+      prepend ::Spree::ServiceModule::Base
+
+      def call(line_item:, position: 1)
+        ApplicationRecord.transaction do
+          validate_completion_steps!(line_item)
+          validate_step_exists!(line_item, position)
+          validate_action_url!(line_item, position)
+
+          # this will set completed_at timestamp to the step in line item
+          mark_step_completed!(line_item, position)
+
+          # regenerate completion steps to check whether is consider completed.
+          # because some steps, just completed at is not enough.
+          line_item.generate_completion_steps!
+
+          success(line_item)
+        end
+      rescue StandardError => e
+        failure(nil, e.message)
+      end
+
+      private
+
+      def validate_completion_steps!(line_item)
+        raise 'Completion steps not found for this line item' if line_item.completion_steps.blank?
+      end
+
+      def validate_step_exists!(line_item, position)
+        raise "Step at position #{position} not found" if step_data(line_item, position).blank?
+      end
+
+      def validate_action_url!(line_item, position)
+        raise 'Action URL is missing for this step' if step_data(line_item, position)['action_url'].blank?
+      end
+
+      def mark_step_completed!(line_item, position)
+        step_data(line_item, position)['completed_at'] = Time.current.iso8601
+      end
+
+      def step_data(line_item, position)
+        line_item.completion_steps.find { |step| step['position'].to_s == position.to_s }
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/completion_steps/regenerate_for_line_items.rb

@@ -0,0 +1,53 @@
+module SpreeCmCommissioner
+  module CompletionSteps
+    class RegenerateForLineItems
+      prepend ::Spree::ServiceModule::Base
+
+      # Regenerates completion steps for all completed line items of a product.
+      # Called when a ProductCompletionStep is created, updated, or destroyed.
+      def call(product:)
+        line_items = product.line_items.complete
+
+        CmAppLogger.log(
+          label: 'SpreeCmCommissioner::CompletionSteps::RegenerateForLineItems#call Starting',
+          data: {
+            product_id: product.id,
+            line_items_count: line_items.count
+          }
+        )
+
+        regenerated_count = 0
+        failed_count = 0
+
+        line_items.find_each do |line_item|
+          line_item.generate_completion_steps!
+          regenerated_count += 1
+        rescue StandardError => e
+          CmAppLogger.error(
+            label: 'SpreeCmCommissioner::CompletionSteps::RegenerateForLineItems#call Line item regeneration failed',
+            data: {
+              product_id: product.id,
+              line_item_id: line_item.id,
+              error_class: e.class.name,
+              error_message: e.message
+            }
+          )
+          failed_count += 1
+        end
+
+        CmAppLogger.log(
+          label: 'SpreeCmCommissioner::CompletionSteps::RegenerateForLineItems#call Completed',
+          data: {
+            product_id: product.id,
+            regenerated_count: regenerated_count,
+            failed_count: failed_count
+          }
+        )
+
+        success(regenerated_count: regenerated_count, failed_count: failed_count)
+      rescue StandardError => e
+        failure(nil, e.message)
+      end
+    end
+  end
+end

data/config/locales/en.yml

@@ -124,9 +124,12 @@ en:
       exceeded_max_quantity_per_order: "Exceeded maximum quantity per order"
       seats_are_required: "Seats are required for all guests"
       blocks_are_reserved_by_other_guest: "Seats were recently reserved by another guest"
+      blocks_are_reserved_by_other_guest_with_label: "Seat %{label} was recently reserved by another guest"
       blocks_are_on_hold_by_other_guest: "Seats were recently put on hold by another guest"
+      blocks_are_on_hold_by_other_guest_with_label: "Seat %{label} was recently put on hold by another guest"
       blocks_are_reserved_by_same_guest: "Seats were recently reserved by this guest"
       unable_to_save_reserved_block_record: "Unable to save seat reservation"
+      unable_to_save_reserved_block_record_with_label: "Unable to save reservation for seat %{label}"
 
   vectors:
     icons:

data/config/locales/km.yml

@@ -118,9 +118,12 @@ km:
       exceeded_max_quantity_per_order: "លើសពីបរិមាណអតិបរមាក្នុងមួយការបញ្ជាទិញ"
       seats_are_required: "ត្រូវការលេខកៅអីសម្រាប់ភ្ញៀវទាំងអស់"
       blocks_are_reserved_by_other_guest: "កៅអីត្រូវបានកក់ថ្មីៗដោយភ្ញៀវផ្សេងទៀត"
+      blocks_are_reserved_by_other_guest_with_label: "កៅអី %{label} ត្រូវបានកក់ថ្មីៗដោយភ្ញៀវផ្សេងទៀត"
       blocks_are_on_hold_by_other_guest: "កៅអីត្រូវបានផ្អាកថ្មីៗដោយភ្ញៀវផ្សេងទៀត"
+      blocks_are_on_hold_by_other_guest_with_label: "កៅអី %{label} ត្រូវបានផ្អាកថ្មីៗដោយភ្ញៀវផ្សេងទៀត"
       blocks_are_reserved_by_same_guest: "កៅអីត្រូវបានកក់ថ្មីៗដោយភ្ញៀវនេះ"
       unable_to_save_reserved_block_record: "មិនអាចរក្សាទុកការកក់កៅអីបានទេ"
+      unable_to_save_reserved_block_record_with_label: "មិនអាចរក្សាទុកការកក់សម្រាប់កៅអី %{label} បានទេ"
 
   subscription:
     validation:

data/config/routes.rb

@@ -595,7 +595,12 @@ Spree::Core::Engine.add_routes do
           resources :variants, only: %i[index show], module: :accommodations
         end
 
-        resources :line_items, only: %i[index show]
+        resources :line_items, only: %i[index show] do
+          member do
+            patch :try_mark_as_completed
+          end
+        end
+
         resources :account_checker
         resource :account_recovers, only: [:update]
 

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

@@ -8,4 +8,11 @@ FactoryBot.define do
       preferred_entry_point_link { 'https://t.me/ThePlatformKHBot?start=bookmeplus' }
     end
   end
+
+  factory :cm_social_entry_url_product_completion_step, class: SpreeCmCommissioner::ProductCompletionSteps::SocialEntryUrl do
+    title { 'Must complete this step' }
+    description { 'Click open now to complete!' }
+    action_label { 'Open' }
+    preferred_entry_point_link { 'https://www.mywebsite?order_number={order.number}&line_item_number={line_item.number}' }
+  end
 end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.3.0-pre10'.freeze
+  VERSION = '2.3.0-pre12'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.3.0.pre.pre10
+  version: 2.3.0.pre.pre12
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-30 00:00:00.000000000 Z
+date: 2025-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -1289,6 +1289,7 @@ files:
 - app/jobs/spree_cm_commissioner/application_job_decorator.rb
 - app/jobs/spree_cm_commissioner/application_unique_job.rb
 - app/jobs/spree_cm_commissioner/chatrace_order_creator_job.rb
+- app/jobs/spree_cm_commissioner/completion_steps/regenerate_for_line_items_job.rb
 - app/jobs/spree_cm_commissioner/conversion_pre_calculator_job.rb
 - app/jobs/spree_cm_commissioner/customer_content_notification_creator_job.rb
 - app/jobs/spree_cm_commissioner/customer_notification_cron_job.rb
@@ -1917,6 +1918,8 @@ files:
 - app/services/spree_cm_commissioner/cart/remove_guest.rb
 - app/services/spree_cm_commissioner/checkout/advance_decorator.rb
 - app/services/spree_cm_commissioner/checkout/update_decorator.rb
+- app/services/spree_cm_commissioner/completion_steps/mark_line_item_as_completed.rb
+- app/services/spree_cm_commissioner/completion_steps/regenerate_for_line_items.rb
 - app/services/spree_cm_commissioner/exports/export_guest_csv_service.rb
 - app/services/spree_cm_commissioner/exports/export_order_csv_service.rb
 - app/services/spree_cm_commissioner/feed.rb