spree_cm_commissioner 2.0.0.pre.pre → 2.0.1.pre.pre1

data/app/serializers/spree/v2/tenant/user_serializer.rb

@@ -11,6 +11,7 @@ module Spree
         has_one :profile, serializer: Spree::V2::Tenant::AssetSerializer
         has_many :device_tokens, serializer: Spree::V2::Tenant::UserDeviceTokenSerializer
         has_many :spree_roles, serializer: Spree::V2::Tenant::RoleSerializer
+        has_many :user_identity_providers, serializer: Spree::V2::Tenant::UserIdentityProviderSerializer
 
         attribute :store_credits, &:total_available_store_credit
 

data/app/serializers/spree_cm_commissioner/v2/operator/dashboard_crew_event_serializer.rb

@@ -2,7 +2,10 @@ module SpreeCmCommissioner
   module V2
     module Operator
       class DashboardCrewEventSerializer < BaseSerializer
-        attributes :id, :name, :permalink, :from_date, :to_date, :updated_at
+        attributes :id, :name, :permalink,
+                   :from_date, :to_date,
+                   :check_in_flows,
+                   :updated_at
 
         has_many :children_classifications, serializer: :classification
         has_one :category_icon, serializer: SpreeCmCommissioner::V2::Storefront::AssetSerializer

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

@@ -2,9 +2,7 @@ module SpreeCmCommissioner
   module V2
     module Storefront
       class DynamicFieldOptionSerializer < BaseSerializer
-        set_type :dynamic_field_option
-
-        attributes :id, :value, :dynamic_field_id, :created_at, :updated_at
+        attributes :id, :value, :dynamic_field_id, :status, :created_at, :updated_at, :position
       end
     end
   end

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

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

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

@@ -4,9 +4,10 @@ module SpreeCmCommissioner
       class GuestDynamicFieldSerializer < BaseSerializer
         set_type :guest_dynamic_field
 
-        attributes :id, :value, :guest_id, :dynamic_field_id, :created_at, :updated_at
+        attributes :id, :value, :guest_id, :dynamic_field_id, :dynamic_field_option_id, :created_at, :updated_at
 
         belongs_to :dynamic_field, serializer: SpreeCmCommissioner::V2::Storefront::DynamicFieldSerializer
+        belongs_to :dynamic_field_option, serializer: SpreeCmCommissioner::V2::Storefront::DynamicFieldOptionSerializer
       end
     end
   end

data/app/services/spree_cm_commissioner/organizer/export_guest_csv_service.rb

@@ -1,11 +1,12 @@
 module SpreeCmCommissioner
   module Organizer
     class ExportGuestCsvService
-      attr_reader :event_id, :columns
+      attr_reader :event_id, :columns, :filters
 
-      def initialize(event_id, columns)
+      def initialize(event_id, columns, filters = {})
         @event_id = event_id
         @columns = columns
+        @filters = filters
       end
 
       def call
@@ -18,7 +19,7 @@ module SpreeCmCommissioner
       private
 
       def headers
-        columns.map(&:humanize).uniq
+        columns.map { |col| col.titleize(keep_id_suffix: true) }.uniq
       end
 
       def build_row(guest)
@@ -28,10 +29,8 @@ module SpreeCmCommissioner
       def fetch_value(guest, column)
         if guest_field?(column)
           fetch_guest_value(guest, column)
-        elsif option_type_field?(column)
-          fetch_option_value(guest, column)
         else
-          ''
+          fetch_option_value(guest, column)
         end
       end
 
@@ -39,19 +38,21 @@ module SpreeCmCommissioner
         SpreeCmCommissioner::KycBitwise::ORDERED_BIT_FIELDS.include?(column.to_sym)
       end
 
-      def option_type_field?(column)
-        Spree::OptionType.exists?(name: column)
-      end
-
       def fetch_guest_value(guest, column)
         column_mappings(guest)[column] || ''
       end
 
-      def fetch_option_value(guest, option_type_name)
-        return guest.formatted_bib_number if option_type_name == 'bib-prefix'
+      # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      def fetch_option_value(guest, column_name)
+        return guest.formatted_bib_number if column_name == 'bib-prefix'
+        return guest.line_item&.number if column_name == 'item_id'
+        return guest.line_item&.order&.number if column_name == 'order_id'
+        return guest.created_at if column_name == 'created_at'
+        return guest.updated_at if column_name == 'updated_at'
 
-        guest.line_item&.variant&.find_option_value_name_for(option_type_name: option_type_name)
+        guest.line_item&.variant&.find_option_value_name_for(option_type_name: column_name) || ''
       end
+      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
       def column_mappings(guest)
         {
@@ -77,12 +78,19 @@ module SpreeCmCommissioner
       end
 
       def guests_with_associations
-        event.guests.includes(
+        scope = event.guests.includes(
           :occupation,
           :nationality,
           :id_card,
           line_item: { variant: { option_values: :option_type } }
-        )
+        ).complete
+        scope = scope.where('cm_guests.created_at >= ?', formatted_date_time(filters[:from_date])) if filters[:from_date].present?
+        scope = scope.where('cm_guests.created_at <= ?', formatted_date_time(filters[:to_date])) if filters[:to_date].present?
+        scope
+      end
+
+      def formatted_date_time(date)
+        Time.zone.parse(date.to_s).strftime('%Y-%m-%d %H:%M:%S %z')
       end
 
       def event

data/app/services/spree_cm_commissioner/user_authenticator.rb

@@ -32,7 +32,7 @@ module SpreeCmCommissioner
         options = { login: params[:username], password: params[:password], tenant_id: tenant_id }
         SpreeCmCommissioner::UserPasswordAuthenticator.call(options)
       when 'social_auth'
-        options = { id_token: params[:id_token] }
+        options = { id_token: params[:id_token], tenant_id: tenant_id }
         SpreeCmCommissioner::UserIdTokenAuthenticator.call(options)
       when 'telegram_web_app_auth'
         options = { telegram_init_data: params[:telegram_init_data], telegram_bot_username: params[:tg_bot] }

data/app/services/spree_cm_commissioner/vehicle_option_value_creator.rb

@@ -0,0 +1,11 @@
+module SpreeCmCommissioner
+  class VehicleOptionValueCreator
+    def self.call(vehicle)
+      vehicle_option_type = Spree::OptionType.vehicle
+
+      value = vehicle_option_type.option_values.where(name: vehicle.id).first_or_initialize
+      value.presentation = vehicle.code
+      value.save
+    end
+  end
+end

data/app/views/blazer/queries/_content.html.erb

@@ -47,6 +47,14 @@
                   class: "btn btn-primary",
                   style: "margin-left: 10px;" %>
     </div>
+  <% elsif !@error && @success && params[:trip_id].present? %>
+    <div>
+      <%= link_to 'Save Trip',
+                  spree.admin_trip_blazer_queries_path(trip_id: params[:trip_id], blazer_query_id: @query.id),
+                  method: :post,
+                  class: "btn btn-primary",
+                  style: "margin-left: 10px;" %>
+    </div>
   <% end %>
 </div>
 

data/app/views/spree/admin/stock_managements/_variant_stock_items.html.erb

@@ -17,11 +17,9 @@
           </td>
           <td class="text-center d-flex flex-column align-items-center justify-content-center">
             <div style="width: 90px;">
-              <%= form_tag admin_product_stock_managements_path(product_id: params[:product_id], variant_id: variant.id, stock_location_id: stock_location.id), method: :post do %>
+              <%= form_tag admin_stock_items_path(variant_id: variant.id, stock_location_id: stock_location.id), method: :post do %>
                 <div class="input-group input-group-sm">
                   <%= number_field_tag 'stock_movement[quantity]', 0, class: 'form-control text-center p-0' %>
-                  <%= hidden_field_tag 'stock_movement[originator_id]', spree_current_user.id %>
-                  <%= hidden_field_tag 'stock_movement[originator_type]', spree_current_user.class.name %>
                   <div class="input-group-append">
                     <%= button_tag(class: 'btn btn-outline-success pl-2 pr-1') do %>
                       <%= svg_icon(name: 'arrow-left-right.svg', classes: "icon", width: 14, height: 14) %>
@@ -34,10 +32,7 @@
           <td class="text-center">
             <% if item.persisted? && can?(:update, item) %>
               <%= form_tag admin_stock_item_path(item), method: :put, class: 'toggle_stock_item_backorderable' do %>
-                <%= check_box_tag 'stock_item[backorderable]', true, item.backorderable?,
-                  class: 'stock_item_backorderable',
-                  id: "stock_item_backorderable_#{stock_location.id}",
-                  onclick: "if (!confirm('Are you sure to change backorderable status?')) { this.checked = !this.checked; }" %>
+                <%= check_box_tag 'stock_item[backorderable]', true, item.backorderable?, class: 'stock_item_backorderable', id: "stock_item_backorderable_#{stock_location.id}" %>
               <% end %>
             <% else %>
               <%= 'N/A' %>

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

@@ -19,73 +19,30 @@
       <% @variants.each do |variant| %>
         <tr id="<%= spree_dom_id variant %>" data-hook="admin_product_stock_management_index_rows">
           <td class="image text-center">
-            <%= small_image(variant) %>
+              <%= small_image(variant) %>
+              <div class="mt-4">
+                Reserved Stock: <%= @reserved_stocks[variant.id] || 0 %></strong>
+              </div>
           </td>
           <td>
             <%= variant.sku_and_options_text %>
             <%= form_tag admin_product_variants_including_master_path(@product, variant, format: :js), method: :put, class: 'toggle_variant_track_inventory mt-2' do %>
               <div class="checkbox">
                 <%= label_tag "track_inventory_#{ variant.id }", class: 'm-0' do %>
-                  <%= check_box_tag 'track_inventory', 1, variant.track_inventory?,
-                    class: 'track_inventory_checkbox',
-                    id: "track_inventory_#{ variant.id }",
-                    onclick: "if (!confirm('Are you sure to change track inventory status?')) { this.checked = !this.checked; }" %>
+                  <%= check_box_tag 'track_inventory', 1, variant.track_inventory?, class: 'track_inventory_checkbox', id: "track_inventory_#{ variant.id }" %>
                   <%= Spree.t(:track_inventory) %>
                   <%= hidden_field_tag 'variant[track_inventory]', variant.track_inventory?, class: 'variant_track_inventory', id: "variant_track_inventory_#{variant.id}" %>
                 <% end %>
               </div>
             <% end if can?(:update, @product) && can?(:update, variant) %>
-
-            <% if defined?(@reserved_stocks) %>
-              <div>
-                <%= svg_icon name: "cart-check.svg", width: '14', height: '14' %>
-                <%= label_tag "reserved_stock#{variant.id}", "Reserved Stock: #{@reserved_stocks[variant.id] || 0}", class: "m-0" %>
-                <%= link_to_with_icon('capture.svg', "Create Inventory Item", admin_product_stock_management_variant_inventory_items(@product, variant.id),
-                  method: :post,
-                  remote: false,
-                  class: 'icon_link btn btn-sm btn-outline-primary ml-2',
-                  no_text: true
-                ) unless @inventory_items[variant.id].present? %>
-              </div>
-            <% end %>
-
             <% if variant.permanent_stock? %>
               <div>
                 <span type="button" data-toggle="popover" data-trigger="hover" data-placement="right" data-content="This product stock will renew every day">
                     <%= svg_icon name: "info-circle-fill.svg", width: '14', height: '14' %>
                 </span>
-                <%= label_tag "permanent_stock_#{ variant.id }", Spree.t(:permanent_stock), class: "m-0" %>
+                <%= label_tag "permanent_stock_#{ variant.id }", Spree.t(:permanent_stock) %>
               </div>
             <% end %>
-
-            <% if defined?(@inventory_items) %>
-              <% @inventory_items[variant.id]&.each do |inventory_item| %>
-                <div>
-                  <%= svg_icon name: "handbag.svg", width: '14', height: '14' %>
-                  <%= label_tag "max_capacity_#{ inventory_item.id }", "Max capacity: #{inventory_item.max_capacity}", class: "m-0" %>
-                </div>
-                <div>
-                  <%= svg_icon name: "approve.svg", width: '14', height: '14' %>
-                  <%= label_tag "quantity_available_#{ inventory_item.id }", "Quantity available: #{inventory_item.quantity_available}", class: "m-0" %>
-
-                  <% synced = inventory_item.quantity_available == @cached_inventory_items[inventory_item.id].quantity_available %>
-                  <span type="button" data-toggle="popover" data-trigger="hover" data-placement="right" data-content="<%= inventory_item_message(inventory_item, @cached_inventory_items[inventory_item.id]) %>">
-                    <% if synced %>
-                      <%= svg_icon name: "cloud-check.svg", width: '14', height: '14', classes: 'text-success' %>
-                    <% else %>
-                      <%= svg_icon name: "cloud-slash.svg", width: '14', height: '14', classes: 'text-danger' %>
-                    <% end %>
-                  </span>
-
-                  <%= link_to_with_icon('arrow-counterclockwise.svg', "Reset Inventory Item", reset_admin_product_variant_inventory_item_path(@product, inventory_item.variant_id, inventory_item.id),
-                    method: :patch,
-                    remote: false,
-                    class: 'icon_link btn btn-sm outline text-dark',
-                    data: { confirm: "Only reset if stock is incorrect. Are you sure?" }, no_text: true
-                  ) %>
-                </div>
-              <% end %>
-            <% end %>
           </td>
 
           <td colspan="3" class="stock_location_info">
@@ -96,9 +53,3 @@
     </tbody>
   </table>
 </div>
-
-<%= turbo_frame_tag "calendar", src: calendar_admin_product_stock_managements_path(year: params[:year]) do %>
-  <div class="spinner-border mt-2" role="status">
-    <span class="sr-only">Loading...</span>
-  </div>
-<% end if @product.permanent_stock? %>

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

@@ -3,17 +3,21 @@
   <div class="col-6">
     <%= f.field_container :name do %>
       <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
-      <%= f.text_field :name, required: true, class: 'form-control', placeholder: 'eg. bookme plus'%>
-      <%= f.error_message_on :name %>
+      <%= f.text_field :name, required: true, class: 'form-control', placeholder: 'eg. bookme plus' %>
+      <% if f.object.errors[:name].any? %>
+        <div class="error text-danger"><%= f.object.errors[:name].join(', ') %></div>
+      <% end %>
     <% end %>
   </div>
 
-  <!-- Slug Field (only show if editing) -->
+  <!-- Slug Field -->
   <div class="col-6">
     <%= f.field_container :slug do %>
       <%= f.label :slug, raw(Spree.t(:slug)) %>
       <%= f.text_field :slug, class: 'form-control', placeholder: 'slug' %>
-      <%= f.error_message_on :slug %>
+      <% if f.object.errors[:slug].any? %>
+        <div class="error text-danger"><%= f.object.errors[:slug].join(', ') %></div>
+      <% end %>
     <% end %>
   </div>
 
@@ -22,16 +26,20 @@
     <%= f.field_container :description do %>
       <%= f.label :description, raw(Spree.t(:description)) %>
       <%= f.text_area :description, class: 'form-control', placeholder: 'description' %>
-      <%= f.error_message_on :description %>
+      <% if f.object.errors[:description].any? %>
+        <div class="error text-danger"><%= f.object.errors[:description].join(', ') %></div>
+      <% end %>
     <% end %>
   </div>
 
-    <!-- Host Field -->
+  <!-- Host Field -->
   <div class="col-12">
     <%= f.field_container :host do %>
       <%= f.label :host, raw(Spree.t(:host) + required_span_tag) %>
       <%= f.text_field :host, required: true, class: 'form-control', placeholder: 'host' %>
-      <%= f.error_message_on :host %>
+      <% if f.object.errors[:host].any? %>
+        <div class="error text-danger"><%= f.object.errors[:host].join(', ') %></div>
+      <% end %>
     <% end %>
   </div>
 
@@ -39,21 +47,26 @@
   <div class="col-12">
     <%= f.field_container :preferred_assetlinks do %>
       <%= f.label :preferred_assetlinks, raw(Spree.t(:assetlinks)) %>
-      <%= f.text_area :preferred_assetlinks, class: 'form-control',
-          placeholder: 'example:
-          [
-            {
-              "relation": ["delegate_permission/common.handle_all_urls"],
-              "target": {
-                "namespace": "android_app",
-                "package_name": "com.yourapp.app",
-                "sha256_cert_fingerprints": [
-                  "SHA256_CERTIFICATE_FINGERPRINT_HERE"
-                ]
-              }
-            }
-          ]', rows: 5 %>
-      <%= f.error_message_on :preferred_assetlinks %>
+      <%= f.text_area :preferred_assetlinks, class: 'form-control', rows: 5,
+            placeholder: <<~JSON.strip
+              example:
+              [
+                {
+                  "relation": ["delegate_permission/common.handle_all_urls"],
+                  "target": {
+                    "namespace": "android_app",
+                    "package_name": "com.yourapp.app",
+                    "sha256_cert_fingerprints": [
+                      "SHA256_CERTIFICATE_FINGERPRINT_HERE"
+                    ]
+                  }
+                }
+              ]
+            JSON
+      %>
+      <% if f.object.errors[:preferred_assetlinks].any? %>
+        <div class="error text-danger"><%= f.object.errors[:preferred_assetlinks].join(', ') %></div>
+      <% end %>
     <% end %>
   </div>
 
@@ -61,34 +74,97 @@
   <div class="col-12">
     <%= f.field_container :preferred_apple_app_site_association do %>
       <%= f.label :preferred_apple_app_site_association, raw(Spree.t(:apple_app_site_association)) %>
-      <%= f.text_area :preferred_apple_app_site_association, class: 'form-control',
-          placeholder: 'example:
-          {
-            "webcredentials": {
-              "apps": [
-                "TEAM_ID.com.yourapp.app"
-              ]
-            },
-            "applinks": {
-              "apps": [],
-              "details": [
-                {
-                  "appID": "TEAM_ID.com.yourapp.app",
-                  "paths": ["*"]
+      <%= f.text_area :preferred_apple_app_site_association, class: 'form-control', rows: 5,
+            placeholder: <<~JSON.strip
+              example:
+              {
+                "webcredentials": {
+                  "apps": [
+                    "TEAM_ID.com.yourapp.app"
+                  ]
+                },
+                "applinks": {
+                  "apps": [],
+                  "details": [
+                    {
+                      "appID": "TEAM_ID.com.yourapp.app",
+                      "paths": ["*"]
+                    }
+                  ]
                 }
-              ]
-            }
-          }', rows: 5 %>
-      <%= f.error_message_on :preferred_apple_app_site_association %>
+              }
+            JSON
+      %>
+      <% if f.object.errors[:preferred_apple_app_site_association].any? %>
+        <div class="error text-danger"><%= f.object.errors[:preferred_apple_app_site_association].join(', ') %></div>
+      <% end %>
     <% 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 %>
       <%= f.label :state, raw(Spree.t(:state)) %>
-      <%= f.select :state, options_for_select([['Enabled', 'enabled'], ['Disabled', 'disabled']], @object.state), { required: true }, class: 'select2 form-control' %>
-      <%= f.error_message_on :state %>
+      <%= f.select :state,
+            options_for_select([['Enabled', 'enabled'], ['Disabled', 'disabled']], f.object&.state),
+            { required: true },
+            class: 'select2 form-control' %>
+      <% if f.object.errors[:state].any? %>
+        <div class="error text-danger"><%= f.object.errors[:state].join(', ') %></div>
+      <% end %>
     <% end %>
   </div>
 </div>
+
+<div data-hook="admin_tenant_form_fields" class="row">
+  <div class="col-12">
+    <div class="row gy-4">
+      <% payment_icon_fields = [
+          { field: :preferred_payment_checkout_image, label: Spree.t(:payment_checkout_image), target: 'checkout' },
+          { field: :preferred_payment_failed_image, label: Spree.t(:payment_failed_image), target: 'failed' },
+          { field: :preferred_payment_success_image, label: Spree.t(:payment_success_image), target: 'success' },
+          { field: :preferred_payment_loader, label: Spree.t(:payment_loader), target: 'loader' }
+        ] %>
+
+      <% payment_icon_fields.each do |icon| %>
+        <div class="col-md-3">
+          <%= f.field_container icon[:field] do %>
+            <div class="d-flex flex-column align-items-center text-center">
+              <label class="form-label fw-bold mb-2" for="tenant_<%= icon[:field] %>">
+                <%= icon[:label] %>
+              </label>
+
+              <div class="icon-preview-container mb-2" id="icon-preview-container-<%= icon[:field] %>">
+                <span class="payment-icon-preview" id="icon-preview-<%= icon[:field] %>">
+                  <% if f.object.send(icon[:field]).present? %>
+                    <%= render_vector_icon(f.object.send(icon[:field])) %>
+                  <% else %>
+                    <span class="no-icon-placeholder"></span>
+                  <% end %>
+                </span>
+                <span class="remove-icon-btn <%= 'hidden' unless f.object.send(icon[:field]).present? %>" data-target="<%= icon[:field] %>">&times;</span>
+              </div>
+            </div>
+
+            <%= f.collection_select icon[:field],
+                  @vector_icons, :path, :path,
+                  { include_blank: 'None' },
+                  { class: 'select2 form-control tenant-payment-icon-select mt-2', data: { target: icon[:target] } } %>
+            <% if f.object.errors[icon[:field]].any? %>
+              <div class="text-danger small mt-1"><%= f.object.errors[icon[:field]].join(', ') %></div>
+            <% end %>
+          <% end %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>

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>