spree_cm_commissioner 1.11.0.pre.pre3 → 1.12.0

data/app/models/spree_cm_commissioner/user_decorator.rb

@@ -134,6 +134,12 @@ module SpreeCmCommissioner
     def update_otp_enabled
       self.otp_enabled = otp_email || otp_phone_number
     end
+
+    def update_tracked_fields!(request)
+      ActiveRecord::Base.connected_to(role: :writing) do
+        super(request)
+      end
+    end
   end
 end
 

data/app/models/spree_cm_commissioner/variant_decorator.rb

@@ -1,14 +1,16 @@
 module SpreeCmCommissioner
   module VariantDecorator
-    def self.prepended(base) # rubocop:disable Metrics/AbcSize
-      base.include SpreeCmCommissioner::ProductType
+    def self.prepended(base)
       base.include SpreeCmCommissioner::ProductDelegation
       base.include SpreeCmCommissioner::VariantOptionsConcern
+      base.include SpreeCmCommissioner::KycBitwise
+
       base.after_commit :update_vendor_price
       base.validate     :validate_option_types
       base.before_save -> { self.track_inventory = false }, if: :subscribable?
 
       base.belongs_to :vendor, class_name: 'Spree::Vendor'
+      base.has_one :event, class_name: 'Spree::Taxon', through: :product
 
       base.has_many :taxons, class_name: 'Spree::Taxon', through: :product
       base.has_many :visible_option_values, lambda {
@@ -21,19 +23,11 @@ module SpreeCmCommissioner
       base.has_many :variant_guest_card_class, class_name: 'SpreeCmCommissioner::VariantGuestCardClass'
       base.has_many :guest_card_classes, class_name: 'SpreeCmCommissioner::GuestCardClass', through: :variant_guest_card_class
 
-      base.has_many :inventory_items, class_name: 'SpreeCmCommissioner::InventoryItem'
-
       base.scope :subscribable, -> { active.joins(:product).where(product: { subscribable: true, status: :active }) }
-      base.scope :with_permanent_stock, -> { where(product_type: base::PERMANENT_STOCK_PRODUCT_TYPES) }
-      base.scope :with_non_permanent_stock, -> { where.not(product_type: base::PERMANENT_STOCK_PRODUCT_TYPES) }
-
       base.has_one :trip,
                    class_name: 'SpreeCmCommissioner::Trip'
       base.has_many :trip_stops, class_name: 'SpreeCmCommissioner::TripStop', dependent: :destroy, foreign_key: :trip_id
       base.accepts_nested_attributes_for :option_values
-
-      base.before_save -> { self.product_type = product.product_type }, if: -> { product_type.nil? }
-
       base.after_commit :sync_trip, if: :transit?
       base.accepts_nested_attributes_for :trip_stops, allow_destroy: true
       base.after_commit :create_trip_stops, if: :transit?
@@ -59,24 +53,8 @@ module SpreeCmCommissioner
       super || product.discontinued?
     end
 
-    def event
-      taxons.event.first
-    end
-
-    def default_inventory_item_exist?
-      inventory_items.exists?(inventory_date: nil)
-    end
-
-    def create_default_non_permanent_inventory_item!(quantity_available: nil, max_capacity: nil)
-      return if product_type.blank? # handle in case product not exist for variant.
-      return unless should_track_inventory?
-      return if default_inventory_item_exist?
-
-      inventory_items.create!(
-        product_type: product_type,
-        quantity_available: [0, quantity_available || total_on_hand].max,
-        max_capacity: [0, max_capacity || total_on_hand].max
-      )
+    def permanent_stock?
+      accommodation?
     end
 
     # override
@@ -94,18 +72,33 @@ module SpreeCmCommissioner
       "#{display_sku} - #{display_price}"
     end
 
+    def transit?
+      product.product_type == 'transit'
+    end
+
     # override
-    def in_stock?(options = {})
-      SpreeCmCommissioner::Stock::AvailabilityChecker.new(self, options).can_supply?
+    def in_stock?
+      available_quantity.positive?
     end
 
     private
 
+    def total_purchases
+      Spree::LineItem.complete.where(variant_id: id).sum(:quantity).to_i
+    end
+
+    def available_quantity
+      stock_count = stock_items.sum(&:count_on_hand)
+      return stock_count if delivery_required?
+
+      stock_count - total_purchases
+    end
+
     def update_vendor_price
-      return unless vendor.present? && product_type == vendor&.primary_product_type
+      return unless vendor.present? && product&.product_type == vendor&.primary_product_type
 
-      vendor.update(min_price: price) if price < vendor.min_price
-      vendor.update(max_price: price) if price > vendor.max_price
+      vendor.update(min_price: price) if vendor.min_price.nil? || price < vendor.min_price
+      vendor.update(max_price: price) if vendor.max_price.nil? || price > vendor.max_price
     end
 
     def validate_option_types
@@ -128,7 +121,7 @@ module SpreeCmCommissioner
     end
 
     def sync_trip
-      return unless transit?
+      return unless product.product_type == 'transit'
 
       trip = SpreeCmCommissioner::Trip.find_or_initialize_by(variant_id: id)
 

data/app/models/spree_cm_commissioner/vehicle.rb

@@ -8,7 +8,6 @@ module SpreeCmCommissioner
     has_one :primary_photo, -> { order(position: :asc) }, class_name: 'SpreeCmCommissioner::VehiclePhoto', as: :viewable, dependent: :destroy
     belongs_to :vendor, class_name: 'Spree::Vendor'
 
-    before_save :set_attributes
     after_commit :create_vehicle_option_value
 
     has_many :vehicle_photo, class_name: 'SpreeCmCommissioner::VehiclePhoto', as: :viewable, dependent: :destroy
@@ -17,12 +16,6 @@ module SpreeCmCommissioner
     validates :code, uniqueness: { scope: :vendor_id }, presence: true
     validates :license_plate, uniqueness: {}, allow_blank: true
 
-    def set_attributes
-      self.route_type = vehicle_type.route_type
-      self.number_of_seats = vehicle_type.vehicle_seats_count
-      self.allow_seat_selection = vehicle_type.allow_seat_selection
-    end
-
     def create_vehicle_option_value
       SpreeCmCommissioner::VehicleOptionValueCreator.call(self)
     end

data/app/models/spree_cm_commissioner/vendor_decorator.rb

@@ -79,7 +79,8 @@ module SpreeCmCommissioner
                     dependent: :destroy, inverse_of: :relatable
 
       base.has_many :vehicle_types, class_name: 'SpreeCmCommissioner::VehicleType', dependent: :destroy
-      base.has_many :vehicles, through: :vehicle_types, class_name: 'SpreeCmCommissioner::Vehicle', dependent: :destroy
+      base.has_many :vehicles, class_name: 'SpreeCmCommissioner::Vehicle', dependent: :destroy
+      # base.has_many :vehicles, through: :vehicle_types, class_name: 'SpreeCmCommissioner::Vehicle', dependent: :destroy
 
       base.validates :account_name, :account_number, presence: true, if: lambda {
                                                                            payment_qrcode.present? && Spree::Store.default.code.include?('billing')
@@ -181,6 +182,13 @@ module SpreeCmCommissioner
     def organizer_url
       "#{Spree::Store.default.formatted_url}/organizers/#{slug}"
     end
+
+    def vendor_rules
+      rules_option_type = Spree::OptionType.rules_option_type
+      return vendor_kind_option_values.none if rules_option_type.nil?
+
+      vendor_kind_option_values.where(option_type_id: rules_option_type.id)
+    end
   end
 end
 

data/app/overrides/spree/admin/cms_pages/_form/tenant_fields.html.erb.deface

@@ -0,0 +1,9 @@
+<!-- insert_before "erb[loud]:contains('f.field_container :title')" -->
+
+<%= f.field_container :tenant_id, class: ['col-12'] do %>
+  <%= f.label :tenant_id, raw(Spree.t(:tenant) + ' (optional)') %>
+  <%= f.collection_select :tenant_id, SpreeCmCommissioner::Tenant.all, :id, :name,
+        { prompt: Spree.t('select_tenant'), include_blank: Spree.t('default_store') },
+        { class: 'form-control select2' } %>
+  <%= f.error_message_on :tenant_id %>
+<% end %>

data/app/overrides/spree/admin/cms_pages/index/cms_pages_tabs.html.erb.deface

@@ -0,0 +1,21 @@
+<!-- insert_before "erb[silent]:contains('content_for :page_actions')" -->
+
+<%= render partial: 'spree/admin/shared/cms_pages_tabs' %>
+
+<% if params[:tab] == 'default' %>
+  <div class="alert alert-info mb-3">
+    <%= svg_icon name: "info-circle.svg", classes: 'mr-2', width: '16', height: '16' %>
+    CMS Pages for the default store. These pages are shared globally and are not tied to any specific tenant.
+  </div>
+<% elsif params[:tab] == 'tenants' && params[:tenant_id].present? %>
+  <div class="alert alert-info mb-3">
+    <%= svg_icon name: "info-circle.svg", classes: 'mr-2', width: '16', height: '16' %>
+    CMS Pages for the tenant: <strong><%= SpreeCmCommissioner::Tenant.find(params[:tenant_id]).name %></strong>.
+    These pages are displayed only to users associated with this tenant.
+  </div>
+<% elsif params[:tab] == 'tenants' %>
+  <div class="alert alert-info mb-3">
+    <%= svg_icon name: "info-circle.svg", classes: 'mr-2', width: '16', height: '16' %>
+    CMS Pages for all tenants. These pages are displayed only to users associated with specific tenants.
+  </div>
+<% end %>

data/app/overrides/spree/admin/taxons/_form/assets_form.html.erb.deface

@@ -1,7 +1,8 @@
 <!-- replace "erb[loud]:contains('assets_form')" -->
 
+<%# Sections don't use assets, so we hide the form here to avoid confusing admin. %>
 
-<div class="row">
+<div class="row <%= "d-none" unless @taxon.depth == 1 %>">
   <%# "@taxon.icon is not used yet" %>
   <%# render 'shared/asset_field',
     field: :icon,
@@ -67,4 +68,3 @@
     <% end %>
   <% end %>
 </div>
-

data/app/overrides/spree/admin/taxons/_form/available_on.html.erb.deface

@@ -1,6 +1,8 @@
 <!-- insert_before "erb[loud]:contains('field_container :parent_id')" -->
 
-<div class="form-group">
+<%# Sections don't use available_on, so we hide the form here to avoid confusing admin. %>
+
+<div class="form-group <%= "d-none" unless @taxon.depth == 1 %>">
   <%= label_tag nil, Spree.t(:available_on) %>
   <div class="input-group datePickerFrom"
           data-wrap="true"

data/app/overrides/spree/admin/taxons/_form/background_color_and_foreground_color.html.erb.deface

@@ -1,6 +1,8 @@
 <!-- insert_before "erb[loud]:contains('field_container :meta_title')" -->
 
-<div class="row">
+<%# Sections don't use colors, so we hide the form here to avoid confusing admin. %>
+
+<div class="row <%= "d-none" unless @taxon.depth == 1 %>">
   <div class="col-md-6">
     <%= f.label :preferred_background_color, Spree.t('background_color'), class: 'form-label' %>
     <%= f.text_field :preferred_background_color, class: 'form-control color-picker', placeholder: '#FFFFFF', value: @object.preferred_background_color %>

data/app/overrides/spree/admin/taxons/_form/custom_redirect_url.html.erb.deface

@@ -1,6 +1,8 @@
 <!-- insert_after "erb[loud]:contains('field_container :permalink')" -->
 
+<%# Sections don't use custom_redirect_url, so we hide the form here to avoid confusing admin. %>
+
 <%= f.field_container :custom_redirect_url do %>
   <%= f.label :custom_redirect_url, Spree.t(:custom_redirect_url) %>
   <%= f.text_field :custom_redirect_url, class: 'form-control', rows: 6 %>
-<% end %>
+<% end if @taxon.depth == 1 %>

data/app/overrides/spree/admin/taxons/_form/hide_video_banner.html.erb.deface

@@ -1,7 +1,9 @@
 <!-- insert_before "erb[loud]:contains('field_container :hide_from_nav')" -->
 
+<%# Sections don't use video banner, so we hide the form here to avoid confusing admin. %>
+
 <%= f.field_container :hide_video_banner, class: ['custom-control', 'custom-checkbox', 'my-4'] do %>
   <%= f.check_box :hide_video_banner, class: 'custom-control-input' %>
   <%= f.label :hide_video_banner, Spree.t(:hide_video_banner), class: 'custom-control-label' %>
   <%= f.error_message_on :hide_video_banner %>
-<% end %>
+<% end if @taxon.depth == 1 %> %>

data/app/overrides/spree/admin/taxons/_form/purchasable_on_status.html.erb.deface

@@ -1,5 +1,7 @@
 <!-- insert_before "erb[loud]:contains('field_container :parent_id')" -->
 
+<%# Sections don't use purchasable_on, so we hide the form here to avoid confusing admin. %>
+
 <%= f.field_container :purchasable_on do %>
   <%= f.label :purchasable_on, Spree.t('purchasable_on'), class: 'form-label' %>
   <%= f.select :purchasable_on,
@@ -7,4 +9,4 @@
         {  },
         { class: 'select2 form-control' } %>
   <%= f.error_message_on :purchasable_on, class: 'text-danger' %>
-<% end %>
+<% end if @taxon.depth == 1 %>

data/app/overrides/spree/admin/taxons/_form/show_badge_status.html.erb.deface

@@ -1,5 +1,7 @@
 <!-- insert_before "erb[loud]:contains('field_container :parent_id')" -->
 
+<%# Sections don't use show_badge_status, so we hide the form here to avoid confusing admin. %>
+
 <%= f.field_container :show_badge_status do %>
   <%= f.label :show_badge_status, Spree.t('show_badge_status'), class: 'form-label' %>
   <%= f.select :show_badge_status,
@@ -7,5 +9,5 @@
         {  },
         { class: 'select2 form-control' } %>
   <%= f.error_message_on :show_badge_status, class: 'text-danger' %>
-<% end %>
+<% end if @taxon.depth == 1 %>
 

data/app/overrides/spree/admin/taxons/_form/to_date_form_date.html.erb.deface

@@ -1,6 +1,8 @@
 <!-- insert_after "erb[loud]:contains('field_container :permalink')" -->
 
-<div class="form-group date-range-filter">
+<%# Beside event, from_date & to_date aren't used inside the system elsewhere. Hide them from UI to avoid confusion %>
+
+<div class="form-group date-range-filter <%= "d-none" unless @object.event? && @object.depth == 1 %>">
   <div class="date-range-filter row">
     <div class="col-12 col-md-6 mb-3 mb-md-0">
       <%= label_tag nil, Spree.t(:from_date) %>
@@ -35,6 +37,3 @@
     </div>
   </div>
 </div>
-
-
-

data/app/overrides/spree/admin/users/_form/roles_fields.html.erb.deface

@@ -1,2 +1,2 @@
 <!-- replace 'erb[loud]:contains("f.collection_check_boxes :spree_role_ids")' -->
-<%= f.collection_check_boxes :spree_role_ids, Spree::Role.non_vendor, :id, :name do |role_form| %>
+<%= f.collection_check_boxes :spree_role_ids, Spree::Role.non_vendor, :id, :name do |role_form| %>

data/app/overrides/spree/admin/users/index/body.html.erb.deface

@@ -23,6 +23,9 @@
   <td class='phone_number'>
     <%= user.phone_number%>
   </td>
+  <td class='tenant'>
+    <%= user.tenant&.name || Spree::Store.default.name %>
+  </td>
   <td class='created_at'>
     <%= user.created_at %>
   </td>

data/app/overrides/spree/admin/users/index/headers.html.erb.deface

@@ -19,6 +19,9 @@
      <th>
       <%= sort_link @search, :phone_number,  I18n.t('activerecord.attributes.spree/order.phone_number'), {}, {title: 'phone_number_title'} %>
     </th>
+    <th>
+      <%= Spree.t(:tenant) %>
+    </th>
     <th>
       <%= sort_link @search, :created_at, Spree.t(:create_at), {}, {title: 'create_at_title'} %>
     </th>

data/app/overrides/spree/admin/variants/_form/kyc_field.html.erb.deface

@@ -0,0 +1,40 @@
+<!-- insert_bottom "[data-hook='admin_variant_form_additional_fields']" -->
+
+<p>Guest Information Fields</p>
+
+<div class="form-check mb-3">
+  <%= f.check_box :use_product_kyc, id: "toggleGuestInfo", class: 'form-check-input mr-2', checked: (@variant.kyc == nil) %>
+  <label for="toggleGuestInfo" class="form-check-label">
+    Use Product KYC
+  </label>
+</div>
+
+<div id="guestInfoForm" <% if @variant.kyc == nil %>style="display: none;"<% end %>">
+  <small class="form-text text-muted mb-4">
+    <%= raw I18n.t('kyc.variant_note') %>
+  </small>
+  <div class="row row-cols-2 row-cols-md-3">
+    <% @variant.class::BIT_FIELDS.each do |key, value| %>
+      <div class="col">
+        <div class="form-check form-check-inline">
+          <%= f.field_container key do %>
+            <%= f.check_box key, class: 'form-check-input', checked: @variant.kyc_value_enabled?(value) %>
+            <%= f.label key, key.to_s.sub(/^guest_/, '').titleize, class: 'form-check-label' %>
+            <%= f.error_message_on key, class: 'text-danger' %>
+          <% end %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>
+
+<script>
+  document.addEventListener("turbo:load", function () {
+    const checkbox = document.getElementById("toggleGuestInfo");
+    const guestForm = document.getElementById("guestInfoForm");
+
+    checkbox.addEventListener("change", function () {
+      guestForm.style.display = this.checked ? "none" : "block";
+    });
+  });
+</script>

data/app/overrides/spree/admin/variants/edit/variant_status.html.erb.deface

@@ -2,12 +2,15 @@
 
 <% unless f.object.accommodation? %>
   <div class="m-3 mb-0">
-    <% valid_duration = f.object.start_date_time.present? && f.object.end_date_time.present? %>
+    <% from_date = f.object.start_date_time || f.object.event&.from_date %>
+    <% to_date = f.object.end_date_time || f.object.event&.to_date %>
+
+    <% valid_duration = from_date.present? && to_date.present? %>
     <% alert_class = valid_duration ? 'alert-success' : 'alert-warning' %>
 
     <div class="alert <%= alert_class %> mb-0">
       <%= svg_icon(name: valid_duration ? "check2-circle.svg" : 'cancel.svg', width: '16', height: '16') %>
-      This variant have start date: <strong><%= pretty_time(f.object.start_date_time).presence || 'N/A' %></strong> and end date: <strong><%= pretty_time(f.object.end_date_time).presence || 'N/A' %></strong>
+      This variant have start date: <strong><%= pretty_time(from_date).presence || 'N/A' %></strong> and end date: <strong><%= pretty_time(to_date).presence || 'N/A' %></strong>
     </div>
 
     <div class="mb-1"></div>
@@ -16,7 +19,7 @@
       <% option_types = Spree::OptionType.where(name: ["start-date", "end-date", "start-time", "end-time", "reminder-in-hours", "duration-in-hours", "duration-in-minutes", "duration-in-seconds"]) %>
       <% event_link = f.object.event.present? ? edit_admin_taxonomy_taxon_url(f.object.event.taxonomy.id, f.object.event.id) : edit_admin_product_url(f.object.product) %>
 
-      Duration can be set by either adding <%= link_to 'event section date', event_link, target: '_blank' %> or add option type such as <%= option_types.pluck(:presentation).to_sentence %>
+      Duration can be set by either adding <%= link_to 'event date', event_link, target: '_blank' %> or add option type such as <%= option_types.pluck(:presentation).to_sentence %>
     </small>
   </div>
 <% end %>

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

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

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

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

data/app/request_schemas/spree_cm_commissioner/accommodation_request_schema.rb

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

data/app/request_schemas/spree_cm_commissioner/application_request_schema.rb

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

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