spree_cm_commissioner 2.0.0.pre.pre → 2.0.1.pre.pre

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

@@ -3,17 +3,21 @@
   <div class="col-6">
     <%= f.field_container :name do %>
       <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
-      <%= f.text_field :name, required: true, class: 'form-control', placeholder: 'eg. bookme plus'%>
-      <%= f.error_message_on :name %>
+      <%= f.text_field :name, required: true, class: 'form-control', placeholder: 'eg. bookme plus' %>
+      <% if f.object.errors[:name].any? %>
+        <div class="error text-danger"><%= f.object.errors[:name].join(', ') %></div>
+      <% end %>
     <% end %>
   </div>
 
-  <!-- Slug Field (only show if editing) -->
+  <!-- Slug Field -->
   <div class="col-6">
     <%= f.field_container :slug do %>
       <%= f.label :slug, raw(Spree.t(:slug)) %>
       <%= f.text_field :slug, class: 'form-control', placeholder: 'slug' %>
-      <%= f.error_message_on :slug %>
+      <% if f.object.errors[:slug].any? %>
+        <div class="error text-danger"><%= f.object.errors[:slug].join(', ') %></div>
+      <% end %>
     <% end %>
   </div>
 
@@ -22,16 +26,20 @@
     <%= f.field_container :description do %>
       <%= f.label :description, raw(Spree.t(:description)) %>
       <%= f.text_area :description, class: 'form-control', placeholder: 'description' %>
-      <%= f.error_message_on :description %>
+      <% if f.object.errors[:description].any? %>
+        <div class="error text-danger"><%= f.object.errors[:description].join(', ') %></div>
+      <% end %>
     <% end %>
   </div>
 
-    <!-- Host Field -->
+  <!-- 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 %>
+      <% if f.object.errors[:host].any? %>
+        <div class="error text-danger"><%= f.object.errors[:host].join(', ') %></div>
+      <% end %>
     <% end %>
   </div>
 
@@ -39,21 +47,26 @@
   <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 %>
+      <%= f.text_area :preferred_assetlinks, class: 'form-control', rows: 5,
+            placeholder: <<~JSON.strip
+              example:
+              [
+                {
+                  "relation": ["delegate_permission/common.handle_all_urls"],
+                  "target": {
+                    "namespace": "android_app",
+                    "package_name": "com.yourapp.app",
+                    "sha256_cert_fingerprints": [
+                      "SHA256_CERTIFICATE_FINGERPRINT_HERE"
+                    ]
+                  }
+                }
+              ]
+            JSON
+      %>
+      <% if f.object.errors[:preferred_assetlinks].any? %>
+        <div class="error text-danger"><%= f.object.errors[:preferred_assetlinks].join(', ') %></div>
+      <% end %>
     <% end %>
   </div>
 
@@ -61,25 +74,30 @@
   <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": ["*"]
+      <%= f.text_area :preferred_apple_app_site_association, class: 'form-control', rows: 5,
+            placeholder: <<~JSON.strip
+              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 %>
+              }
+            JSON
+      %>
+      <% if f.object.errors[:preferred_apple_app_site_association].any? %>
+        <div class="error text-danger"><%= f.object.errors[:preferred_apple_app_site_association].join(', ') %></div>
+      <% end %>
     <% end %>
   </div>
 
@@ -87,8 +105,57 @@
   <div class="col-6">
     <%= f.field_container :state do %>
       <%= f.label :state, raw(Spree.t(:state)) %>
-      <%= f.select :state, options_for_select([['Enabled', 'enabled'], ['Disabled', 'disabled']], @object.state), { required: true }, class: 'select2 form-control' %>
-      <%= f.error_message_on :state %>
+      <%= f.select :state,
+            options_for_select([['Enabled', 'enabled'], ['Disabled', 'disabled']], f.object&.state),
+            { required: true },
+            class: 'select2 form-control' %>
+      <% if f.object.errors[:state].any? %>
+        <div class="error text-danger"><%= f.object.errors[:state].join(', ') %></div>
+      <% end %>
     <% end %>
   </div>
 </div>
+
+<div data-hook="admin_tenant_form_fields" class="row">
+  <div class="col-12">
+    <div class="row gy-4">
+      <% payment_icon_fields = [
+          { field: :preferred_payment_checkout_image, label: Spree.t(:payment_checkout_image), target: 'checkout' },
+          { field: :preferred_payment_failed_image, label: Spree.t(:payment_failed_image), target: 'failed' },
+          { field: :preferred_payment_success_image, label: Spree.t(:payment_success_image), target: 'success' },
+          { field: :preferred_payment_loader, label: Spree.t(:payment_loader), target: 'loader' }
+        ] %>
+
+      <% payment_icon_fields.each do |icon| %>
+        <div class="col-md-3">
+          <%= f.field_container icon[:field] do %>
+            <div class="d-flex flex-column align-items-center text-center">
+              <label class="form-label fw-bold mb-2" for="tenant_<%= icon[:field] %>">
+                <%= icon[:label] %>
+              </label>
+
+              <div class="icon-preview-container mb-2" id="icon-preview-container-<%= icon[:field] %>">
+                <span class="payment-icon-preview" id="icon-preview-<%= icon[:field] %>">
+                  <% if f.object.send(icon[:field]).present? %>
+                    <%= render_vector_icon(f.object.send(icon[:field])) %>
+                  <% else %>
+                    <span class="no-icon-placeholder"></span>
+                  <% end %>
+                </span>
+                <span class="remove-icon-btn <%= 'hidden' unless f.object.send(icon[:field]).present? %>" data-target="<%= icon[:field] %>">&times;</span>
+              </div>
+            </div>
+
+            <%= f.collection_select icon[:field],
+                  @vector_icons, :path, :path,
+                  { include_blank: 'None' },
+                  { class: 'select2 form-control tenant-payment-icon-select mt-2', data: { target: icon[:target] } } %>
+            <% if f.object.errors[icon[:field]].any? %>
+              <div class="text-danger small mt-1"><%= f.object.errors[icon[:field]].join(', ') %></div>
+            <% end %>
+          <% end %>
+        </div>
+      <% end %>
+    </div>
+  </div>
+</div>

data/config/initializers/spree_permitted_attributes.rb

@@ -31,6 +31,8 @@ module Spree
       subtitle
       preferred_background_color
       preferred_foreground_color
+      preferred_group_check_in_enabled
+      preferred_individual_check_in_enabled
       show_badge_status
       purchasable_on
       available_on

data/config/locales/en.yml

@@ -459,6 +459,10 @@ en:
               businesses_cant_be_blank: "Businesses can't be blank"
               phone_number_cant_be_blank: "Phone number can't be blank"
               quantity_cant_be_less_than_or_equal_to_zero: "Quantity can't be less or equal than 0"
+        spree_cm_commissioner/vendor_place:
+          attributes:
+            place_id:
+              taken: "has already existed with this place type"
 
   mail:
     order_mailer:
@@ -543,6 +547,7 @@ en:
       update_user_login: "update user code"
       contact_update: "update contact code"
       otp_code: "OTP code"
+      telegram_verification: "telegram code"
 
   notifications:
     spree_cm_commissioner:

data/config/routes.rb

@@ -288,6 +288,7 @@ Spree::Core::Engine.add_routes do
       resources :vendors, controller: :tenant_vendors
     end
     resources :event_blazer_queries
+    resources :trip_blazer_queries
   end
 
   resources :events, controller: 'events/base' do
@@ -464,6 +465,7 @@ Spree::Core::Engine.add_routes do
         resources :images
         resource :s3_signed_urls
         resources :invites
+        resources :invite_crews, only: %i[show update]
         resources :invite_guests, only: %i[show update]
       end
 
@@ -688,5 +690,6 @@ 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)/ }
+  get '.well-known/assetlinks.json', to: 'spree_cm_commissioner/well_known#assetlinks_json'
+  get '.well-known/apple-app-site-association', to: 'spree_cm_commissioner/well_known#apple_app_site_association'
 end

data/db/migrate/20250616084219_add_description_to_cm_vendor_place.rb

@@ -0,0 +1,5 @@
+class AddDescriptionToCmVendorPlace < ActiveRecord::Migration[7.0]
+  def change
+      add_column :cm_vendor_places, :description, :string, if_not_exists: true
+  end
+end

data/db/migrate/20250630103536_create_cm_telegram_chats.rb

@@ -0,0 +1,13 @@
+class CreateCmTelegramChats < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cm_telegram_chats, if_not_exists: true do |t|
+      t.bigint :chat_id, null: false
+      t.string :chat_title
+      t.string :chat_type
+      t.boolean :active, default: false
+      t.references :vendor, foreign_key: { to_table: :spree_vendors }
+      t.timestamps
+    end
+    add_index :cm_telegram_chats, :chat_id, unique: true, if_not_exists: true
+  end
+end

data/db/migrate/20250701093203_add_configurations_to_cm_dynamic_field.rb

@@ -0,0 +1,6 @@
+class AddConfigurationsToCmDynamicField < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_dynamic_fields, :configurations, :jsonb, default: {}, null: false, if_not_exists: true
+    add_index :cm_dynamic_fields, :configurations, if_not_exists: true
+  end
+end

data/db/migrate/20250702091305_add_dynamic_field_option_to_guest_dynamic_field.rb

@@ -0,0 +1,5 @@
+class AddDynamicFieldOptionToGuestDynamicField < ActiveRecord::Migration[7.0]
+  def change
+    add_reference :cm_guest_dynamic_fields, :dynamic_field_option, index: true, foreign_key: { to_table: :cm_dynamic_field_options }, if_not_exists: true
+  end
+end

data/db/migrate/20250702091935_add_status_to_dynamic_field_option.rb

@@ -0,0 +1,5 @@
+class AddStatusToDynamicFieldOption < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_dynamic_field_options, :status, :integer, default: 0, if_not_exists: true
+  end
+end

data/db/migrate/20250707032008_add_vendor_id_to_spree_category.rb

@@ -0,0 +1,7 @@
+class AddVendorIdToSpreeCategory < ActiveRecord::Migration[7.0]
+  def change
+    unless column_exists?(:spree_promotion_categories, :vendor_id)
+      add_reference :spree_promotion_categories, :vendor, index: true, foreign_key: { to_table: :spree_vendors }
+    end
+  end
+end

data/db/migrate/20250711092937_add_position_to_cm_dynamic_fields.rb

@@ -0,0 +1,11 @@
+class AddPositionToCmDynamicFields < ActiveRecord::Migration[7.0]
+  def change
+    unless column_exists?(:cm_dynamic_fields, :position)
+      add_column :cm_dynamic_fields, :position, :integer, default: 0, null: false
+    end
+
+    unless index_exists?(:cm_dynamic_fields, :position, name: 'index_dynamic_fields_on_position')
+      add_index :cm_dynamic_fields, :position, name: 'index_dynamic_fields_on_position'
+    end
+  end
+end

data/db/migrate/20250711093045_add_position_to_cm_dynamic_field_options.rb

@@ -0,0 +1,11 @@
+class AddPositionToCmDynamicFieldOptions < ActiveRecord::Migration[7.0]
+  def change
+    unless column_exists?(:cm_dynamic_field_options, :position)
+      add_column :cm_dynamic_field_options, :position, :integer, default: 0, null: false
+    end
+
+    unless index_exists?(:cm_dynamic_field_options, :position, name: 'index_dynamic_field_options_on_position')
+      add_index :cm_dynamic_field_options, :position, name: 'index_dynamic_field_options_on_position'
+    end
+  end
+end

data/db/migrate/20250714121508_rename_cm_taxon_blazer_query_to_blazer_queryables.rb

@@ -0,0 +1,7 @@
+class RenameCmTaxonBlazerQueryToBlazerQueryables < ActiveRecord::Migration[7.0]
+  def change
+    if table_exists?(:cm_taxon_blazer_queries)
+      rename_table :cm_taxon_blazer_queries, :cm_blazer_queryables
+    end
+  end
+end

data/db/migrate/20250714124323_make_cm_blazer_queryables_polymorphic.rb

@@ -0,0 +1,19 @@
+class MakeCmBlazerQueryablesPolymorphic < ActiveRecord::Migration[7.0]
+  def change
+    if column_exists?(:cm_blazer_queryables, :taxon_id) && !column_exists?(:cm_blazer_queryables, :queryable_id)
+      rename_column :cm_blazer_queryables, :taxon_id, :queryable_id
+    end
+
+    unless column_exists?(:cm_blazer_queryables, :queryable_type)
+      add_column :cm_blazer_queryables, :queryable_type, :string, default: 'Spree::Taxon'
+    end
+
+    if foreign_key_exists?(:cm_blazer_queryables, column: :queryable_id)
+      remove_foreign_key :cm_blazer_queryables, column: :queryable_id
+    end
+
+    unless index_exists?(:cm_blazer_queryables, [:queryable_type, :queryable_id], name: 'index_cm_blazer_queryables_on_queryable_type_and_id')
+      add_index :cm_blazer_queryables, [:queryable_type, :queryable_id], name: 'index_cm_blazer_queryables_on_queryable_type_and_id'
+    end
+  end
+end

data/db/migrate/20250716022821_add_location_reference_to_cm_vendor_places.rb

@@ -0,0 +1,5 @@
+class AddLocationReferenceToCmVendorPlaces < ActiveRecord::Migration[7.0]
+  def change
+    add_reference :cm_vendor_places, :location, foreign_key: { to_table: :cm_vendor_places }, index: true, if_not_exists: true
+  end
+end

data/db/migrate/20250716031743_drop_table_cm_vendor_stops.rb

@@ -0,0 +1,5 @@
+class DropTableCmVendorStops < ActiveRecord::Migration[7.0]
+  def change
+    drop_table :cm_vendor_stops, if_exists: true
+  end
+end

data/db/migrate/20250717023824_add_vendor_reference_to_cm_trips.rb

@@ -0,0 +1,5 @@
+class AddVendorReferenceToCmTrips < ActiveRecord::Migration[7.0]
+  def change
+    add_reference :cm_trips, :vendor, foreign_key: { to_table: :spree_vendors }, index: true, if_not_exists: true
+  end
+end

data/db/migrate/20250717041414_add_location_place_reference_to_cm_trip_stops.rb

@@ -0,0 +1,5 @@
+class AddLocationPlaceReferenceToCmTripStops < ActiveRecord::Migration[7.0]
+  def change
+    add_reference :cm_trip_stops, :location_place, foreign_key: { to_table: :cm_places }, index: true, if_not_exists: true
+  end
+end

data/db/migrate/20250717042539_rename_cm_trip_stops_stop_id_column_to_stop_place_id.rb

@@ -0,0 +1,7 @@
+class RenameCmTripStopsStopIdColumnToStopPlaceId < ActiveRecord::Migration[7.0]
+  def change
+    if column_exists?(:cm_trip_stops, :stop_id)
+      rename_column :cm_trip_stops, :stop_id, :stop_place_id
+    end
+  end
+end

data/db/migrate/20250717042707_rename_cm_trips_origin_and_destination_to_origin_place_and_destination_place.rb

@@ -0,0 +1,11 @@
+class RenameCmTripsOriginAndDestinationToOriginPlaceAndDestinationPlace < ActiveRecord::Migration[7.0]
+  def change
+    if column_exists?(:cm_trips, :origin_id)
+      rename_column :cm_trips, :origin_id, :origin_place_id
+    end
+
+    if column_exists?(:cm_trips, :destination_id)
+      rename_column :cm_trips, :destination_id, :destination_place_id
+    end
+  end
+end

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

@@ -1,9 +1,15 @@
 FactoryBot.define do
   factory :cm_block, class: SpreeCmCommissioner::Block do
+    label { "Block #{rand(1.0..100.0)}" }
+
     association :seat_section, factory: :cm_seat_section
 
-    label { "A1" }
-    row_index { 1 }
-    column_index { 1 }
+    width { rand(10.0..100.0) }
+    height { rand(10.0..100.0) }
+
+    x { rand(0.0..500.0) }
+    y { rand(0.0..500.0) }
+
+    rotation { rand(-180.0..180.0) }
   end
 end

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

@@ -1,8 +1,11 @@
 FactoryBot.define do
   factory :cm_seat_layout, class: SpreeCmCommissioner::SeatLayout do
-    name { "VIP Layout" }
-    layout_type { :grid }
-    status { :active }
     association :layoutable, factory: :cm_vehicle
+
+    name { "Layout #{rand(1.0..50.0)}" }
+    status { :active }
+
+    width { rand(200.0..1000.0) }
+    height { rand(200.0..1000.0) }
   end
 end

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

@@ -1,8 +1,16 @@
 FactoryBot.define do
   factory :cm_seat_section, class: SpreeCmCommissioner::SeatSection do
+    name { "Section #{rand(1.0..50.0)}" }
+
     association :seat_layout, factory: :cm_seat_layout
-    name { "Front Section" }
-    row { 10 }
-    column { 10 }
+
+    width { rand(50.0..500.0) }
+    height { rand(50.0..500.0) }
+
+    x { rand(0.0..500.0) }
+    y { rand(0.0..500.0) }
+
+    rotation { rand(-180.0..180.0) }
+    shape_path { "M0,0 L10,0 L10,10 L0,10 Z" }
   end
 end

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

@@ -6,8 +6,9 @@ FactoryBot.define do
 
     product { create(:cm_product, product_type: :transit) }
 
+    association :vendor, factory: :cm_transit_vendor
     association :vehicle, factory: :cm_vehicle
-    association :origin, factory: :cm_place
-    association :destination, factory: :cm_place
+    association :origin_place, factory: :cm_place
+    association :destination_place, factory: :cm_place
   end
 end

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

@@ -0,0 +1,10 @@
+FactoryBot.define do
+  factory :cm_trip_stop, class: SpreeCmCommissioner::TripStop do
+    association :trip, factory: :cm_trip
+    association :stop_place, factory: :cm_place
+    association :location_place, factory: :cm_place
+
+    stop_type { :boarding }
+    stop_name { stop_place.name }
+  end
+end

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

@@ -1,4 +1,9 @@
 FactoryBot.define do
+  factory :cm_transit_vendor, parent: :vendor do
+    state { :active }
+    primary_product_type { :transit }
+  end
+
   factory :cm_vendor, parent: :vendor do
     state { :active }
     default_state_id { Spree::State.first&.id }

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

@@ -1,7 +1,19 @@
 FactoryBot.define do
-  factory :vendor_place, class: SpreeCmCommissioner::VendorPlace do
+  factory :cm_location_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 { :location }
+  end
+
+  factory :cm_vendor_place, class: SpreeCmCommissioner::VendorPlace do
+    association :vendor, factory: :vendor
+    association :place, factory: :cm_place
+    association :location, factory: :cm_location_vendor_place
+
     distance  { FFaker::Number.decimal }
     position  { FFaker::Number.number }
     place_type { :branch }

data/lib/spree_cm_commissioner/trip_query_result.rb

@@ -10,5 +10,13 @@ module SpreeCmCommissioner
     def direct?
       @trips.size == 1
     end
+
+    def quantity_available
+      @trips.map(&:quantity_available).compact.min
+    end
+
+    def max_capacity
+      @trips.map(&:max_capacity).compact.min
+    end
   end
 end

data/lib/spree_cm_commissioner/trip_result.rb

@@ -2,7 +2,7 @@ module SpreeCmCommissioner
   class TripResult
     attr_accessor :trip_id, :vendor_id, :vendor_name, :short_name, :route_name,
                   :origin_id, :origin, :destination_id, :destination,
-                  :total_sold, :total_seats,
+                  :quantity_available, :max_capacity,
                   :duration, :vehicle_id, :departure_time
 
     def initialize(options = {})
@@ -11,8 +11,10 @@ module SpreeCmCommissioner
       end
     end
 
-    def remaining_seats
-      total_seats - total_sold
+    def total_sold
+      return if max_capacity.nil? || quantity_available.nil?
+
+      max_capacity - quantity_available
     end
 
     def arrival_time

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.0.0-pre'.freeze
+  VERSION = '2.0.1-pre'.freeze
 
   module_function