spree_cm_commissioner 2.0.0.pre.pre → 2.0.0

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/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/initializers/spree_permitted_attributes.rb

@@ -31,6 +31,8 @@ module Spree
       subtitle
       preferred_background_color
       preferred_foreground_color
+      preferred_group_check_in_enabled
+      preferred_individual_check_in_enabled
       show_badge_status
       purchasable_on
       available_on
@@ -58,10 +60,5 @@ module Spree
       age
       gender
     ]
-
-    @@stock_movement_attributes += %i[
-      originator_type
-      originator_id
-    ]
   end
 end

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."
@@ -459,6 +463,10 @@ en:
               businesses_cant_be_blank: "Businesses can't be blank"
               phone_number_cant_be_blank: "Phone number can't be blank"
               quantity_cant_be_less_than_or_equal_to_zero: "Quantity can't be less or equal than 0"
+        spree_cm_commissioner/vendor_place:
+          attributes:
+            place_id:
+              taken: "has already existed with this place type"
 
   mail:
     order_mailer:
@@ -543,6 +551,7 @@ en:
       update_user_login: "update user code"
       contact_update: "update contact code"
       otp_code: "OTP code"
+      telegram_verification: "telegram code"
 
   notifications:
     spree_cm_commissioner:

data/config/routes.rb

@@ -138,21 +138,7 @@ Spree::Core::Engine.add_routes do
         end
       end
 
-      resources :stock_managements do
-        collection do
-          get :calendar
-        end
-      end
-
-      resources :variants do
-        resources :inventory_items, only: %i[show create] do
-          member do
-            patch :reset
-            patch :update_prices
-            delete :delete_prices
-          end
-        end
-      end
+      resources :stock_managements
 
       resources :product_completion_steps do
         collection do
@@ -288,6 +274,7 @@ Spree::Core::Engine.add_routes do
       resources :vendors, controller: :tenant_vendors
     end
     resources :event_blazer_queries
+    resources :trip_blazer_queries
   end
 
   resources :events, controller: 'events/base' do
@@ -464,6 +451,7 @@ Spree::Core::Engine.add_routes do
         resources :images
         resource :s3_signed_urls
         resources :invites
+        resources :invite_crews, only: %i[show update]
         resources :invite_guests, only: %i[show update]
       end
 
@@ -543,8 +531,6 @@ Spree::Core::Engine.add_routes do
       end
 
       namespace :storefront do
-        resources :inventory_item
-
         resources :waiting_room_sessions, only: :create
         resources :vattanac_banks, only: %i[create]
         resource :cart, controller: :cart, only: %i[show create destroy] do
@@ -570,10 +556,7 @@ Spree::Core::Engine.add_routes do
         resource :cart_guests, only: %i[create destroy]
         resources :cart_payment_method_groups, only: %i[index]
 
-        resources :accommodations, only: %i[index show] do
-          resources :variants, only: %i[index show], module: :accommodations
-        end
-
+        resources :accommodations, only: %i[index show]
         resources :line_items, only: %i[index show]
         resources :account_checker
         resource :account_recovers, only: [:update]
@@ -688,5 +671,6 @@ Rails.application.routes.draw do
   get 'o/:id', to: 'spree_cm_commissioner/orders#show', as: 'order'
   get 'li/:id', to: 'spree_cm_commissioner/line_item_qr_images#show', as: 'line_item_qr_image'
   get 'g/:id', to: 'spree_cm_commissioner/guest_cards#show', as: 'guest_cards'
-  get '.well-known/:id', to: 'spree_cm_commissioner/well_known#show', constraints: { id: /(assetlinks\.json|apple-app-site-association)/ }
+  get '.well-known/assetlinks.json', to: 'spree_cm_commissioner/well_known#assetlinks_json'
+  get '.well-known/apple-app-site-association', to: 'spree_cm_commissioner/well_known#apple_app_site_association'
 end

data/db/migrate/20240202080634_update_counter_cache_of_vehicle_type.rb

@@ -1,7 +1,5 @@
 class UpdateCounterCacheOfVehicleType < ActiveRecord::Migration[7.0]
-  def up
-    if defined?(SpreeCmCommissioner::VehicleSeat) && SpreeCmCommissioner::VehicleSeat.respond_to?(:counter_culture_fix_counts)
+    def up
       SpreeCmCommissioner::VehicleSeat.counter_culture_fix_counts
     end
-  end
 end

data/db/migrate/20250616084219_add_description_to_cm_vendor_place.rb

@@ -0,0 +1,5 @@
+class AddDescriptionToCmVendorPlace < ActiveRecord::Migration[7.0]
+  def change
+      add_column :cm_vendor_places, :description, :string, if_not_exists: true
+  end
+end