spree_cm_commissioner 2.0.2.pre.pre → 2.0.3.pre.pre1

data/app/queries/spree_cm_commissioner/variant_availability/non_permanent_stock_query.rb

@@ -0,0 +1,45 @@
+module SpreeCmCommissioner
+  module VariantAvailability
+    class NonPermanentStockQuery
+      attr_reader :variant, :except_line_item_id, :error_message
+
+      def initialize(variant:, except_line_item_id: nil)
+        @variant = variant
+        @except_line_item_id = except_line_item_id
+        @error_message = nil
+      end
+
+      def available?(quantity)
+        reserve_variants =
+          Spree::LineItem
+          .complete
+          .select('(SUM(DISTINCT spree_stock_items.count_on_hand) - SUM(spree_line_items.quantity)) AS available_quantity')
+          .joins(variant: :stock_items)
+          .where(variant_id: variant.id)
+          .where.not(id: except_line_item_id)
+          .group(:variant_id)
+
+        # there is a case when variant does not have any purchaces yet, it will return empty & always available true.
+        # in this case, we check with stock items directly.
+
+        available_quantity = if reserve_variants.any?
+                               reserve_variants.sum(&:available_quantity)
+                             else
+                               variant.stock_items.sum(:count_on_hand)
+                             end
+        if available_quantity >= quantity
+          true
+        elsif available_quantity == 1
+          @error_message = I18n.t('variant_availability.item_available_instock')
+          false
+        elsif available_quantity <= 0
+          @error_message = I18n.t('variant_availability.items_out_of_stock')
+          false
+        else
+          @error_message = I18n.t('variant_availability.items_available_instock', available_quantity: available_quantity)
+          false
+        end
+      end
+    end
+  end
+end

data/app/queries/spree_cm_commissioner/variant_availability/permanent_stock_query.rb

@@ -0,0 +1,55 @@
+module SpreeCmCommissioner
+  module VariantAvailability
+    class PermanentStockQuery
+      attr_reader :variant, :from_date, :to_date, :except_line_item_id
+
+      def initialize(variant:, from_date:, to_date:, except_line_item_id: nil)
+        @variant = variant
+        @from_date = from_date
+        @to_date = to_date
+        @except_line_item_id = except_line_item_id
+      end
+
+      def available?(quantity)
+        (from_date..from_date).all? do |booking_date|
+          booked_date_quantity[booking_date].nil? ||
+            (booked_date_quantity[booking_date] - quantity) >= 0
+        end
+      end
+
+      def booked_date_quantity
+        dates_sql = ApplicationRecord.sanitize_sql_array(
+          [
+            'SELECT date FROM generate_series(?::date, ?::date, ?) AS date',
+            from_date,
+            to_date,
+            date_interval
+          ]
+        )
+
+        @booked_variants ||=
+          Spree::LineItem
+          .complete
+          .select(
+            '(SUM(DISTINCT spree_stock_items.count_on_hand) - SUM(spree_line_items.quantity)) AS available_quantity',
+            'dates.date AS reservation_date'
+          )
+          .joins(variant: :stock_items)
+          .where(variant_id: variant.id)
+          .where.not(id: except_line_item_id)
+          .joins("INNER JOIN (#{dates_sql}) dates ON dates.date >= spree_line_items.from_date AND dates.date < spree_line_items.to_date")
+          .group(:variant_id, :reservation_date)
+          .order(:reservation_date)
+          .each_with_object({}) do |record, hash|
+            hash[record.reservation_date.to_date] = record.available_quantity
+          end
+      end
+
+      # override this for product that have
+      # different date time interval than 1 day.
+      def date_interval
+        '1 day'
+      end
+    end
+  end
+end

data/app/queries/spree_cm_commissioner/vendor_stop_place_query.rb

@@ -0,0 +1,54 @@
+module SpreeCmCommissioner
+  class VendorStopPlaceQuery
+    attr_reader :query, :vendor_id, :stop_type, :reference_stop_id
+
+    def initialize(query:, vendor_id:, stop_type: :boarding, reference_stop_id: nil)
+      @query = query.to_s.strip
+      @vendor_id = vendor_id
+      @stop_type = stop_type
+      @reference_stop_id = reference_stop_id
+    end
+
+    def call
+      results = vendor_stops
+      return [] if results.empty?
+
+      places = results.includes(:stop).map(&:stop).compact.uniq
+
+      format_places(places)
+    end
+
+    private
+
+    def vendor_stops
+      scope = base_scope
+      return scope if query.blank?
+
+      scope = scope.where.not(stop_id: reference_stop_id) if reference_stop_id.present?
+      scope.where('cm_places.name ILIKE ?', "%#{query}%")
+    end
+
+    def base_scope
+      SpreeCmCommissioner::VendorStop
+        .joins(:stop)
+        .where(vendor_id: vendor_id)
+        .where(stop_type: stop_type)
+        .order(trip_count: :desc)
+        .where.not(trip_count: 0)
+    end
+
+    def format_places(places)
+      places
+        .sort_by { |p| [-p.depth, -p.lft] }
+        .filter_map do |place|
+          next if place.depth.zero?
+
+          {
+            id: place.id,
+            parent_id: place.parent_id,
+            name: place.self_and_ancestors.map(&:name).reverse.join(', ')
+          }
+        end
+    end
+  end
+end

data/app/request_schemas/spree_cm_commissioner/accommodation_request_schema.rb

@@ -3,9 +3,6 @@ module SpreeCmCommissioner
     params do
       required(:from_date).value(:date)
       required(:to_date).value(:date)
-      required(:province_id).value(:integer)
-      required(:adult).value(:integer)
-      required(:children).value(:integer)
     end
 
     rule(:from_date, :to_date) do

data/app/request_schemas/spree_cm_commissioner/application_request_schema.rb

@@ -11,7 +11,7 @@ module SpreeCmCommissioner
     end
 
     def error_message
-      errors.map { |error| "#{error.path.join(', ')}: #{error.text}" }.to_sentence
+      errors.map(&:text).join(', ')
     end
 
     private

data/app/serializables/spree_cm_commissioner/event_chart.rb

@@ -0,0 +1,11 @@
+module SpreeCmCommissioner
+  class EventChart
+    attr_reader :id, :chart_type, :product_charts
+
+    def initialize(id:, chart_type:, product_charts:)
+      @id = id
+      @chart_type = chart_type
+      @product_charts = product_charts
+    end
+  end
+end

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

@@ -9,12 +9,10 @@ module Spree
 
         attributes :total_inventory, :service_availabilities
 
-        # Deprecated
         attribute :total_booking do |vendor|
           vendor.respond_to?(:total_booking) ? vendor.total_booking : 0
         end
 
-        # Deprecated
         attribute :remaining do |vendor|
           vendor.respond_to?(:remaining) ? vendor.remaining : vendor.total_inventory
         end

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

@@ -4,7 +4,6 @@ module Spree
       module LineItemSerializerDecorator
         def self.prepended(base)
           base.attributes :from_date, :to_date, :need_confirmation, :product_type, :event_status, :amount, :display_amount,
-                          :checkin_date, :checkout_date,
                           :number, :qr_data,
                           :kyc, :kyc_fields, :remaining_total_guests, :number_of_guests,
                           :completion_steps, :available_social_contact_platforms, :allow_anonymous_booking, :discontinue_on,

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/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/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

@@ -58,6 +58,8 @@
   <% end %>
 </div>
 
+<%= render partial: 'blazer/queries/preset' %>
+
 <% if flash[:success] %>
   <div class="alert alert-success">
     <%= flash[:success] %>

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

@@ -0,0 +1,11 @@
+<%= form_for @query do |f| %>
+  <div>
+    <%= f.check_box :preset, onchange: "this.form.submit()" %>
+    <%= f.label :preset, Spree.t(:preset) %>
+  </div>
+  <small style="margin-bottom: 6px; display: inline-block;">
+    Mark as <strong>preset</strong> to auto-assign this report to new organizers or vendors.
+  </small>
+<% end %>
+
+

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/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;