RubyGems - spree_cm_commissioner - Versions diffs - 2.5.0.pre.pre13 → 2.5.0 - Mend

spree_cm_commissioner 2.5.0.pre.pre13 → 2.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (110) hide show

data/app/views/spree_cm_commissioner/cancel_order_mailer/tenant/_cancel_email.html.erb ADDED Viewed

@@ -0,0 +1,13 @@
+<div class="cancel-greeting">
+  <h1>
+    <%= I18n.t('mail.order_mailer.hello', full_name: user_full_name(order))%>
+  </h1>
+  <p class="description">
+    <%= raw I18n.t('mail.order_mailer.cancel_description',  order_number: order.number || 'NA') %>
+  </p>
+  <p class="description">
+    <span style="font-weight: bold; color: #000000;">Reason:</span>
+    <%= order&.internal_note %>
+  </p>
+  <div style="border-bottom: 1px solid #E5E7EB; margin-top: 1.5rem;">
+</div>

data/app/views/spree_cm_commissioner/cancel_order_mailer/tenant/_footer.html.erb ADDED Viewed

@@ -0,0 +1,8 @@
+<div class="footer">
+  <p>
+    <%= I18n.t('mail.order_mailer.cancel_thank') %>
+  </p>
+  <p class="team">
+    <%= I18n.t('mail.order_mailer.from_team', store: name) %>
+  </p>
+</div>

data/app/views/spree_cm_commissioner/cancel_order_mailer/tenant/_header.html.erb ADDED Viewed

@@ -0,0 +1,15 @@
+<div class="header-tenant">
+  <table width="100%" cellpadding="0" cellspacing="0">
+    <tr>
+      <td class="tenant-name">
+        <%= name %>
+      </td>
+      <% if logo.present? %>
+        <td class="logo-tenant" align="right">
+          <img src="<%= logo %>">
+        </td>
+      <% end %>
+    </tr>
+  </table>
+</div>

data/app/views/spree_cm_commissioner/layouts/cancel_order_mailer.html.erb ADDED Viewed

@@ -0,0 +1,16 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <meta name="x-apple-disable-message-reformatting"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <link href="https://fonts.googleapis.com/css2?family=Poppins&display=swap" rel="stylesheet">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+    <%= render partial: 'spree_cm_commissioner/cancel_order_mailer/mailer_stylesheets' %>
+  </head>
+   <body>
+    <table role="presentation" cellspacing="0" cellpadding="0" border="0" align="center" width="100%">
+      <%= yield %>
+    </table>
+  </body>
+</html>

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

@@ -20,7 +20,7 @@
       </tr>
       <tr>
         <td height="60px">
-          <table class="email-footer" align="center" width="570" cellpadding="0" cellspacing="0" role="presentation">
+          <table class="email-footer" align="center" width="100%" style="max-width: 570px;" cellpadding="0" cellspacing="0" role="presentation">
             <tr>
               <td>
                 <% if @order.tenant.nil? %>

data/app/views/spree_cm_commissioner/order_mailer/_customer_info.html.erb CHANGED Viewed

@@ -1,31 +1,25 @@
 <div class="content-cell">
   <div class="container">
     <h2><%= I18n.t('mail.order_mailer.customer_info')%></h2>
-    <div class="flex two-columns">
+    <div class="flex two-columns-contact">
       <div class="two-columns-item">
         <div class="flex two-columns-item_detail">
-          <div class="two-columns_icon"><%= image_tag "mailer/user.png", class: "mail-icon"%></div>
+          <div class="two-columns_icon" style="color: black;"><%= image_tag "mailer/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/envelope.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/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(

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

@@ -1,5 +1,9 @@
 <style type="text/css" rel="stylesheet" media="all">
   /* Custom Mailer ------------------------------ */
+  body {
+    padding: 0;
+    margin: 0;
+  }
   #confirm-email {
     font-family: "Poppins", "Nunito Sans", Helvetica, Arial, sans-serif;
@@ -95,12 +99,12 @@
     margin-bottom: 0.625rem;
   }
   #confirm-email .icon-hang-meas {
-    width: 50%;
+    width: 40%;
     text-align: right;
   }
   #confirm-email .icon-hang-meas img {
-    width: 6.25rem;
-    height: 6.25rem;
+    width: 3.5rem;
+    height: 3.5rem;
     border-radius: 50%;
     background-color: #fff;
     display: inline-block;
@@ -108,7 +112,8 @@
   #confirm-email .header h1 {
     margin: 0;
     color: #fff;
-    width: 50%;
+    width: 60%;
+    font-size: 1.8rem;
   }
   #confirm-email .header {
@@ -140,26 +145,25 @@
     padding: 0.625rem 0;
   }
   #confirm-email .purchase_image {
-    width: 20%;
+    border-radius:10px;
+    width:auto; height:auto;
+    display:block; margin-bottom:6px;
+    margin-right: 8px;
   }
   #confirm-email .purchase_item {
     padding: 0 0.625rem;
     width: 60%;
   }
   #confirm-email .purchase-item-option-text {
-    font-size: 1rem;
-    background-color: #F2F2F2;
-    color: #646161;
-    white-space: normal;
-    overflow: hidden;
-    display: inline-block;
-    max-width: 100%;
-    width: auto;
-    padding: 0.375rem 0.875rem;
-    margin: 0.625rem 0;
-    border-radius: 6.25rem;
-    word-wrap: break-word;
-    word-break: break-word;
+    padding:12px;
+    border:1px solid #d1d5db;
+    background-color:#f3f4f6;
+    border-radius:10px;
+    font-size:12px;
+    line-height:1.25;
+    color:#4b5563;
+    word-wrap:break-word;
+    text-align:start;
   }
   #confirm-email .purchase_item_price {
     margin-bottom: 0.5rem;  }
@@ -186,9 +190,18 @@
     height: auto;
     background: #F2F2F2;
   }
+  #confirm-email .two-columns-contact{
+    display: flex;
+    flex-direction: column;
+  }
+  #confirm-email .two-columns-contact .two-columns-item {
+    flex: 1 1 45%;
+    word-wrap: break-word;
+    word-break: break-word;
+    width: 100%;
+  }
   #confirm-email .two-columns .two-columns-item {
     flex: 1 1 45%;
-    margin: 0.5rem 0;
     word-wrap: break-word;
     word-break: break-word;
     width: 100%;
@@ -200,16 +213,30 @@
     width: 65%;
     justify-content: right;
   }
-  #confirm-email .two-columns .two-columns-item_detail {
+  #confirm-email .two-columns-contact .two-columns-item_detail {
     margin-bottom: 1rem;
     width: 100%;
+    display: flex;
+    align-items: center;
   }
   #confirm-email .two-columns_icon {
-    min-width: 3rem;
-    height: 3rem;
+    min-width: 2rem;
+    height: 2rem;
     background: #f1f1f1;
     border-radius: 50%;
     display: flex;
+    align-items: center;
+    justify-content: center;
+    fill: blue;
+    stroke: black;
+  }
+  #confirm-email .two-columns_icon .mail-icon {
+    width: 1rem; /* Adjust size as needed */
+    height: 1rem;
+  }
+  #confirm-email .two-columns_icon .mail-icon-tenant {
+    width: 1.2rem;
+    height: 1.2rem;
   }
   #confirm-email .two-columns_icon .vendor-logo {
     max-width: 3rem;
@@ -295,6 +322,7 @@
     padding: 1.5rem;
     border-radius: 0 0 1.5625rem 1.5625rem;
     border: 0.0625rem solid #dddfe2;
+    background-color: #fff;
   }
   .purchase {
     width: 100%;
@@ -310,7 +338,7 @@
     align: right;
   }
   .align-right {
-    padding: 0.625rem;
+    padding: 0.625rem 0;
     text-align: right;
     align: right;
   }

data/app/views/spree_cm_commissioner/order_mailer/_support_contact.html.erb CHANGED Viewed

@@ -1,12 +1,11 @@
 <div class="content-cell">
   <div class="container">
     <h2><%= I18n.t('mail.order_mailer.bookmeplus_support')%></h2>
-    <div class="flex two-columns">
+    <div class="flex two-columns-contact">
       <div class="two-columns-item">
         <div class="flex two-columns-item_detail">
-          <div class="two-columns_icon"><%= image_tag "mailer/phone.png", class: "mail-icon"%></div>
+          <div class="two-columns_icon"><%= image_tag "mailer/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}" %>
@@ -14,13 +13,9 @@
             <% 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/envelope.png", class: "mail-icon"%></div>
           <div class="two-columns_text-container">
-            <p class="two-columns_title">Email</p>
             <% if current_store.customer_support_email.present? %>
               <p class="two-columns_description">
                 <%= link_to current_store.customer_support_email, "mailto:#{current_store.customer_support_email}" %>

data/app/views/spree_cm_commissioner/order_mailer/purchased_items/_items.html.erb CHANGED Viewed

@@ -1,46 +1,80 @@
-<table class="purchase order-info">
+<table class="purchase order-info" width="100%" cellpadding="0" cellspacing="0">
   <% line_items.each do |line_item| %>
     <tr>
-      <td class="purchase_image align-center-vertical">
-        <% if line_item.variant.present? && variant_image_url(line_item.variant).present? %>
-          <%= link_to(
-                image_tag(
-                  variant_image_url(line_item.variant),
-                  style: "border-radius: 10px; width: 100%;"),
-                custom_product_storefront_resource_url(line_item.product) || '#'
-              ) %>
-        <% end %>
-      </td>
-      <td class="purchase_item">
-        <% if line_item.name.present? %>
-          <p><%= link_to(
-                  raw(line_item.name),
+      <td>
+        <!-- Outer container table -->
+        <table width="100%" cellpadding="0" cellspacing="0" role="presentation">
+          <!-- Row 1: Name + Quantity × Price -->
+          <tr>
+            <td align="left" valign="top" width="60%">
+              <% if line_item.name.present? %>
+                <span>
+                  <%= link_to(raw(line_item.name), custom_product_storefront_resource_url(line_item.product) || '#') %>
+                </span>
+              <% end %>
+            </td>
+            <td align="right" valign="top" width="40%">
+              <table width="100%" cellpadding="0" cellspacing="0" role="presentation">
+                <tr>
+                  <td align="right" style="color: gray; padding-bottom:2px; white-space:nowrap;">
+                    <%= line_item.quantity %> x <%= line_item.single_money %>
+                  </td>
+                </tr>
+                <tr>
+                  <td align="right">
+                    <span style="font-weight:600;"><%= line_item.display_amount %></span>
+                  </td>
+                </tr>
+              </table>
+            </td>
+          </tr>
+        </table>
+        <!-- Separate table for Image + Options to avoid width conflicts -->
+        <table width="100%" cellpadding="0" cellspacing="0" role="presentation" style="margin-top:6px;">
+          <tr>
+            <!-- Image -->
+            <td align="left" valign="top">
+              <% if line_item.variant.present? && variant_image_url(line_item.variant).present? %>
+                <%= link_to(
+                  image_tag(
+                    variant_image_url(line_item.variant),
+                    class: "purchase_image"
+                  ),
                   custom_product_storefront_resource_url(line_item.product) || '#'
-          ) %></p>
-        <% end %>
-        <% if line_item.variant.options_text.present? %>
-          <div class="purchase-item-option-text">
-            <%= sanitize(line_item.variant.options_text) %>
-          </div>
-        <% end %>
-        <div> <%= link_to 'View Details', custom_product_line_item_url(line_item) %></div>
-      </td>
-      <td class="align-right align-center-vertical" width="10%">
-        <span>
-          <%= line_item.quantity %>x
-        </span>
+                ) %>
+              <% end %>
+            </td>
+            <!-- Options -->
+            <td align="right" valign="top" width="100%">
+              <% if line_item.variant.options_text.present? %>
+                <table width="100%" cellpadding="0" cellspacing="0" role="presentation">
+                  <tr>
+                    <td class="purchase-item-option-text">
+                      <%= sanitize(line_item.variant.options_text) %>
+                    </td>
+                  </tr>
+                </table>
+              <% end %>
+            </td>
+          </tr>
+          <!-- Detail link -->
+          <tr>
+            <td></td>
+            <td align="right" style="padding-top:6px;">
+              <%= link_to 'View Pass', custom_product_line_item_url(line_item)%>
+            </td>
+          </tr>
+        </table>
       </td>
-      <td class="align-right align-center-vertical" width="20%">
-        <div class="f-fallback purchase_item_price">
-          <%= line_item.single_money %><br>
-        </div>
-        <div class="f-fallback purchase_item_price">
-          <%= line_item.display_amount %>
-        </div>
-      </td>
-  </tr>
-  <tr>
-    <td colspan="4"><hr></td>
-  </tr>
-  <%end%>
-</table>
+    </tr>
+    <tr>
+      <td><hr></td>
+    </tr>
+  <% end %>
+</table>

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

@@ -1,31 +1,25 @@
 <div class="content-cell">
 <div class="container">
   <h2><%= I18n.t('mail.order_mailer.customer_info') %></h2>
-  <div class="flex two-columns">
+  <div class="flex two-columns-contact">
     <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_icon"><%= image_tag "mailer/user-tenant.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_icon"><%= image_tag "mailer/email.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_icon"><%= image_tag "mailer/call.png", class: "mail-icon-tenant" %></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(

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

@@ -1,12 +1,11 @@
 <div class="content-cell">
   <div class="container">
     <h2><%= name %> Support</h2>
-    <div class="flex two-columns">
+    <div class="flex two-columns-contact">
       <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_icon"><%= image_tag "mailer/call.png", class: "mail-icon-tenant"%></div>
           <div class="two-columns_text-container">
-            <p class="two-columns_title">Contact</p>
             <% if order&.tenant&.contact_phone&.present? %>
               <p class="two-columns_description">
                 <%= link_to order.tenant.contact_phone, "tel:#{order.tenant.contact_phone}" %>
@@ -14,13 +13,9 @@
             <% 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_icon"><%= image_tag "mailer/email.png", class: "mail-icon"%></div>
           <div class="two-columns_text-container">
-            <p class="two-columns_title">Email</p>
             <p class="two-columns_description">
               <%= order&.tenant&.customer_support_email.present? ? link_to(order.tenant.customer_support_email, "mailto:#{order.tenant.customer_support_email}") : "N/A" %>
             </p>

data/config/locales/en.yml CHANGED Viewed

@@ -119,6 +119,17 @@ en:
     product_kind_option_types:
       empty_info: "<b>Note:</b> Set service option types to service first. To edit, go to <b>Details</b> tab > <b>Option Types</b>"
+  vehicle_type:
+    suv: "SUV"
+    sedan: "Sedan"
+    van: "Van"
+    minivan: "Minivan"
+    sleeping_bus: "Sleeping Bus"
+    luxury_van: "Luxury Van"
+    air_bus: "Air Bus"
+    bus: "Bus"
+    ferry: "Ferry"
   line_item:
     validation:
       exceeded_max_quantity_per_order: "Exceeded maximum quantity per order"
@@ -528,6 +539,9 @@ en:
       hello: "Hello %{full_name},"
       thanks: "Thanks %{full_name},"
       booking_event: "Your booking for %{order_number} is successfully complete!"
+      cancel_description: "Your order <span style='color: #000000; font-weight: bold;'>%{order_number}</span> has been <span style='color: red; font-weight: bold;'>CANCELLED</span>. Please retain this cancellation information for your records."
+      cancel_thank: "Thank you for your business."
+      from_team: "The %{store} Team"
       booking_reference: "For reference, your booking ID is %{order_number}."
       booking_id: "Booking ID <b>%{order_number}</b>"
       booking_summary: "Booking Summary"

data/config/locales/km.yml CHANGED Viewed

@@ -113,6 +113,17 @@ km:
     product_kind_option_types:
       empty_info: "<b>ចំណាំ:</b> កំណត់ប្រភេទសម្រាប់ផលិតផល. ដើម្បីកែប្រែ, សូមចូលទៅ <b>លម្អិត</b> tab > <b>ប្រភេទ</b>"
+  vehicle_type:
+    suv: "SUV"
+    sedan: "Sedan"
+    van: "Van"
+    minivan: "Minivan"
+    sleeping_bus: "Sleeping Bus"
+    luxury_van: "Luxury Van"
+    air_bus: "Air Bus"
+    bus: "Bus"
+    ferry: "Ferry"
   line_item:
     validation:
       exceeded_max_quantity_per_order: "លើសពីបរិមាណអតិបរមាក្នុងមួយការបញ្ជាទិញ"
@@ -190,6 +201,16 @@ km:
       system_registered: "ចុះឈ្មោះដោយប្រព័ន្ធ"
       self_registered: "ចុះឈ្មោះដោយខ្លួនឯង"
     registration_source: "ប្រភេទការចុះឈ្មោះ"
+    vehicle_kind:
+      suv: "SUV"
+      sedan: "Sedan"
+      van: "Van"
+      minivan: "Minivan"
+      sleeping_bus: "Sleeping Bus"
+      luxury_van: "Luxury Van"
+      air_bus: "Air Bus"
+      bus: "Bus"
+      ferry: "Ferry"
     service_types:
       organizer: "Organizer"
       transit: "Transit"
@@ -388,9 +409,12 @@ km:
       booking_confirm: "Confirmed!"
       hello: "Hello %{full_name},"
       thanks: "Thanks %{full_name},"
-      booking_event: "Your booking for %{order_name} is successfully complete!"
+      booking_event: "Your booking for %{order_number} is successfully complete!"
+      cancel_description: "Your order <span style='color: #000000; font-weight: bold;'>%{order_number}</span> has been <span style='color: red; font-weight: bold;'>CANCELLED</span>. Please retain this cancellation information for your records."
+      cancel_thank: "Thank you for your business."
+      from_team: "The %{store} Team"
       booking_reference: "For reference, your booking ID is %{order_number}."
-      booking_id: "Booking ID <b>%{order_number}<b>"
+      booking_id: "Booking ID <b>%{order_number}</b>"
       booking_summary: "Booking Summary"
       check_in: "Check in:"
       check_out: "Check out:"

data/config/routes.rb CHANGED Viewed

@@ -563,6 +563,7 @@ Spree::Core::Engine.add_routes do
         namespace :intercity_taxi do
           resource :draft_orders, only: %i[create update]
+          resource :distance_calculator, controller: :distance_calculator, only: [:create]
         end
         resource :reset_passwords, only: [:update]
@@ -708,6 +709,7 @@ Spree::Core::Engine.add_routes do
         end
         namespace :intercity_taxi do
           resource :draft_orders, only: %i[create update]
+          resource :distance_calculator, controller: :distance_calculator, only: [:create]
         end
       end

data/db/migrate/20251127074809_change_guest_dynamic_fields_value_from_jsonb_to_text.rb ADDED Viewed

@@ -0,0 +1,40 @@
+class ChangeGuestDynamicFieldsValueFromJsonbToText < ActiveRecord::Migration[7.0]
+  def up
+    # Check if the migration has already been run
+    return if column_exists?(:cm_guest_dynamic_fields, :value, :text)
+    add_column :cm_guest_dynamic_fields, :value_text, :text
+    # Convert JSONB value to TEXT value
+    execute <<-SQL
+      UPDATE cm_guest_dynamic_fields
+      SET value_text = value ->> 0
+    SQL
+    remove_column :cm_guest_dynamic_fields, :value
+    rename_column :cm_guest_dynamic_fields, :value_text, :value
+    # Restore NOT NULL and default value constraints
+    #To make it the same as the original: t.jsonb :value, default: [], null: false
+    change_column_default :cm_guest_dynamic_fields, :value, ''
+    change_column_null :cm_guest_dynamic_fields, :value, false
+  end
+  def down
+    add_column :cm_guest_dynamic_fields, :value_jsonb, :jsonb
+    # Convert TEXT value to JSONB value
+    execute <<-SQL
+      UPDATE cm_guest_dynamic_fields
+      SET value_jsonb = to_jsonb(value)
+    SQL
+    remove_column :cm_guest_dynamic_fields, :value
+    rename_column :cm_guest_dynamic_fields, :value_jsonb, :value
+    # Restore NOT NULL and default value constraints
+    #To make it the same as the original: t.jsonb :value, default: [], null: false
+    change_column_default :cm_guest_dynamic_fields, :value, []
+    change_column_null :cm_guest_dynamic_fields, :value, false
+  end
+end

data/db/migrate/20251219035243_add_migrations_to_support_vehicle_types.rb ADDED Viewed

@@ -0,0 +1,36 @@
+class AddMigrationsToSupportVehicleTypes < ActiveRecord::Migration[7.0]
+  def change
+    # 1. rename amentity table from vehicle to vehicle type
+    rename_table :cm_vehicle_option_types, :cm_vehicle_type_option_types if table_exists?(:cm_vehicle_option_types)
+    rename_table :cm_option_value_vehicles, :cm_option_value_vehicle_types if table_exists?(:cm_option_value_vehicles)
+    rename_table :cm_vehicles, :cm_vehicle_types if table_exists?(:cm_vehicles) && !table_exists?(:cm_vehicle_types)
+    rename_column :cm_vehicle_type_option_types, :vehicle_id, :vehicle_type_id if column_exists?(:cm_vehicle_type_option_types, :vehicle_id)
+    rename_column :cm_option_value_vehicle_types, :vehicle_id, :vehicle_type_id if column_exists?(:cm_option_value_vehicle_types, :vehicle_id)
+    # 2. remove uncessary column for vehicle type.
+    # also rename code to name to make it more friendly. Meyhong also use name.
+    # rename vehicle_type to kind to avoid confusion with vehicle_type association
+    change_table :cm_vehicle_types do |t|
+      t.remove :license_plate if column_exists?(:cm_vehicle_types, :license_plate)
+      t.remove :allow_seat_selection if column_exists?(:cm_vehicle_types, :allow_seat_selection)
+      t.rename :code, :name if column_exists?(:cm_vehicle_types, :code)
+      t.rename :vehicle_type, :kind if column_exists?(:cm_vehicle_types, :vehicle_type)
+    end
+    # 3. new vehicle table
+    create_table :cm_vehicles, if_not_exists: true do |t|
+      t.string :license_plate
+      t.string :name
+      t.integer :kind
+      t.references :vendor, null: false, foreign_key: { to_table: :spree_vendors }
+      t.references :vehicle_type, null: false, foreign_key: { to_table: :cm_vehicle_types }
+      t.timestamps
+    end
+    # 4. drop existing vehicle assocation, and add vehicle/vehicle type assocation type to trip again.
+    remove_column :cm_trips, :vehicle_id if column_exists?(:cm_trips, :vehicle_id)
+    add_reference :cm_trips, :vehicle, null: true, foreign_key: { to_table: :cm_vehicles } unless column_exists?(:cm_trips, :vehicle_id)
+    add_reference :cm_trips, :vehicle_type, null: true, foreign_key: { to_table: :cm_vehicle_types } unless column_exists?(:cm_trips, :vehicle_type_id)
+  end
+end

data/db/migrate/20260105072146_add_nationality_group_and_age_group_to_cm_saved_guests.rb ADDED Viewed

@@ -0,0 +1,6 @@
+class AddNationalityGroupAndAgeGroupToCmSavedGuests < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_saved_guests, :nationality_group, :integer, default: 0, null: false, if_not_exists: true
+    add_column :cm_saved_guests, :age_group, :integer, default: 0, null: false, if_not_exists: true
+  end
+end