spree_cm_commissioner 1.13.0 → 1.15.0.pre.beta1

data/app/interactors/spree_cm_commissioner/host_matcher.rb

@@ -0,0 +1,28 @@
+module SpreeCmCommissioner
+  class HostMatcher < BaseInteractor
+    delegate :host, to: :context
+
+    def call
+      normalized_host = normalize_host(host)
+
+      context.store = find_store(normalized_host)
+      return if context.store.present?
+
+      context.tenant = find_tenant(normalized_host)
+    end
+
+    private
+
+    def normalize_host(host)
+      host.sub(/^www\./, '')
+    end
+
+    def find_store(normalized_host)
+      Spree::Store.find_by(code: normalized_host)
+    end
+
+    def find_tenant(normalized_host)
+      SpreeCmCommissioner::Tenant.find_by(host: "https://#{normalized_host}")
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/place_decoder.rb

@@ -0,0 +1,16 @@
+module SpreeCmCommissioner
+  class PlaceDecoder
+    def self.process_place(base_64_content)
+      begin
+        place_data = JSON.parse(Base64.strict_decode64(base_64_content))
+      rescue ArgumentError, JSON::ParserError => e
+        Rails.logger.error("Failed to decode and parse place data: #{e.message}")
+        return nil
+      end
+
+      place = SpreeCmCommissioner::Place.where(reference: place_data['reference']).first_or_initialize
+      place.assign_attributes(place_data)
+      place
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/place_service.rb

@@ -0,0 +1,32 @@
+module SpreeCmCommissioner
+  class PlaceService
+    def initialize(model:, place_class:, params:)
+      @model = model # e.g., Taxon or Product
+      @place_class = place_class # e.g., TaxonPlace or ProductPlace
+      @params = params
+    end
+
+    def call
+      @base64_content = @params[:base_64_content]
+      @place_name = @params[:place_name]
+
+      if @base64_content.blank?
+        existing_place = @place_class
+        existing_place.delete if existing_place && @place_name.blank?
+        return
+      end
+
+      place = PlaceDecoder.process_place(@base64_content)
+      return if place.nil?
+
+      if place.save # rubocop:disable Style/GuardClause
+        existing_place = @place_class
+        if existing_place.present?
+          existing_place.update(place_id: place.id)
+        else
+          @model.places << place
+        end
+      end
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/user_pin_code_authenticator.rb

@@ -33,6 +33,7 @@ module SpreeCmCommissioner
 
       user = Spree::User.new(create_options)
       user.confirmed_at = Time.zone.now
+      assign_role(user) if context.role.present?
 
       if user.save
         context.user = user
@@ -41,6 +42,14 @@ module SpreeCmCommissioner
       end
     end
 
+    def assign_role(user)
+      role = Spree::Role.find_by(name: context.role)
+      return unless role
+
+      user.assigned_roles = [role.name]
+      user.spree_roles << role
+    end
+
     def mark_pin_code_expired!
       SpreeCmCommissioner::PinCode.mark_expired!(context.pin_code_token)
     end

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

@@ -0,0 +1,23 @@
+module SpreeCmCommissioner
+  module JsonPreferenceValidator
+    extend ActiveSupport::Concern
+
+    included do
+      validate :validate_json_preferences
+    end
+
+    private
+
+    def validate_json_preferences
+      %i[preferred_assetlinks preferred_apple_app_site_association].each do |pref|
+        next if send(pref).blank?
+
+        begin
+          JSON.parse(send(pref))
+        rescue JSON::ParserError => e
+          errors.add(pref, "is not valid JSON: #{e.message}")
+        end
+      end
+    end
+  end
+end

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

@@ -15,13 +15,15 @@ module SpreeCmCommissioner
       guest_expectation: 0b1000000000,
       guest_social_contact: 0b10000000000,
       guest_address: 0b100000000000,
-      guest_phone_number: 0b1000000000000
+      guest_phone_number: 0b1000000000000,
+      guest_contact: 0b10000000000000
     }.freeze
 
     ORDERED_BIT_FIELDS = %i[
       guest_name
       guest_gender
       guest_phone_number
+      guest_contact
       guest_dob
       guest_occupation
       guest_nationality

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

@@ -6,6 +6,8 @@ module SpreeCmCommissioner
       preference :sms_sender_id, :string
       preference :telegram_order_alert_chat_id, :string
       preference :telegram_order_request_alert_chat_id, :string
+      preference :assetlinks, :string, default: ''
+      preference :apple_app_site_association, :string, default: ''
     end
   end
 end

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

@@ -0,0 +1,11 @@
+module SpreeCmCommissioner
+  module TenantPreference
+    extend ActiveSupport::Concern
+
+    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/cms_page_decorator.rb

@@ -2,8 +2,23 @@ module SpreeCmCommissioner
   module CmsPageDecorator
     def self.prepended(base)
       base.belongs_to :tenant, class_name: 'SpreeCmCommissioner::Tenant'
+
+      base.validates :slug,
+                     uniqueness: {
+                       scope: %i[tenant_id deleted_at],
+                       allow_nil: true,
+                       case_sensitive: true
+                     }
     end
   end
 end
 
-Spree::CmsPage.prepend(SpreeCmCommissioner::CmsPageDecorator) unless Spree::CmsPage.included_modules.include?(SpreeCmCommissioner::CmsPageDecorator)
+unless Spree::CmsPage.included_modules.include?(SpreeCmCommissioner::CmsPageDecorator)
+  # remove old :slug validations
+  Spree::CmsPage._validators.reject! { |key, _| key == :slug }
+  Spree::CmsPage._validate_callbacks.each do |c|
+    c.filter.attributes.delete(:slug) if c.filter.respond_to?(:attributes)
+  end
+
+  Spree::CmsPage.prepend(SpreeCmCommissioner::CmsPageDecorator)
+end

data/app/models/spree_cm_commissioner/guest.rb

@@ -1,6 +1,8 @@
+# rubocop:disable Metrics/ClassLength
 module SpreeCmCommissioner
   class Guest < SpreeCmCommissioner::Base
     include SpreeCmCommissioner::KycBitwise
+    include SpreeCmCommissioner::PhoneNumberSanitizer
 
     delegate :kyc, to: :line_item, allow_nil: true
     delegate :allowed_upload_later?, to: :line_item, allow_nil: true
@@ -48,13 +50,13 @@ module SpreeCmCommissioner
     validates :bib_index, uniqueness: true, allow_nil: true
 
     self.whitelisted_ransackable_associations = %w[id_card event]
-    self.whitelisted_ransackable_attributes = %w[first_name last_name phone_number gender occupation_id card_type created_at check_in_status]
+    self.whitelisted_ransackable_attributes = %w[first_name last_name phone_number gender contact occupation_id card_type created_at check_in_status]
 
     def self.csv_importable_columns
       %i[
         first_name last_name phone_number age dob gender address other_occupation
         entry_type nationality_id other_organization expectation emergency_contact bib_number
-        preferred_telegram_user_id seat_number
+        preferred_telegram_user_id seat_number country_code contact
       ]
     end
 
@@ -77,6 +79,8 @@ module SpreeCmCommissioner
       return upload_later? || (id_card.present? && id_card.allowed_checkout?) if field == :guest_id_card
       return address.present? if field == :guest_address
       return phone_number.present? if field == :guest_phone_number
+      return country_code.present? if field == :guest_country_code
+      return contact.present? if field == :guest_contact
 
       false
     end
@@ -110,6 +114,10 @@ module SpreeCmCommissioner
           address.blank?
         when :guest_phone_number
           phone_number.blank?
+        when :guest_country_code
+          country_code.blank?
+        when :guest_contact
+          contact.blank?
         else
           false
         end
@@ -219,3 +227,4 @@ module SpreeCmCommissioner
     end
   end
 end
+# rubocop:enable Metrics/ClassLength

data/app/models/spree_cm_commissioner/invite_guest.rb

@@ -19,5 +19,13 @@ module SpreeCmCommissioner
       line_item = order.line_items.first
       line_item.guests.count >= order.line_items.first.number_of_guests
     end
+
+    def invitation_link
+      "#{Spree::Store.default.formatted_url}/invite_guests/#{token}?utm_source=email"
+    end
+
+    def ticket_url(guest_token)
+      "#{Spree::Store.default.formatted_url}/invite_guests/#{token}/guest_invitations/#{guest_token}"
+    end
   end
 end

data/app/models/spree_cm_commissioner/order_decorator.rb

@@ -192,6 +192,11 @@ module SpreeCmCommissioner
       Spree::Money.new(outstanding_balance, currency: currency).to_s
     end
 
+    # override spree_vpago method
+    def payment_host
+      tenant&.host.presence || ENV.fetch('DEFAULT_URL_HOST')
+    end
+
     private
 
     # override :spree_api

data/app/models/spree_cm_commissioner/payment_method_decorator.rb

@@ -1,11 +1,18 @@
 module SpreeCmCommissioner
   module PaymentMethodDecorator
-    DISPLAY = %i[both front_end back_end frontend_for_early_adopter].freeze
+    DISPLAY = %i[both front_end back_end frontend_for_early_adopter mini_app].freeze
 
     def self.prepended(base)
       base.const_set(:DISPLAY, DISPLAY)
 
       base.scope :available_on_frontend_for_early_adopter, -> { active.where(display_on: %i[both front_end frontend_for_early_adopter]) }
+
+      # override
+      base.scope :available_on_front_end, -> { active.where(display_on: %i[front_end both mini_app]) }
+    end
+
+    def mini_app?
+      display_on == 'mini_app'
     end
   end
 end

data/app/models/spree_cm_commissioner/place.rb

@@ -19,6 +19,9 @@ module SpreeCmCommissioner
     has_many :children, -> { order(:lft) }, class_name: 'SpreeCmCommissioner::Place', foreign_key: :parent_id, dependent: :destroy
     has_many :vendor_stops, class_name: 'SpreeCmCommissioner::VendorStop', dependent: :destroy, foreign_key: :stop_id
 
+    has_many :taxon_places, class_name: 'SpreeCmCommissioner::TaxonPlace', dependent: :destroy
+    has_many :taxons, through: :taxon_places
+
     def self.ransackable_attributes(auth_object = nil)
       super & %w[name code]
     end

data/app/models/spree_cm_commissioner/store_decorator.rb

@@ -2,10 +2,11 @@ module SpreeCmCommissioner
   module StoreDecorator
     def self.prepended(base)
       base.include SpreeCmCommissioner::StorePreference
+      base.include SpreeCmCommissioner::JsonPreferenceValidator
 
       base.has_one :default_notification_image, class_name: 'SpreeCmCommissioner::FeatureImage', dependent: :destroy, as: :viewable
       base.accepts_nested_attributes_for :default_notification_image, reject_if: :all_blank
-      base.multi_tenant :tenant, class_name: 'SpreeCmCommissioner::Tenant'
+      base.has_one :tenant, class_name: 'SpreeCmCommissioner::Tenant'
     end
   end
 end

data/app/models/spree_cm_commissioner/taxon_decorator.rb

@@ -59,6 +59,7 @@ module SpreeCmCommissioner
 
       base.has_many :line_items, through: :products
       base.has_many :event_line_items, class_name: 'Spree::LineItem', foreign_key: :event_id
+      base.has_many :event_products, class_name: 'Spree::Product', foreign_key: :event_id
 
       base.has_many :event_blazer_queries, class_name: 'SpreeCmCommissioner::TaxonBlazerQuery'
       base.has_many :blazer_queries, through: :event_blazer_queries, class_name: 'Blazer::Query'
@@ -68,6 +69,9 @@ module SpreeCmCommissioner
 
       base.after_commit :send_transaction_email_to_organizers, on: :create
 
+      base.has_many :taxon_places, class_name: 'SpreeCmCommissioner::TaxonPlace', dependent: :destroy
+      base.has_many :places, through: :taxon_places
+
       def base.active_homepage_events
         joins(:homepage_section_relatables)
           .joins("INNER JOIN spree_taxons taxon ON taxon.id = cm_homepage_section_relatables.relatable_id

data/app/models/spree_cm_commissioner/taxon_place.rb

@@ -0,0 +1,12 @@
+module SpreeCmCommissioner
+  class TaxonPlace < Base
+    self.inheritance_column = '_type_disabled'
+
+    belongs_to :taxon, class_name: 'Spree::Taxon', optional: false
+    belongs_to :place, class_name: 'SpreeCmCommissioner::Place', optional: false
+
+    validates :place_id, uniqueness: { scope: :taxon_id }
+
+    enum type: { venue: 0, nearby_place: 1 }
+  end
+end

data/app/models/spree_cm_commissioner/tenant.rb

@@ -1,5 +1,8 @@
 module SpreeCmCommissioner
   class Tenant < SpreeCmCommissioner::Base
+    include SpreeCmCommissioner::TenantPreference
+    include SpreeCmCommissioner::JsonPreferenceValidator
+
     extend FriendlyId
     friendly_id :name, use: :history
 
@@ -9,6 +12,8 @@ module SpreeCmCommissioner
                                       through: :vendors,
                                       source: :payment_methods
 
+    validates :host, uniqueness: true, presence: true
+
     enum state: { enabled: 0, disabled: 1 }
 
     before_validation :generate_slug, if: -> { slug.blank? && name.present? }

data/app/models/spree_cm_commissioner/user_decorator.rb

@@ -1,7 +1,8 @@
-# rubocop:disable Metrics/MethodLength
+require 'strong_password'
+
 module SpreeCmCommissioner
   module UserDecorator
-    def self.prepended(base) # rubocop:disable Metrics/AbcSize
+    def self.prepended(base) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
       base.include SpreeCmCommissioner::UserNotification
       base.include SpreeCmCommissioner::UserIdentity
       base.include SpreeCmCommissioner::UserPreference
@@ -36,6 +37,8 @@ module SpreeCmCommissioner
       base.whitelisted_ransackable_attributes = %w[email first_name last_name gender phone_number]
 
       base.before_save :update_otp_enabled
+      base.attr_accessor :assigned_roles
+      base.validates_password_strength :password, if: -> { requires_strong_password? && password.present? }
 
       define_user_places(base)
 
@@ -88,6 +91,15 @@ module SpreeCmCommissioner
       [first_name, last_name].compact_blank.join(' ')
     end
 
+    def privileged_role?
+      assigned = assigned_roles || []
+      assigned.map(&:to_s).include?('admin')
+    end
+
+    def requires_strong_password?
+      admin? || privileged_role?
+    end
+
     def display_name
       return full_name if full_name.present?
       return first_name if first_name.present?
@@ -144,4 +156,3 @@ module SpreeCmCommissioner
 end
 
 Spree::User.prepend(SpreeCmCommissioner::UserDecorator) unless Spree::User.included_modules.include?(SpreeCmCommissioner::UserDecorator)
-# rubocop:enable Metrics/MethodLength

data/app/models/spree_cm_commissioner/vendor_decorator.rb

@@ -36,8 +36,12 @@ module SpreeCmCommissioner
       base.has_many :vendor_kind_option_values,
                     through: :option_value_vendors, source: :option_value
 
-      base.has_many :branches, class_name: 'SpreeCmCommissioner::Branch'
-      base.has_many :stops, class_name: 'SpreeCmCommissioner::Place'
+      base.has_many :branches, lambda {
+                                 where(cm_vendor_places: { place_type: 0 })
+                               }, through: :vendor_places, class_name: 'SpreeCmCommissioner::VendorPlace'
+      base.has_many :stops, -> { where(cm_vendor_places: { place_type: 1 }) }, through: :vendor_places, class_name: 'SpreeCmCommissioner::VendorPlace'
+      base.has_many :locations, -> { where(cm_vendor_places: { place_type: 2 }) },
+                    through: :vendor_places, class_name: 'SpreeCmCommissioner::VendorPlace'
 
       base.has_many :places,
                     through: :nearby_places, source: :place, class_name: 'SpreeCmCommissioner::Place'
@@ -118,7 +122,7 @@ module SpreeCmCommissioner
       end
 
       def selected_place_references
-        places.pluck(:reference)
+        places.where.not(reference: [nil, '']).pluck(:reference)
       end
 
       def search_data

data/app/models/spree_cm_commissioner/vendor_place.rb

@@ -2,15 +2,23 @@ require_dependency 'spree_cm_commissioner'
 
 module SpreeCmCommissioner
   class VendorPlace < ApplicationRecord
+    enum place_type: { branch: 0, stop: 1, locations: 2 }
     acts_as_list scope: :vendor
 
-    belongs_to :vendor, class_name: 'Spree::Vendor'
-    belongs_to :place, class_name: 'SpreeCmCommissioner::Place'
+    belongs_to :vendor, class_name: 'Spree::Vendor', optional: false
+    belongs_to :place, class_name: 'SpreeCmCommissioner::Place', optional: false
+
+    validates :place_type, presence: true
+    validates :position, presence: true, numericality: { only_integer: true, greater_than: 0 }
 
     accepts_nested_attributes_for :place, allow_destroy: true
 
+    scope :branches, -> { where(place_type: :branch) }
+    scope :stops, -> { where(place_type: :stop) }
+    scope :locations, -> { where(place_type: :locations) }
+
     def selected
-      vendor.selected_place_references.include?(place.reference)
+      vendor.selected_place_references.include?(place&.reference)
     end
   end
 end

data/app/overrides/spree/admin/stores/_form/store_preferences.html.erb.deface

@@ -1,18 +1,91 @@
 <!-- insert_bottom "[data-hook='admin_store_form_fields']" -->
 
 <% if @store.persisted? %>
-<div class="card mb-4">
-  <div class="card-header">
-    <h5 class="card-title mb-0 h6">
-      <%= Spree.t(:preference).pluralize %>
-    </h5>
-  </div>
-  <div class="card-body">
-    <div id="preference-settings" data-hook class="form-group">
-      <% unless preference_fields(@store, f).empty? %>
-        <%= preference_fields(@store, f) %>
-      <% end %>
+  <div class="card mb-4">
+    <div class="card-header">
+      <h5 class="card-title mb-0 h6">
+        <%= Spree.t(:preference).pluralize %>
+      </h5>
+    </div>
+    <div class="card-body">
+      <div id="preference-settings" data-hook class="form-group">
+        <div class="row">
+          <!-- SMS Sender ID -->
+          <div class="col-6">
+            <%= f.field_container :preferred_sms_sender_id do %>
+              <%= f.label :preferred_sms_sender_id, Spree.t(:sms_sender_id) %>
+              <%= f.text_field :preferred_sms_sender_id, class: 'form-control' %>
+              <%= f.error_message_on :preferred_sms_sender_id %>
+            <% end %>
+          </div>
+
+          <!-- Telegram Order Alert Chat ID -->
+          <div class="col-6">
+            <%= f.field_container :preferred_telegram_order_alert_chat_id do %>
+              <%= f.label :preferred_telegram_order_alert_chat_id, Spree.t(:telegram_order_alert_chat_id) %>
+              <%= f.text_field :preferred_telegram_order_alert_chat_id, class: 'form-control' %>
+              <%= f.error_message_on :preferred_telegram_order_alert_chat_id %>
+            <% end %>
+          </div>
+
+          <!-- Telegram Order Request Alert Chat ID -->
+          <div class="col-6">
+            <%= f.field_container :preferred_telegram_order_request_alert_chat_id do %>
+              <%= f.label :preferred_telegram_order_request_alert_chat_id, Spree.t(:telegram_order_request_alert_chat_id) %>
+              <%= f.text_field :preferred_telegram_order_request_alert_chat_id, class: 'form-control' %>
+              <%= f.error_message_on :preferred_telegram_order_request_alert_chat_id %>
+            <% end %>
+          </div>
+
+          <!-- Assetlinks -->
+          <div class="col-12">
+            <%= f.field_container :preferred_assetlinks do %>
+              <%= f.label :preferred_assetlinks, Spree.t(:assetlinks) %>
+              <%= f.text_area :preferred_assetlinks, class: 'form-control', rows: 5,
+                  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"
+                        ]
+                      }
+                    }
+                ]' %>
+              <%= f.error_message_on :preferred_assetlinks %>
+            <% end %>
+          </div>
+
+          <!-- Apple App Site Association -->
+          <div class="col-12">
+            <%= f.field_container :preferred_apple_app_site_association do %>
+              <%= f.label :preferred_apple_app_site_association, Spree.t(:apple_app_site_association) %>
+              <%= f.text_area :preferred_apple_app_site_association, class: 'form-control', rows: 5,
+                  placeholder: 'example:
+                  {
+                    "webcredentials": {
+                      "apps": [
+                        "TEAM_ID.com.yourapp.app"
+                      ]
+                    },
+                    "applinks": {
+                      "apps": [],
+                      "details": [
+                        {
+                          "appID": "TEAM_ID.com.yourapp.app",
+                          "paths": ["*"]
+                        }
+                      ]
+                    }
+                  }' %>
+              <%= f.error_message_on :preferred_apple_app_site_association %>
+            <% end %>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
-</div>
 <% end %>

data/app/overrides/spree/admin/variants/_form/kyc_field.html.erb.deface

@@ -1,15 +1,14 @@
 <!-- insert_bottom "[data-hook='admin_variant_form_additional_fields']" -->
 
 <p>Guest Information Fields</p>
-
 <div class="form-check mb-3">
-  <%= f.check_box :use_product_kyc, id: "toggleGuestInfo", class: 'form-check-input mr-2', checked: (@variant.kyc == nil) %>
+  <%= f.check_box :use_product_kyc, id: "toggleGuestInfo", class: 'form-check-input mr-2', checked: (@variant.kyc == @product.kyc) %>
   <label for="toggleGuestInfo" class="form-check-label">
-    Use Product KYC
+    Use Product Guest Information
   </label>
 </div>
 
-<div id="guestInfoForm" <% if @variant.kyc == nil %>style="display: none;"<% end %>">
+<div id="guestInfoForm" <% if @variant.kyc == @product.kyc %>style="display: none;"<% end %>">
   <small class="form-text text-muted mb-4">
     <%= raw I18n.t('kyc.variant_note') %>
   </small>

data/app/queries/spree_cm_commissioner/reservation_query.rb

@@ -0,0 +1,12 @@
+module SpreeCmCommissioner
+  class ReservationQuery
+    def initialize(vendor)
+      @vendor = vendor
+    end
+
+    def base_scope
+      vendor_id = @vendor&.id
+      SpreeCmCommissioner::Transit::OrderQueryHelper.transit_orders_for_vendor(vendor_id)
+    end
+  end
+end