spree_cm_commissioner 1.8.8 → 1.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 687ff4cf4e03ffe157a851660a8d0a82f90463ab2f7e2050e8d25e0792377989
-  data.tar.gz: 78794baf30a3bf2bcf033cc1ca921c422c273d2a3eb50ce40481c7424cd07950
+  metadata.gz: 1b66674e326443a681e0e4f80caa6a25569d508141a05966471c14f675a6690d
+  data.tar.gz: ab0ab4b8b78a04c5a9f54ab15ce88df60b5719b85566ab8aae8c1a6574a46d73
 SHA512:
-  metadata.gz: 7b1884005a4e95691a3f71c6d2a128c821cd32fb41a29bb7af72f4be5a2a3734a8c81137a29d4a3a258832118c446ce8b93656122ebeeb8dc8e985edfca400ad
-  data.tar.gz: 5c5c8d8dd8f1a75402b034f9e158554cf00aa3e1d7a25f16c983c71a3867b4d4312f882e0863a30b463df82e205a59daa19b432f84e67a34c6adcab484e38786
+  metadata.gz: cb4d294124696d2fa0aa76beb43eb2ce76182565118d5d98b750efd5df27daadd2081dc4c3bd707c37794c375d3ac0f55b448ec0c2b52389b6169f70d261102d
+  data.tar.gz: d522bb1bc55ddb70ce0185ab6c0352a51829199c535da283555a33d9ca1897379b95229593fc2e98ed0023c8d4ca3ef9318438d1558439435656b9a33c8d14ac

data/Gemfile.lock

@@ -34,12 +34,13 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (1.8.8)
+    spree_cm_commissioner (1.8.9)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront
       aws-sdk-ecs
       aws-sdk-s3
+      blazer (~> 3.0.4)
       byebug
       counter_culture (~> 3.2)
       dry-validation (~> 1.10)
@@ -215,6 +216,12 @@ GEM
     base64 (0.1.1)
     bcrypt (3.1.19)
     bigdecimal (3.1.8)
+    blazer (3.0.4)
+      activerecord (>= 6.1)
+      chartkick (>= 5)
+      csv
+      railties (>= 6.1)
+      safely_block (>= 0.4)
     bootstrap (4.6.2)
       autoprefixer-rails (>= 9.1.0)
       popper_js (>= 1.16.1, < 2)
@@ -238,6 +245,7 @@ GEM
     capybara-select-2 (0.5.1)
     carmen (1.1.3)
       activesupport (>= 3.0.0)
+    chartkick (5.1.4)
     chunky_png (1.4.0)
     coderay (1.1.3)
     concurrent-ruby (1.2.2)
@@ -253,6 +261,7 @@ GEM
     crass (1.0.6)
     css_parser (1.16.0)
       addressable
+    csv (3.3.3)
     database_cleaner (2.0.2)
       database_cleaner-active_record (>= 2, < 3)
     database_cleaner-active_record (2.1.0)
@@ -698,6 +707,7 @@ GEM
       ffi (~> 1.12)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
+    safely_block (0.4.1)
     sass-rails (6.0.0)
       sassc-rails (~> 2.1, >= 2.1.1)
     sassc (2.4.0)

data/app/controllers/blazer/base_controller_decorator.rb

@@ -1,10 +1,15 @@
+# https://stackoverflow.com/questions/77318060/blazer-raised-activerecordconnectionnotestablished
 module Blazer
   module BaseControllerDecorator
     def self.prepended(base)
+      base.around_action :set_writing_role
       base.before_action :restrict_organizer_access
     end
 
-    private
+    # Annonymous block: https://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Naming/BlockForwarding
+    def set_writing_role(&block)
+      ActiveRecord::Base.connected_to(role: :writing, &block)
+    end
 
     def restrict_organizer_access
       return unless spree_current_user.organizer? && !spree_current_user.admin?
@@ -15,4 +20,4 @@ module Blazer
   end
 end
 
-Blazer::BaseController.prepend(Blazer::BaseControllerDecorator) if defined?(Blazer::BaseController)
+Blazer::BaseController.prepend(Blazer::BaseControllerDecorator) unless Blazer::BaseController.ancestors.include?(Blazer::BaseControllerDecorator)

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

@@ -19,7 +19,7 @@ module Spree
             render_error_payload(context.message, 400)
           end
 
-          # :phone_number, :email, :type, :recaptcha_token, :recaptcha_action, :recaptcah_site_key
+          # :phone_number, :email, :type, :tenant
           def create
             context = SpreeCmCommissioner::PinCodeGenerator.call(pin_code_attrs)
 
@@ -40,8 +40,10 @@ module Spree
             SpreeCmCommissioner::V2::Storefront::PinCodeSerializer
           end
 
+          private
+
           def pin_code_attrs
-            params.slice(:phone_number, :email, :type)
+            params.slice(:phone_number, :email, :type).merge(tenant: @tenant)
           end
         end
       end

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

@@ -3,7 +3,7 @@ module Spree
     module V2
       module Tenant
         class PinCodeGeneratorsController < BaseController
-          # :phone_number, :email, :type
+          # :phone_number, :email, :type, :tenant
           def create
             context = SpreeCmCommissioner::PinCodeGenerator.call(pin_code_attrs)
 
@@ -24,8 +24,10 @@ module Spree
             SpreeCmCommissioner::V2::Storefront::PinCodeSerializer
           end
 
+          private
+
           def pin_code_attrs
-            params.slice(:phone_number, :email, :type)
+            params.slice(:phone_number, :email, :type).merge(tenant: @tenant)
           end
         end
       end

data/app/helpers/spree_cm_commissioner/pin_code_sender_helper.rb

@@ -0,0 +1,22 @@
+module SpreeCmCommissioner
+  module PinCodeSenderHelper
+    def sender_name(tenant)
+      return Spree::Store.default&.name if tenant.nil?
+
+      tenant.active_vendor&.name
+    end
+
+    def sender_email(tenant)
+      return Spree::Store.default.mail_from_address if tenant.nil?
+
+      tenant.active_vendor&.notification_email
+    end
+
+    def logo_url(tenant)
+      vendor_or_store = tenant.nil? || tenant.active_vendor.nil? ? Spree::Store.default : tenant.active_vendor
+      return unless vendor_or_store&.logo&.attachment&.attached?
+
+      main_app.cdn_image_url(vendor_or_store.logo.attachment.variant(resize_to_limit: [244, 104]))
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/pin_code_sender.rb

@@ -15,7 +15,10 @@ module  SpreeCmCommissioner
     private
 
     def send_sms
+      from = context.tenant || Spree::Store.default
+
       options = {
+        from: from,
         to: context.pin_code.contact,
         body: I18n.t('pincode_sender.sms.body', code: context.pin_code.code, readable_type: context.pin_code.readable_type)
       }
@@ -24,13 +27,22 @@ module  SpreeCmCommissioner
     end
 
     def send_email
-      SpreeCmCommissioner::PinCodeMailer.send_pin_code(context.pin_code.id, context.pin_code.readable_type).deliver_later
+      SpreeCmCommissioner::PinCodeMailer.send_pin_code(
+        context.pin_code.id,
+        context.pin_code.readable_type,
+        context.tenant
+      ).deliver_later
     end
 
     def send_telegram_debug_pin_code
       return unless ENV['PIN_CODE_DEBUG_NOTIFIY_TELEGRAM_ENABLE'] == 'yes'
 
-      SpreeCmCommissioner::TelegramDebugPinCodeSenderJob.perform_later(context.pin_code.id)
+      options = {
+        pin_code_id: context.pin_code.id,
+        tenant_id: context.tenant&.id
+      }
+
+      SpreeCmCommissioner::TelegramDebugPinCodeSenderJob.perform_later(options)
     end
   end
 end

data/app/interactors/spree_cm_commissioner/sms.rb

@@ -40,7 +40,7 @@ module  SpreeCmCommissioner
     end
 
     def sms_options
-      opts = { to: context.to, body: context.body }
+      opts = { from: context.from, to: context.to, body: context.body }
       opts[:to] = sanitize(opts[:to]) if opts[:to].present?
       opts[:from] = from_number
       opts

data/app/interactors/spree_cm_commissioner/telegram_debug_pin_code_sender.rb

@@ -1,6 +1,6 @@
 module SpreeCmCommissioner
   class TelegramDebugPinCodeSender < BaseInteractor
-    delegate :pin_code, to: :context
+    delegate :pin_code, :name, to: :context
 
     def call
       telegram_client.send_message(
@@ -13,6 +13,7 @@ module SpreeCmCommissioner
     def body
       text = []
 
+      text << "<b>From: #{name}</b>"
       text << "<b>PIN CODE sent to #{pin_code.contact}</b>"
       text << "<code>#{pin_code.code}</code> is your #{pin_code.readable_type}"
 

data/app/jobs/spree_cm_commissioner/sms_pin_code_job.rb

@@ -1,6 +1,6 @@
 module SpreeCmCommissioner
   class SmsPinCodeJob < SpreeCmCommissioner::SmsJob
-    # options = { to: xxxx, body: xxxx }
+    # options = { from: xxx, to: xxxx, body: xxxx }
     def perform(options)
       SpreeCmCommissioner::Sms.call(options)
     end

data/app/jobs/spree_cm_commissioner/telegram_debug_pin_code_sender_job.rb

@@ -1,9 +1,17 @@
 module SpreeCmCommissioner
   class TelegramDebugPinCodeSenderJob < ApplicationUniqueJob
-    def perform(pin_code_id)
-      pin_code = SpreeCmCommissioner::PinCode.find(pin_code_id)
+    include SpreeCmCommissioner::PinCodeSenderHelper
 
-      SpreeCmCommissioner::TelegramDebugPinCodeSender.call(pin_code: pin_code)
+    def perform(options)
+      pin_code = SpreeCmCommissioner::PinCode.find(options[:pin_code_id])
+      tenant = SpreeCmCommissioner::Tenant.find_by(id: options[:tenant_id])
+
+      name = sender_name(tenant)
+
+      SpreeCmCommissioner::TelegramDebugPinCodeSender.call(
+        pin_code: pin_code,
+        name: name
+      )
     end
   end
 end

data/app/mailers/spree_cm_commissioner/pin_code_mailer.rb

@@ -1,13 +1,19 @@
 module SpreeCmCommissioner
   class PinCodeMailer < Spree::BaseMailer
-    def send_pin_code(pin_code_id, action)
+    include SpreeCmCommissioner::PinCodeSenderHelper
+
+    def send_pin_code(pin_code_id, action, tenant)
       @pin_code = SpreeCmCommissioner::PinCode.find(pin_code_id)
 
+      @sender_name = sender_name(tenant)
+      @sender_email = sender_email(tenant)
+      @logo_path = logo_url(tenant)
+
       return unless @pin_code.email?
 
-      subject = "#{Spree::Store.default.name} #{action.titlecase}"
+      subject = "#{@sender_name} #{action.titlecase}"
 
-      mail(from: from_address, to: @pin_code.contact, subject: subject)
+      mail(from: @sender_email, to: @pin_code.contact, subject: subject)
     end
   end
 end

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

@@ -3,6 +3,7 @@ module SpreeCmCommissioner
     extend ActiveSupport::Concern
 
     included do
+      preference :sms_sender_id, :string
       preference :telegram_order_alert_chat_id, :string
       preference :telegram_order_request_alert_chat_id, :string
     end

data/app/models/spree_cm_commissioner/store_decorator.rb

@@ -5,6 +5,7 @@ module SpreeCmCommissioner
 
       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'
     end
   end
 end

data/app/models/spree_cm_commissioner/tenant.rb

@@ -13,6 +13,10 @@ module SpreeCmCommissioner
 
     before_validation :generate_slug, if: -> { slug.blank? && name.present? }
 
+    def active_vendor
+      vendors.where(state: :active).first
+    end
+
     private
 
     def generate_slug

data/app/views/spree/shared/_base_mailer_header.html.erb

@@ -0,0 +1,12 @@
+<!-- override base_mailer_header.html.erb -->
+<tr>
+  <td class="email-masthead">
+    <%= link_to @sender_name, class: 'template-label' do %>
+      <% if @logo_path.present? %>
+        <%= image_tag @logo_path, class: 'logo', alt: @sender_name, title: @sender_name %>
+      <% else %>
+        <%= @sender_name %>
+      <% end %>
+    <% end %>
+  </td>
+</tr>

data/app/views/spree_cm_commissioner/pin_code_mailer/send_pin_code.html.erb

@@ -3,7 +3,7 @@
     <tr>
       <td>
         <h4>Hello, </h4>
-        <p>Welcome to <%= Spree::Store.default.name %> </p>
+        <p>Welcome to <%= @sender_name %> </p>
         <p>Please use the following code:</p>
         <h5 style="font-size: 22px;padding: 0 10px;"><%= @pin_code.code %></h5>
         <p>to verify your account.</p>
@@ -11,7 +11,7 @@
         <br>
         <p>
           Regards,<br>
-          The <%= Spree::Store.default.name  %> team
+          The <%= @sender_name %> team
         </p>
       </td>
     </tr>

data/config/routes.rb

@@ -1,5 +1,10 @@
 Spree::Core::Engine.add_routes do
   # Add your extension routes here
+
+  authenticate :spree_user, -> (user) { user.admin? || user.organizer? } do
+    mount Blazer::Engine, at: 'admin/bi_reports'
+  end
+
   namespace :admin do
     post '/invalidate_api_caches', to: 'base#invalidate_api_caches'
 

data/db/migrate/20250403040036_install_blazer.rb

@@ -44,4 +44,4 @@ class InstallBlazer < ActiveRecord::Migration[7.0]
       t.timestamps null: false
     end
   end
-end
+end

data/db/migrate/20250403083001_create_spree_cm_commissioner_taxon_blazer_query.rb

@@ -7,4 +7,3 @@ class CreateSpreeCmCommissionerTaxonBlazerQuery < ActiveRecord::Migration[7.0]
     end
   end
 end
-

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '1.8.8'.freeze
+  VERSION = '1.8.9'.freeze
 
   module_function
 

data/lib/spree_cm_commissioner.rb

@@ -3,6 +3,7 @@ require 'spree_api_v1'
 require 'spree_backend'
 require 'spree_auth_devise'
 require 'spree_multi_vendor'
+require 'blazer'
 require 'spree_extension'
 
 require 'spree_cm_commissioner/engine'

data/spree_cm_commissioner.gemspec

@@ -28,7 +28,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'spree_backend', spree_opts
   s.add_dependency 'spree_multi_vendor', '>= 2.4.1'
   s.add_dependency 'spree_extension'
-
   s.add_dependency 'activerecord-multi-tenant'
   s.add_dependency 'phonelib'
   s.add_dependency 'aws-sdk-ecs'
@@ -56,5 +55,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'counter_culture', '~> 3.2'
   s.add_development_dependency 'pg'
   s.add_development_dependency 'spree_dev_tools'
+  s.add_dependency 'blazer', '~> 3.0.4'
   s.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 1.8.8
+  version: 1.8.9
 platform: ruby
 authors:
 - You
@@ -478,6 +478,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: blazer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.4
 description: Add (optional) extension description here
 email: you@example.com
 executables: []
@@ -940,6 +954,7 @@ files:
 - app/helpers/spree_cm_commissioner/admin/video_on_demand_helper.rb
 - app/helpers/spree_cm_commissioner/billing/monthly_orders_helper.rb
 - app/helpers/spree_cm_commissioner/billing/qrcodes_helper.rb
+- app/helpers/spree_cm_commissioner/pin_code_sender_helper.rb
 - app/helpers/spree_cm_commissioner/telegram/base_helper.rb
 - app/helpers/spree_cm_commissioner/transit/service_calendars_helper.rb
 - app/interactors/spree_cm_commissioner/accommodation_search_detail.rb
@@ -1909,6 +1924,7 @@ files:
 - app/views/spree/order_mailer/confirm_email.html.erb
 - app/views/spree/order_mailer/ticket_email.html.erb
 - app/views/spree/order_mailer/ticket_email.text.erb
+- app/views/spree/shared/_base_mailer_header.html.erb
 - app/views/spree/telegram/errors/_error.html.erb
 - app/views/spree/telegram/errors/forbidden.html.erb
 - app/views/spree/telegram/errors/resource_not_found.html.erb