spree_cm_commissioner 1.21.0 → 2.0.0.pre.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7043a8acbe6da011c50dcf6d5f9c4fa4c09d44f0c273c7d8c5f35e9da6430628
-  data.tar.gz: '049dc2649fbb41b2e43945741baf9c7815ddc11b38a83cec8157c2eac5ed8431'
+  metadata.gz: b85b4b7a446688bc4aed2974e7150a9155a2d919b998188fc7e575ccea0d2714
+  data.tar.gz: 134a3e165301c382a7e48016e768755420d32003a31cf3b3dac79f33b7a0d5a6
 SHA512:
-  metadata.gz: 17233d10bfd72385a100faf262a0c236017970a4429e33098a7992dd64c217ff02c06168931f3472ef8e5a3245786df65c72f0123f2cacca58223b66c5ca6a3f
-  data.tar.gz: 68bac4de8bf2b866b75ccbcfef5c53b50786427d7cbe87e4d17fa0b284186cfbd08d71fbe8c5fe496dfce6b1e6340a6bb0be4cbac00103388c7545397ad417d1
+  metadata.gz: fd91cb46cb05faec83d0978df8312e272265ad03d1d14c1319ea0303081521dac9468a4e9e6fd4e72698e61c175fcddfc3bed53527e7f0ebe1a23f81062bf9c3
+  data.tar.gz: 1d04b75c972c6cff71fa6e95ca3882411a8a54b6b0b226183369a97b1360fa00c2c334e728203f647405313da8deec7298e4662dedfb068cc51540e4caf548d7

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (1.21.0)
+    spree_cm_commissioner (2.0.0.pre.pre1)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront
@@ -572,10 +572,6 @@ GEM
     nokogiri (1.15.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-linux)
-      racc (~> 1.4)
     noticed (1.6.3)
       http (>= 4.0.0)
       rails (>= 5.2.0)

data/app/controllers/spree/api/v2/operator/pie_chart_events_controller.rb

@@ -0,0 +1,46 @@
+module Spree
+  module Api
+    module V2
+      module Operator
+        class PieChartEventsController < ::Spree::Api::V2::ResourceController
+          ACCEPTED_KYC_FIELDS = %i[guest_gender guest_occupation guest_nationality].freeze
+          ADDITIONAL_FIELDS = %i[participation entry_type].freeze
+
+          def index
+            kyc_fields = fetch_filtered_kyc_fields
+            types = ADDITIONAL_FIELDS + kyc_fields
+
+            resources = types.map { |type| SpreeCmCommissioner::ChartType.new(type) }
+
+            render json: SpreeCmCommissioner::V2::Operator::ChartTypeSerializer.new(resources).serializable_hash
+          end
+
+          def resource
+            @resource = pie_chart_event_aggregator_queries.call
+          end
+
+          def resource_serializer
+            SpreeCmCommissioner::V2::Operator::PieChartEventAggregatorSerializer
+          end
+
+          private
+
+          def pie_chart_event_aggregator_queries
+            SpreeCmCommissioner::PieChartEventQueries.new(
+              taxon_id: params[:taxon_id],
+              chart_type: params[:id] || 'participation',
+              refreshed: params[:refreshed] || false
+            )
+          end
+
+          def fetch_filtered_kyc_fields
+            Spree::Product
+              .where(event_id: params[:taxon_id])
+              .flat_map(&:kyc_fields)
+              .uniq & ACCEPTED_KYC_FIELDS
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -39,22 +39,22 @@ module Spree
             spree_authorize! :update, spree_current_order, order_token
 
             begin
-              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!
+              ActiveRecord::Base.transaction do
+                if guest_params[:guest_dynamic_fields_attributes]
+                  dynamic_field_ids = guest_params[:guest_dynamic_fields_attributes].pluck(:dynamic_field_id)
+                  resource.guest_dynamic_fields.where(dynamic_field_id: dynamic_field_ids).destroy_all
+
+                  guest_params[:guest_dynamic_fields_attributes].each do |attr|
+                    field = build_dynamic_field(attr)
+                    field.save!
+                  end
                 end
-              end
 
-              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)
+                resource.assign_attributes(guest_params.except(:guest_dynamic_fields_attributes))
+                resource.save!
               end
+
+              render_serialized_payload { serialize_resource(resource) }
             rescue ActiveRecord::RecordInvalid => e
               render_error_payload(e.record.errors, 400)
             end

data/app/factory/spree_cm_commissioner/invite_guest_claimed_telegram_message_factory.rb

@@ -1,17 +1,16 @@
-# <p>📣 --- <b>[NEW GUEST CLAIMED INVITATION]</b> ---</p>
-
-# <p>✨ <b>Ticket Successfully Claimed!</b> ✨</p>
-
-# <p><b>🙍 Claimed By</b><br>
-# Name: Orng SreyMoch<br>
-# Tel: <code>0966827830</code></p>
-
-# <p><b>Run Ticket + 2 way bus ticket + Tent</b><br>
-# <i>👉 Distance: 5km, Tent: tent (1 people), and T-shirt: S</i><br>
-# <i>🗓️ May 30, 2025 -> Jun 30, 2025</i></p>
-
-# <p><b>📑 Order Number:</b><br>
-# <code>R172627517</code></p>
+# 🎫 --- [NEW INVITATION CLAIMED] ---
+#
+# <b>🙍 Claimed By</b>
+# Name: Orng SreyMoch
+# Tel: <code>+85570760548</code>
+#
+# <b>5km Running Ticket</b>
+# Quantity: 1
+# <i>👉 Distance: 5km, T-shirt: S</i>
+# <i>🗓️ Nov 15, 2023 -> Nov 17, 2023</i>
+#
+# Order Number:
+# <code>R621016753</code>
 
 module SpreeCmCommissioner
   class InviteGuestClaimedTelegramMessageFactory < TelegramMessageFactory
@@ -27,40 +26,31 @@ module SpreeCmCommissioner
     end
 
     def selected_line_items
-      return order.line_items.for_vendor(vendor) if vendor.present?
-
-      order.line_items
+      vendor.present? ? order.line_items.for_vendor(vendor) : order.line_items
     end
 
     # override
     def body
       text = []
-      text << '<p>📣 --- <b>[NEW GUEST CLAIMED INVITATION]</b> ---</p>'
-      text << '<p>✨ <b>Ticket Successfully Claimed!</b> ✨</p>'
-      text << '<p><b>🙍 Claimed By</b><br>'
-      text << "Name: #{guest.first_name} #{guest.last_name}<br>"
-      text << "Tel: <code>#{guest.phone_number}</code></p>"
 
+      text << bold('🙍 Claimed By')
+      text << "Name: #{guest.first_name} #{guest.last_name}"
+      text << "Tel: #{inline_code(guest.phone_number)}"
+      text << ''
+
+      # Each invitation_link leads to one order with one line_item, claimed by one guest so quantity is always 1.
       selected_line_items.each do |item|
-        text << line_item_block(item)
+        text << bold(item.product.name.to_s)
+        text << '🎟️ Quantity: 1'
+        text << italic("👉 #{item.options_text}") if item.options_text.present?
+        text << italic(pretty_date_for(item)) if item.date_present?
+        text << ''
       end
 
-      text << "<p><b>📑 Order Number:</b><br><code>#{order.number}</code></p>"
-
-      text.join("\n")
-    end
-
-    def line_item_block(item)
-      parts = []
-      parts << "<p><b>#{item.product.name}</b><br>"
-
-      details = []
-      details << "👉 #{item.options_text}" if item.options_text.present?
-      details << pretty_date_for(item) if item.date_present?
+      text << bold('Order Number:')
+      text << inline_code(order.number)
 
-      parts << details.map { |d| "<i>#{d}</i><br>" }.join
-      parts << '</p>'
-      parts.join("\n")
+      text.compact.join("\n")
     end
 
     def pretty_date_for(line_item)

data/app/interactors/spree_cm_commissioner/create_ticket.rb

@@ -9,7 +9,8 @@ module SpreeCmCommissioner
         set_option_value
         create_variant
         create_stock_item
-        upload_image
+        upload_image_to(@ticket.master)
+        upload_image_to(@variant)
         create_place
       end
     end
@@ -77,13 +78,13 @@ module SpreeCmCommissioner
       context.fail!(message: @stock_item.errors.full_messages.join(', '))
     end
 
-    def upload_image
+    def upload_image_to(target)
       return if context.params[:ticket_image].blank?
 
-      @image = @ticket.master.images.new(attachment: context.params[:ticket_image])
-      return if @image.save
+      image = target.images.new(attachment: context.params[:ticket_image])
+      return if image.save
 
-      context.fail!(message: @image.errors.full_messages.join(', '))
+      context.fail!(message: image.errors.full_messages.join(', '))
     end
 
     def create_place

data/app/interactors/spree_cm_commissioner/create_vendor.rb

@@ -0,0 +1,44 @@
+module SpreeCmCommissioner
+  class CreateVendor
+    include Interactor
+
+    def call
+      validate_context!
+
+      ActiveRecord::Base.transaction do
+        create_vendor
+        assign_vendor_to_user
+        create_role
+      end
+    end
+
+    private
+
+    def validate_context!
+      context.fail!(message: 'User is missing') unless context.user
+      context.fail!(message: 'Vendor parameters are missing') unless context.vendor_params
+    end
+
+    def create_vendor
+      @vendor = Spree::Vendor.new(context.vendor_params)
+      return if @vendor.save
+
+      context.fail!(message: @vendor.errors.full_messages.join(', '))
+    end
+
+    def assign_vendor_to_user
+      context.user.vendors << @vendor
+    end
+
+    def create_role
+      role = context.user.spree_roles.create(
+        name: "#{@vendor.name.downcase.parameterize(separator: '-')}-organizer",
+        vendor_id: @vendor.id,
+        presentation: 'Organizer'
+      )
+      return if role.persisted?
+
+      context.fail!(message: role.errors.full_messages.to_sentence)
+    end
+  end
+end

data/app/mailers/spree/order_mailer_decorator.rb

@@ -1,6 +1,5 @@
 module Spree
   module OrderMailerDecorator
-    # overrided
     def cancel_email(order, resend: false)
       @order = order.respond_to?(:id) ? order : Spree::Order.find(order)
       return false if @order.email.blank?
@@ -12,18 +11,34 @@ module Spree
       @order = order.respond_to?(:id) ? order : Spree::Order.find(order)
       return false if @order.email.blank?
 
+      @tenant = @order.tenant
+      if @tenant.present?
+        @brand_color = @tenant.preferences[:brand_primary_color]
+        @vendor_logo_url = @tenant.active_vendor&.logo&.original_url
+      end
+
       @current_store = @order.store
       @product_type = @order.products.first&.product_type || 'accommodation'
 
-      subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
+      subject = resend ? "[#{Spree.t(:resend).upcase}] " : ''
       subject += "#{@current_store&.name} Booking Confirmation ##{@order.number}"
 
-      mail(to: @order.email, from: from_address, subject: subject, store_url: @current_store.url) do |format|
+      mail(to: @order.email, from: from_email_address, subject: subject, store_url: @current_store.url) do |format|
         format.html { render layout: 'spree_cm_commissioner/layouts/order_mailer' }
         format.text
       end
     end
 
+    private
+
+    def from_email_address
+      if @order.tenant.nil?
+        from_address
+      else
+        @order.tenant.active_vendor&.from_email
+      end
+    end
+
     def ticket_email(guest, email)
       @guest = guest
       @event = @guest.event

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

@@ -55,6 +55,24 @@ module SpreeCmCommissioner
     def set_duration
       self.from_date ||= variant.start_date_time || event&.from_date
       self.to_date ||= variant.end_date_time || event&.to_date
+
+      return if persisted?
+
+      apply_variant_time(:from_date, variant.start_date_time)
+      apply_variant_time(:to_date, variant.end_date_time)
+    end
+
+    def apply_variant_time(field, variant_time)
+      field_value = send(field)
+
+      return unless field_value.present? && field_value.hour.zero? && variant_time.present?
+
+      send("#{field}=", field_value.change(
+                          hour: variant_time.hour,
+                          min: variant_time.min,
+                          sec: variant_time.sec
+                        )
+      )
     end
   end
 end

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

@@ -9,6 +9,7 @@ module SpreeCmCommissioner
       preference :payment_failed_image, :string, default: ''
       preference :payment_success_image, :string, default: ''
       preference :payment_loader, :string, default: ''
+      preference :brand_primary_color, :string, default: ''
     end
   end
 end

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

@@ -53,8 +53,9 @@ module SpreeCmCommissioner
     # No need to fallback to event start date to avoid n+1.
     # To get end_time duration of event, include event when needed instead.
     def start_date_time
-      return nil if start_date.blank?
+      return nil if start_date.blank? && start_time.blank?
       return start_date if start_time.blank?
+      return start_time if start_date.blank?
 
       start_date.change(hour: start_time.hour, min: start_time.min, sec: start_time.sec)
     end
@@ -62,8 +63,9 @@ module SpreeCmCommissioner
     # No need to fallback to event end date to avoid n+1.
     # To get end_time duration of event, include event when needed instead.
     def end_date_time
-      return nil if end_date.blank?
+      return nil if end_date.blank? && end_time.blank?
       return end_date if end_time.blank?
+      return end_time if end_date.blank?
 
       end_date.change(hour: end_time.hour, min: end_time.min, sec: end_time.sec)
     end

data/app/models/spree_cm_commissioner/chart_type.rb

@@ -0,0 +1,10 @@
+module SpreeCmCommissioner
+  class ChartType
+    attr_reader :chart_type, :name
+
+    def initialize(chart_type)
+      @chart_type = chart_type.to_s
+      @name = @chart_type.humanize
+    end
+  end
+end

data/app/models/spree_cm_commissioner/dynamic_field.rb

@@ -9,12 +9,14 @@ module SpreeCmCommissioner
     has_many :product_dynamic_fields, class_name: 'SpreeCmCommissioner::ProductDynamicField', dependent: :destroy
 
     enum data_type: { text: 0, number: 1, boolean: 2, checkbox: 3, radio: 4, selection: 5, textarea: 6 }
+    enum data_fill_stage: { pre_registration: 0, post_registration: 1, during_check_in: 2 }
 
     accepts_nested_attributes_for :dynamic_field_options, allow_destroy: true, reject_if: :all_blank
 
     validates :label, presence: true
     validates :data_type, presence: true
     validates :configurations, presence: true, allow_blank: false
+    validate :validate_data_fill_stage_phase
 
     def requires_dynamic_field_options?
       checkbox? || radio? || selection?
@@ -30,5 +32,23 @@ module SpreeCmCommissioner
       self.configurations ||= {}
       self.configurations['multiple_select'] = ActiveModel::Type::Boolean.new.cast(value)
     end
+
+    def required_at_stage?(stage)
+      data_fill_stage == stage.to_s
+    end
+
+    def display_label
+      label + " (#{data_fill_stage.humanize})"
+    end
+
+    private
+
+    def validate_data_fill_stage_phase
+      return if data_fill_stage.blank?
+
+      return if data_fill_stage.in?(self.class.data_fill_stages.keys)
+
+      errors.add(:data_fill_stage, "must be one of: #{self.class.data_fill_stages.keys.join(', ')}")
+    end
   end
 end

data/app/models/spree_cm_commissioner/guest.rb

@@ -213,6 +213,62 @@ module SpreeCmCommissioner
       save!
     end
 
+    def missing_dynamic_fields_for_stage(stage)
+      required_fields = line_item.product.dynamic_fields.where(data_fill_stage: stage)
+      filled_ids = guest_dynamic_fields.map(&:dynamic_field_id)
+
+      required_fields.reject { |field| filled_ids.include?(field.id) }
+    end
+
+    def all_required_dynamic_fields_completed?(stage)
+      missing_dynamic_fields_for_stage(stage).blank?
+    end
+
+    def validate_dynamic_fields_for_phase(phase)
+      required_fields = line_item.product.dynamic_fields.where(data_fill_stage: phase)
+      filled_ids = guest_dynamic_fields.map(&:dynamic_field_id)
+
+      required_fields.each do |field|
+        errors.add(:base, "#{field.label} is required for #{phase} phase") unless filled_ids.include?(field.id)
+      end
+    end
+
+    def pre_registration_completed?
+      return true unless line_item.product.dynamic_fields.pre_registration.any?
+
+      pre_registration_fields_completed?
+    end
+
+    def post_registration_completed?
+      return true unless line_item.product.dynamic_fields.post_registration.any?
+
+      post_registration_fields_completed?
+    end
+
+    def check_in_completed?
+      return true unless line_item.product.dynamic_fields.during_check_in.any?
+
+      check_in_fields_completed?
+    end
+
+    def current_collection_phase
+      if check_in.present?
+        :during_check_in
+      elsif line_item.order.completed?
+        :post_registration
+      else
+        :pre_registration
+      end
+    end
+
+    def phase_completion_status
+      {
+        pre_registration: pre_registration_completed?,
+        post_registration: post_registration_completed?,
+        during_check_in: check_in_completed?
+      }
+    end
+
     # bib_number: 345, bib_prefix: 5KM, bib_zerofill: 5 => return 5KM00345
     # bib_number: 345, bib_prefix: 5KM, bib_zerofill: 2 => return 5KM345
     def formatted_bib_number

data/app/models/spree_cm_commissioner/guest_dynamic_field.rb

@@ -7,6 +7,7 @@ module SpreeCmCommissioner
     validates :value, presence: true
     validate :validate_value_format, if: -> { value.present? && dynamic_field.present? }
     validate :validate_option_reference, if: -> { dynamic_field_option.present? }
+    validate :check_required_fields_based_on_phase
 
     private
 
@@ -34,10 +35,49 @@ module SpreeCmCommissioner
 
     def validate_option_reference
       return if dynamic_field.blank? || dynamic_field_option.blank?
-
       return if dynamic_field_option.dynamic_field_id == dynamic_field_id
 
       errors.add(:dynamic_field_option, 'must belong to the same dynamic field')
     end
+
+    def before_checkin_phase?
+      guest.present? && guest.line_item.present? && guest.check_in.nil?
+    end
+
+    def after_purchase_phase?
+      guest.present? && guest.line_item.present? && guest.line_item.completed? && guest.check_in.nil?
+    end
+
+    def during_checkin_phase?
+      guest.present? && guest.check_in.present?
+    end
+
+    def pre_registration_required?
+      dynamic_field.data_fill_stage.to_sym == :pre_registration &&
+        guest.line_item.order.completed? && guest.check_in.blank?
+    end
+
+    def post_registration_required?
+      dynamic_field.data_fill_stage.to_sym == :post_registration &&
+        guest.line_item.order.completed? && guest.check_in.blank?
+    end
+
+    def during_check_in_required?
+      dynamic_field.data_fill_stage.to_sym == :during_check_in &&
+        guest.check_in.present?
+    end
+
+    def check_required_fields_based_on_phase
+      return if dynamic_field.blank? || value.present?
+
+      case dynamic_field.data_fill_stage.to_sym
+      when :pre_registration
+        errors.add(:value, I18n.t('guest_dynamic_field.errors.pre_registration_required')) if pre_registration_required?
+      when :post_registration
+        errors.add(:value, I18n.t('guest_dynamic_field.errors.post_registration_required')) if post_registration_required?
+      when :during_check_in
+        errors.add(:value, I18n.t('guest_dynamic_field.errors.during_check_in_required')) if during_check_in_required?
+      end
+    end
   end
 end

data/app/models/spree_cm_commissioner/product_decorator.rb

@@ -86,6 +86,28 @@ module SpreeCmCommissioner
       "#{Spree::Store.default.formatted_url}/tickets/#{slug}"
     end
 
+    def dynamic_fields_by_collection_phase
+      {
+        pre_registration: dynamic_fields.pre_registration.order(:position),
+        post_registration: dynamic_fields.post_registration.order(:position),
+        during_check_in: dynamic_fields.during_check_in.order(:position)
+      }
+    end
+
+    def required_dynamic_fields_completed?(guest, phase)
+      required_fields = dynamic_fields.where(data_fill_stage: phase)
+      return true if required_fields.empty?
+
+      filled_ids = guest.guest_dynamic_fields.where(dynamic_field_id: required_fields.select(:id)).pluck(:dynamic_field_id)
+      (required_fields.pluck(:id) - filled_ids).empty?
+    end
+
+    def required_fields_for_guest(guest)
+      dynamic_fields_by_collection_phase.transform_values do |fields|
+        fields.select { |field| guest.guest_dynamic_fields.where(dynamic_field: field).empty? }
+      end
+    end
+
     private
 
     def set_tenant

data/app/models/spree_cm_commissioner/user_decorator.rb

@@ -88,6 +88,12 @@ module SpreeCmCommissioner
       has_spree_role?('operator')
     end
 
+    def vendor_organizer?(vendor)
+      spree_roles.any? do |role|
+        role.name == "#{vendor.name.downcase.parameterize(separator: '-')}-organizer"
+      end
+    end
+
     def full_name
       [first_name, last_name].compact_blank.join(' ')
     end

data/app/models/spree_cm_commissioner/vendor_decorator.rb

@@ -93,6 +93,7 @@ module SpreeCmCommissioner
                                                                          }
 
       base.validates :commission_rate, presence: true, numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: 100 }
+      base.validates :from_email, presence: true, if: :tenant_present?
 
       def base.by_vendor_id!(vendor_id)
         if vendor_id.to_s =~ /^\d+$/
@@ -195,6 +196,8 @@ module SpreeCmCommissioner
 
       vendor_kind_option_values.where(option_type_id: rules_option_type.id)
     end
+
+    delegate :present?, to: :tenant, prefix: true
   end
 end