spree_cm_commissioner 2.12.9 → 2.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 574f5215f2246c2cc433d99ab73113be56a4c82b509758548c1d0951c894caef
-  data.tar.gz: 0fec7f50315d67e24a41779dafd38467c5c7648180c4b54b3ec1d05f1cc7f1a6
+  metadata.gz: b168ef103cb6aec0e7865fc4a752cc2367d526180fd6855bf21f6fba1cc72412
+  data.tar.gz: 05a6401d8ea20de2661c421471a16e0e8e1ace6882178a4f3f1cef0e9825d9b4
 SHA512:
-  metadata.gz: 700f502becf735bfb55744ef153508ecfdb14f0f89f6a9a0b2063739c9739a0cbcfaab2d6b7f992858b0c601e212330a90d927a5c8c9b07621b96ef41071b35a
-  data.tar.gz: 31e2cc185129609a659dc3257a343d62ff9dc5b491ab8120a8e4b3daf2b9f77f8d3aca445f7a128b6e2f30bfad4504a5d2dfb0d2a6980ddcb9a33f8eb41551cf
+  metadata.gz: 6cc975658385143deea2b8f1f8e7ac7b4d9ccfa2ce96054c1968a99fe4a6f3793a09585341bf389d2d9939f1097b4d9e867f62734a1d6aafaef0429628d2c875
+  data.tar.gz: 1baa1785ad8c59d5d3ae287518b19c4e680db6a796678096b31c9e18c7e5c1f856984e18ca19407e478e332a465ed4f0d86f0f3c269378e37e9567bb9e91e46b

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.12.9)
+    spree_cm_commissioner (2.13.0)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront

data/app/controllers/spree/admin/orders/customer_details_controller_decorator.rb

@@ -15,11 +15,13 @@ module Spree
         def assign_customer
           user = tenant_user_scope.find_by(id: params[:user_id])
 
-          if user
-            @order.associate_user!(user)
-            flash[:success] = Spree.t('admin.orders.customer_details.customer_assigned', email: user.email)
-          else
+          if user.nil?
             flash[:error] = Spree.t(:user_not_found)
+          elsif user.id == @order.user_id
+            flash[:notice] = Spree.t('admin.orders.customer_details.user_already_assigned', email: user.email)
+          else
+            @order.associate_user!(user)
+            flash[:success] = Spree.t('admin.orders.customer_details.user_assigned', email: user.email)
           end
 
           redirect_to spree.edit_admin_order_customer_path(@order)

data/app/controllers/spree/api/v2/platform/resource_controller_decorator.rb

@@ -0,0 +1,48 @@
+module Spree
+  module Api
+    module V2
+      module Platform
+        # Single reusable entry point for tenant-scoping any Platform API resource: pass
+        # `?tenant_id=X` on the request and the collection is narrowed to that tenant, without each
+        # controller having to wire up its own filter/param handling.
+        #
+        # Tri-state on the param itself:
+        #   - absent: no scoping applied, collection flows through unrestricted (existing callers,
+        #     eg. the products/users pickers in checkouts and private sales, are unaffected).
+        #   - "0": scope to records with no tenant (tenant_id IS NULL) - most vendors today aren't
+        #     attached to a tenant, so this is the common case for tenant-scoped search.
+        #   - any other value: scope to that exact tenant_id.
+        #
+        # Default assumes the model owns a `tenant_id` column directly (true for Spree::User,
+        # Spree::Vendor, SpreeCmCommissioner::HomepageSection - see their `multi_tenant :tenant`
+        # declarations). A model related to tenant only indirectly should override
+        # `scope_by_tenant` in its own controller decorator.
+        module ResourceControllerDecorator
+          def scope
+            base_scope = super
+
+            # Keep the existing behavior when no tenant_id param is passed,
+            # so that existing controllers are unaffected.
+            return base_scope if params[:tenant_id].nil?
+
+            scope_by_tenant(base_scope, params[:tenant_id])
+          end
+
+          private
+
+          def scope_by_tenant(scope, tenant_id)
+            return scope unless scope.klass.column_names.include?('tenant_id')
+
+            if tenant_id.to_s == '0'
+              scope.where(tenant_id: nil)
+            else
+              scope.where(tenant_id: tenant_id)
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+Spree::Api::V2::Platform::ResourceController.prepend(Spree::Api::V2::Platform::ResourceControllerDecorator)

data/app/models/spree_cm_commissioner/line_item_decorator.rb

@@ -37,7 +37,7 @@ module SpreeCmCommissioner
       base.validate :ensure_all_guests_have_blocks, if: :required_seat_selection?
 
       base.whitelisted_ransackable_associations |= %w[guests order]
-      base.whitelisted_ransackable_attributes |= %w[number to_date from_date vendor_id]
+      base.whitelisted_ransackable_attributes |= %w[number to_date from_date vendor_id event_id]
 
       base.delegate :delivery_required?, :high_demand,
                     to: :variant

data/app/overrides/spree/admin/orders/_order_actions/actions.html.erb.deface

@@ -13,7 +13,7 @@
 <% end %>
 
 <% if can?(:fire, order) && order.can_cancel? %>
-  <% cancel_label = Spree.t(:cancel, scope: 'admin.order.events', default: Spree.t(:cancel)) %>
+  <% cancel_label = Spree.t(:cancel) %>
   <%= button_link_to cancel_label,
         '#',
         icon: 'cancel.svg',
@@ -24,7 +24,7 @@
     <div class="modal-dialog" role="document">
       <div class="modal-content">
         <div class="modal-header">
-          <h5 class="modal-title mr-auto" id="cancelModalLabel-<%= order.number %>"><%= Spree.t(:order_sure_want_to, event: cancel_label) %></h5>
+          <h5 class="mr-auto modal-title" id="cancelModalLabel-<%= order.number %>"><%= Spree.t(:order_sure_want_to, event: cancel_label) %></h5>
           <button type="button" class="close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>">
             <span aria-hidden="true">&times;</span>
           </button>
@@ -32,12 +32,12 @@
 
         <%= form_with model: order, url: spree.cancel_admin_order_url(order), method: :put do |f| %>
           <div class="modal-body">
-            <div class="form-group text-left text-start">
+            <div class="text-left form-group text-start">
               <%= f.label :internal_note, raw(Spree.t(:reason) + required_span_tag), class: 'd-block text-left text-start' %>
               <%= f.text_area :internal_note, rows: 3, class: 'form-control', placeholder: Spree.t(:enter_internal_note, default: 'Enter reason here...'), required: true %>
             </div>
           </div>
-          <div class="modal-footer d-flex justify-end">
+          <div class="justify-end modal-footer d-flex">
             <button type="button" class="btn btn-primary" data-dismiss="modal"><%= Spree.t(:close) %></button>
             <%= f.submit Spree.t(:confirm), class: 'btn btn-danger' %>
           </div>

data/app/overrides/spree/admin/orders/_search/taxon_search_field.html.erb.deface

@@ -0,0 +1,8 @@
+<!-- insert_before "[data-hook='admin_orders_index_search'] .row:nth-child(5) .col-12.col-lg-4:nth-child(3)" -->
+
+<div class="col-12 col-lg-4">
+  <div class="form-group">
+    <%= label_tag :q_line_items_event_id_eq, "Event" %>
+    <%= f.select :line_items_event_id_eq, Spree::Taxon.events.pluck(:name, :id), { include_blank: true }, class: 'select2-clear js-filterable' %>
+  </div>
+</div>

data/app/overrides/spree/admin/orders/customer_details/edit/reassign_customer_search.html.erb.deface

@@ -1,6 +1,5 @@
 <!-- replace "#select-customer" -->
 
-<% unless @order.completed? && @order.user.present? %>
   <%= turbo_frame_tag 'customer_reassign' do %>
     <div class="mb-3 card" data-hook>
       <div class="card-header">
@@ -28,14 +27,15 @@
 
         <% if @customer_search_query.present? %>
           <% if @customer_search_result %>
+            <% replacing_user = @order.user.present? %>
             <div class="flex-wrap gap-2 mt-2 mb-0 alert alert-success d-flex justify-content-between align-items-center">
               <span><%= Spree.t('admin.orders.customer_details.customer_found', email: @customer_search_result.email) %></span>
-              <%= button_to Spree.t('admin.orders.customer_details.assign'),
+              <%= button_to replacing_user ? Spree.t('admin.orders.customer_details.replace_user') : Spree.t('admin.orders.customer_details.assign_user'),
                 spree.assign_customer_admin_order_customer_path(@order),
                 method: :patch,
                 params: { user_id: @customer_search_result.id },
-                class: 'btn btn-primary btn-sm',
-                form: { data: { turbo_frame: '_top' } } %>
+                class: "btn btn-sm #{replacing_user ? 'btn-danger' : 'btn-primary'}",
+                form: { data: { turbo_frame: '_top', turbo_confirm: (Spree.t('admin.orders.customer_details.replace_user_confirm', email: @order.user.email) if replacing_user) } } %>
             </div>
           <% else %>
             <div class="mt-2 mb-0 alert alert-warning">
@@ -46,4 +46,3 @@
       </div>
     </div>
   <% end %>
-<% end %>

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

@@ -1,7 +1,11 @@
 <!-- insert_before "erb[loud]:contains('field_container :hide_from_nav')" -->
 
+<% if @taxon.depth == 1 %>
+
 <%= f.field_container :preview, class: ['custom-control', 'custom-checkbox', 'my-4'] do %>
   <%= f.check_box :preview, class: 'custom-control-input' %>
   <%= f.label :preview, 'Preview (internal team only)', class: 'custom-control-label' %>
   <%= f.error_message_on :preview %>
 <% end %>
+
+<% end %>

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

@@ -3,11 +3,19 @@
 <% if @taxon.depth == 1 %>
   <div>
     <%= f.field_container :vendor_id do %>
-      <%= label_tag :vendor_id, Spree.t(:vendor) %>
+      <label class="d-flex">
+        <span class="mr-2"><%= Spree.t(:vendor) %></span>
+        <% if f.object.vendor_id.present? %>
+          <%= link_to_with_icon 'arrow-right-circle.svg', Spree.t(' '), spree.edit_admin_vendor_path(f.object.vendor_id), class: "d-flex align-items-center" do %>
+            <i class="bi bi-arrow-right-circle me-1"></i>
+          <% end %>
+        <% else %>
+          <span class="text-muted"><%= Spree.t(:no_vendor_assigned) %></span>
+        <% end %>
+      </label>
       <%= f.select :vendor_id, Spree::Vendor.order(:name).pluck(:name, :id),
                     { include_blank: true }, { class: 'select2-clear js-filterable' } %>
       <%= f.error_message_on :vendor_id, class: 'error-message' %>
     <% end %>
   </div>
 <% end %>
-

data/app/overrides/spree/admin/users/_tabs/tabs.html.erb.deface

@@ -45,7 +45,7 @@
   </li>
   <li class="nav-item">
     <%= link_to_with_icon 'calendar-event.svg',
-      Spree.t(:user_events),
+      Spree.t(:crews),
       admin_user_events_path(user_id: @user.id),
       class: "nav-link #{'active' if current == :user_events }" %>
   </li>

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

@@ -33,7 +33,7 @@
   <%# user event only show for event %>
   <%= content_tag :li, class: 'nav-item' do %>
     <%= link_to_with_icon 'user.svg',
-      Spree.t(:user_events),
+      Spree.t(:crews),
       admin_user_events_path(params: {taxon_id: @taxon.id, taxonomy_id: @taxonomy}),
       class: "nav-link #{'active' if current == :user_events}" %>
   <% end if can?(:manage, SpreeCmCommissioner::UserTaxon) && @taxon.event? && @taxon.depth == 1 %>

data/app/views/spree/admin/user_events/_new_user.html.erb

@@ -19,7 +19,8 @@
                                       { include_hidden: true },
                                         data: { autocomplete_url_value: 'users_api_v2',
                                                 autocomplete_return_attr_value: 'email',
-                                                autocomplete_search_query_value: 'email_i_cont',
+                                                autocomplete_search_query_value: 'email_or_normalized_login_or_phone_number_i_cont',
+                                                autocomplete_additional_url_params_value: "tenant_id=#{@taxon.vendor&.tenant_id || 0}",
                                                 minimum_input_length: 3 } %>
             <%= f.error_message_on :user_id %>
           <% end %>

data/app/views/spree/admin/user_events/_users.html.erb

@@ -11,7 +11,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:add_new_user_events), new_admin_user_event_path(params: {taxon_id: @taxon.id}), class: "btn-success", icon: 'add.svg', id: 'admin_new_user_events_link' %>
+  <%= button_link_to Spree.t(:add_new_crews), new_admin_user_event_path(params: {taxon_id: @taxon.id}), class: "btn-success", icon: 'add.svg', id: 'admin_new_user_events_link' %>
 <% end if can? :create,  SpreeCmCommissioner::UserTaxon %>
 
 <%= render partial: 'spree/admin/shared/taxon_tabs', locals: { current: :user_events } %>

data/config/locales/en.yml

@@ -660,8 +660,11 @@ en:
           customer_found: "Found %{email}."
           customer_not_found: 'No customer found for "%{query}" in this tenant.'
           clear_search: "Clear search"
-          assign: "Assign"
-          customer_assigned: "Order reassigned to %{email}."
+          assign_user: "Assign User"
+          replace_user: "Replace User"
+          replace_user_confirm: "This order is currently assigned to %{email}. Replace them with the user found above?"
+          user_assigned: "Order reassigned to %{email}."
+          user_already_assigned: "This order is already assigned to %{email}."
     event:
       check_in:
         success: "Guest check-in in successfully"

data/config/locales/km.yml

@@ -433,8 +433,11 @@ km:
           customer_found: "រកឃើញ %{email}។"
           customer_not_found: 'រកមិនឃើញអតិថិជនសម្រាប់ "%{query}" ក្នុង tenant នេះទេ។'
           clear_search: "សម្អាតការស្វែងរក"
-          assign: "ផ្តល់ជូន"
-          customer_assigned: "លំដាប់នេះត្រូវបានផ្លាស់ប្តូរទៅ %{email}។"
+          assign_user: "ផ្តល់ជូនអ្នកប្រើប្រាស់"
+          replace_user: "ជំនួសអ្នកប្រើប្រាស់"
+          replace_user_confirm: "លំដាប់នេះកំពុងភ្ជាប់ជាមួយ %{email} រួចហើយ។ តើជំនួសដោយអ្នកប្រើប្រាស់ដែលរកឃើញខាងលើមែនទេ?"
+          user_assigned: "លំដាប់នេះត្រូវបានផ្លាស់ប្តូរទៅ %{email}។"
+          user_already_assigned: "លំដាប់នេះបានភ្ជាប់ជាមួយ %{email} រួចហើយ។"
     event:
       check_in:
         success: "Guest check-in in successfully"

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.12.9'.freeze
+  VERSION = '2.13.0'.freeze
 
   module_function
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.12.9
+  version: 2.13.0
 platform: ruby
 authors:
 - You
@@ -961,6 +961,7 @@ files:
 - app/controllers/spree/api/v2/platform/homepage_section_relatable_options_controller.rb
 - app/controllers/spree/api/v2/platform/option_types_controller_decorator.rb
 - app/controllers/spree/api/v2/platform/places_controller.rb
+- app/controllers/spree/api/v2/platform/resource_controller_decorator.rb
 - app/controllers/spree/api/v2/platform/seat_number_layouts_controller.rb
 - app/controllers/spree/api/v2/platform/taxons_controller_decorator.rb
 - app/controllers/spree/api/v2/resource_controller_decorator.rb
@@ -1833,6 +1834,7 @@ files:
 - app/overrides/spree/admin/orders/_search/line_item_number_search_field.html.erb.deface
 - app/overrides/spree/admin/orders/_search/payment_method_search_field.html.erb.deface
 - app/overrides/spree/admin/orders/_search/payment_number_search_field.html.erb.deface
+- app/overrides/spree/admin/orders/_search/taxon_search_field.html.erb.deface
 - app/overrides/spree/admin/orders/_search/vendor_search_field.html.erb.deface
 - app/overrides/spree/admin/orders/customer_details/_form/phone_number_field.html.erb.deface
 - app/overrides/spree/admin/orders/customer_details/_form/view_profile_link.html.erb.deface