spree_cm_commissioner 1.15.0.pre.beta1 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b81b8e884fba65cb5081f039fe5c4eafbe2873a355c69f844dbbd8205b70b3fe
-  data.tar.gz: 6c6648d65bc80caeabb0d6fab484086647b9c80bcebb4d36e3160210be7aa3d4
+  metadata.gz: 169845d2403406e562178fb3b438559b9d4cc42d93776513b5b7235399f69e2a
+  data.tar.gz: 5d7526b7df7150bddd97deb2989f08a014437b4c4c9efc8a318405d335e35e27
 SHA512:
-  metadata.gz: 37e68c1ba296971013b060663e13758907ff0a567c413f1899f6b1f88d4f5eb7a17ceea8695ded4dbca9dd3be0d06669038fbf19e81ff230446b8c7e651a395d
-  data.tar.gz: 85f7a966e0396433617edc3375909fb92ca88bae2118fec2af8a99bd2d16d6e9b1af013ed3ad3f0ca08539f8395cde3e5312ea792e4b4f3974ccd98b62fbefcb
+  metadata.gz: ba5ff297f04ed5f749794f56b8c38900d36ce76d5b78a7778c0e06007816004190745ad3664b038be3c84e30a540deb57715652ed6d8012593b57126a14dba9c
+  data.tar.gz: d83b272f1fe458cc17fa833e2edd1a643ffa9c25f888c8432bc4e08d10ce1b16e8a2e870b52532995448043dda00eab8473f50e8f687dbf11ee6e45eca58556e

data/Gemfile.lock

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

data/app/helpers/spree/admin/base_helper_decorator.rb

@@ -1,8 +1,8 @@
 module Spree
   module Admin
     module BaseHelperDecorator
-      def render_vector_icon(asset_path, _options = {})
-        return inline_svg_tag asset_path, size: '24px*24px' if asset_path.end_with?('.svg')
+      def render_vector_icon(asset_path, options = {})
+        return inline_svg_tag asset_path, size: options[:size] || '24px*24px' if asset_path.end_with?('.svg')
 
         image_tag asset_path, width: '24px'
       end

data/app/models/concerns/spree_cm_commissioner/tenant_preference.rb

@@ -5,7 +5,6 @@ module SpreeCmCommissioner
     included do
       preference :assetlinks, :string, default: ''
       preference :apple_app_site_association, :string, default: ''
-      preference :brand_primary_color, :string, default: ''
     end
   end
 end

data/app/models/spree_cm_commissioner/option_type_decorator.rb

@@ -14,6 +14,8 @@ module SpreeCmCommissioner
 
       base.has_many :variants, through: :products
 
+      base.has_many :vehicle_option_types, class_name: 'SpreeCmCommissioner::VehicleOptionType', foreign_key: :option_type_id, dependent: :destroy
+
       base.scope :promoted, -> { where(promoted: true) }
       base.whitelisted_ransackable_attributes = %w[kind]
 

data/app/models/spree_cm_commissioner/option_value_decorator.rb

@@ -2,6 +2,7 @@ module SpreeCmCommissioner
   module OptionValueDecorator
     def self.prepended(base)
       base.include SpreeCmCommissioner::OptionValueAttrType
+      base.has_many :option_value_vehicles, class_name: 'SpreeCmCommissioner::OptionValueVehicle', foreign_key: :option_value_id, dependent: :destroy
     end
 
     def display_icon

data/app/models/spree_cm_commissioner/option_value_vehicle.rb

@@ -0,0 +1,8 @@
+require_dependency 'spree_cm_commissioner'
+
+module SpreeCmCommissioner
+  class OptionValueVehicle < ApplicationRecord
+    belongs_to :vehicle, class_name: 'SpreeCmCommissioner::Vehicle'
+    belongs_to :option_value, class_name: 'Spree::OptionValue'
+  end
+end

data/app/models/spree_cm_commissioner/vehicle.rb

@@ -13,6 +13,9 @@ module SpreeCmCommissioner
     has_many :vehicle_photo, class_name: 'SpreeCmCommissioner::VehiclePhoto', as: :viewable, dependent: :destroy
     has_many :vehicle_seats, class_name: 'SpreeCmCommissioner::VehicleSeat', through: :vehicle_type
 
+    has_many :vehicle_option_types, class_name: 'SpreeCmCommissioner::VehicleOptionType', dependent: :destroy
+    has_many :option_value_vehicles, class_name: 'SpreeCmCommissioner::OptionValueVehicle', dependent: :destroy
+
     validates :code, uniqueness: { scope: :vendor_id }, presence: true
     validates :license_plate, uniqueness: {}, allow_blank: true
 

data/app/models/spree_cm_commissioner/vehicle_option_type.rb

@@ -0,0 +1,6 @@
+module SpreeCmCommissioner
+  class VehicleOptionType < ApplicationRecord
+    belongs_to :vehicle, class_name: 'SpreeCmCommissioner::Vehicle'
+    belongs_to :option_type, class_name: 'Spree::OptionType'
+  end
+end

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

@@ -83,15 +83,6 @@
     <% end %>
   </div>
 
-  <!-- Brand Primary Color Field -->
-  <div class="col-md-6">
-    <%= f.label :preferred_brand_primary_color, Spree.t(:brand_primary_color), class: 'form-label' %>
-    <%= f.text_field :preferred_brand_primary_color, class: 'form-control color-picker', placeholder: '#FF5733', value: @object.preferred_brand_primary_color %>
-    <div class="color-preview" style="margin-top: 10px;">
-      <%= content_tag :div, nil, style: "background-color: #{@object.preferred_brand_primary_color}; width: 60px; height: 60px; border: 1px solid #ccc; box-sizing: border-box; display: block;" %>
-    </div>
-  </div>
-
   <!-- State Field -->
   <div class="col-6">
     <%= f.field_container :state do %>

data/db/migrate/20250531074036_create_spree_cm_commissioner_option_value_vehicle.rb

@@ -0,0 +1,10 @@
+class CreateSpreeCmCommissionerOptionValueVehicle < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cm_option_value_vehicles, if_not_exists: true do |t|
+      t.references :option_value
+      t.references :vehicle
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250531074258_create_spree_cm_commissioner_vehicle_option_types.rb

@@ -0,0 +1,10 @@
+class CreateSpreeCmCommissionerVehicleOptionTypes < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cm_vehicle_option_types, if_not_exists: true do |t|
+      t.references :vehicle
+      t.references :option_type
+
+      t.timestamps
+    end
+  end
+end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '1.15.0-beta1'.freeze
+  VERSION = '1.16.0'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 1.15.0.pre.beta1
+  version: 1.16.0
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-19 00:00:00.000000000 Z
+date: 2025-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -1270,6 +1270,7 @@ files:
 - app/models/spree_cm_commissioner/oauth_application_decorator.rb
 - app/models/spree_cm_commissioner/option_type_decorator.rb
 - app/models/spree_cm_commissioner/option_value_decorator.rb
+- app/models/spree_cm_commissioner/option_value_vehicle.rb
 - app/models/spree_cm_commissioner/option_value_vehicle_type.rb
 - app/models/spree_cm_commissioner/option_value_vendor.rb
 - app/models/spree_cm_commissioner/order/address_book_decorator.rb
@@ -1356,6 +1357,7 @@ files:
 - app/models/spree_cm_commissioner/variant_options.rb
 - app/models/spree_cm_commissioner/vector_icon.rb
 - app/models/spree_cm_commissioner/vehicle.rb
+- app/models/spree_cm_commissioner/vehicle_option_type.rb
 - app/models/spree_cm_commissioner/vehicle_photo.rb
 - app/models/spree_cm_commissioner/vehicle_seat.rb
 - app/models/spree_cm_commissioner/vehicle_type.rb
@@ -2478,6 +2480,8 @@ files:
 - db/migrate/20250528073748_remove_unique_slug_index_on_spree_cms_pages.rb
 - db/migrate/20250528074043_add_unique_index_on_slug_tenant_id_deleted_at_to_spree_cms_pages.rb
 - db/migrate/20250528090330_add_place_type_to_cm_vendor_place.rb
+- db/migrate/20250531074036_create_spree_cm_commissioner_option_value_vehicle.rb
+- db/migrate/20250531074258_create_spree_cm_commissioner_vehicle_option_types.rb
 - db/migrate/20250602094751_add_host_to_cm_tenants.rb
 - db/migrate/20250609015216_remove_claimed_at_and_expires_at_from_cm_invite_guest.rb
 - db/migrate/20250610080108_add_contact_to_cm_guests.rb
@@ -2635,9 +2639,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - none
 rubygems_version: 3.4.1