spree_cm_commissioner 1.11.0.pre.pre4 → 1.13.0

data/app/serializers/spree/v2/organizer/invite_guest_serializer.rb

@@ -0,0 +1,13 @@
+module Spree
+  module V2
+    module Organizer
+      class InviteGuestSerializer < BaseSerializer
+        attributes :email, :quantity, :token, :invite_type, :claimed_status, :issued_to, :expiration_date,
+                   :claimed_at, :email_send_at, :created_at, :updated_at, :remark
+        belongs_to :variant, serializer: SpreeCmCommissioner::V2::Storefront::EventVariantSerializer
+        belongs_to :order, serializer: Spree::V2::Storefront::OrderSerializer
+        belongs_to :event, serializer: Spree::V2::Storefront::TaxonSerializer
+      end
+    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/taxon_serializer_decorator.rb

@@ -25,6 +25,8 @@ module Spree
           end
 
           base.cache_options store: nil
+
+          base.attribute :event_url, &:event_url
         end
       end
     end

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

@@ -0,0 +1,9 @@
+module Spree
+  module V2
+    module Tenant
+      class WaitingRoomSessionSerializer < BaseSerializer
+        attributes :jwt_token, :expired_at
+      end
+    end
+  end
+end

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

@@ -6,7 +6,8 @@ module SpreeCmCommissioner
 
         attributes :first_name, :last_name, :dob, :gender, :kyc_fields, :other_occupation, :created_at, :updated_at,
                    :qr_data, :social_contact_platform, :social_contact, :available_social_contact_platforms,
-                   :age, :emergency_contact, :other_organization, :expectation, :upload_later, :address, :formatted_bib_number, :phone_number
+                   :age, :emergency_contact, :other_organization, :expectation, :upload_later, :address, :formatted_bib_number, :phone_number,
+                   :token
 
         # temporary, once app release after cm-app v1.9.1, we no longer need this.
         attribute :seat_number do |object|

data/app/services/spree_cm_commissioner/user_authenticator.rb

@@ -25,9 +25,11 @@ module SpreeCmCommissioner
     end
 
     def self.auth_context(params)
+      tenant_id = find_oauth_application(params)&.tenant_id
+
       case flow_type(params)
       when 'login_auth'
-        options = { login: params[:username], password: params[:password] }
+        options = { login: params[:username], password: params[:password], tenant_id: tenant_id }
         SpreeCmCommissioner::UserPasswordAuthenticator.call(options)
       when 'social_auth'
         options = { id_token: params[:id_token] }

data/app/services/spree_cm_commissioner/user_roles_assigner.rb

@@ -0,0 +1,62 @@
+module SpreeCmCommissioner
+  class UserRolesAssigner
+    attr_reader :user_id, :email, :role_ids, :vendor_id, :user
+
+    def self.create(user_id: nil, email: nil, role_ids: nil, vendor_id: nil)
+      new(user_id: user_id, email: email, role_ids: role_ids, vendor_id: vendor_id).create
+    end
+
+    def self.update(user_id: nil, email: nil, role_ids: nil, vendor_id: nil)
+      new(user_id: user_id, email: email, role_ids: role_ids, vendor_id: vendor_id).update
+    end
+
+    def initialize(user_id: nil, email: nil, role_ids: nil, vendor_id: nil)
+      @user_id = user_id
+      @email = email
+      @role_ids = role_ids
+      @vendor_id = vendor_id
+      @user = find_user
+    end
+
+    def create
+      return { success: false, message: I18n.t('user_roles_assigner.user_not_found') } unless user
+      return { success: false, message: I18n.t('user_roles_assigner.user_already_assigned') } if user.vendors.exists?(id: vendor_id)
+      return { success: false, message: I18n.t('user_roles_assigner.roles_required') } if role_ids.blank?
+
+      create_roles
+      { success: true }
+    end
+
+    def update
+      return { success: false, message: I18n.t('user_roles_assigner.roles_required') } if role_ids.blank?
+
+      update_roles
+      { success: true }
+    end
+
+    private
+
+    def find_user
+      return Spree::User.find_by(id: user_id) if user_id.present?
+      return Spree::User.find_by(email: email) if email.present?
+
+      nil
+    end
+
+    def users_role
+      roles = Spree::Role.filter_by_vendor(vendor_id)
+      user.role_users.where(role: roles)
+    end
+
+    def create_roles
+      vendor = Spree::Vendor.find_by(id: vendor_id)
+      user.vendors << vendor unless user.vendors.include?(vendor)
+      role_ids.each { |role_id| users_role.find_or_create_by(role_id: role_id) }
+    end
+
+    def update_roles
+      users_role.where.not(role_id: role_ids).destroy_all
+      role_ids.each { |role_id| users_role.find_or_create_by(role_id: role_id) }
+    end
+  end
+end

data/app/views/spree/admin/shared/_cms_pages_tabs.html.erb

@@ -0,0 +1,20 @@
+<% content_for(:page_tabs) do %>
+  <% if can?(:admin, Spree::CmsPage) %>
+    <%= content_tag :li, class: 'nav-item' do %>
+      <%= link_to_with_icon 'building.svg',
+        Spree::Store.default&.name || Spree.t(:store),
+        admin_cms_pages_url(tab: :default),
+        class: "nav-link #{'active' if params[:tab].blank? || params[:tab] == 'default'}" %>
+    <% end %>
+
+    <!-- Tenant Tabs -->
+    <% SpreeCmCommissioner::Tenant.all.each do |tenant| %>
+      <%= content_tag :li, class: 'nav-item' do %>
+        <%= link_to_with_icon 'building.svg',
+          tenant.name,
+          admin_cms_pages_url(tab: :tenants, tenant_id: tenant.id),
+          class: "nav-link #{'active' if params[:tenant_id].to_s == tenant.id.to_s}" %>
+      <% end %>
+    <% end %>
+  <% end %>
+<% end %>

data/app/views/spree/admin/shared/_taxon_tabs.html.erb

@@ -5,43 +5,43 @@
       Spree.t(:details),
       edit_admin_taxonomy_taxon_url(@taxonomy.id, @taxon.id),
       class: "nav-link #{'active' if current == :details}" %>
-  <% end if can?(:admin, Spree::Taxonomy) %>
+  <% end if can?(:manage, Spree::Taxonomy) %>
 
   <%= content_tag :li, class: 'nav-item' do %>
     <%= link_to_with_icon 'store.svg',
       Spree.t(:vendors),
       admin_taxonomy_taxon_taxon_vendors_url(@taxonomy.id, @taxon.id),
       class: "nav-link #{'active' if current == :vendors}" %>
-  <% end if can?(:admin,SpreeCmCommissioner::TaxonVendor)%>
-  <% if @taxon.depth != 1 %>
+  <% end if can?(:manage, SpreeCmCommissioner::TaxonVendor) && @taxon.depth == 2 %>
 
- <%= content_tag :li, class: 'nav-item' do %>
-    <%= link_to_with_icon 'inbox.svg',
-      Spree.t(:products),
-      admin_taxonomy_taxon_classifications_url(@taxonomy.id, @taxon.id),
-      class: "nav-link #{'active' if current == :products}" %>
-  <% end if can?(:admin, Spree::Classification)%>
-  <%else%>
+  <% if @taxon.depth != 1 %>
+    <%= content_tag :li, class: 'nav-item' do %>
+      <%= link_to_with_icon 'inbox.svg',
+        Spree.t(:products),
+        admin_taxonomy_taxon_classifications_url(@taxonomy.id, @taxon.id),
+        class: "nav-link #{'active' if current == :products}" %>
+    <% end if can?(:manage, Spree::Classification)%>
+  <% else %>
     <%= content_tag :li, class: 'nav-item' do %>
-        <%= link_to_with_icon 'store.svg',
-          Spree.t(:sections),
-          admin_taxonomy_taxon_taxon_childrens_url(@taxonomy.id, @taxon.id),
-          class: "nav-link #{'active' if current == :sections}" %>
-    <% end if can?(:admin,Spree::Taxon)%>
-    <%end%>
+      <%= link_to_with_icon 'store.svg',
+        Spree.t(:sections),
+        admin_taxonomy_taxon_taxon_childrens_url(@taxonomy.id, @taxon.id),
+        class: "nav-link #{'active' if current == :sections}" %>
+      <% end if can?(:manage, Spree::Taxon)%>
+  <% end %>
 
+  <%# user event only show for event %>
   <%= content_tag :li, class: 'nav-item' do %>
     <%= link_to_with_icon 'user.svg',
       Spree.t(:user_events),
-      # admin_taxonomy_taxon_user_taxons_url(@taxonomy, @taxon.id),
       admin_user_events_path(params: {taxon_id: @taxon.id, taxonomy_id: @taxonomy}),
       class: "nav-link #{'active' if current == :user_events}" %>
-  <% end if can?(:admin, SpreeCmCommissioner::UserTaxon) %>
+  <% end if can?(:manage, SpreeCmCommissioner::UserTaxon) && @taxon.event? && @taxon.depth == 1 %>
 
  <%= content_tag :li, class: 'nav-item' do %>
     <%= link_to_with_icon 'store.svg',
       Spree.t(:guest_card_classes),
       admin_taxonomy_taxon_guest_card_classes_url(@taxonomy.id, @taxon.id),
       class: "nav-link #{'active' if current == :guest_card_classes}" %>
-      <% end if can?(:admin,SpreeCmCommissioner::GuestCardClasses)%>
+      <% end if can?(:manage, SpreeCmCommissioner::GuestCardClasses) && @taxon.event? && @taxon.depth == 1 %>
 <% 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) %>

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

@@ -19,7 +19,10 @@
       <% @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 %>
@@ -32,46 +35,14 @@
                 <% end %>
               </div>
             <% end if can?(:update, @product) && can?(:update, variant) %>
-
-            <% if defined?(@reserved_stocks) %>
-              <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: "cart-check.svg", width: '14', height: '14' %>
-                </span>
-                <%= label_tag "reserved_stock#{variant.id}", "Reserved Stock: #{@reserved_stocks[variant.id] || 0}", class: "m-0" %>
-              </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>
-                </div>
-              <% end %>
-            <% end %>
           </td>
 
           <td colspan="3" class="stock_location_info">
@@ -82,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/shared/_base_mailer_header.html.erb

@@ -1,11 +1,19 @@
 <!-- override base_mailer_header.html.erb -->
 <tr>
   <td class="email-masthead">
-    <%= link_to @sender_name, class: 'template-label' do %>
+    <% if defined?(@tenant) && @tenant.present? %>
       <% if @logo_path.present? %>
         <%= image_tag @logo_path, class: 'logo', alt: @sender_name, title: @sender_name %>
       <% else %>
-        <%= @sender_name %>
+        <span class="template-label"><%= @sender_name %></span>
+      <% end %>
+    <% else %>
+      <%= link_to current_store.url, class: 'template-label' do %>
+        <% if @logo_path.present? %>
+          <%= image_tag @logo_path, class: 'logo', alt: current_store.name, title: current_store.name %>
+        <% else %>
+          <%= current_store.name %>
+        <% end %>
       <% end %>
     <% end %>
   </td>

data/app/views/spree_cm_commissioner/event_transactional_mailer/_event_banner.html.erb

@@ -0,0 +1,3 @@
+<div class="banner">
+  <%= image_tag(main_app.rails_blob_url(@event.home_banner.attachment), class: "banner-image", alt: t('mail.event_engagement_mailer.organizer.header_title')) %>
+</div>

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

@@ -0,0 +1,317 @@
+<style>
+  body {
+    margin-top: 20px;
+    padding: 0;
+    font-family: 'Poppins', Arial, sans-serif;
+    line-height: 1.6;
+    background-color: #f4f4f4;
+  }
+
+  table {
+    border-collapse: collapse;
+    width: 100%;
+    max-width: 640px;
+    margin: 0 auto;
+  }
+
+  img {
+    border: 0;
+    line-height: 100%;
+    outline: none;
+    text-decoration: none;
+    max-width: 100%;
+    height: auto;
+  }
+
+  a {
+    color: #6444D8;
+  }
+
+  .container {
+    background-color: #ffffff;
+    border-radius: 8px;
+    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+    padding: 24px;
+    margin: 16px auto;
+  }
+
+  .header {
+    text-align: left;
+    margin-bottom: 20px;
+  }
+
+  .header .icon {
+    font-size: 24px;
+    margin-bottom: 12px;
+  }
+
+  .main-title {
+    color: #6444D8;
+  }
+
+  .header h1 {
+    font-size: 24px;
+    font-weight: bold;
+    margin: 0;
+  }
+
+  .header h2 {
+    font-size: 18px;
+    margin: 8px 0 0;
+  }
+
+  .intro p {
+    color: #1f2937;
+    font-size: 14px;
+    margin: 0 0 8px;
+    text-align: left;
+  }
+
+  .impact-section {
+    background-color: #F1F2FE;
+    border-radius: 8px;
+    padding: 20px;
+    margin: 20px 0;
+  }
+
+  .impact-section h3 {
+    font-size: 14px;
+    font-weight: 600;
+    margin: 0 0 12px;
+    color: #1f2937;
+    text-align: left;
+  }
+
+  .impact-list {
+    list-style: none;
+    padding: 0;
+    margin: 0;
+  }
+
+  .impact-list li {
+    display: flex;
+    align-items: flex-start;
+    margin-bottom: 12px;
+  }
+
+  .impact-list span {
+    margin-right: 8px;
+    font-size: 14px;
+    flex-shrink: 0;
+  }
+
+  .impact-list div {
+    font-size: 14px;
+    color: #1f2937;
+    text-align: left;
+  }
+
+  .closing p {
+    font-size: 14px;
+    color: #1f2937;
+    margin: 0 0 8px;
+    text-align: left;
+  }
+
+  .closing p:last-child {
+    font-weight: 600;
+  }
+
+  .button-wrapper {
+    text-align: center;
+    margin: 20px 0;
+  }
+
+  .cta-button {
+    display: inline-block;
+    background-color: #6444D8;
+    color: #ffffff;
+    padding: 12px 24px;
+    border-radius: 24px;
+    text-decoration: none;
+    font-weight: 500;
+    font-size: 14px;
+    width: 10rem;
+    max-width: 90%;
+  }
+
+  .cta-button:hover {
+    background-color: #7b5ce0;
+    text-decoration: none;
+  }
+
+  .signature {
+    text-align: left;
+    color: #4b5563;
+    margin: 20px 0;
+  }
+
+  .signature p {
+    margin: 0;
+    font-size: 14px;
+  }
+
+  .social-icons {
+    display: flex;
+    justify-content: flex-start;
+    gap: 16px;
+    margin: 12px 0 0;
+  }
+
+  .social-icons a {
+    font-size: 18px;
+    text-decoration: none;
+    color: #4b5563;
+    transition: color 0.3s ease;
+  }
+
+  .social-icons a:hover {
+    color: #6444D8;
+  }
+
+  .footer {
+    text-align: center;
+    color: #6b7280;
+    font-size: 12px;
+    padding: 16px;
+  }
+
+  .footer-content {
+    max-width: 100%;
+  }
+
+  .footer-brand {
+    font-size: 14px;
+    color: #1f2937;
+    margin: 0 0 8px;
+  }
+
+  .footer-text {
+    margin: 0 0 8px;
+    color: #6b7280;
+  }
+
+  .footer-links {
+    margin: 0 0 8px;
+  }
+
+  .footer-links a {
+    color: #6444D8;
+    text-decoration: none;
+    margin-right: 12px;
+  }
+
+  .footer-links a:hover {
+    text-decoration: underline;
+  }
+
+  .footer a {
+    color: #6444D8;
+    text-decoration: none;
+  }
+
+  .footer a:hover {
+    text-decoration: underline;
+  }
+
+  .footer-logo {
+    font-weight: bold;
+    color: #1f2937;
+  }
+
+  .footer-logo-icon {
+    font-weight: bold;
+    color: #6444D8;
+  }
+
+  .banner {
+    margin-bottom: 16px;
+    text-align: center;
+  }
+
+  .banner-image {
+    max-width: 100%;
+    height: auto;
+    border-radius: 8px;
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  }
+
+  @media only screen and (max-width: 600px) {
+    .container {
+      padding: 16px;
+      margin: 8px;
+      border-radius: 4px;
+    }
+
+    .header .icon {
+      font-size: 20px;
+    }
+
+    .header h1 {
+      font-size: 20px;
+    }
+
+    .header h2 {
+      font-size: 16px;
+    }
+
+    .intro p {
+      font-size: 13px;
+    }
+
+    .impact-section {
+      padding: 16px;
+    }
+
+    .impact-section h3 {
+      font-size: 13px;
+    }
+
+    .impact-list span {
+      font-size: 13px;
+    }
+
+    .impact-list div {
+      font-size: 13px;
+    }
+
+    .closing p {
+      font-size: 13px;
+    }
+
+    .cta-button {
+      padding: 10px 20px;
+      font-size: 13px;
+    }
+
+    .signature p {
+      font-size: 13px;
+    }
+
+    .social-icons a {
+      font-size: 16px;
+    }
+
+    .footer {
+      font-size: 11px;
+      padding: 12px;
+    }
+
+    .footer-brand {
+      font-size: 13px;
+    }
+
+    .footer-text {
+      font-size: 11px;
+    }
+
+    .footer-links a {
+      font-size: 11px;
+      margin-right: 8px;
+    }
+
+    .banner-image {
+      border-radius: 4px;
+    }
+  }
+</style>

data/app/views/spree_cm_commissioner/event_transactional_mailer/_note.html.erb

@@ -0,0 +1,8 @@
+
+<td class="footer">
+  <div class="footer-content">
+     <p class="footer-text">This email was sent by <span class="footer-logo"><i>BookMe</i><span class="footer-logo-icon">+</span></span>
+      For support, contact us at <a href="mailto:info@bookme.plus">Info@bookme.plus</a>.
+    </p>
+  </div>
+</td>

data/app/views/spree_cm_commissioner/event_transactional_mailer/_share_button.html.erb

@@ -0,0 +1,3 @@
+<div class="button-wrapper">
+  <a href="<%= @event.event_url %>" class="cta-button"><%= t('mail.event_engagement_mailer.organizer.share_now') %></a>
+</div