spree_cm_commissioner 2.0.3.pre.pre6 → 2.0.3.pre.pre8

data/app/models/spree_cm_commissioner/taxon_decorator.rb

@@ -46,6 +46,7 @@ module SpreeCmCommissioner
       base.validates_associated :category_icon
       base.before_save :set_kind
       base.before_save :set_slug
+      base.before_save :normalize_custom_redirect_url
 
       base.after_update :sync_event_dates_to_line_items, if: -> { saved_change_to_from_date? || saved_change_to_to_date? }
 
@@ -140,6 +141,12 @@ module SpreeCmCommissioner
 
       ::SpreeCmCommissioner::EventLineItemsDateSyncerJob.perform_later(id)
     end
+
+    private
+
+    def normalize_custom_redirect_url
+      self.custom_redirect_url = nil if custom_redirect_url.blank?
+    end
   end
 end
 

data/app/models/spree_cm_commissioner/user_decorator.rb

@@ -90,7 +90,7 @@ module SpreeCmCommissioner
 
     def vendor_organizer?(vendor)
       spree_roles.any? do |role|
-        role.name == "#{vendor.name.downcase.parameterize(separator: '-')}-organizer"
+        role.name == "#{vendor.id}-organizer"
       end
     end
 

data/app/models/spree_cm_commissioner/variant_options.rb

@@ -139,6 +139,10 @@ module SpreeCmCommissioner
       @seat_number_layouts ||= option_value_name_for(option_type_name: 'seat-number-layouts')&.split(',')
     end
 
+    def seat_type
+      @seat_type ||= option_value_name_for(option_type_name: 'seat-type')
+    end
+
     # can consider as customers.
     def number_of_guests
       number_of_adults + number_of_kids

data/app/models/spree_cm_commissioner/vehicle.rb

@@ -12,6 +12,8 @@ module SpreeCmCommissioner
     has_many :vehicle_option_types, class_name: 'SpreeCmCommissioner::VehicleOptionType', dependent: :destroy
     has_many :option_value_vehicles, class_name: 'SpreeCmCommissioner::OptionValueVehicle', dependent: :destroy
     has_many :option_values, through: :option_value_vehicles, class_name: 'Spree::OptionValue'
+    has_many :amenities, through: :option_value_vehicles, source: :option_value
+
     validates :code, uniqueness: { scope: :vendor_id }, presence: true
     validates :license_plate, uniqueness: true, allow_blank: true
 

data/app/overrides/spree/admin/shared/sub_menu/_configuration/locations_tab.html.erb.deface

@@ -0,0 +1,5 @@
+<!-- insert_top "[data-hook='admin_configurations_sidebar_menu']" -->
+
+<%= tab :locations, match_path: '/locations', label: 'locations' if can? :manage, SpreeCmCommissioner::Place %>
+
+

data/app/serializers/{spree → spree_cm_commissioner}/v2/storefront/amenity_serializer.rb

@@ -1,11 +1,11 @@
-module Spree
+module SpreeCmCommissioner
   module V2
     module Storefront
       class AmenitySerializer < BaseSerializer
         set_type :amenity
         attributes :name, :presentation
         attribute :display_icon do |option_value|
-          ActionController::Base.helpers.image_url(option_value.display_icon)
+          ::ActionController::Base.helpers.image_url(option_value.display_icon)
         rescue StandardError
           nil
         end

data/app/serializers/spree_cm_commissioner/v2/storefront/block_serializer.rb

@@ -0,0 +1,9 @@
+module SpreeCmCommissioner
+  module V2
+    module Storefront
+      class BlockSerializer < BaseSerializer
+        attributes :label, :width, :height, :x, :y, :rotation, :block_type
+      end
+    end
+  end
+end

data/app/serializers/spree_cm_commissioner/v2/storefront/guest_serializer.rb

@@ -7,7 +7,7 @@ module SpreeCmCommissioner
         attributes :first_name, :last_name, :dob, :gender, :kyc_fields, :other_occupation, :created_at, :updated_at,
                    :qr_data, :social_contact_platform, :social_contact, :available_social_contact_platforms,
                    :age, :emergency_contact, :other_organization, :expectation, :upload_later, :address, :formatted_bib_number, :phone_number,
-                   :token, :country_code, :contact
+                   :token, :country_code, :contact, :data_fill_stage_phase
 
         # temporary, once app release after cm-app v1.9.1, we no longer need this.
         attribute :seat_number do |object|
@@ -22,8 +22,6 @@ module SpreeCmCommissioner
         belongs_to :nationality, serializer: Spree::V2::Storefront::TaxonSerializer
         belongs_to :line_item, serializer: Spree::V2::Storefront::LineItemSerializer
 
-        has_many :guest_dynamic_fields, serializer: SpreeCmCommissioner::V2::Storefront::GuestDynamicFieldSerializer
-
         has_one :id_card, serializer: Spree::V2::Storefront::IdCardSerializer
         has_one :check_in
 

data/app/serializers/spree_cm_commissioner/v2/storefront/seat_layout_serializer.rb

@@ -0,0 +1,12 @@
+module SpreeCmCommissioner
+  module V2
+    module Storefront
+      class SeatLayoutSerializer < BaseSerializer
+        attributes :name, :status, :width, :height
+
+        has_many :seat_sections, serializer: SpreeCmCommissioner::V2::Storefront::SeatSectionSerializer
+        has_many :top_level_blocks, serializer: SpreeCmCommissioner::V2::Storefront::BlockSerializer
+      end
+    end
+  end
+end

data/app/serializers/spree_cm_commissioner/v2/storefront/seat_section_serializer.rb

@@ -0,0 +1,11 @@
+module SpreeCmCommissioner
+  module V2
+    module Storefront
+      class SeatSectionSerializer < BaseSerializer
+        attributes :name, :width, :height, :x, :y, :rotation, :shape_path
+
+        has_many :blocks, serializer: SpreeCmCommissioner::V2::Storefront::BlockSerializer
+      end
+    end
+  end
+end

data/app/serializers/{spree → spree_cm_commissioner}/v2/storefront/trip_place_serializer.rb

@@ -1,4 +1,4 @@
-module Spree
+module SpreeCmCommissioner
   module V2
     module Storefront
       class TripPlaceSerializer < BaseSerializer

data/app/serializers/{spree → spree_cm_commissioner}/v2/storefront/trip_query_result_serializer.rb

@@ -1,4 +1,4 @@
-module Spree
+module SpreeCmCommissioner
   module V2
     module Storefront
       class TripQueryResultSerializer < BaseSerializer
@@ -7,7 +7,7 @@ module Spree
         attributes :quantity_available, :max_capacity
 
         attribute :direct, &:direct?
-        has_many :trips, serializer: Spree::V2::Storefront::TripResultSerializer
+        has_many :trips, serializer: ::SpreeCmCommissioner::V2::Storefront::TripResultSerializer
       end
     end
   end

data/app/serializers/{spree → spree_cm_commissioner}/v2/storefront/trip_result_serializer.rb

@@ -1,4 +1,4 @@
-module Spree
+module SpreeCmCommissioner
   module V2
     module Storefront
       class TripResultSerializer < BaseSerializer
@@ -8,9 +8,9 @@ module Spree
                    :allow_seat_selection, :departure_time, :route_type
         attribute :duration_in_hms, &:duration_in_hms
         attribute :arrival_time, &:arrival_time
-        belongs_to :vendor, serializer: Spree::V2::Storefront::TripVendorSerializer
-        belongs_to :vehicle, serializer: Spree::V2::Storefront::TripVehicleSerializer
-        has_many :amenities, serializer: Spree::V2::Storefront::AmenitySerializer
+        belongs_to :vendor, serializer: ::SpreeCmCommissioner::V2::Storefront::TripVendorSerializer
+        belongs_to :vehicle, serializer: ::SpreeCmCommissioner::V2::Storefront::TripVehicleSerializer
+        has_many :amenities, serializer: ::SpreeCmCommissioner::V2::Storefront::AmenitySerializer
       end
     end
   end

data/app/serializers/spree_cm_commissioner/v2/storefront/trip_serializer.rb

@@ -0,0 +1,17 @@
+module SpreeCmCommissioner
+  module V2
+    module Storefront
+      class TripSerializer < BaseSerializer
+        attributes :departure_time, :arrival_time, :duration_in_hms, :origin_place, :destination_place, :route_type
+
+        has_one :vehicle, serializer: ::SpreeCmCommissioner::V2::Storefront::TripVehicleSerializer
+
+        has_many :boarding_trip_stops, serializer: ::SpreeCmCommissioner::V2::Storefront::TripStopSerializer
+        has_many :drop_off_trip_stops, serializer: ::SpreeCmCommissioner::V2::Storefront::TripStopSerializer
+        has_many :variants, serializer: ::SpreeCmCommissioner::V2::Storefront::TripVariantSerializer
+
+        belongs_to :vendor, serializer: ::SpreeCmCommissioner::V2::Storefront::TripVendorSerializer
+      end
+    end
+  end
+end

data/app/serializers/spree_cm_commissioner/v2/storefront/trip_stop_serializer.rb

@@ -0,0 +1,9 @@
+module SpreeCmCommissioner
+  module V2
+    module Storefront
+      class TripStopSerializer < BaseSerializer
+        attributes :id, :stop_place, :arrival_time, :departure_time
+      end
+    end
+  end
+end

data/app/serializers/spree_cm_commissioner/v2/storefront/trip_variant_serializer.rb

@@ -0,0 +1,12 @@
+module SpreeCmCommissioner
+  module V2
+    module Storefront
+      class TripVariantSerializer < BaseSerializer
+        attributes :price, :display_price, :compare_at_price, :display_compare_at_price,
+                   :number_of_guests, :seat_type
+
+        has_many :variant_blocks, serializer: ::SpreeCmCommissioner::V2::Storefront::VariantBlockSerializer
+      end
+    end
+  end
+end

data/app/serializers/spree_cm_commissioner/v2/storefront/trip_vehicle_serializer.rb

@@ -0,0 +1,16 @@
+module SpreeCmCommissioner
+  module V2
+    module Storefront
+      class TripVehicleSerializer < BaseSerializer
+        set_type :vehicle
+
+        attributes :id, :code, :vehicle_type
+
+        has_many :vehicle_photos, serializer: ::SpreeCmCommissioner::V2::Storefront::AssetSerializer
+        has_many :amenities, serializer: ::SpreeCmCommissioner::V2::Storefront::AmenitySerializer
+
+        has_one :seat_layout, serializer: SpreeCmCommissioner::V2::Storefront::SeatLayoutSerializer
+      end
+    end
+  end
+end

data/app/serializers/{spree → spree_cm_commissioner}/v2/storefront/trip_vendor_serializer.rb

@@ -1,4 +1,4 @@
-module Spree
+module SpreeCmCommissioner
   module V2
     module Storefront
       class TripVendorSerializer < BaseSerializer
@@ -7,6 +7,9 @@ module Spree
         attributes :name, :star_rating
 
         has_one :logo, serializer: ::SpreeCmCommissioner::V2::Storefront::AssetSerializer
+
+        has_many :vendor_kind_option_types, serializer: ::Spree::V2::Storefront::OptionTypeSerializer
+        has_many :vendor_kind_option_values, serializer: ::Spree::V2::Storefront::OptionValueSerializer
       end
     end
   end

data/app/serializers/spree_cm_commissioner/v2/storefront/variant_block_serializer.rb

@@ -0,0 +1,9 @@
+module SpreeCmCommissioner
+  module V2
+    module Storefront
+      class VariantBlockSerializer < BaseSerializer
+        attributes :variant_id, :block_id
+      end
+    end
+  end
+end

data/app/views/shared/_map.html.erb

@@ -1,14 +1,15 @@
-<div class="border rounded mb-4"><div id="map" class="rounded" style="height: 200px;"></div></div>
+<% map_height ||= 200 %>
 
+<div class="border rounded mb-4">
+  <div id="map" class="rounded" style="height: <%= map_height %>px;"></div>
+</div>
 <% @default_latlon = ENV.fetch("DEFAULT_LATLON") %>
 <% @default_lat = @default_latlon.split(",")[0] %>
 <% @default_lon = @default_latlon.split(",")[1] %>
-
 <%= content_tag :div, class: 'map-selector', data: {
-  lat: lat || @default_lat, 
+  lat: lat || @default_lat,
   lon: lon || @default_lon
 } do %><% end %>
-
 <%# MAP scripts %>
 <% @map_key = ENV.fetch("GOOGLE_MAP_KEY") %>
 <% @map_src = "https://maps.googleapis.com/maps/api/js?key=#{@map_key}&callback=initMap&v=weekly" %>

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

@@ -0,0 +1,133 @@
+<div class="row g-4" data-controller="place">
+  <div class="col-md-6">
+    <div class="form-group">
+      <%= f.field_container :base_64_content do %>
+        <%= f.label :base_64_content, Spree.t(:place) %>
+        <% if can? :modify, SpreeCmCommissioner::Place %>
+          <% selected_name = f.object.name.presence || f.object.formatted_address || "Search Place" %>
+          <%= f.select :base_64_content, [], { include_hidden: true },
+            class: 'select2autocomplete',
+            data: {
+              autocomplete_url_value: 'places_api_v2',
+              autocomplete_return_attr_value: :name,
+              autocomplete_custom_return_id_value: :base_64_content
+            } do %>
+            <option selected><%= selected_name %></option>
+          <% end %>
+        <% end %>
+      <% end %>
+    </div>
+
+    <%= render 'shared/map', lat: f.object.lat, lon: f.object.lon, map_height: 270 %>
+  </div>
+
+  <div class="col-md-6">
+    <div class="card shadow-sm border-0">
+      <div class="card-header bg-light fw-semibold">
+        <i class="bi bi-geo-alt-fill me-2"></i><%= Spree.t(:location_details) %>
+      </div>
+
+      <div class="card-body">
+        <div class="mb-3">
+          <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
+          <%= f.text_field :name,
+                class: "form-control",
+                placeholder: "Enter your name",
+                required: :required,
+                data: { target: "place.name" } %>
+          <%= error_message_on(f.object, :name) %>
+        </div>
+
+        <div class="row">
+          <div class="col-md-6 mb-3">
+            <%= f.label :lat, Spree.t(:lat), class: "form-label" %>
+            <%= f.text_field :lat,
+                  class: "form-control",
+                  placeholder: "e.g., 11.5621",
+                  data: { target: "place.lat" } %>
+            <%= error_message_on(f.object, :lat) %>
+          </div>
+
+          <div class="col-md-6 mb-3">
+            <%= f.label :lon, Spree.t(:lon), class: "form-label" %>
+            <%= f.text_field :lon,
+                  class: "form-control",
+                  placeholder: "e.g., 104.9143",
+                  data: { target: "place.lon" } %>
+            <%= error_message_on(f.object, :lon) %>
+          </div>
+        </div>
+
+        <div class="mb-3">
+          <%= f.label :formatted_address, Spree.t(:address), class: "form-label" %>
+          <%= f.text_field :formatted_address,
+                class: "form-control",
+                placeholder: "Enter your address",
+                data: { target: "place.address" } %>
+          <%= error_message_on(f.object, :formatted_address) %>
+        </div>
+
+        <%= f.hidden_field :reference, value: f.object.reference, data: { target: "place.reference" } %>
+        <%= f.hidden_field :types, value: f.object.types, data: { target: "place.types" } %>
+        <%= f.hidden_field :vicinity, value: f.object.vicinity, data: { target: "place.vicinity" } %>
+        <%= f.hidden_field :icon, value: f.object.icon, data: { target: "place.icon" } %>
+        <%= f.hidden_field :rating, value: f.object.rating, data: { target: "place.rating" } %>
+      </div>
+    </div>
+  </div>
+</div>
+
+<script>
+  let map, marker;
+
+  function initMap() {
+    const mapElement = document.getElementById("map");
+    if (!mapElement) return;
+
+    const container = document.querySelector(".map-selector");
+    const defaultLat = parseFloat(container?.dataset.lat) || 11.5621;
+    const defaultLon = parseFloat(container?.dataset.lon) || 104.8885;
+
+    const center = { lat: defaultLat, lng: defaultLon };
+
+    map = new google.maps.Map(mapElement, { center, zoom: 18 });
+    marker = new google.maps.Marker({ position: center, map });
+  }
+
+  document.addEventListener("spree:load", () => {
+    const select = document.querySelector(".select2autocomplete");
+    if (!select) return;
+
+    $(select).on("select2:select", (e) => {
+      const base64Content = e.params.data.id;
+      if (!base64Content) return;
+
+      try {
+        const placeData = JSON.parse(atob(base64Content));
+
+        const setValue = (selector, value) => {
+          const el = document.querySelector(selector);
+          if (el) el.value = value ?? "";
+        };
+
+        setValue('[data-target="place.name"]', placeData.name);
+        setValue('[data-target="place.lat"]', placeData.lat);
+        setValue('[data-target="place.lon"]', placeData.lon);
+        setValue('[data-target="place.address"]', placeData.formatted_address);
+        setValue('[data-target="place.reference"]', placeData.reference);
+        setValue('[data-target="place.types"]', placeData.types?.[0] || "");
+        setValue('[data-target="place.vicinity"]', placeData.vicinity);
+        setValue('[data-target="place.icon"]', placeData.icon);
+        setValue('[data-target="place.rating"]', placeData.rating);
+
+        if (placeData.lat && placeData.lon && map && marker) {
+          const newLatLng = new google.maps.LatLng(+placeData.lat, +placeData.lon);
+          map.setCenter(newLatLng);
+          marker.setPosition(newLatLng);
+        }
+      } catch (err) {
+        console.error("Error decoding or parsing place data:", err);
+      }
+    });
+  });
+</script>

data/app/views/spree/admin/locations/edit.html.erb

@@ -0,0 +1,11 @@
+<% content_for :page_title do %>
+  <%= page_header_back_button spree.admin_locations_path %>
+  <%= @object.name %>
+<% end %>
+
+<%= form_with model: @object, url: { action: 'update' }, html: { multipart: true } do |f| %>
+  <fieldset>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/edit_resource_links' %>
+  </fieldset>
+<% end %>

data/app/views/spree/admin/locations/index.html.erb

@@ -0,0 +1,67 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:locations) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <% if can?(:create, SpreeCmCommissioner::Place) %>
+    <%= button_link_to Spree.t(:new_location),
+                     new_object_url,
+                     class: "btn-success",
+                     icon: "add.svg",
+                     id: "admin_new_location" %>
+  <% end %>
+<% end %>
+
+<% content_for :table_filter do %>
+  <div data-hook="admin_locations_index_search">
+    <%= search_form_for [:admin, @search], url: spree.admin_locations_path do |f| %>
+      <div class="row">
+        <div class="col-md-6">
+          <div class="form-group">
+            <%= label_tag :q_name_cont, Spree.t(:name) %>
+            <%= f.text_field :name_cont, tabindex: 1, class: "form-control js-quick-search-target" %>
+          </div>
+        </div>
+      </div>
+      <div data-hook="admin_locations_index_search_buttons" class="form-actions">
+        <%= button Spree.t(:filter_results), 'search' %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
+
+<div class="table-responsive border rounded bg-white mb-3" >
+  <table class="table" id="listing_locations" data-hook>
+    <thead class="text-muted">
+      <tr data-hook="location_header">
+        <th><%= sort_link @search, :name, Spree.t(:name), {}, { title: 'name' } %></th>
+        <th><%= Spree.t(:address) %></th>
+        <th><%= Spree.t(:latitude) %></th>
+        <th><%= Spree.t(:longitude) %></th>
+        <th><%= sort_link @search, :created_at, Spree.t(:created_at), {}, { title: 'created_at' } %></th>
+        <th><%= sort_link @search, :updated_at, Spree.t(:updated_at), {}, { title: 'updated_at' } %></th>
+        <th scope="col" data-hook="admin_locations_actions" class="actions"></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @locations.each do |location| %>
+        <tr id="<%= spree_dom_id(location) %>" data-hook="location_row">
+          <td><%= link_to location.name, spree.edit_admin_location_path(location) %></td>
+          <td><%= location.formatted_address.presence || location.vicinity %></td>
+          <td><%= location.lat %></td>
+          <td><%= location.lon %></td>
+          <td><%= location.created_at %></td>
+          <td><%= location.updated_at %></td>
+          <td data-hook="admin_locations_index_row_actions">
+            <span class="d-flex justify-content-end ">
+              <%= link_to_edit(location, url: edit_admin_location_url(location), no_text: true, class: 'edit') if can?(:edit, location) %>
+              <%= link_to_delete(location, url: admin_location_url(location), no_text: true) if can?(:delete, location) %>
+            </span>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>
+
+<%= paginate @locations, theme: 'admin-twitter-bootstrap-4' %>

data/app/views/spree/admin/locations/new.html.erb

@@ -0,0 +1,11 @@
+<% content_for :page_title do %>
+  <%= page_header_back_button spree.admin_locations_path %>
+  <%= Spree.t(:new_location) %>
+<% end %>
+
+<%= form_with model: @object, url: { action: 'create' }, html: { multipart: true } do |f| %>
+  <fieldset>
+    <%= render partial: 'form', locals: { f: f } %>
+    <%= render partial: 'spree/admin/shared/new_resource_links' %>
+  </fieldset>
+<% end %>

data/config/locales/en.yml

@@ -117,6 +117,8 @@ en:
     empty_info: "No <b>Photos</b> found."
   nearby_place:
     empty_info: "No <b>Nearby places</b> found."
+  location:
+    already_exist: "Location already exist"
 
   product_place:
     empty_info: "No <b>Places</b> found."

data/config/routes.rb

@@ -284,6 +284,8 @@ Spree::Core::Engine.add_routes do
       end
     end
 
+    resources :locations
+
     resources :tenants do
       resources :vendors, controller: :tenant_vendors
     end
@@ -555,6 +557,7 @@ Spree::Core::Engine.add_routes do
 
         resources :trip_places
         resources :trip_search, only: [:index]
+        resources :trips, only: %i[show]
 
         namespace :queue_cart do
           resources :line_items, only: [:create]
@@ -644,6 +647,7 @@ Spree::Core::Engine.add_routes do
           resources :id_cards
         end
         resources :dynamic_field_options
+        resources :dynamic_fields
         resources :user_guests do
           resources :id_cards
         end

data/db/migrate/20250812121745_add_data_fill_stage_phase_to_cm_guests.rb

@@ -0,0 +1,5 @@
+class AddDataFillStagePhaseToCmGuests < ActiveRecord::Migration[7.0]
+  def change
+    add_column :cm_guests, :data_fill_stage_phase, :string, default: 'pre_registration', null: false, if_not_exists: true
+  end
+end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.0.3-pre6'.freeze
+  VERSION = '2.0.3-pre8'.freeze
 
   module_function