spree_cm_commissioner 2.13.7 → 2.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c83a53b69842100120ae6f6edea538c4a7335fc9859e52765f4be45ad2506b0c
-  data.tar.gz: 61cd2bea3a4a011a385ad636c6f3330bc44e04085eb39ea22c64c96f86c59978
+  metadata.gz: 2d7734080da716bf13a816acbd174d75272acdbbf4fd5a257d5e6c535eb7cece
+  data.tar.gz: 310a647df40f1c0d6f0cab1a3f676d7f558e07d0a45108addd7a1d552ebd4083
 SHA512:
-  metadata.gz: 18012dec394174123a5fefcb459c369aab56bf075cabb068e695ab42eac92c1f487468047d6201bee6dc2f1f8730147260ec7d4b4dbfa1b4c0f5c98c31720508
-  data.tar.gz: 5dae3a462226fe008f4c17d43231d315d45e24a415fd07fe8c564f61694821ba70e037b311f8f653766df763a009e00b2ccf0d8f7bbbaf712e858a50b0cbdf43
+  metadata.gz: efb1b8f98edd7bb4a815086717aad5722a2e22ca6dd7c9472df0aa18ce1259cbd26674c45a3b0e8a064ff69e194f6b650bfded02528d7ef6078c74e62aad0fee
+  data.tar.gz: e578ec7e879cfade2a629c9a452283689942890aae8ad5b82b81bb67dba4f3155aaba401f76d77ae603435614e90a610293f2e1c9fde942627dab76bec5f6241

data/.github/workflows/test_and_build_gem.yml

@@ -117,7 +117,9 @@ jobs:
 
   setup:
     needs: [validate-commits]
-    runs-on: ubuntu-latest
+    # Pinned (also test/build_and_publish): newer images only ship the latest 3.2.x patch, and
+    # production runs exactly ruby:3.2.0 (cm-market-server Dockerfile-app).
+    runs-on: ubuntu-24.04
 
     services:
       db:
@@ -170,7 +172,7 @@ jobs:
 
   test:
     needs: [setup]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     if: github.event_name == 'pull_request'
 
     strategy:
@@ -279,7 +281,7 @@ jobs:
 
   build_and_publish:
     needs: [setup]
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     if: startsWith(github.ref, 'refs/tags/')
 
     steps:

data/Gemfile.lock

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

data/app/assets/javascripts/spree_cm_commissioner/backend.js

@@ -1,7 +1,7 @@
 //= require map/map-control-button
 //= require map/map-picker
 //= require spree_cm_commissioner/routes
-//= require spree_cm_commissioner/calendar
 //= require spree_cm_commissioner/annual_calendar_form
 //= require spree_cm_commissioner/tenant_payment_icon_fields
 //= require spree_cm_commissioner/copy_to_clipboard
+//= require spree_cm_commissioner/promotion_rule_pickers

data/app/assets/javascripts/spree_cm_commissioner/promotion_rule_pickers.js

@@ -0,0 +1,12 @@
+// Our product/user/vendors promotion rule partials use select2autocomplete, which spree_backend only
+// initializes on spree:load. "Add rule" is a remote form whose create.js.erb appends the new rule and
+// re-inits only the core product_picker/user_picker, so without this the new rule's picker stays a
+// plain, empty select until the page is reloaded.
+//
+// jquery_ujs fires ajax:complete as a jQuery event (not a DOM one), after the JS response has run.
+// Delegated from document so Turbo page loads don't stack duplicate listeners.
+$(document).on("ajax:complete", "#new_product_rule_form", function () {
+  $("#rules select[data-autocomplete-url-value]:not(.select2-hidden-accessible)").each(function () {
+    buildParamsFromDataAttrs(this);
+  });
+});

data/app/assets/stylesheets/spree_cm_commissioner/backend/calendar.scss

@@ -22,37 +22,6 @@ $day-background: theme-color("light");
     @include hover {
       background-color: darken($day-background, 5%);
     }
-
-    .c-date-container {
-      display: flex;
-      flex-flow: column;
-      height: 100%;
-
-      .c-date {
-        padding: 6px;
-        cursor: pointer;
-      }
-
-      .c-events-container {
-        flex-grow: 1;
-        display: flex;
-        align-items: flex-end;
-      }
-
-      .c-events {
-        display: flex;
-        align-items: flex-end;
-
-        .c-event {
-          width: 8px;
-          height: 8px;
-          border-radius: 4px;
-          background-color: theme-color("primary");
-          margin-right: 4px;
-          cursor: pointer;
-        }
-      }
-    }
   }
 
   .wday-0 {
@@ -103,14 +72,6 @@ $day-background: theme-color("light");
   // }
 }
 
-.c-month-calendar {
-  .simple-calendar {
-    table {
-      @extend .table-responsive-md;
-    }
-  }
-}
-
 .c-annual-calendar {
   @extend .row;
 

data/app/controllers/concerns/spree/admin/rates_availability_cells.rb

@@ -0,0 +1,16 @@
+module Spree
+  module Admin
+    # The `cells` the Rates & Availability grid posts for its selection, shaped by the script's raCellData:
+    # { type: 'stock' | 'price', variant_id:, rate_plan_id: ('' for the variant's own prices), date: ('' for Base) }.
+    # They travel in a JSON body, as a selection across months can be thousands.
+    module RatesAvailabilityCells
+      extend ActiveSupport::Concern
+
+      private
+
+      def selected_cells
+        @selected_cells ||= params.permit(cells: %i[type variant_id rate_plan_id date]).fetch(:cells, []).map { |cell| cell.to_h.symbolize_keys }
+      end
+    end
+  end
+end

data/app/controllers/concerns/spree/api/v2/product_list_includes_decorator.rb

@@ -18,6 +18,7 @@ module Spree
             stock_items: :stock_location
           }
           base_includes[:product_option_types] = :option_type
+          base_includes[:variant_kind_product_option_types] = :option_type
           base_includes[:product_promotion_rules] = {
             promotion_rule: {
               promotion: []

data/app/controllers/spree/admin/guests_controller.rb

@@ -43,7 +43,8 @@ module Spree
 
       def edit
         @kyc_fields = @object.line_item.kyc_fields
-        @check_in = @object.check_in
+        @check_ins = @object.check_ins.includes(:check_in_session, :check_in_by)
+        @eligible_check_in_sessions = @object.eligible_check_in_sessions.order(:position)
       end
 
       def check_in

data/app/controllers/spree/admin/integrations_controller.rb

@@ -35,6 +35,17 @@ module Spree
         admin_integrations_url(options)
       end
 
+      # Builds the chosen subclass rather than the base Integration: `create` only assigns `type`
+      # afterwards, which changes the column but not the object's class, so the subclass's
+      # callbacks and attribute defaults would never run. `create` posts the type in the form;
+      # `new` gets it as ?type= when one is picked. With no type yet, or one that isn't an
+      # integration, it stays the base class (never constantized).
+      # override
+      def build_resource
+        type = params.dig(:spree_cm_commissioner_integration, :type).presence || params[:type]
+        SpreeCmCommissioner::Integration.types.include?(type) ? type.constantize.new : model_class.new
+      end
+
       private
 
       def permitted_resource_params
@@ -47,6 +58,7 @@ module Spree
           :full_sync_interval_hours,
           :tenant_id,
           :vendor_id,
+          :oauth_application_id,
           public_metadata: {},
           private_metadata: {}
         )
@@ -62,6 +74,7 @@ module Spree
         @conflict_strategy_options ||= enum_to_options(SpreeCmCommissioner::Integration.conflict_strategies)
         @tenants ||= SpreeCmCommissioner::Tenant.select(:id, :name).order(:name)
         @vendors ||= Spree::Vendor.select(:id, :name).order(:name)
+        @oauth_applications ||= Spree::OauthApplication.select(:id, :name).order(:name)
       end
 
       def enum_to_options(enum_hash)
@@ -69,14 +82,10 @@ module Spree
       end
 
       def integration_type_options
-        files = Dir[SpreeCmCommissioner::Engine.root.join('app/models/spree_cm_commissioner/integrations/*.rb')]
-
-        return [[Spree.t(:type), 'SpreeCmCommissioner::Integration']] if files.blank?
+        types = SpreeCmCommissioner::Integration.types
+        return [[Spree.t(:type), 'SpreeCmCommissioner::Integration']] if types.blank?
 
-        files.map do |path|
-          class_name = "SpreeCmCommissioner::Integrations::#{File.basename(path, '.rb').camelize}"
-          [class_name, class_name]
-        end.sort_by(&:first)
+        types.map { |class_name| [class_name, class_name] }
       end
     end
   end

data/app/controllers/spree/admin/inventory_items_controller.rb

@@ -1,73 +1,25 @@
 module Spree
   module Admin
     class InventoryItemsController < StockManagementsController
-      before_action :load_parent
-
-      # GET /products/:slug/inventory_items/prices?inventory_item_ids=1,2,3
-      def prices
-        inventory_item_ids = params[:inventory_item_ids]
-        @inventory_items = @product.inventory_items.where(id: inventory_item_ids)
-      end
-
-      # GET /products/:slug/inventory_items/stocks?inventory_item_ids=1,2,3
-      def stocks
-        inventory_item_ids = params[:inventory_item_ids]
-        @inventory_items = @product.inventory_items.where(id: inventory_item_ids)
-      end
-
-      # PATCH /products/:slug/inventory_items/bulk_update_prices
-      def bulk_update_prices # rubocop:disable Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
-        inventory_item_ids = params[:inventory_item_ids]
-        inventory_items = @product.inventory_items.where(id: inventory_item_ids)
-
-        inventory_items.each do |inventory_item|
-          params[:prices]&.values&.each do |price_params|
-            next if price_params[:price].empty?
+      include RatesAvailabilityCells
 
-            price = inventory_item.prices.find_or_initialize_by(currency: price_params[:currency])
-            price.price = price_params[:price]
-            price.compare_at_price = price_params[:compare_at_price].empty? ? nil : price_params[:compare_at_price]
-            price.variant_id = inventory_item.variant_id
-            price.save! if (price.new_record? && price.price) || (!price.new_record? && price.changed?)
-          end
-        end
-
-        flash[:success] = "Successfully updated prices for #{inventory_items.count} items"
-        redirect_back fallback_location: admin_product_stock_managements_path(@product)
-      end
+      DETAILS_PER_PAGE = 50
 
-      # PATCH /products/:slug/inventory_items/bulk_update_stocks
-      def bulk_update_stocks
-        inventory_item_ids = params[:inventory_item_ids]
-        inventory_items = @product.inventory_items.where(id: inventory_item_ids)
-        target_quantity = params[:quantity].to_i
-
-        if target_quantity.negative?
-          flash[:error] = "Target quantity (#{target_quantity}) must not be negative"
-          return redirect_back(fallback_location: admin_product_stock_managements_path(@product))
-        end
-
-        inventory_items.each do |inventory_item|
-          # Calculate the difference between target and current quantity
-          quantity_change = target_quantity - inventory_item.quantity_available
-
-          # Use adjust_quantity! to update max_capacity, quantity_available, and sync to Redis
-          inventory_item.adjust_quantity!(quantity_change)
-        end
+      before_action :load_parent
 
-        flash[:success] = "Successfully updated stocks for #{inventory_items.count} items"
-        redirect_back fallback_location: admin_product_stock_managements_path(@product)
-      end
+      helper SpreeCmCommissioner::Admin::RatesAvailabilitiesHelper
 
-      # PATCH /products/:slug/inventory_items/bulk_update_closed
+      # POST /products/:slug/inventory_items/details, JSON: { cells: [...], page: }
       #
-      # Ids travel in the form body, not the query string: a range across a year can be hundreds of ids.
-      def bulk_update_closed
-        closed = ActiveModel::Type::Boolean.new.cast(params[:closed])
-        count = @product.inventory_items.where(id: params[:inventory_item_ids]).update_all(closed: closed, updated_at: Time.current) # rubocop:disable Rails/SkipsModelValidations
-
-        flash[:success] = "#{closed ? 'Closed' : 'Reopened'} #{count} inventory items for sale"
-        redirect_back fallback_location: admin_product_stock_managements_path(@product)
+      # The Rates & Availability grid's stock details modal: the counts of each selected variant and date, as stock
+      # managements shows them. POST, as cells travel in the body.
+      def details
+        inventory_items = selected_inventory_items.page(params[:page]).per(DETAILS_PER_PAGE)
+        cached = SpreeCmCommissioner::RedisStock::CachedInventoryItemsBuilder.new(inventory_items.to_a).call.index_by(&:inventory_item_id)
+
+        render partial: 'details', formats: [:html], locals: {
+          inventory_items: inventory_items, cached_inventory_items: cached, cells: selected_cells
+        }
       end
 
       # PATCH /products/:slug/inventory_items/bulk_reset?inventory_item_ids=1,2,3
@@ -89,6 +41,25 @@ module Spree
 
         redirect_back fallback_location: admin_product_stock_managements_path(@product)
       end
+
+      private
+
+      # Price cells count too: each names a variant and a date. A dated product's Base has no inventory item.
+      def selected_inventory_items
+        pairs = selected_cells.map { |cell| [cell[:variant_id].to_i, cell[:date].presence] }.uniq
+        return SpreeCmCommissioner::InventoryItem.none if pairs.empty?
+
+        # Joined to the exact pairs: variant and date lists alone would also match every other variant on those dates.
+        values = pairs.map { |variant_id, date| ActiveRecord::Base.sanitize_sql_array(['(?, ?::date)', variant_id, date]) }.join(', ')
+        selected = "JOIN (VALUES #{values}) AS selected(variant_id, inventory_date) ON selected.variant_id = cm_inventory_items.variant_id " \
+                   'AND selected.inventory_date IS NOT DISTINCT FROM cm_inventory_items.inventory_date'
+        SpreeCmCommissioner::InventoryItem
+          .where(variant_id: @product.variants_including_master.select(:id))
+          .joins(selected)
+          .joins(:variant)
+          .order('spree_variants.position, cm_inventory_items.variant_id, cm_inventory_items.inventory_date')
+          .preload(variant: [:product, { option_values: :option_type }])
+      end
     end
   end
 end

data/app/controllers/spree/admin/product_option_types_controller.rb

@@ -0,0 +1,88 @@
+module Spree
+  module Admin
+    class ProductOptionTypesController < Spree::Admin::ResourceController
+      belongs_to 'spree/product', find_by: :slug
+
+      before_action :load_available_option_types, only: :index
+      before_action :ensure_not_used_by_variants, only: :destroy
+
+      # override: the base version finds ids across every product; scope them to this one.
+      def update_positions
+        ApplicationRecord.transaction do
+          params[:positions].each do |id, index|
+            parent.product_option_types.find(id).set_list_position(index)
+          end
+        end
+
+        head :ok
+      end
+
+      # One Save for the whole table instead of a submit per row. Only this product's rows are looked up,
+      # so ids belonging to another product are ignored.
+      def update_all
+        rows = parent.product_option_types.where(id: bulk_params.keys).index_by { |row| row.id.to_s }
+
+        ApplicationRecord.transaction do
+          bulk_params.each { |id, attributes| rows[id]&.update!(attributes) }
+        end
+
+        flash[:success] = I18n.t('spree.admin.product_option_types.saved')
+        redirect_to collection_url
+      rescue ActiveRecord::RecordInvalid => e
+        flash[:error] = e.record.errors.full_messages.to_sentence
+        redirect_to collection_url
+      end
+
+      private
+
+      # override
+      def collection_actions
+        super + [:update_all]
+      end
+
+      # { "<product_option_type id>" => { hidden:, presentation: } }
+      def bulk_params
+        @bulk_params ||= params.fetch(:product_option_types, {}).to_unsafe_h.to_h do |id, attributes|
+          [id.to_s, ActionController::Parameters.new(attributes).permit(:hidden, :presentation)]
+        end
+      end
+
+      # override
+      def collection
+        parent.product_option_types.includes(:option_type).order(:position)
+      end
+
+      # override
+      def model_class
+        Spree::ProductOptionType
+      end
+
+      # override: only create goes through the resource params; display settings are saved by #update_all.
+      def permitted_resource_params
+        params.require(:product_option_type).permit(:option_type_id)
+      end
+
+      def load_available_option_types
+        @available_option_types = Spree::OptionType.where(kind: %i[variant product])
+                                                   .where.not(id: parent.option_type_ids)
+                                                   .order(:presentation)
+      end
+
+      # Removing an option type that variants still carry values for would leave those values orphaned
+      # from the product's option types, the same rule the dashboard's variant options page enforces.
+      def ensure_not_used_by_variants
+        used = parent.variants_including_master.joins(:option_values)
+                     .exists?(spree_option_values: { option_type_id: @object.option_type_id })
+        return unless used
+
+        flash[:error] = I18n.t('spree.admin.product_option_types.still_used_by_variants', name: @object.display_presentation)
+
+        # link_to_delete removes over AJAX and only drops the row when the JS response carries a success flash.
+        respond_to do |format|
+          format.html { redirect_to collection_url }
+          format.js { render_js_for_destroy }
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/admin/rate_plans_controller.rb

@@ -0,0 +1,125 @@
+module Spree
+  module Admin
+    # A product's rate plans: the record (name, kind, adjustment, terms), not its prices, which the Rates &
+    # Availability grid edits. Forms open in a modal on that grid, so a save answers with no content and the
+    # grid reloads its rows, while an invalid form comes back as HTML to show in place.
+    class RatePlansController < Spree::Admin::BaseController
+      before_action :load_product
+      before_action :load_rate_plan, only: %i[edit update destroy]
+
+      helper SpreeCmCommissioner::Admin::RatesAvailabilitiesHelper
+      helper_method :rate_plan_option_types, :currencies
+
+      def new
+        variant = variants.find(params[:variant_id])
+        @rate_plan = variant.rate_plans.new(kind: :derived, adjustment_type: :percent)
+        render_form
+      end
+
+      def edit
+        render_form
+      end
+
+      # Also creates it on each variant in `also_variant_ids`, with the same terms.
+      def create
+        variant = variants.find(params[:variant_id])
+        also_variants = variants.where(id: params[:also_variant_ids]).where.not(id: variant.id)
+        @rate_plan = variant.rate_plans.new
+        rate_plans = [@rate_plan] + also_variants.map { |also_variant| also_variant.rate_plans.new }
+
+        save(rate_plans, rate_plan_params.merge(kind: params.dig(:rate_plan, :kind)))
+      end
+
+      # Kind stays as created: an independent rate plan has its own price rows, a derived one only date overrides.
+      def update
+        save([@rate_plan], rate_plan_params.merge(status: params.dig(:rate_plan, :status)).compact)
+      end
+
+      # Only a rate plan never sold: line items keep theirs (`restrict_with_error`), so a sold one is archived.
+      def destroy
+        if @rate_plan.destroy
+          head :no_content
+        else
+          render json: { error: @rate_plan.errors.full_messages.to_sentence }, status: :unprocessable_entity
+        end
+      end
+
+      # A dialog listing one variant's rate plans, archived too, as positions run across all of them.
+      def edit_order
+        @variant = variants.find(params[:variant_id])
+        render_order_form
+      end
+
+      # Saves the whole order at once, so a misclick in the dialog costs nothing until Save. `rate_plan_ids` must be
+      # exactly the variant's rate plans, or a plan added or deleted meanwhile would end up out of place.
+      def update_order
+        @variant = variants.find(params[:variant_id])
+        ids = Array(params[:rate_plan_ids]).map(&:to_i)
+        rate_plans = @variant.rate_plans.index_by(&:id)
+
+        return render_order_form(error: t('rates_availabilities.reorder_form.changed'), status: :conflict) unless ids.sort == rate_plans.keys.sort
+
+        # update_columns: acts_as_list would shift the others on every single save.
+        SpreeCmCommissioner::RatePlan.transaction do
+          ids.each.with_index(1) do |id, position|
+            rate_plans[id].update_columns(position: position, updated_at: Time.current) # rubocop:disable Rails/SkipsModelValidations
+          end
+        end
+
+        head :no_content
+      end
+
+      private
+
+      def rate_plan_option_types
+        @rate_plan_option_types ||= Spree::OptionType.where(kind: :rate_plan).includes(:option_values).order(:position)
+      end
+
+      def currencies
+        supported_currencies_for_all_stores.map(&:iso_code)
+      end
+
+      def save(rate_plans, attributes)
+        result = SpreeCmCommissioner::RatePlans::Save.call(
+          rate_plans: rate_plans,
+          attributes: attributes,
+          option_value_ids: Array(params.dig(:rate_plan, :option_value_ids)),
+          starting_prices: params.fetch(:starting_prices, {}).permit(*currencies).to_h
+        )
+
+        return head :no_content if result.success?
+
+        render_form(error: result.error.to_s, status: :unprocessable_entity)
+      end
+
+      def render_form(error: nil, status: :ok)
+        render partial: 'form', locals: { rate_plan: @rate_plan, error: error }, status: status
+      end
+
+      def render_order_form(error: nil, status: :ok)
+        rate_plans = @variant.rate_plans.includes(option_values: :option_type)
+        render partial: 'order_form', locals: { variant: @variant, rate_plans: rate_plans, error: error }, status: status
+      end
+
+      def rate_plan_params
+        params.require(:rate_plan).permit(:name, :adjustment_type, :adjustment_value, :currency)
+      end
+
+      def load_product
+        @product = Spree::Product.find_by!(slug: params[:product_id])
+      end
+
+      def load_rate_plan
+        @rate_plan = SpreeCmCommissioner::RatePlan.where(variant_id: variants.select(:id)).find(params[:id])
+      end
+
+      def variants
+        Spree::Variant.where(product_id: @product.id)
+      end
+
+      def model_class
+        SpreeCmCommissioner::RatePlan
+      end
+    end
+  end
+end