spree_cm_commissioner 1.14.0 → 1.16.0

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

@@ -20,12 +20,69 @@
   <!-- Description Field -->
   <div class="col-12">
     <%= f.field_container :description do %>
-      <%= f.label :description, raw(Spree.t(:description) + required_span_tag) %>
-      <%= f.text_area :description, required: true, class: 'form-control', placeholder: 'description' %>
+      <%= f.label :description, raw(Spree.t(:description)) %>
+      <%= f.text_area :description, class: 'form-control', placeholder: 'description' %>
       <%= f.error_message_on :description %>
     <% end %>
   </div>
 
+    <!-- Host Field -->
+  <div class="col-12">
+    <%= f.field_container :host do %>
+      <%= f.label :host, raw(Spree.t(:host) + required_span_tag) %>
+      <%= f.text_field :host, required: true, class: 'form-control', placeholder: 'host' %>
+      <%= f.error_message_on :host %>
+    <% end %>
+  </div>
+
+  <!-- Assetlinks Field -->
+  <div class="col-12">
+    <%= f.field_container :preferred_assetlinks do %>
+      <%= f.label :preferred_assetlinks, raw(Spree.t(:assetlinks)) %>
+      <%= f.text_area :preferred_assetlinks, class: 'form-control',
+          placeholder: 'example:
+          [
+            {
+              "relation": ["delegate_permission/common.handle_all_urls"],
+              "target": {
+                "namespace": "android_app",
+                "package_name": "com.yourapp.app",
+                "sha256_cert_fingerprints": [
+                  "SHA256_CERTIFICATE_FINGERPRINT_HERE"
+                ]
+              }
+            }
+          ]', rows: 5 %>
+      <%= f.error_message_on :preferred_assetlinks %>
+    <% end %>
+  </div>
+
+  <!-- Apple App Site Association Field -->
+  <div class="col-12">
+    <%= f.field_container :preferred_apple_app_site_association do %>
+      <%= f.label :preferred_apple_app_site_association, raw(Spree.t(:apple_app_site_association)) %>
+      <%= f.text_area :preferred_apple_app_site_association, class: 'form-control',
+          placeholder: 'example:
+          {
+            "webcredentials": {
+              "apps": [
+                "TEAM_ID.com.yourapp.app"
+              ]
+            },
+            "applinks": {
+              "apps": [],
+              "details": [
+                {
+                  "appID": "TEAM_ID.com.yourapp.app",
+                  "paths": ["*"]
+                }
+              ]
+            }
+          }', rows: 5 %>
+      <%= f.error_message_on :preferred_apple_app_site_association %>
+    <% end %>
+  </div>
+
   <!-- State Field -->
   <div class="col-6">
     <%= f.field_container :state do %>

data/config/initializers/spree_permitted_attributes.rb

@@ -39,8 +39,11 @@ module Spree
     ]
 
     @@store_attributes += [
+      :preferred_sms_sender_id,
       :preferred_telegram_order_alert_chat_id,
       :preferred_telegram_order_request_alert_chat_id,
+      :preferred_assetlinks,
+      :preferred_apple_app_site_association,
       { default_notification_image_attributes: {} },
       :term_and_condition_promotion
     ]

data/config/routes.rb

@@ -520,6 +520,12 @@ Spree::Core::Engine.add_routes do
 
         resources :cms_pages, only: %i[index show]
         resources :waiting_room_sessions, only: :create
+
+        resources :order_histories, only: %i[index] do
+          member do
+            patch :archive
+          end
+        end
       end
 
       namespace :storefront do
@@ -662,4 +668,5 @@ Rails.application.routes.draw do
   get 'o/:id', to: 'spree_cm_commissioner/orders#show', as: 'order'
   get 'li/:id', to: 'spree_cm_commissioner/line_item_qr_images#show', as: 'line_item_qr_image'
   get 'g/:id', to: 'spree_cm_commissioner/guest_cards#show', as: 'guest_cards'
+  get '.well-known/:id', to: 'spree_cm_commissioner/well_known#show', constraints: { id: /(assetlinks\.json|apple-app-site-association)/ }
 end

data/db/migrate/20250127081646_add_preferences_to_cm_tenants.rb

@@ -0,0 +1,7 @@
+class AddPreferencesToCmTenants < ActiveRecord::Migration[7.0]
+  def change
+    unless column_exists?(:cm_tenants, :preferences)
+      add_column :cm_tenants, :preferences, :text
+    end
+  end
+end

data/db/migrate/20250527043231_create_spree_commissioner_taxon_places.rb

@@ -0,0 +1,15 @@
+class CreateSpreeCommissionerTaxonPlaces < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cm_taxon_places, if_not_exists: true do |t|
+      t.references :place, null: false, foreign_key: { to_table: :cm_places }
+      t.references :taxon, null: false, foreign_key: { to_table: :spree_taxons }
+      t.integer :type, default: 0, null: false
+      t.integer :position, default: 0, null: false
+      t.text :description
+
+      t.index [:place_id, :taxon_id], unique: true
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250528090330_add_place_type_to_cm_vendor_place.rb

@@ -0,0 +1,6 @@
+class AddPlaceTypeToCmVendorPlace < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_vendor_places, :place_type, :integer, default: 0, null: false, if_not_exists: true
+    add_index :cm_vendor_places, :place_type, if_not_exists: true
+  end
+end

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/db/migrate/20250602094751_add_host_to_cm_tenants.rb

@@ -0,0 +1,6 @@
+class AddHostToCmTenants < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_tenants, :host, :string, if_not_exists: true
+    add_index :cm_tenants, :host, unique: true, if_not_exists: true
+  end
+end

data/db/migrate/20250609015216_remove_claimed_at_and_expires_at_from_cm_invite_guest.rb

@@ -0,0 +1,6 @@
+class RemoveClaimedAtAndExpiresAtFromCmInviteGuest < ActiveRecord::Migration[7.0]
+  def change
+    remove_column :cm_invite_guests, :claimed_at, :datetime, if_exists: true
+    remove_column :cm_invite_guests, :expires_at, :datetime, if_exists: true
+  end
+end

data/db/migrate/20250610080108_add_contact_to_cm_guests.rb

@@ -0,0 +1,5 @@
+class AddContactToCmGuests < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_guests, :contact, :string, if_not_exists: true
+  end
+end

data/db/migrate/20250611023548_add_country_code_to_guests.rb

@@ -0,0 +1,5 @@
+class AddCountryCodeToGuests < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_guests, :country_code, :string, limit: 5, if_not_exists: true
+  end
+end

data/db/migrate/20250612035937_add_intel_phone_number_to_guests.rb

@@ -0,0 +1,5 @@
+class AddIntelPhoneNumberToGuests < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_guests, :intel_phone_number, :string, if_not_exists: true
+  end
+end

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

@@ -0,0 +1,6 @@
+FactoryBot.define do
+  factory :invite_guest, class: SpreeCmCommissioner::InviteGuest do
+    association :order, factory: :order
+    token { SecureRandom.hex(16) }
+  end
+end

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

@@ -1,5 +1,6 @@
 FactoryBot.define do
   factory :cm_tenant, class: 'SpreeCmCommissioner::Tenant' do
     name { "Tenant_a" }
+    host { "tenant_a.example.com" }
   end
 end

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

@@ -1,8 +1,21 @@
 FactoryBot.define do
-  factory :cm_vendor_place, class: SpreeCmCommissioner::VendorPlace do
-    vendor    { vendor}
-    place     { place }
+  factory :vendor_place, class: SpreeCmCommissioner::VendorPlace do
+    association :vendor, factory: :vendor
+    association :place, factory: :cm_place
     distance  { FFaker::Number.decimal }
     position  { FFaker::Number.number }
+    place_type { :branch }
+
+    trait :branch do
+      place_type { :branch }
+    end
+
+    trait :stop do
+      place_type { :stop }
+    end
+
+    trait :locations do
+      place_type { :locations }
+    end
   end
-end
+end

data/lib/spree_cm_commissioner/version.rb

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

data/lib/spree_cm_commissioner.rb

@@ -5,6 +5,7 @@ require 'spree_auth_devise'
 require 'spree_multi_vendor'
 require 'blazer'
 require 'spree_extension'
+require 'spree_vpago'
 
 require 'spree_cm_commissioner/engine'
 require 'spree_cm_commissioner/version'

data/spree_cm_commissioner.gemspec

@@ -57,5 +57,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pg'
   s.add_development_dependency 'spree_dev_tools'
   s.add_dependency 'blazer', '~> 3.0.4'
+  s.add_dependency 'strong_password', '~> 0.0.10'
+  s.add_dependency 'spree_vpago'
   s.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.16.0
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-30 00:00:00.000000000 Z
+date: 2025-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -506,6 +506,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.4
+- !ruby/object:Gem::Dependency
+  name: strong_password
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.10
+- !ruby/object:Gem::Dependency
+  name: spree_vpago
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Add (optional) extension description here
 email: you@example.com
 executables: []
@@ -537,6 +565,12 @@ files:
 - app/assets/images/backend-accept_all.svg
 - app/assets/images/backend-alert_request_to_vendor.svg
 - app/assets/images/backend-reject_all.svg
+- app/assets/images/category_icons/art_icon.png
+- app/assets/images/category_icons/concert_icon.png
+- app/assets/images/category_icons/fundraising_icon.png
+- app/assets/images/category_icons/marathon_icon.png
+- app/assets/images/category_icons/online_icon.png
+- app/assets/images/category_icons/workshop_icon.png
 - app/assets/images/cm-24-hour-hot-water-icon.svg
 - app/assets/images/cm-ac-icon.svg
 - app/assets/images/cm-alarm-clock-icon.svg
@@ -868,6 +902,7 @@ files:
 - app/controllers/spree/api/v2/tenant/id_cards_controller.rb
 - app/controllers/spree/api/v2/tenant/line_items_controller.rb
 - app/controllers/spree/api/v2/tenant/notifications_controller.rb
+- app/controllers/spree/api/v2/tenant/order_histories_controller.rb
 - app/controllers/spree/api/v2/tenant/pin_code_checkers_controller.rb
 - app/controllers/spree/api/v2/tenant/pin_code_generators_controller.rb
 - app/controllers/spree/api/v2/tenant/products_controller.rb
@@ -952,6 +987,7 @@ files:
 - app/controllers/spree_cm_commissioner/line_item_qr_images_controller.rb
 - app/controllers/spree_cm_commissioner/orders_controller.rb
 - app/controllers/spree_cm_commissioner/qr_images_controller.rb
+- app/controllers/spree_cm_commissioner/well_known_controller.rb
 - app/errors/spree_cm_commissioner/connection_error.rb
 - app/errors/spree_cm_commissioner/exceeding_range_error.rb
 - app/errors/spree_cm_commissioner/payment_creation_error.rb
@@ -986,6 +1022,7 @@ files:
 - app/helpers/spree_cm_commissioner/billing/qrcodes_helper.rb
 - app/helpers/spree_cm_commissioner/pin_code_sender_helper.rb
 - app/helpers/spree_cm_commissioner/telegram/base_helper.rb
+- app/helpers/spree_cm_commissioner/transit/order_query_helper.rb
 - app/helpers/spree_cm_commissioner/transit/service_calendars_helper.rb
 - app/helpers/spree_cm_commissioner/transit/trip_helper.rb
 - app/interactors/spree_cm_commissioner/accommodation_search_detail.rb
@@ -1019,6 +1056,7 @@ files:
 - app/interactors/spree_cm_commissioner/firebase_id_token_provider.rb
 - app/interactors/spree_cm_commissioner/google_places_fetcher.rb
 - app/interactors/spree_cm_commissioner/guest_id_card_manager.rb
+- app/interactors/spree_cm_commissioner/host_matcher.rb
 - app/interactors/spree_cm_commissioner/id_card_image_updater.rb
 - app/interactors/spree_cm_commissioner/image_saver.rb
 - app/interactors/spree_cm_commissioner/import_csv_template_downloader.rb
@@ -1050,6 +1088,8 @@ files:
 - app/interactors/spree_cm_commissioner/pin_code_creator.rb
 - app/interactors/spree_cm_commissioner/pin_code_generator.rb
 - app/interactors/spree_cm_commissioner/pin_code_sender.rb
+- app/interactors/spree_cm_commissioner/place_decoder.rb
+- app/interactors/spree_cm_commissioner/place_service.rb
 - app/interactors/spree_cm_commissioner/product_event_id_to_children_syncer.rb
 - app/interactors/spree_cm_commissioner/profile_image_destroyer.rb
 - app/interactors/spree_cm_commissioner/profile_image_updater.rb
@@ -1138,6 +1178,7 @@ files:
 - app/mailers/spree_cm_commissioner/pin_code_mailer.rb
 - app/models/.gitkeep
 - app/models/concerns/spree_cm_commissioner/homepage_section_bitwise.rb
+- app/models/concerns/spree_cm_commissioner/json_preference_validator.rb
 - app/models/concerns/spree_cm_commissioner/kyc_bitwise.rb
 - app/models/concerns/spree_cm_commissioner/line_item_durationable.rb
 - app/models/concerns/spree_cm_commissioner/line_item_guests_concern.rb
@@ -1154,6 +1195,7 @@ files:
 - app/models/concerns/spree_cm_commissioner/service_calendar_type.rb
 - app/models/concerns/spree_cm_commissioner/store_preference.rb
 - app/models/concerns/spree_cm_commissioner/taxon_kind.rb
+- app/models/concerns/spree_cm_commissioner/tenant_preference.rb
 - app/models/concerns/spree_cm_commissioner/tenant_updatable.rb
 - app/models/concerns/spree_cm_commissioner/user_identity.rb
 - app/models/concerns/spree_cm_commissioner/user_notification.rb
@@ -1228,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
@@ -1290,6 +1333,7 @@ files:
 - app/models/spree_cm_commissioner/taxon_home_banner.rb
 - app/models/spree_cm_commissioner/taxon_option_type.rb
 - app/models/spree_cm_commissioner/taxon_option_value.rb
+- app/models/spree_cm_commissioner/taxon_place.rb
 - app/models/spree_cm_commissioner/taxon_vendor.rb
 - app/models/spree_cm_commissioner/taxon_video_banner.rb
 - app/models/spree_cm_commissioner/taxon_web_banner.rb
@@ -1313,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
@@ -1480,6 +1525,7 @@ files:
 - app/queries/spree_cm_commissioner/line_item_searcher_query.rb
 - app/queries/spree_cm_commissioner/organizer_profile_event_query.rb
 - app/queries/spree_cm_commissioner/pie_chart_event_aggregator_queries.rb
+- app/queries/spree_cm_commissioner/reservation_query.rb
 - app/queries/spree_cm_commissioner/subscription_orders_query.rb
 - app/queries/spree_cm_commissioner/subscription_revenue_overview_query.rb
 - app/queries/spree_cm_commissioner/tickets_searcher_query.rb
@@ -1543,6 +1589,7 @@ files:
 - app/serializers/spree/v2/tenant/asset_serializer.rb
 - app/serializers/spree/v2/tenant/base_serializer.rb
 - app/serializers/spree/v2/tenant/booking_card_class_serializer.rb
+- app/serializers/spree/v2/tenant/cart_serializer.rb
 - app/serializers/spree/v2/tenant/customer_notification_serializer.rb
 - app/serializers/spree/v2/tenant/digital_link_serializer.rb
 - app/serializers/spree/v2/tenant/guest_card_class_serializer.rb
@@ -1664,6 +1711,8 @@ files:
 - app/services/spree_cm_commissioner/order_params_checker.rb
 - app/services/spree_cm_commissioner/orders/generate_commissions_decorator.rb
 - app/services/spree_cm_commissioner/organizer/export_guest_csv_service.rb
+- app/services/spree_cm_commissioner/organizer/export_invite_guest_csv_service.rb
+- app/services/spree_cm_commissioner/payment_method_type_mapper.rb
 - app/services/spree_cm_commissioner/penalty_calculator.rb
 - app/services/spree_cm_commissioner/role_permissions_constructor.rb
 - app/services/spree_cm_commissioner/role_permissions_loader.rb
@@ -2387,6 +2436,7 @@ files:
 - db/migrate/20250124034128_add_tenant_id_to_spree_orders.rb
 - db/migrate/20250124034153_add_tenant_id_to_spree_products.rb
 - db/migrate/20250127081645_add_fields_to_cm_tenants.rb
+- db/migrate/20250127081646_add_preferences_to_cm_tenants.rb
 - db/migrate/20250131024730_add_tenant_id_to_cm_homepage_section.rb
 - db/migrate/20250212100328_add_foreign_key_to_spree_user_tenant_id.rb
 - db/migrate/20250214025007_add_required_self_check_in_location_to_spree_products.rb
@@ -2426,8 +2476,17 @@ files:
 - db/migrate/20250520044533_add_event_to_spree_line_items.rb
 - db/migrate/20250521024345_add_tenant_id_to_cm_waiting_room_sessions.rb
 - db/migrate/20250521095539_add_kyc_to_spree_variants.rb
+- db/migrate/20250527043231_create_spree_commissioner_taxon_places.rb
 - 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
+- db/migrate/20250611023548_add_country_code_to_guests.rb
+- db/migrate/20250612035937_add_intel_phone_number_to_guests.rb
 - docker-compose.yml
 - docs/option_types/attr_types.md
 - docs/private_key.pem
@@ -2483,6 +2542,7 @@ files:
 - lib/spree_cm_commissioner/test_helper/factories/id_card_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/image_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/invite_factory.rb
+- lib/spree_cm_commissioner/test_helper/factories/invite_guests_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/invite_user_event_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/line_item_factory.rb
 - lib/spree_cm_commissioner/test_helper/factories/line_item_seat_factory.rb