spree_cm_commissioner 1.21.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7043a8acbe6da011c50dcf6d5f9c4fa4c09d44f0c273c7d8c5f35e9da6430628
-  data.tar.gz: '049dc2649fbb41b2e43945741baf9c7815ddc11b38a83cec8157c2eac5ed8431'
+  metadata.gz: f153e6dedc0923e77cd5fb9e53f99fb8b5f18f1289acc2961df248054621bbc8
+  data.tar.gz: efc85b32c83368f26e02db04b67c14e71c430baafcedcf997ee5961a6217d7d4
 SHA512:
-  metadata.gz: 17233d10bfd72385a100faf262a0c236017970a4429e33098a7992dd64c217ff02c06168931f3472ef8e5a3245786df65c72f0123f2cacca58223b66c5ca6a3f
-  data.tar.gz: 68bac4de8bf2b866b75ccbcfef5c53b50786427d7cbe87e4d17fa0b284186cfbd08d71fbe8c5fe496dfce6b1e6340a6bb0be4cbac00103388c7545397ad417d1
+  metadata.gz: 9f13f470efb8892b55fac8bdbb0e6f180dd08ebc12a3d6639ded76855526849890cc02f17d7bcdc592e4528eaad619da94f82b403084a1e697afd7e2fd0100b2
+  data.tar.gz: a6646ac4739b414ffab2890f2230f0e07c6401d78ed77482e394303234a6d67e102132ca0ad589a879c6370eac0d1efc947f0fba4a115ebc10622950c09ecbfe

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (1.21.0)
+    spree_cm_commissioner (2.0.0)
       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/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,30 @@ 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 << ''
 
       selected_line_items.each do |item|
-        text << line_item_block(item)
+        text << bold(item.product.name.to_s)
+        text << "🎟️ Quantity: #{item.quantity}"
+        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/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/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/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/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
 

data/app/serializers/spree_cm_commissioner/v2/storefront/dynamic_field_serializer.rb

@@ -2,7 +2,7 @@ module SpreeCmCommissioner
   module V2
     module Storefront
       class DynamicFieldSerializer < BaseSerializer
-        attributes :id, :label, :data_type, :vendor_id, :multiple_select, :created_at, :updated_at, :position
+        attributes :id, :label, :data_type, :vendor_id, :multiple_select, :created_at, :updated_at, :position, :data_fill_stage
 
         has_many :dynamic_field_options, serializer: SpreeCmCommissioner::V2::Storefront::DynamicFieldOptionSerializer
       end

data/app/views/spree/admin/tenant_vendors/index.html.erb

@@ -1,6 +1,6 @@
 <% content_for :page_title do %>
   <%= page_header_back_button spree.admin_tenants_url %>
-  <%= link_to @tenant.name, spree.admin_tenants_url %> / <%= Spree.t('vendors') %>
+  <%= link_to Spree.t('tenants'), spree.admin_tenants_url %> / <%= link_to @tenant.name, spree.admin_tenants_url%> / <%= Spree.t('vendors') %>
 <% end %>
 
 <% content_for :page_actions do %>
@@ -24,13 +24,20 @@
       <tbody>
         <% @vendors.each do |vendor| %>
           <tr id="<%= spree_dom_id vendor %>" data-hook="admin_vendors_index_rows">
-            <td><%= vendor.name %></td>
+            <td>
+              <% if can?(:edit, vendor) %>
+                <%= link_to vendor.name, edit_admin_vendor_path(vendor.slug) %>
+              <% else %>
+                  <td><%= vendor.name %></td>
+              <% end %>
+            </td>
             <td><%= vendor.slug %></td>
             <td><%= vendor.created_at %></td>
             <td><%= vendor.updated_at %></td>
             <td><%= vendor.tenant.name %></td>
             <td data-hook="admin_tenants_index_row_actions" class="actions">
               <span class="d-flex justify-content-end">
+                <%= link_to_edit vendor, url: edit_admin_vendor_path(vendor.slug), no_text: true if can?(:edit, vendor) %>
                 <%= link_to_delete vendor, url: admin_tenant_vendor_path(@tenant, vendor.id), no_text: true if can?(:delete, vendor) %>
               </span>
             </td>

data/app/views/spree/admin/tenants/_form.html.erb

@@ -101,6 +101,15 @@
     <% end %>
   </div>
 
+  <!-- Brand Primary Color Field -->
+  <div class="col-md-6">
+    <%= f.label :preferred_brand_primary_color, Spree.t(:brand_primary_color), class: 'form-label' %>
+    <%= f.text_field :preferred_brand_primary_color, class: 'form-control color-picker', placeholder: '#FF5733', value: @object.preferred_brand_primary_color %>
+    <div class="color-preview" style="margin-top: 10px;">
+      <%= content_tag :div, nil, style: "background-color: #{@object.preferred_brand_primary_color}; width: 60px; height: 60px; border: 1px solid #ccc; box-sizing: border-box; display: block;" %>
+    </div>
+  </div>
+
   <!-- State Field -->
   <div class="col-6">
     <%= f.field_container :state do %>

data/app/views/spree/admin/tenants/edit.html.erb

@@ -1,6 +1,7 @@
 <% content_for :page_title do %>
   <%= page_header_back_button spree.admin_tenants_url %>
-  <%= link_to @object.name, spree.admin_tenants_url %>
+   <%= link_to Spree.t('tenants'), spree.admin_tenants_url %> /
+  <%= @object.name %>
 <% end %>
 
 <%= render partial: 'tabs', locals: { current: :edit } %>

data/app/views/spree/admin/tenants/index.html.erb

@@ -40,7 +40,13 @@
       <tbody>
         <% @collection.each do |tenant| %>
           <tr id="<%= spree_dom_id tenant %>" data-hook="admin_tenants_index_rows">
-            <td><%= tenant.name %></td>
+            <td>
+              <% if can?(:edit, tenant) %>
+                <%= link_to tenant.name, edit_admin_tenant_path(tenant.slug) %>
+              <% else %>
+                <%= tenant.name %>
+              <% end %>
+            </td>
             <td><%= tenant.slug %></td>
             <td><%= tenant.description %></td>
             <td><%= tenant.created_at %></td>

data/app/views/spree/admin/vendors/_form.html.erb

@@ -60,4 +60,18 @@
     <%= f.label :notification_email %>
     <%= f.email_field :notification_email, class: 'form-control' %>
   <% end %>
+   <%= f.field_container :from_email do %>
+    <%= f.label :from_email, Spree.t(:from_email)%>
+    <%= f.email_field :from_email, class: 'form-control' %>
+    <small class="form-text text-muted">
+        This is the email which will be the sender of all your Store emails (Order Confirmation, Shipment notification etc)
+    </small>
+  <% end %>
+  <%= f.field_container :support_email do %>
+    <%= f.label :support_email, Spree.t(:support_email)  %>
+    <%= f.email_field :support_email, class: 'form-control' %>
+    <small class="form-text text-muted">
+    This email is visible to your Store visitors in the Footer section
+    </small>
+  <% end %>
 </div>

data/app/views/spree/order_mailer/confirm_email.html.erb

@@ -1,22 +1,33 @@
 <tr>
-   <td class="email-body" width="570" cellpadding="0" cellspacing="0">
-      <table class="email-body_inner" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
-      <!-- Body content -->
+  <td class="email-body" width="570" cellpadding="0" cellspacing="0">
+    <table class="email-body_inner" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
       <tbody>
-      <tr>
-         <td>
-            <div class="f-fallback">
-               <%= render 'spree_cm_commissioner/order_mailer/greeting', order: @order %>
-               <div class="content">
+        <tr>
+          <td>
+            <% if @order.tenant.nil? %>
+              <div class="f-fallback">
+                <%= render 'spree_cm_commissioner/order_mailer/greeting', order: @order %>
+                <div class="content">
                   <%= render 'spree_cm_commissioner/order_mailer/order_total', order: @order %>
                   <%= render 'spree_cm_commissioner/order_mailer/your_booking', order: @order, show_booking_header: true %>
                   <%= render 'spree_cm_commissioner/order_mailer/customer_info', order: @order %>
-                  <%= render 'spree_cm_commissioner/order_mailer/support_contact'%>
-               </div>
-            </div>
-         </td>
-      </tr>
+                  <%= render 'spree_cm_commissioner/order_mailer/support_contact' %>
+                </div>
+              </div>
+            <% else %>
+              <div class="f-fallback">
+                <%= render 'spree_cm_commissioner/order_mailer/tenant/greeting', order: @order %>
+                <div class="content">
+                  <%= render 'spree_cm_commissioner/order_mailer/order_total', order: @order %>
+                  <%= render 'spree_cm_commissioner/order_mailer/your_booking', order: @order, show_booking_header: true %>
+                  <%= render 'spree_cm_commissioner/order_mailer/tenant/customer_info', order: @order %>
+                  <%= render 'spree_cm_commissioner/order_mailer/tenant/support_contact' %>
+                </div>
+              </div>
+            <% end %>
+          </td>
+        </tr>
       </tbody>
-      </table>
-   </td>
-</tr>
+    </table>
+  </td>
+</tr>

data/app/views/spree_cm_commissioner/layouts/order_mailer.html.erb

@@ -23,7 +23,11 @@
           <table class="email-footer" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
             <tr>
               <td>
-                  <%= render 'spree_cm_commissioner/order_mailer/footer', store: @order.store%>
+                <% if @order.tenant.nil? %>
+                  <%= render 'spree_cm_commissioner/order_mailer/footer', store: @order.store %>
+                <% else %>
+                  <%= render 'spree_cm_commissioner/order_mailer/tenant/footer', store: @order.store %>
+                <% end %>
               </td>
             </tr>
           </table>

data/app/views/spree_cm_commissioner/order_mailer/_mailer_stylesheets.html.erb

@@ -55,10 +55,10 @@
     border-radius: 1.5625rem 1.5625rem 0 0;
     background: #653ed7;
     background: url(<%= image_path("mailer/event-mailer-bg.png") %>) center center / cover,
-                linear-gradient(45deg, #653ed7, rgba(0, 0, 255, 0) 70.71%),
-                linear-gradient(225deg, #653ed7, rgba(0, 0, 255, 0) 70.71%),
-                linear-gradient(330deg, #35ace0, rgba(0, 0, 255, 0) 70.71%),
-                linear-gradient(150deg, #35ace0, rgba(0, 0, 255, 0) 70.71%);
+        linear-gradient(45deg, #653ed7, rgba(0, 0, 255, 0) 70.71%),
+        linear-gradient(225deg, #653ed7, rgba(0, 0, 255, 0) 70.71%),
+        linear-gradient(330deg, #35ace0, rgba(0, 0, 255, 0) 70.71%),
+        linear-gradient(150deg, #35ace0, rgba(0, 0, 255, 0) 70.71%);
   }
   #confirm-email #greeting-card p,
   #confirm-email #greeting-card .booking-confirmm,
@@ -66,6 +66,24 @@
   #confirm-email #greeting-card .description {
     color: #fff;
   }
+
+  #confirm-email #greeting-card-1 {
+    color: #fff;
+    padding: 1.5rem;
+    background-size: cover;
+    background-position: center;
+    background-repeat: no-repeat;
+    border-radius: 1.5625rem 1.5625rem 0 0;
+    background: #<%= @brand_color %>;
+  }
+  #confirm-email #greeting-card-1 p,
+  #confirm-email #greeting-card-1 .header,
+  #confirm-email #greeting-card-1 .booking-confirm,
+  #confirm-email #greeting-card-1 .hello,
+  #confirm-email #greeting-card-1 .description {
+    color: #fff;
+  }
+
   #confirm-email .align-right {
     vertical-align: top;
   }
@@ -74,6 +92,15 @@
     margin-top: 1.25rem;
     margin-bottom: 0.625rem;
   }
+  #confirm-email .icon-hang-meas {
+    width: 6.25rem;
+  }
+  #confirm-email .header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width: 100%;
+  }
   #confirm-email #greeting-card .hello,
   .booking-confirm {
     font-size: 1.375rem;
@@ -83,6 +110,15 @@
     margin-bottom: 0.25rem;
     margin-top: 1.25rem;
   }
+  #confirm-email #greeting-card-1 .booking-confirm {
+    font-size: 1.375rem;
+    font-style: normal;
+    font-weight: 700;
+    line-height: 1.75rem;
+    margin-bottom: 0.25rem;
+    margin-top: 1.25rem;
+    color: #fff;
+  }
   #confirm-email #greeting-card .booking-confirm {
     font-size: 1.5rem;
     padding: 0.625rem 0;
@@ -233,6 +269,7 @@
   }
   #confirm-email .notice-info .description {
     padding-left: 0.75rem;
+    color: #939393;
   }
   #confirm-email .notice-info a {
     color: #6444D8;

data/app/views/spree_cm_commissioner/order_mailer/tenant/_customer_info.html.erb

@@ -0,0 +1,42 @@
+<div class="content-cell">
+<div class="container">
+  <h2><%= I18n.t('mail.order_mailer.customer_info') %></h2>
+  <div class="flex two-columns">
+    <div class="two-columns-item">
+      <div class="flex two-columns-item_detail">
+        <div class="two-columns_icon"><%= image_tag "mailer/tenant_user.png", class: "mail-icon" %></div>
+        <div class="two-columns_text-container">
+          <p class="two-columns_title">Name</p>
+          <p class="two-columns_description"><%= user_full_name(order) %></p>
+        </div>
+      </div>
+      <div class="flex two-columns-item_detail">
+        <div class="two-columns_icon"><%= image_tag "mailer/mail.png", class: "mail-icon" %></div>
+        <div class="two-columns_text-container">
+          <p class="two-columns_title">Email</p>
+          <% if order.email.present? %>
+            <p class="two-columns_description"><%= link_to order.email, "mailto:#{order.email}" %></p>
+          <% end %>
+        </div>
+      </div>
+    </div>
+    <div class="vertical-separater"></div>
+    <div class="two-columns-item">
+      <div class="flex two-columns-item_detail">
+        <div class="two-columns_icon"><%= image_tag "mailer/tenant_phone.png", class: "mail-icon" %></div>
+        <div class="two-columns_text-container">
+          <p class="two-columns_title">Contact</p>
+          <% if order.phone_number.present? || order.intel_phone_number.present? %>
+            <p class="two-columns_description">
+              <%= link_to(
+                    order.phone_number || order.intel_phone_number,
+                    "tel:#{order.phone_number || order.intel_phone_number}") %>
+            </p>
+          <% end %>
+        </div>
+      </div>
+    </div>
+  </div>
+  <hr>
+</div>
+</div>

data/app/views/spree_cm_commissioner/order_mailer/tenant/_footer.html.erb

@@ -0,0 +1,25 @@
+<div class="email-footer_inner">
+  <div class="mb-24"><%= store.description%></div>
+  <div class="mb-24 f-14"><%= store.address%></div>
+  <h2 class="mb-24">Connect with us</h2>
+  <table class="mb-24 social_icons">
+    <tbody>
+      <tr>
+        <% if store.facebook? %>
+          <td class="social_icon">
+            <%= link_to store.facebook, target: :_blank do %>
+              <%= image_tag "mailer/facebook.png", class: "mail-icon"%>
+            <% end %>
+          </td>
+        <% end %>
+        <% if store.instagram?%>
+          <td class="social_icon">
+            <%= link_to store.instagram, target: :_blank do %>
+              <%= image_tag "mailer/instagram.png", class: "mail-icon"%>
+            <% end %>
+          </td>
+        <% end %>
+      </tr>
+    </tbody>
+  </table>
+</div>

data/app/views/spree_cm_commissioner/order_mailer/tenant/_greeting.html.erb

@@ -0,0 +1,19 @@
+<div id="greeting-card-1">
+  <div>
+    <div class="header">
+      <h1><%=@order.store.name %></h1>
+      <% if @vendor_logo_url.present? %>
+        <img src="<%= @vendor_logo_url %>" alt="Vendor Logo" class="icon-hang-meas">
+      <% end %>
+    </div>
+    <div class="booking-confirm">
+      <%= I18n.t('mail.order_mailer.booking_confirm') %>
+    </div>
+    <div class="hello">
+      <%= I18n.t('mail.order_mailer.hello', full_name: user_full_name(order)) %>
+    </div>
+    <div class="description">
+      <%= I18n.t('mail.order_mailer.booking_event', order_number: @order.number || 'NA') %>
+    </div>
+  </div>
+</div>

data/app/views/spree_cm_commissioner/order_mailer/tenant/_support_contact.html.erb

@@ -0,0 +1,33 @@
+<div class="content-cell">
+<div class="container">
+  <h2><%= I18n.t('mail.order_mailer.bookmeplus_support')%></h2>
+  <div class="flex two-columns">
+    <div class="two-columns-item">
+      <div class="flex two-columns-item_detail">
+        <div class="two-columns_icon"><%= image_tag "mailer/tenant_phone.png", class: "mail-icon"%></div>
+        <div class="two-columns_text-container">
+          <p class="two-columns_title">Contact</p>
+          <% if current_store.contact_phone.present? %>
+            <p class="two-columns_description">
+              <%= link_to current_store.contact_phone, "tel:#{current_store.contact_phone}" %>
+            </p>
+          <% end %>
+        </div>
+      </div>
+    </div>
+    <div class="vertical-separater"></div>
+    <div class="two-columns-item">
+      <div class="flex two-columns-item_detail">
+        <div class="two-columns_icon"><%= image_tag "mailer/mail.png", class: "mail-icon"%></div>
+        <div class="two-columns_text-container">
+          <p class="two-columns_title">Email</p>
+            <p class="two-columns_description">
+          <%= @vendor&.support_email.present? ? link_to(@vendor.support_email, "mailto:#{@vendor.support_email}") : "N/A" %>
+          </p>
+
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+</div>

data/config/locales/en.yml

@@ -54,7 +54,11 @@ en:
   guest_card_classes:
     empty_info: "No guest card classes information available."
     background_image: "Background Image"
-
+  guest_dynamic_field:
+      errors:
+        pre_registration_required: "is required before ticket issuance"
+        post_registration_required: "must be completed after purchase"
+        during_check_in_required: "is required during check-in"
   google_wallet:
     note: "Click <b>Create</b> or <b> Update</b> to connect to Google Wallet after filled all information "
     google_wallet_class_created: "Google Wallet class created successfully."

data/db/migrate/20250709073455_add_email_fields_to_spree_vendors.rb

@@ -0,0 +1,6 @@
+class AddEmailFieldsToSpreeVendors < ActiveRecord::Migration[7.0]
+  def change
+    add_column :spree_vendors, :from_email, :string, if_not_exists: true
+    add_column :spree_vendors, :support_email, :string, if_not_exists: true
+  end
+end

data/db/migrate/20250718071620_add_data_fill_stage_to_dynamic_fields.rb

@@ -0,0 +1,5 @@
+class AddDataFillStageToDynamicFields < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_dynamic_fields, :data_fill_stage, :integer, default: 0, null: false, if_not_exists: true
+  end
+end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '1.21.0'.freeze
+  VERSION = '2.0.0'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 1.21.0
+  version: 2.0.0
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-23 00:00:00.000000000 Z
+date: 2025-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -652,8 +652,11 @@ files:
 - app/assets/images/mailer/facebook.png
 - app/assets/images/mailer/instagram.png
 - app/assets/images/mailer/line_item-mailer-bg.png
+- app/assets/images/mailer/mail.png
 - app/assets/images/mailer/map-marker.png
 - app/assets/images/mailer/phone.png
+- app/assets/images/mailer/tenant_phone.png
+- app/assets/images/mailer/tenant_user.png
 - app/assets/images/mailer/twitter.png
 - app/assets/images/mailer/user.png
 - app/assets/images/payment_methods/cm-payment-affirm.svg
@@ -2187,6 +2190,10 @@ files:
 - app/views/spree_cm_commissioner/order_mailer/hotel/_booking_detail.html.erb
 - app/views/spree_cm_commissioner/order_mailer/purchased_items/_items.html.erb
 - app/views/spree_cm_commissioner/order_mailer/purchased_items/_summary.html.erb
+- app/views/spree_cm_commissioner/order_mailer/tenant/_customer_info.html.erb
+- app/views/spree_cm_commissioner/order_mailer/tenant/_footer.html.erb
+- app/views/spree_cm_commissioner/order_mailer/tenant/_greeting.html.erb
+- app/views/spree_cm_commissioner/order_mailer/tenant/_support_contact.html.erb
 - app/views/spree_cm_commissioner/pin_code_mailer/send_pin_code.html.erb
 - app/views/spree_cm_commissioner/team_invite_mailer/_mailer_stylesheets.html.erb
 - app/views/spree_cm_commissioner/team_invite_mailer/send_team_invite_email.html.erb
@@ -2533,11 +2540,13 @@ files:
 - 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
+- db/migrate/20250709073455_add_email_fields_to_spree_vendors.rb
 - db/migrate/20250711092937_add_position_to_cm_dynamic_fields.rb
 - db/migrate/20250711093045_add_position_to_cm_dynamic_field_options.rb
 - db/migrate/20250714121508_rename_cm_taxon_blazer_query_to_blazer_queryables.rb
 - db/migrate/20250714124323_make_cm_blazer_queryables_polymorphic.rb
 - db/migrate/20250715103333_remove_indexes_from_cm_user_identity_providers.rb
+- db/migrate/20250718071620_add_data_fill_stage_to_dynamic_fields.rb
 - docker-compose.yml
 - docs/option_types/attr_types.md
 - docs/private_key.pem