spree_cm_commissioner 1.14.0 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a83f128539c20da0667aaa913954b8d686df38054b90ea51ede36b2967a96c4b
-  data.tar.gz: 46fa67f9aff722e83efd60ae52bb640f5ba9b2576294625a3c07093cbf0c2784
+  metadata.gz: 169845d2403406e562178fb3b438559b9d4cc42d93776513b5b7235399f69e2a
+  data.tar.gz: 5d7526b7df7150bddd97deb2989f08a014437b4c4c9efc8a318405d335e35e27
 SHA512:
-  metadata.gz: d48ff6f2945c262955121a7f7144c5fc4ad53afa23bb2b093baaefd985346276a60b82de985b1912ec5a8fb64e6e86d37eb163638c2261446c2f85945165c3df
-  data.tar.gz: 7e21994489d8d36559a632a0008a92ecf9902c95be865190624173b89e1c8ad6146f405744971dbd448935cf9a9557b60401f34b6d211ce833eca61880082719
+  metadata.gz: ba5ff297f04ed5f749794f56b8c38900d36ce76d5b78a7778c0e06007816004190745ad3664b038be3c84e30a540deb57715652ed6d8012593b57126a14dba9c
+  data.tar.gz: d83b272f1fe458cc17fa833e2edd1a643ffa9c25f888c8432bc4e08d10ce1b16e8a2e870b52532995448043dda00eab8473f50e8f687dbf11ee6e45eca58556e

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (1.14.0)
+    spree_cm_commissioner (1.16.0)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront
@@ -66,6 +66,8 @@ PATH
       spree_backend (>= 4.5.0)
       spree_extension
       spree_multi_vendor (>= 2.4.1)
+      spree_vpago
+      strong_password (~> 0.0.10)
       telegram-bot
       twilio-ruby (~> 5.48.0)
 
@@ -849,6 +851,14 @@ GEM
       spree_backend (>= 4.3.0.rc1)
       spree_emails (>= 4.3.0.rc1)
       spree_extension
+    spree_vpago (2.0.5.pre.beta)
+      faraday
+      google-cloud-firestore
+      spree_api (>= 4.5)
+      spree_backend (>= 4.5)
+      spree_core (>= 4.5)
+      spree_extension
+      spree_multi_vendor (>= 2.4.1)
     sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
       rack (>= 2.2.4, < 4)
@@ -866,6 +876,7 @@ GEM
     stimulus-rails (1.3.0)
       railties (>= 6.0.0)
     stringex (2.8.6)
+    strong_password (0.0.10)
     telegram-bot (0.15.7)
       actionpack (>= 4.0, < 7.1)
       activesupport (>= 4.0, < 7.1)

data/README.md

@@ -123,6 +123,48 @@ EXCEPTION_TELEGRAM_BOT_TOKEN=""
 EXCEPTION_NOTIFIER_TELEGRAM_CHANNEL_ID=""
 ```
 
+## JSON Format Examples For Store and Tenant Preferences
+
+### Asset Links Format
+For Android app integration, use the following format in your `assetlinks.json`:
+
+```json
+[
+  {
+    "relation": ["delegate_permission/common.handle_all_urls"],
+    "target": {
+      "namespace": "android_app",
+      "package_name": "com.yourapp.app",
+      "sha256_cert_fingerprints": [
+        "SHA256_CERTIFICATE_FINGERPRINT_HERE"
+      ]
+    }
+  }
+]
+```
+
+### Apple App Site Association Format
+For iOS app integration, use the following format in your `apple-app-site-association`:
+
+```json
+{
+  "webcredentials": {
+    "apps": [
+      "TEAM_ID.com.yourapp.app"
+    ]
+  },
+  "applinks": {
+    "apps": [],
+    "details": [
+      {
+        "appID": "TEAM_ID.com.yourapp.app",
+        "paths": ["*"]
+      }
+    ]
+  }
+}
+```
+
 ## Using Deface DSL (.deface files)
 
 - Make sure the path of override should match the path of view template
@@ -338,7 +380,7 @@ end
 
 ## Protected Cloudfront with signed requests
 
-To use signed cookies with CloudFront, you'll need to set up your CloudFront distribution to require signed cookies and then generate and distribute the signed cookies to your users. Here’s how to do it using Terraform for infrastructure setup and Ruby for cookie generation.
+To use signed cookies with CloudFront, you'll need to set up your CloudFront distribution to require signed cookies and then generate and distribute the signed cookies to your users. Here's how to do it using Terraform for infrastructure setup and Ruby for cookie generation.
 
 ### Generating keypair
 

data/app/controllers/spree/admin/users_controller_decorator.rb

@@ -5,6 +5,19 @@ module Spree
         base.before_action :build_profile, only: %i[create update]
       end
 
+      # override
+      def create
+        @user = Spree.user_class.new(user_params)
+        @user.assigned_roles = Spree::Role.where(id: params.dig(:user, :spree_role_ids)).pluck(:name) if params.dig(:user, :spree_role_ids)
+
+        if @user.save
+          flash[:success] = flash_message_for(@user, :successfully_created)
+          redirect_to spree.edit_admin_user_path(@user)
+        else
+          render :new, status: :unprocessable_entity
+        end
+      end
+
       private
 
       def build_profile

data/app/controllers/spree/api/chatrace/guests_controller.rb

@@ -48,7 +48,8 @@ module Spree
             order_phone_number: order.intel_phone_number || order.customer_address&.phone,
             checked_in_at: guest.check_in&.confirmed_at,
             qr_data: guest.qr_data,
-            order_qr_data: order.qr_data
+            order_qr_data: order.qr_data,
+            country_code: guest.country_code
           }
         end
       end

data/app/controllers/spree/api/v2/organizer/invite_guests_controller.rb

@@ -38,6 +38,7 @@ module Spree
             factory = SpreeCmCommissioner::InviteGuestClaimedTelegramMessageFactory.new(
               title: title,
               order: @invite_guest.order,
+              guest: guest,
               vendor: guest.event.vendor
             )
             SpreeCmCommissioner::TelegramNotificationSenderJob.perform_later(

data/app/controllers/spree/api/v2/storefront/cart_payment_method_groups_controller.rb

@@ -17,7 +17,7 @@ module Spree
           # override
           def collection
             @collection ||= SpreeCmCommissioner::PaymentMethods::GroupByBank.new.execute(
-              payment_methods: spree_current_order.available_payment_methods,
+              payment_methods: payment_methods,
               preferred_payment_method_id: spree_current_user&.preferred_payment_method_id
             )
           end
@@ -26,6 +26,17 @@ module Spree
           def collection_serializer
             SpreeCmCommissioner::V2::Storefront::PaymentMethodGroupSerializer
           end
+
+          private
+
+          def payment_methods
+            methods = spree_current_order.available_payment_methods
+
+            return methods.reject(&:mini_app?) if params[:type].blank?
+
+            type = SpreeCmCommissioner::PaymentMethodTypeMapper.call(params[:type])
+            methods.select { |pm| pm.mini_app? && pm.type == type }
+          end
         end
       end
     end

data/app/controllers/spree/api/v2/storefront/guests_controller.rb

@@ -73,7 +73,9 @@ module Spree
               :address,
               :other_organization,
               :expectation,
-              :upload_later
+              :upload_later,
+              :country_code,
+              :contact
             )
           end
         end

data/app/controllers/spree/api/v2/tenant/cart_controller.rb

@@ -6,6 +6,7 @@ module Spree
           include Spree::Api::V2::Storefront::OrderConcern
           include Spree::Api::V2::CouponCodesHelper
           include Spree::Api::V2::Storefront::MetadataControllerConcern
+          include SpreeCmCommissioner::OrderConcern
 
           around_action :wrap_with_multitenant_without, except: %i[create]
 
@@ -138,6 +139,16 @@ module Spree
             end
           end
 
+          # Restart the checkout flow to bring the order back to the cart view
+          def restart_checkout_flow
+            spree_authorize! :update, spree_current_order, order_token
+
+            spree_current_order.restart_checkout_flow
+            spree_current_order.update_with_updater!
+
+            render_serialized_payload { serialized_current_order }
+          end
+
           private
 
           def wrap_with_multitenant_without(&block)

data/app/controllers/spree/api/v2/tenant/checkout_controller.rb

@@ -4,6 +4,7 @@ module Spree
       module Tenant
         class CheckoutController < BaseController
           include Spree::Api::V2::Storefront::OrderConcern
+          include SpreeCmCommissioner::OrderConcern
 
           around_action :wrap_with_multitenant_without
 

data/app/controllers/spree/api/v2/tenant/order_histories_controller.rb

@@ -0,0 +1,65 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class OrderHistoriesController < BaseController
+          # GET /api/v2/tenant/order_histories
+          # For user - no params needed
+          # For guest - pass: { "order_tokens[]": [1, 2, 3] }
+
+          around_action :wrap_with_multitenant_without
+
+          def index
+            render_serialized_payload do
+              serialize_collection(paginated_collection)
+            end
+          end
+
+          # PATCH /api/v2/tenant/order_histories/:id/archive
+          def archive
+            order_token = params[:id]
+            order = Spree::Order.not_archived.find_by!(token: order_token)
+
+            spree_authorize! :update, order, order_token
+            raise CanCan::AccessDenied unless order.payment?
+
+            if order.mark_as_archive
+              render_serialized_payload { serialize_resource(order) }
+            else
+              render_error_payload(order.errors.full_messages.to_sentence)
+            end
+          end
+
+          private
+
+          def wrap_with_multitenant_without(&block)
+            MultiTenant.without(&block)
+          end
+
+          def collection
+            if spree_current_user.present?
+              spree_current_user.orders.payment.not_archived
+            else
+              order_tokens = Array(params[:order_tokens])
+              return Spree::Order.none if order_tokens.empty?
+
+              Spree::Order.payment.not_archived.without_user.where(token: order_tokens)
+            end
+          end
+
+          def collection_serializer
+            Spree::V2::Tenant::CartSerializer
+          end
+
+          def resource_serializer
+            Spree::V2::Tenant::CartSerializer
+          end
+
+          def model_class
+            Spree::Order
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree_cm_commissioner/admin/variants_controller_decorator.rb

@@ -37,7 +37,7 @@ module SpreeCmCommissioner
         bit_fields = SpreeCmCommissioner::KycBitwise::BIT_FIELDS.keys
 
         if permitted_resource_params[:use_product_kyc] == '1'
-          permitted_resource_params[:kyc] = nil
+          permitted_resource_params[:kyc] = @product.kyc
         else
           @kyc_result = calculate_kyc_value(params[:variant])
           permitted_resource_params[:kyc] = @kyc_result

data/app/controllers/spree_cm_commissioner/well_known_controller.rb

@@ -0,0 +1,46 @@
+module SpreeCmCommissioner
+  class WellKnownController < ApplicationController
+    before_action :identify_request_source
+    rescue_from StandardError, with: :handle_error
+
+    def show
+      case params[:id]
+      when 'assetlinks.json'
+        render_preference(:preferred_assetlinks)
+      when 'apple-app-site-association'
+        render_preference(:preferred_apple_app_site_association)
+      else
+        render_not_found
+      end
+    end
+
+    private
+
+    def identify_request_source
+      host = params[:original_host].presence || request.host.downcase
+
+      result = SpreeCmCommissioner::HostMatcher.call(host: host)
+
+      @store = result.store
+      @tenant = result.tenant
+    end
+
+    def render_preference(preference_key)
+      if @store&.send(preference_key).present?
+        render json: @store.send(preference_key)
+      elsif @tenant&.send(preference_key).present?
+        render json: @tenant.send(preference_key)
+      else
+        render_not_found
+      end
+    end
+
+    def render_not_found
+      render json: { error: 'Not found' }, status: :not_found
+    end
+
+    def handle_error
+      render json: { error: 'Internal server error' }, status: :internal_server_error
+    end
+  end
+end

data/app/factory/spree_cm_commissioner/invite_guest_claimed_telegram_message_factory.rb

@@ -24,14 +24,15 @@
 
 module SpreeCmCommissioner
   class InviteGuestClaimedTelegramMessageFactory < TelegramMessageFactory
-    attr_reader :order, :vendor, :show_details_link
+    attr_reader :order, :vendor, :guest, :show_details_link
 
-    def initialize(title:, order:, subtitle: nil, show_details_link: nil, vendor: nil)
+    def initialize(title:, order:, guest:, **options)
       @order = order
-      @vendor = vendor
-      @show_details_link = show_details_link || false
+      @vendor = options[:vendor]
+      @guest = guest
+      @show_details_link = options[:show_details_link] || false
 
-      super(title: title, subtitle: subtitle)
+      super(title: title, subtitle: options[:subtitle])
     end
 
     def selected_line_items
@@ -79,9 +80,8 @@ module SpreeCmCommissioner
       text = []
 
       text << bold('🙍 Claimed By')
-      text << "Name: #{order.name}"
-      text << "Tel: #{inline_code(order.intel_phone_number || order.phone_number)}"
-      text << "Email: #{inline_code(order.email)}" if order.email.present?
+      text << "Name: #{guest.first_name} #{guest.last_name}" if guest.first_name.present? || guest.last_name.present?
+      text << "Tel: #{inline_code(guest.intel_phone_number)}" if guest.intel_phone_number.present?
 
       if show_details_link && order.guests.any?
         text << ''

data/app/helpers/spree/admin/base_helper_decorator.rb

@@ -1,8 +1,8 @@
 module Spree
   module Admin
     module BaseHelperDecorator
-      def render_vector_icon(asset_path, _options = {})
-        return inline_svg_tag asset_path, size: '24px*24px' if asset_path.end_with?('.svg')
+      def render_vector_icon(asset_path, options = {})
+        return inline_svg_tag asset_path, size: options[:size] || '24px*24px' if asset_path.end_with?('.svg')
 
         image_tag asset_path, width: '24px'
       end

data/app/helpers/spree_cm_commissioner/transit/order_query_helper.rb

@@ -0,0 +1,17 @@
+module SpreeCmCommissioner
+  module Transit
+    module OrderQueryHelper
+      def self.transit_orders_for_vendor(vendor_id)
+        return Spree::Order.none if vendor_id.nil?
+
+        Spree::Order
+          .includes(:user, :created_by, { payments: :payment_method }, { line_items: { variant: :product } })
+          .joins(line_items: { variant: :product })
+          .where(spree_products: { product_type: :transit })
+          .where(spree_variants: { vendor_id: vendor_id })
+          .distinct
+          .order(created_at: :desc)
+      end
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/create_event.rb

@@ -9,7 +9,8 @@ module SpreeCmCommissioner
         assign_vendor
         assign_prototype
         create_child_taxon
-        build_home_banner
+        build_asset
+        create_place
       end
     end
 
@@ -55,15 +56,39 @@ module SpreeCmCommissioner
       context.fail!(message: child_taxon.errors.full_messages.join(', '))
     end
 
-    def build_home_banner
-      return if context.params[:home_banner].nil?
+    def asset(banner_type, asset_param, failure_message)
+      return if context.params[asset_param].nil?
 
-      banner = SpreeCmCommissioner::TaxonHomeBanner.create(
+      banner = banner_type.create(
         viewable: @parent_taxon,
-        attachment: context.params[:home_banner]
+        attachment: context.params[asset_param]
       )
 
-      context.fail!(message: 'Home banner upload failed') unless banner.persisted?
+      context.fail!(message: failure_message) unless banner.persisted?
+    end
+
+    def build_asset
+      asset(SpreeCmCommissioner::TaxonCategoryIcon, :category_icon, 'Logo upload failed') if context.params[:category_icon].present?
+      asset(SpreeCmCommissioner::TaxonHomeBanner, :home_banner, 'Home banner upload failed') if context.params[:home_banner].present?
+      context.params[:app_banner] = context.params[:home_banner] if context.params[:use_main_photo] == '1'
+      asset(SpreeCmCommissioner::TaxonAppBanner, :app_banner, 'App banner upload failed') if context.params[:app_banner].present?
+      asset(SpreeCmCommissioner::TaxonWebBanner, :web_banner, 'Web banner upload failed') if context.params[:web_banner].present?
+    end
+
+    def create_place
+      return if context.params[:base_64_content].blank?
+
+      place = SpreeCmCommissioner::PlaceDecoder.process_place(context.params[:base_64_content])
+
+      if place.save
+        SpreeCmCommissioner::TaxonPlace.create(
+          place_id: place.id,
+          taxon_id: @parent_taxon.id,
+          description: context.params[:place_description]
+        )
+      else
+        context.fail!(message: place.errors.full_messages.join(', '))
+      end
     end
   end
 end

data/app/interactors/spree_cm_commissioner/create_ticket.rb

@@ -9,6 +9,8 @@ module SpreeCmCommissioner
         set_option_value
         create_variant
         create_stock_item
+        upload_image
+        create_place
       end
     end
 
@@ -75,6 +77,37 @@ module SpreeCmCommissioner
       context.fail!(message: @stock_item.errors.full_messages.join(', '))
     end
 
+    def upload_image
+      return if context.params[:ticket_image].blank?
+
+      @image = @ticket.master.images.new(attachment: context.params[:ticket_image])
+      return if @image.save
+
+      context.fail!(message: @image.errors.full_messages.join(', '))
+    end
+
+    def create_place
+      if context.params[:base_64_content].present?
+        place = SpreeCmCommissioner::PlaceDecoder.process_place(context.params[:base_64_content])
+
+        if place.save
+          product_place = SpreeCmCommissioner::ProductPlace.create(
+            place_id: place.id,
+            product_id: @ticket.id
+          )
+          context.fail!(message: product_place.errors.full_messages.join(', ')) unless product_place.persisted?
+        else
+          context.fail!(message: place.errors.full_messages.join(', '))
+        end
+      elsif context.params[:place_id].present?
+        product_place = SpreeCmCommissioner::ProductPlace.create(
+          place_id: context.params[:place_id],
+          product_id: @ticket.id
+        )
+        context.fail!(message: product_place.errors.full_messages.join(', ')) unless product_place.persisted?
+      end
+    end
+
     def ticket_params
       {
         name: context.params[:name],
@@ -88,7 +121,9 @@ module SpreeCmCommissioner
         vendor_id: context.params[:vendor_id],
         status: context.params[:status],
         shipping_category_id: context.params[:shipping_category_id],
-        option_type_ids: context.params[:option_type_ids]
+        option_type_ids: context.params[:option_type_ids],
+        allow_anonymous_booking: context.params[:allow_anonymous_booking],
+        allow_self_check_in: context.params[:allow_self_check_in]
       }
     end
   end

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