spree_cm_commissioner 1.17.0.pre.pre7 → 1.18.0.pre.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a00e3ade6665258924af6b63276add5be49a3b887d193942c41b8ba4a1fa573
-  data.tar.gz: c30315d4d2f4313a342f94be21cf567cab1dbc4bac07cd754542d61d5de17990
+  metadata.gz: 7c6c8c2151ba24667cc1e9b85cd4977c6f3745e3c74149039e62fc1c890c769f
+  data.tar.gz: de557da12a035a1bd7aca057b643212e3032947076b347fda2607ab5c610a77e
 SHA512:
-  metadata.gz: 30c14950496e7a3df59fd8a5e3233572a30437f750d0d546d4ec87cc405a8d24850912b161ca74eab4530d1d7cf27e3cb333625b0b4915e63102e3b45f1a3e94
-  data.tar.gz: 3062f419e60420e2e9a87c57b8720051292ebdbff63b4308bc739e32309b4aef55498b06c1b2134ee3761b9c4fca5cea8d0ecf912d3bf928701292123a23e11b
+  metadata.gz: 640db753337cbeb97197940d575c5fea9ecccf4d64bf96fbf59b18ec2135b89a1165afe91a28d2f6a4270c2041cc4c4f14a4a42397f08c6c51433a585bc78062
+  data.tar.gz: dc0e18a7417112fdf20350f12d7558da7f8fc1002e6059c3595316d8da82a50a2dbcde94c07cef49282de7950c98ff16d2e703069166eb4e5a314c25ce0e8d4b

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (1.17.0.pre.pre7)
+    spree_cm_commissioner (1.18.0.pre.pre1)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront
@@ -572,10 +572,6 @@ GEM
     nokogiri (1.15.4)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-linux)
-      racc (~> 1.4)
     noticed (1.6.3)
       http (>= 4.0.0)
       rails (>= 5.2.0)

data/app/controllers/concerns/spree_cm_commissioner/content_cachable.rb

@@ -6,8 +6,9 @@ module SpreeCmCommissioner
       after_action :set_cache_control_for_cdn
     end
 
+    # Override This Method based on your UseCase
     def max_age
-      ENV.fetch('CONTENT_CACHE_MAX_AGE', '180')
+      ENV.fetch('CONTENT_CACHE_MAX_AGE', 1.day.to_i).to_i
     end
 
     def set_cache_control_for_cdn

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

@@ -38,20 +38,7 @@ module Spree
           def update
             spree_authorize! :update, spree_current_order, order_token
 
-            if guest_params[:guest_dynamic_fields_attributes]
-              resource.guest_dynamic_fields.destroy_all
-
-              guest_params[:guest_dynamic_fields_attributes].each do |attr|
-                field = resource.guest_dynamic_fields.build(attr.except(:id))
-
-                if field.dynamic_field.requires_dynamic_field_options?
-                  option = field.dynamic_field.dynamic_field_options.find_by(id: field.value)
-                  field.dynamic_field_option = option if option
-                end
-
-                field.save!
-              end
-            end
+            update_dynamic_fields if guest_params[:guest_dynamic_fields_attributes]
 
             resource.assign_attributes(guest_params.except(:guest_dynamic_fields_attributes))
 
@@ -96,6 +83,26 @@ module Spree
               guest_dynamic_fields_attributes: %i[id dynamic_field_id dynamic_field_option_id value _destroy]
             )
           end
+
+          def update_dynamic_fields
+            resource.guest_dynamic_fields.destroy_all
+
+            dynamic_fields_attrs = guest_params[:guest_dynamic_fields_attributes]
+
+            resource.guest_dynamic_fields = dynamic_fields_attrs.map do |attr|
+              build_dynamic_field(attr)
+            end
+          end
+
+          def build_dynamic_field(attr)
+            field = resource.guest_dynamic_fields.build(attr.except(:id))
+
+            if field.dynamic_field.requires_dynamic_field_options?
+              field.dynamic_field_option = field.dynamic_field.dynamic_field_options.find_by(id: field.value)
+            end
+
+            field
+          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] = @product.kyc
+          permitted_resource_params[:kyc] = nil
         else
           @kyc_result = calculate_kyc_value(params[:variant])
           permitted_resource_params[:kyc] = @kyc_result

data/app/controllers/spree_cm_commissioner/well_known_controller.rb

@@ -3,19 +3,31 @@ module SpreeCmCommissioner
     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)
+    def assetlinks_json
+      render_universal_link('assetlinks.json')
+    end
+
+    def apple_app_site_association
+      render_universal_link('apple-app-site-association')
+    end
+
+    private
+
+    def render_universal_link(universal_link)
+      result = SpreeCmCommissioner::UniversalLinkFetcher.new(
+        universal_link: universal_link,
+        store: @store,
+        tenant: @tenant,
+        refresh: params[:_refresh].to_s == 'true'
+      ).call
+
+      if result[:success]
+        render json: result[:data]
       else
         render_not_found
       end
     end
 
-    private
-
     def identify_request_source
       host = params[:original_host].presence || request.host.downcase
 
@@ -25,16 +37,6 @@ module SpreeCmCommissioner
       @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

data/app/interactors/spree_cm_commissioner/universal_link_fetcher.rb

@@ -0,0 +1,54 @@
+module SpreeCmCommissioner
+  class UniversalLinkFetcher < BaseInteractor
+    delegate :universal_link, :store, :tenant, :refresh, to: :context
+
+    def call
+      return not_found unless resource
+
+      data = load_cached_preference(resource)
+      return not_found if data.blank?
+
+      { success: true, data: data }
+    end
+
+    private
+
+    def resource
+      @resource ||= store.presence || tenant
+    end
+
+    def load_cached_preference(resource)
+      preference_key = preference_key_for(universal_link)
+      return nil unless preference_key && resource.respond_to?(preference_key)
+
+      updated_at = resource.try(:updated_at)&.to_i || 'no_updated_at'
+      cache_key = build_cache_key(universal_link, resource, updated_at)
+
+      CmAppLogger.log(label: 'LOOKING_UP_CACHE', data: { cache_key: cache_key })
+
+      Rails.cache.delete(cache_key) if refresh
+
+      Rails.cache.fetch(cache_key, expires_in: 1.day, force: refresh) do
+        CmAppLogger.log(label: 'CACHE_MISS', data: { cache_key: cache_key })
+        resource.public_send(preference_key).presence
+      end
+    end
+
+    def build_cache_key(universal_link, resource, updated_at)
+      "well_known:#{universal_link}:#{resource.class.name}:#{resource.id}:#{updated_at}"
+    end
+
+    def preference_key_for(universal_link)
+      case universal_link
+      when 'assetlinks.json'
+        :preferred_assetlinks
+      when 'apple-app-site-association'
+        :preferred_apple_app_site_association
+      end
+    end
+
+    def not_found
+      { success: false, error: 'Not found' }
+    end
+  end
+end

data/app/models/spree_cm_commissioner/invite_team.rb

@@ -1,5 +1,7 @@
 module SpreeCmCommissioner
   class InviteTeam < SpreeCmCommissioner::Base
+    validates :email, presence: true, uniqueness: { scope: :vendor_id, message: I18n.t('invite.already_invited') }
+
     belongs_to :user, class_name: 'Spree::User', optional: true
     belongs_to :inviter, class_name: 'Spree::User'
     belongs_to :vendor, class_name: 'Spree::Vendor'

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

@@ -2,13 +2,13 @@
 
 <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 == @product.kyc) %>
+  <%= f.check_box :use_product_kyc, id: "toggleGuestInfo", class: 'form-check-input mr-2', checked: @variant.kyc.nil? %>
   <label for="toggleGuestInfo" class="form-check-label">
     Use Product Guest Information
   </label>
 </div>
 
-<div id="guestInfoForm" <% if @variant.kyc == @product.kyc %>style="display: none;"<% end %>">
+<div id="guestInfoForm" <% if @variant.kyc.nil? %>style="display: none;"<% end %>">
   <small class="form-text text-muted mb-4">
     <%= raw I18n.t('kyc.variant_note') %>
   </small>

data/config/routes.rb

@@ -669,5 +669,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/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '1.17.0-pre7'.freeze
+  VERSION = '1.18.0-pre1'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 1.17.0.pre.pre7
+  version: 1.18.0.pre.pre1
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-04 00:00:00.000000000 Z
+date: 2025-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -1116,6 +1116,7 @@ files:
 - app/interactors/spree_cm_commissioner/telegram_web_app_vendor_user_checker.rb
 - app/interactors/spree_cm_commissioner/transactional_email_sender.rb
 - app/interactors/spree_cm_commissioner/unique_device_token_cron_executor.rb
+- app/interactors/spree_cm_commissioner/universal_link_fetcher.rb
 - app/interactors/spree_cm_commissioner/update_payment_gateway_status.rb
 - app/interactors/spree_cm_commissioner/user_contact_updater.rb
 - app/interactors/spree_cm_commissioner/user_device_token_deregister.rb