spree_cm_commissioner 1.8.0 → 1.8.2

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

@@ -0,0 +1,11 @@
+module Spree
+  module V2
+    module Organizer
+      class AssetSerializer < BaseSerializer
+        include ::Spree::Api::V2::ImageTransformationConcern
+
+        attributes :alt, :original_url, :position, :styles
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Spree
+  module V2
+    module Organizer
+      class InviteSerializer < BaseSerializer
+        attributes :token, :expires_at
+        belongs_to :taxon, serializer: Spree::V2::Organizer::TaxonSerializer
+        belongs_to :inviter, serializer: Spree::V2::Organizer::UserSerializer
+      end
+    end
+  end
+end

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

@@ -0,0 +1,10 @@
+module Spree
+  module V2
+    module Organizer
+      class TaxonSerializer < BaseSerializer
+        attributes :name
+        has_one :app_banner, serializer: Spree::V2::Organizer::AssetSerializer
+      end
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+module Spree
+  module V2
+    module Organizer
+      class UserSerializer < BaseSerializer
+        attributes :first_name, :last_name, :email
+      end
+    end
+  end
+end

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

@@ -10,10 +10,11 @@ module Spree
           base.has_one :app_banner, serializer: ::SpreeCmCommissioner::V2::Storefront::AssetSerializer
           base.has_one :web_banner, serializer: ::SpreeCmCommissioner::V2::Storefront::AssetSerializer
           base.has_one :home_banner, serializer: ::SpreeCmCommissioner::V2::Storefront::AssetSerializer
+          base.has_one :video_banner, serializer: ::SpreeCmCommissioner::V2::Storefront::VideoSerializer
 
           base.attributes :custom_redirect_url, :kind, :subtitle, :from_date, :to_date,
                           :background_color, :foreground_color, :show_badge_status,
-                          :purchasable_on, :vendor_id
+                          :purchasable_on, :vendor_id, :available_on
 
           base.attribute :purchasable_on_app do |taxon|
             taxon.purchasable_on == 'app' || taxon.purchasable_on == 'both'

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

@@ -0,0 +1,11 @@
+module Spree
+  module V2
+    module Tenant
+      class CustomerNotificationSerializer < BaseSerializer
+        attributes :title, :payload, :body, :url, :started_at, :sent_at, :notification_type, :action_label
+
+        has_many :feature_images, serializer: Spree::V2::Tenant::AssetSerializer
+      end
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+module Spree
+  module V2
+    module Tenant
+      class DigitalLinkSerializer < BaseSerializer
+        attribute :token
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Spree
+  module V2
+    module Tenant
+      class ImageSerializer < BaseSerializer
+        set_type :image
+
+        attributes :styles, :position, :alt, :created_at, :updated_at, :original_url
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+module Spree
+  module V2
+    module Tenant
+      class LineItemSerializer < BaseSerializer
+        attributes :name, :quantity, :price, :slug, :options_text, :currency,
+                   :display_price, :total, :display_total, :adjustment_total,
+                   :display_adjustment_total, :additional_tax_total, :discounted_amount,
+                   :display_discounted_amount, :display_additional_tax_total, :promo_total,
+                   :display_promo_total, :included_tax_total, :display_included_tax_total,
+                   :from_date, :to_date, :need_confirmation, :product_type, :event_status, :amount,
+                   :display_amount, :number, :qr_data, :kyc, :kyc_fields, :remaining_total_guests, :number_of_guests,
+                   :completion_steps, :available_social_contact_platforms, :allow_anonymous_booking,
+                   :discontinue_on, :high_demand, :jwt_token, :pre_tax_amount, :display_pre_tax_amount, :public_metadata
+
+        attribute :required_self_check_in_location, &:required_self_check_in_location?
+        attribute :allowed_self_check_in, &:allowed_self_check_in?
+        attribute :allowed_upload_later, &:allowed_upload_later?
+        attribute :delivery_required, &:delivery_required?
+        attribute :sufficient_stock, &:sufficient_stock?
+
+        has_one :vendor, serializer: Spree::V2::Tenant::VendorSerializer
+        has_one :product, serializer: Spree::V2::Storefront::ProductSerializer
+
+        belongs_to :variant, serializer: Spree::V2::Tenant::VariantSerializer
+        belongs_to :order, serializer: Spree::V2::Tenant::OrderSerializer
+
+        has_many :digital_links, serializer: Spree::V2::Tenant::DigitalLinkSerializer
+        has_many :guests, serializer: Spree::V2::Tenant::GuestSerializer
+
+        # completion_steps updates frequently
+        cache_options store: nil
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Spree
+  module V2
+    module Tenant
+      class NotificationSerializer < BaseSerializer
+        set_type :notification
+
+        attributes :read_at, :created_at, :params, :type
+      end
+    end
+  end
+end

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

@@ -0,0 +1,12 @@
+module Spree
+  module V2
+    module Tenant
+      class OptionTypeSerializer < BaseSerializer
+        attributes :name, :presentation, :position, :public_metadata,
+                   :kind, :attr_type, :promoted, :hidden
+
+        has_many :option_values, serializer: Tenant::OptionValueSerializer
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module Spree
+  module V2
+    module Tenant
+      class OptionValueSerializer < BaseSerializer
+        attributes :name, :presentation, :position, :public_metadata
+
+        attribute :display_icon do |option_value|
+          ActionController::Base.helpers.image_url(option_value.display_icon)
+        rescue StandardError
+          nil
+        end
+
+        belongs_to :option_type, serializer: Spree::V2::Tenant::OptionTypeSerializer
+      end
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+module Spree
+  module V2
+    module Tenant
+      class OrderSerializer < Spree::V2::Storefront::CartSerializer
+      end
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+module Spree
+  module V2
+    module Tenant
+      class S3SignedUrlSerializer < BaseSerializer
+        attribute :host, :fields, :url
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Spree
+  module V2
+    module Tenant
+      class StockItemSerializer < BaseSerializer
+        # add this because some frontend UI need total room/product for user to select.
+        # but for this, total stock will publicly shown.
+        attributes :count_on_hand
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Spree
+  module V2
+    module Tenant
+      class StockLocationSerializer < BaseSerializer
+        set_type :stock_location
+
+        attributes :name
+      end
+    end
+  end
+end

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

@@ -0,0 +1,8 @@
+module Spree
+  module V2
+    module Tenant
+      class UserProfileSerializer < Spree::V2::Tenant::AssetSerializer
+      end
+    end
+  end
+end

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

@@ -0,0 +1,46 @@
+module Spree
+  module V2
+    module Tenant
+      class VariantSerializer < BaseSerializer
+        include Spree::Api::V2::DisplayMoneyHelper
+        attributes :sku, :barcode, :weight, :height, :width, :depth, :is_master, :options_text, :public_metadata
+        attribute :purchasable, &:purchasable?
+        attribute :in_stock, &:in_stock?
+        attribute :backorderable, &:backorderable?
+
+        attribute :currency do |_product, params|
+          params[:currency]
+        end
+
+        attribute :price do |product, params|
+          price(product, params[:currency])
+        end
+
+        attribute :display_price do |product, params|
+          display_price(product, params[:currency])
+        end
+
+        attribute :compare_at_price do |product, params|
+          compare_at_price(product, params[:currency])
+        end
+
+        attribute :display_compare_at_price do |product, params|
+          display_compare_at_price(product, params[:currency])
+        end
+
+        attributes :need_confirmation, :product_type, :kyc, :allow_anonymous_booking,
+                   :reminder_in_hours, :start_time, :delivery_option,
+                   :number_of_guests, :max_quantity_per_order, :discontinue_on, :high_demand
+
+        attribute :delivery_required, &:delivery_required?
+
+        belongs_to :product, serializer: Spree::V2::Storefront::ProductSerializer
+
+        has_many :images, serializer: Spree::V2::Tenant::ImageSerializer
+        has_many :option_values, serializer: Spree::V2::Tenant::OptionValueSerializer
+        has_many :stock_locations, serializer: Spree::V2::Tenant::StockLocationSerializer
+        has_many :stock_items, serializer: Spree::V2::Tenant::StockItemSerializer
+      end
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+module SpreeCmCommissioner
+  module V2
+    module Storefront
+      class VideoSerializer < BaseSerializer
+        attributes :alt, :original_url
+      end
+    end
+  end
+end

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

@@ -74,5 +74,13 @@
         <%= f.error_message_on :taxon_ids %>
       </div>
     </div>
+
+    <div class="col-lg-12 col-sm-12">
+      <div class="form-group">
+      <%= f.label :tenant_id, raw(Spree.t(:tenant) + ' (optional)') %>
+      <%= f.collection_select :tenant_id, SpreeCmCommissioner::Tenant.all, :id, :name, { prompt: Spree.t(:select_tenant) }, { class: 'form-control select2' } %>
+      <%= f.error_message_on :tenant_id %>
+      </div>
+    </div>
   </div>
 </div>

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

@@ -0,0 +1,82 @@
+<style>
+  body, table, td {
+      font-family: 'Poppins', Arial, sans-serif;
+      margin: 0;
+      padding: 0;
+    }
+
+  .content-wrapper {
+    max-width: 500px;
+    margin: 0 auto;
+    border: 1px solid grey;
+    border-top: none;
+  }
+
+  .main-content{
+    padding-top: 10px;
+    padding-bottom: 25px;
+  }
+
+  .logo {
+    display: block;
+    width: 150px;
+    margin-top: 10px;
+    margin-bottom: 20px;
+  }
+
+  .heading-1 {
+    font-size: 24px;
+    text-align: center;
+    line-height: 1.4;
+    margin-bottom: 15px;
+  }
+
+  .bar-large {
+    height: 10px;
+    background-color:  #5D54D9;
+    margin-bottom: 20px;
+
+  }
+
+  .bar-thin {
+    height: 3px;
+    height: 1px;
+    background-color: grey;
+    width: 100%;
+    margin: 20px auto;
+  }
+
+  .heading-2 {
+    font-size: 16px;
+    text-align: center;
+    line-height: 1.5;
+  }
+
+  .title-bold {
+    font-weight: bold;
+    color: #000;
+  }
+
+  .action-button {
+    display: inline-block;
+    background-color: #5D54D9;
+    border-radius: 24px;
+    font-size: 14px;
+    width: 222px;
+    height: 50px;
+    text-align: center;
+    line-height: 50px;
+    text-decoration: none;
+    cursor: pointer;
+    margin: 15px 0;
+    color: white !important;
+    text-decoration: none;
+  }
+
+  .heading-3 {
+    font-size: 12px;
+    text-align: center;
+    color: #888;
+  }
+</style>
+

data/app/views/spree_cm_commissioner/crew_invite_mailer/send_crew_invite_email.html.erb

@@ -0,0 +1,33 @@
+<table role="presentation" cellspacing="0" cellpadding="0" border="0" align="center" width="100%">
+  <tr>
+    <td align="center">
+      <div class="content-wrapper">
+        <div class="bar-large"></div>
+        <div class="main-content">
+            <div class="content">
+              <div><%= image_tag "mailer/bookme-plus_light.svg", class: "logo" %></div>
+              <div class="heading-1">
+                Become a part of the <br> event <strong> <%= @invite_user_event.invite.taxon.name %> </strong>
+              </div>
+              <div class="bar-thin"></div>
+              <div class="heading-2">
+                <%= @invite_user_event.invite.inviter.full_name.presence || @invite_user_event.inviter.email %> invites you to join the <br>
+                <span class="title-bold">Check-in Crew</span> for the event <br>
+                <%= @invite_user_event.invite.taxon.name %>
+              </div>
+              <div style="text-align: center;">
+                <a href="<%= @invite_user_event.invite.invite_url %>" class="action-button">
+                  Get Started
+                </a>
+              </div>
+              <div class="heading-3">
+                Please note that this invitation will expire<br>
+                in <%= ((@invite_user_event.invite.expires_at - Time.current) / 1.hour).round %> hours.
+              </div>
+            </div>
+        </div>
+      </div>
+    </td>
+  </tr>
+</table>
+

data/app/views/spree_cm_commissioner/layouts/crew_invite_mailer.html.erb

@@ -0,0 +1,15 @@
+
+<!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/crew_invite_mailer/mailer_stylesheets' %>
+  </head>
+   <body>
+      <%= yield %>
+  </body>
+</html>

data/config/initializers/spree_permitted_attributes.rb

@@ -33,6 +33,7 @@ module Spree
       preferred_foreground_color
       show_badge_status
       purchasable_on
+      available_on
       vendor_id
     ]
 

data/config/locales/en.yml

@@ -41,6 +41,8 @@ en:
     app_banner: App Banner (16x9)
     web_banner: Web banner (10x2)
     home_banner: Home Banner (16x9)
+    video_banner: Video Banner (9x16)
+    video_banner_require_size: Maximum size 10MB
     note: "<b>Note:</b> Subtitle is used for country code in Nationality Taxon"
 
   taxon_vendor:
@@ -564,4 +566,11 @@ en:
     update_success: Option Type updated successfully.
   user_roles_assigner:
     user_not_found: 'User not found'
-    roles_empty: 'Roles are empty'
+    roles_empty: 'Roles are empty'
+  invite:
+    url_not_found: 'Invite link not found or have been expired'
+    accept_fail: 'Failed to accept invite'
+    url_expired: 'Invitation link is expired'
+    already_invited: 'Failed: User already invited to event'
+    update_fail: 'Failed: to Update invite user'
+

data/config/locales/km.yml

@@ -46,6 +46,8 @@ km:
     app_banner: App Banner (16x9)
     web_banner: Web banner (10x2)
     home_banner: Home Banner (16x9)
+    video_banner: Video Banner (9x16)
+    video_banner_require_size: Maximum size 10MB
 
   taxon_vendor:
     empty_info: "មិនមានព័ត៌មានអំពីអ្នកលក់ទេ"
@@ -408,4 +410,11 @@ km:
         not_found: 'រកមិនឃើញរូបភាព'
   user_roles_assigner:
     user_not_found: 'រកមិនឃើញអ្នកប្រើប្រាស់'
-    roles_empty: 'តួនាទីគឺទទេ'
+    roles_empty: 'តួនាទីគឺទទេ'
+
+  invite:
+    url_not_found: 'រកមិនឃើញតំណអញ្ជើញ ឬផុតកំណត់ហើយ'
+    accept_fail: 'បរាជ័យក្នុងការទទួលយកការអញ្ជើញ'
+    url_expired: 'តំណ​អញ្ជើញ​បាន​ផុត​កំណត់'
+    already_invited: 'បរាជ័យ៖ អ្នកប្រើប្រាស់បានអញ្ជើញចូលរួមព្រឹត្តិការណ៍រួចហើយ'
+    update_fail: 'បរាជ័យ៖ ធ្វើបច្ចុប្បន្នភាពអ្នកប្រើប្រាស់អញ្ជើញ'

data/config/routes.rb

@@ -173,6 +173,7 @@ Spree::Core::Engine.add_routes do
           delete :remove_app_banner
           delete :remove_web_banner
           delete :remove_home_banner
+          delete :remove_video_banner
         end
       end
     end
@@ -441,6 +442,7 @@ Spree::Core::Engine.add_routes do
         end
         resources :images
         resource :s3_signed_urls
+        resources :invites
       end
 
       namespace :tenant do
@@ -479,7 +481,20 @@ Spree::Core::Engine.add_routes do
           patch  :complete
         end
 
+        resources :customer_notifications, only: [:show]
+        resources :notifications do
+          collection do
+            patch :mark_all_as_read
+          end
+          member do
+            patch :mark_as_read
+          end
+        end
+
         resources :user_account_linkages, only: %i[index create destroy]
+        resource :s3_signed_urls
+        resource :profile_images, only: %i[update destroy]
+        resources :line_items, only: %i[index show]
       end
 
       namespace :storefront do

data/db/migrate/20250304101907_create_spree_cm_commissioner_invite.rb

@@ -0,0 +1,12 @@
+class CreateSpreeCmCommissionerInvite < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cm_invites, if_not_exists: true do |t|
+      t.string :token, null: false, unique: true
+      t.datetime :expires_at
+      t.string :type
+      t.references :inviter, null: false, foreign_key: { to_table: :spree_users }, index: true
+      t.references :taxon, null: false, foreign_key: { to_table: :spree_taxons }, index: true
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250304101946_create_spree_cm_commissioner_invite_user_taxon.rb

@@ -0,0 +1,11 @@
+class CreateSpreeCmCommissionerInviteUserTaxon < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cm_invite_user_taxons, if_not_exists: true do |t|
+      t.references :invite, foreign_key: { to_table: :cm_invites }, null: true, index: true
+      t.references :user_taxon,  foreign_key: { to_table: :cm_user_taxons }, null: true, index: true
+      t.string :email, index: true
+      t.datetime :confirmed_at
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250307013422_add_parent_id_to_cm_place.rb

@@ -0,0 +1,9 @@
+class AddParentIdToCmPlace < ActiveRecord::Migration[7.0]
+  def change
+    unless column_exists?(:cm_places, :parent_id)
+      add_column :cm_places, :parent_id, :integer, null: true
+      add_foreign_key :cm_places, :cm_places, column: :parent_id
+      add_index :cm_places, :parent_id
+    end
+  end
+end

data/db/migrate/20250307073003_add_tenant_id_to_cm_customer_notifications.rb

@@ -0,0 +1,6 @@
+class AddTenantIdToCmCustomerNotifications < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_customer_notifications, :tenant_id, :integer, if_not_exists: true
+    add_index :cm_customer_notifications, :tenant_id, if_not_exists: true
+  end
+end

data/db/migrate/20250307083809_remove_tenant_id_from_cm_notifications.rb

@@ -0,0 +1,6 @@
+class RemoveTenantIdFromCmNotifications < ActiveRecord::Migration[7.0]
+  def change
+    remove_index :cm_notifications, :tenant_id, if_exists: true
+    remove_column :cm_notifications, :tenant_id, if_exists: true
+  end
+end

data/db/migrate/20250314013434_add_available_on_to_spree_taxons.rb

@@ -0,0 +1,5 @@
+class AddAvailableOnToSpreeTaxons < ActiveRecord::Migration[7.0]
+  def change
+    add_column :spree_taxons, :available_on, :datetime, if_not_exists: true
+  end
+end

data/lib/spree_cm_commissioner/test_helper/factories/invite_factory.rb

@@ -0,0 +1,7 @@
+FactoryBot.define do
+  factory :invite, class: SpreeCmCommissioner::Invite do
+    token { SecureRandom.hex(16) }
+    taxon { create(:taxon) }
+    inviter { create(:user) }
+  end
+end

data/lib/spree_cm_commissioner/test_helper/factories/invite_user_event_factory.rb

@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :invite_user_event, class: SpreeCmCommissioner::InviteUserEvent do
+    invite { create(:invite) }
+  end
+end

data/lib/spree_cm_commissioner/test_helper/factories/option_type_factory.rb

@@ -147,6 +147,36 @@ FactoryBot.define do
       presentation { 'seat-number-positions' }
     end
 
+    trait :origin do
+      attr_type { :origin }
+      name { 'origin' }
+      presentation { 'origin' }
+    end
+
+    trait :destination do
+      attr_type { :destination }
+      name { 'destination' }
+      presentation { 'destination' }
+    end
+
+    trait :departure_time do
+      attr_type { :time }
+      name { 'departure-time' }
+      presentation { 'departure-time' }
+    end
+
+    trait :vehicle do
+      attr_type { :vehicle_id }
+      name { 'vehicle' }
+      presentation { 'vehicle' }
+    end
+
+    trait :allow_seat_selection do
+      attr_type { :boolean }
+      name { 'allow-seat-selection' }
+      presentation { 'allow-seat-selection' }
+    end
+
     initialize_with { Spree::OptionType.where(name: name).first_or_initialize }
   end
 end

data/lib/spree_cm_commissioner/test_helper/factories/user_event_factory.rb

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :user_event, class: SpreeCmCommissioner::UserEvent do
+    taxon { create(:taxon) }
+    user { create(:user) }
+  end
+end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '1.8.0'.freeze
+  VERSION = '1.8.2'.freeze
 
   module_function