spree_cm_commissioner 1.13.0 → 1.15.0.pre.beta1

data/app/queries/spree_cm_commissioner/trip_query.rb

@@ -1,21 +1,23 @@
 module SpreeCmCommissioner
   class TripQuery
-    attr_reader :origin_id, :destination_id, :travel_date
+    include SpreeCmCommissioner::Transit::TripHelper
 
-    def initialize(origin_id:, destination_id:, travel_date: Time.zone.now)
+    attr_reader :origin_id, :destination_id, :travel_date, :params
+
+    def initialize(origin_id:, destination_id:, travel_date:, params: {})
       @origin_id = origin_id
       @destination_id = destination_id
       @travel_date = travel_date
+      @travel_date = Time.zone.now if travel_date.to_date == Time.zone.now.to_date
+      @params = params
     end
 
     def call
-      trips = direct_trips
-      connections = connected_trips if trips.size < 3
-
-      trip_results = trips.map { |trip| SpreeCmCommissioner::TripQueryResult.new([trip]) }
+      return [] if travel_date.to_date < Date.current
 
-      trip_results += connections if connections
-      trip_results
+      direct_results = direct_trips.map { |trip| SpreeCmCommissioner::TripQueryResult.new([trip]) }
+      connected_results = connected_trips || []
+      direct_results + connected_results
     end
 
     def direct_trips
@@ -38,7 +40,12 @@ module SpreeCmCommissioner
                .joins('INNER JOIN cm_trip_stops AS drop_off ON drop_off.trip_id = spree_variants.id AND drop_off.stop_type = 1')
                .joins('INNER JOIN spree_vendors AS vendors ON vendors.id = spree_variants.vendor_id')
                .joins('INNER JOIN spree_products AS routes ON routes.id = spree_variants.product_id')
-               .where('boarding.stop_id = ? AND drop_off.stop_id = ?', origin_id, destination_id)
+      result = result.where(vendors: { id: params[:vendor_id] }) if params[:vendor_id].present?
+      result = result.where('boarding.stop_id = ? AND drop_off.stop_id = ?', origin_id, destination_id)
+                     .where('trips.departure_time > ? AND trips.departure_time <= ?',
+                            travel_date.strftime('%H:%M:%S'),
+                            travel_date.end_of_day.strftime('%H:%M:%S')
+                           )
 
       result.map do |trip|
         trip_result_options = {
@@ -53,7 +60,7 @@ module SpreeCmCommissioner
           destination_id: trip[:destination_id],
           destination: trip[:destination],
           vehicle_id: trip[:vehicle_id],
-          departure_time: trip[:departure_time],
+          departure_time: parse_time(trip[:departure_time]),
           duration: trip[:duration]
         }
         SpreeCmCommissioner::TripResult.new(trip_result_options)
@@ -63,17 +70,17 @@ module SpreeCmCommissioner
     def connected_trips # rubocop:disable Metrics/MethodLength
       result = SpreeCmCommissioner::TripConnection
                .joins('
-                 INNER JOIN spree_variants variant1 ON variant1.id = cm_trip_connections.from_trip_id
-                 INNER JOIN spree_variants variant2 ON variant2.id = cm_trip_connections.to_trip_id
-                 INNER JOIN spree_products AS routes1 ON routes1.id = variant1.product_id
-                 INNER JOIN spree_products AS routes2 ON routes2.id = variant2.product_id
-                 INNER JOIN cm_trips AS trip1 ON trip1.variant_id = cm_trip_connections.from_trip_id
-                 INNER JOIN cm_trips AS trip2 ON trip2.variant_id = cm_trip_connections.to_trip_id
-                 INNER JOIN cm_trip_stops trip1_origin ON trip1_origin.trip_id = variant1.id AND trip1_origin.stop_type = 0
-                 INNER JOIN cm_trip_stops trip2_origin ON trip2_origin.trip_id = variant2.id AND trip2_origin.stop_type = 0
-                 INNER JOIN cm_trip_stops trip2_destination ON trip2_destination.trip_id = variant2.id AND trip2_destination.stop_type = 1
-                 INNER JOIN spree_vendors AS vendor1 ON vendor1.id = variant1.vendor_id
-                 INNER JOIN spree_vendors AS vendor2 ON vendor2.id = variant2.vendor_id'
+                INNER JOIN spree_variants variant1 ON variant1.id = cm_trip_connections.from_trip_id
+                INNER JOIN spree_variants variant2 ON variant2.id = cm_trip_connections.to_trip_id
+                INNER JOIN spree_products AS routes1 ON routes1.id = variant1.product_id
+                INNER JOIN spree_products AS routes2 ON routes2.id = variant2.product_id
+                INNER JOIN cm_trips AS trip1 ON trip1.variant_id = cm_trip_connections.from_trip_id
+                INNER JOIN cm_trips AS trip2 ON trip2.variant_id = cm_trip_connections.to_trip_id
+                INNER JOIN cm_trip_stops trip1_origin ON trip1_origin.trip_id = variant1.id AND trip1_origin.stop_type = 0
+                INNER JOIN cm_trip_stops trip2_origin ON trip2_origin.trip_id = variant2.id AND trip2_origin.stop_type = 0
+                INNER JOIN cm_trip_stops trip2_destination ON trip2_destination.trip_id = variant2.id AND trip2_destination.stop_type = 1
+                INNER JOIN spree_vendors AS vendor1 ON vendor1.id = variant1.vendor_id
+                INNER JOIN spree_vendors AS vendor2 ON vendor2.id = variant2.vendor_id'
                      )
                .select('cm_trip_connections.id AS id,
                         trip1.variant_id AS trip1_id,
@@ -97,8 +104,11 @@ module SpreeCmCommissioner
                         trip2_origin.stop_name AS trip2_origin,
                         trip2_destination.stop_name AS trip2_destination,
                         vendor2.name AS trip2_vendor_name'
-                      ).where('trip1_origin.stop_id = ? AND trip2_destination.stop_id = ?', origin_id, destination_id
-                      ).uniq
+                      ).where('trip1_origin.stop_id = ? AND trip2_destination.stop_id = ?', origin_id, destination_id)
+      result = result.where('vendor1.id = ? OR vendor2.id = ?', params[:vendor_id], params[:vendor_id]) if params[:vendor_id].present?
+      result = result.where('trip1.departure_time > ? AND trip1.departure_time <= ?', travel_date.strftime('%H:%M:%S'),
+                            travel_date.end_of_day.strftime('%H:%M:%S')
+      ).uniq
 
       return [] if result.blank?
 
@@ -113,7 +123,7 @@ module SpreeCmCommissioner
           trip_id: trip[:trip1_id],
           origin_id: trip[:trip1_origin_id],
           destination_id: trip[:trip1_destination_id],
-          departure_time: trip[:trip1_departure_time],
+          departure_time: parse_time(trip[:trip1_departure_time]),
           duration: trip[:trip1_duration],
           vendor_name: trip[:trip1_vendor_name],
           route_name: trip[:route1_name],
@@ -126,7 +136,7 @@ module SpreeCmCommissioner
           trip_id: trip[:trip2_id],
           origin_id: trip[:trip2_origin_id],
           destination_id: trip[:trip2_destination_id],
-          departure_time: trip[:trip2_departure_time],
+          departure_time: parse_time(trip[:trip2_departure_time]),
           duration: trip[:trip2_duration],
           vendor_name: trip[:trip2_vendor_name],
           route_name: trip[:route2_name],

data/app/serializers/spree/v2/organizer/invite_guest_serializer.rb

@@ -3,7 +3,7 @@ module Spree
     module Organizer
       class InviteGuestSerializer < BaseSerializer
         attributes :email, :quantity, :token, :invite_type, :claimed_status, :issued_to, :expiration_date,
-                   :claimed_at, :email_send_at, :created_at, :updated_at, :remark
+                   :email_send_at, :created_at, :updated_at, :remark
         belongs_to :variant, serializer: SpreeCmCommissioner::V2::Storefront::EventVariantSerializer
         belongs_to :order, serializer: Spree::V2::Storefront::OrderSerializer
         belongs_to :event, serializer: Spree::V2::Storefront::TaxonSerializer

data/app/serializers/spree/v2/storefront/taxon_serializer_decorator.rb

@@ -5,6 +5,7 @@ module Spree
         def self.prepended(base)
           base.has_many :vendors, serializer: ::Spree::V2::Storefront::VendorSerializer
           base.has_many :visible_products, serializer: ::Spree::V2::Storefront::ProductSerializer
+          base.has_many :places, serializer: ::Spree::V2::Storefront::PlaceSerializer
 
           base.has_one :category_icon, serializer: ::SpreeCmCommissioner::V2::Storefront::AssetSerializer
           base.has_one :app_banner, serializer: ::SpreeCmCommissioner::V2::Storefront::AssetSerializer

data/app/serializers/spree/v2/tenant/cart_serializer.rb

@@ -0,0 +1,8 @@
+module Spree
+  module V2
+    module Tenant
+      class CartSerializer < Spree::V2::Storefront::CartSerializer
+      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
+                   :token, :country_code, :contact
 
         # temporary, once app release after cm-app v1.9.1, we no longer need this.
         attribute :seat_number do |object|

data/app/services/spree_cm_commissioner/organizer/export_invite_guest_csv_service.rb

@@ -0,0 +1,63 @@
+module SpreeCmCommissioner
+  module Organizer
+    class ExportInviteGuestCsvService
+      attr_reader :invite_guest_id, :columns
+
+      def initialize(invite_guest_id, columns)
+        @invite_guest_id = invite_guest_id
+        @columns = (columns + %w[created_at ticket_url]).uniq
+      end
+
+      def call
+        CSV.generate(headers: true) do |csv|
+          csv << (['No.'] + headers)
+          guests.each_with_index do |guest, index|
+            csv << ([index + 1] + build_row(guest))
+          end
+        end
+      end
+
+      private
+
+      def headers
+        columns.map(&:humanize).uniq
+      end
+
+      def build_row(guest)
+        columns.map { |column| fetch_value(guest, column) }
+      end
+
+      def fetch_value(guest, column)
+        column_mappings(guest)[column] || ''
+      end
+
+      def column_mappings(guest)
+        {
+          'guest_name' => "#{guest.first_name} #{guest.last_name}".strip,
+          'guest_phone_number' => guest.phone_number,
+          'guest_gender' => guest.gender,
+          'guest_dob' => guest.dob.to_s,
+          'guest_occupation' => guest.occupation&.name || guest.other_occupation,
+          'guest_nationality' => guest.nationality&.name,
+          'guest_age' => guest.age.to_s,
+          'guest_emergency_contact' => guest.emergency_contact,
+          'guest_organization' => guest.other_organization,
+          'guest_social_contact' => guest.social_contact,
+          'guest_address' => guest.address,
+          'guest_expectation' => guest.expectation,
+          'entry_type' => guest.entry_type,
+          'created_at' => guest.created_at.strftime('%Y-%m-%d %H:%M:%S'),
+          'ticket_url' => invite_guest.ticket_url(guest.token)
+        }
+      end
+
+      def invite_guest
+        SpreeCmCommissioner::InviteGuest.find(invite_guest_id)
+      end
+
+      def guests
+        invite_guest.order.line_items.first.guests
+      end
+    end
+  end
+end

data/app/services/spree_cm_commissioner/payment_method_type_mapper.rb

@@ -0,0 +1,11 @@
+module SpreeCmCommissioner
+  class PaymentMethodTypeMapper
+    TYPES = {
+      'vattanac_mini_app' => 'Spree::Gateway::VattanacMiniApp'
+    }.freeze
+
+    def self.call(type)
+      TYPES[type.to_s.downcase]
+    end
+  end
+end

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

@@ -20,12 +20,78 @@
   <!-- 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>
+
+  <!-- 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/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/20250528073748_remove_unique_slug_index_on_spree_cms_pages.rb

@@ -0,0 +1,12 @@
+class RemoveUniqueSlugIndexOnSpreeCmsPages < ActiveRecord::Migration[7.0]
+  def change
+    if index_exists?(:spree_cms_pages,
+      [:slug, :store_id, :deleted_at],
+      unique: true,
+      name: "index_spree_cms_pages_on_slug_and_store_id_and_deleted_at")
+
+      remove_index :spree_cms_pages,
+                   name: "index_spree_cms_pages_on_slug_and_store_id_and_deleted_at"
+    end
+  end
+end

data/db/migrate/20250528074043_add_unique_index_on_slug_tenant_id_deleted_at_to_spree_cms_pages.rb

@@ -0,0 +1,13 @@
+class AddUniqueIndexOnSlugTenantIdDeletedAtToSpreeCmsPages < ActiveRecord::Migration[7.0]
+  def change
+    unless index_exists?(:spree_cms_pages,
+      [:slug, :tenant_id, :deleted_at],
+      unique: true,
+      name: "index_spree_cms_pages_on_slug_and_tenant_id_and_deleted_at")
+
+      add_index :spree_cms_pages, [:slug, :tenant_id, :deleted_at],
+                unique: true,
+                name: "index_spree_cms_pages_on_slug_and_tenant_id_and_deleted_at"
+    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/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/cms_page_factory.rb

@@ -0,0 +1,11 @@
+FactoryBot.define do
+  factory :cm_cms_page, class: 'Spree::CmsPage' do
+    sequence(:slug) { |n| "page-slug-#{n}" }
+    title { "Sample Page Title" }
+    association :store, factory: :store
+    locale { 'en' }
+    type { 'Spree::Cms::Pages::StandardPage' }
+    tenant { nil }
+    deleted_at { nil }
+  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.13.0'.freeze
+  VERSION = '1.15.0-beta1'.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