spree_cm_commissioner 1.8.5 → 1.8.6.pre.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53d7b7682c7178ee43a82fa1bed180bff277284eb4cc11790f7b9286d4aa2c98
-  data.tar.gz: e352ffca56db709ce091fd5d1900b0893ef86fc55a0c0254da1443cad454a49f
+  metadata.gz: b0b65120bd40e618788bb86e33eee9c8a8e153d94009f1d75d0ba14aa4a53892
+  data.tar.gz: 8051369cfb6c2d1629c572092b6ddc25c4ebea0141260342e27d23c87fa4b260
 SHA512:
-  metadata.gz: ab207fab5a440fb505cb157f7d29070c3d0f53a89117854bcdfceb0141e9cea8cc497d73d80afae1b6921c79b566744b52e86e4783c747527fa36bfb19505e5a
-  data.tar.gz: 790e0b20a95d9a52c525b1e0528f6421479742d2713fd87fc325e3b69c09ab8c6804db3969fee36256d13e728ace25277a2a2f3e96aad496ff3e02fa0695d2ac
+  metadata.gz: 529acfe1be953123a8566c8b947e3f9672b1685e9f26de383c1f862c7efd16e64bafb69922a92b4b1c160181d759e019876357acd8ef6c8eb591192b86081cc2
+  data.tar.gz: 5e30758a1ed19f5197120ad204bc619a9c8e798bcae5c1670c9ac0d884872fb033e495f45cc454363c703670eae87ffb9ce4ab6b6cbb7372951175ea733b0b71

data/Gemfile.lock

@@ -34,12 +34,13 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (1.8.5)
+    spree_cm_commissioner (1.8.6.pre.beta1)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront
       aws-sdk-ecs
       aws-sdk-s3
+      blazer (~> 3.0.0)
       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

@@ -0,0 +1,23 @@
+# 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
+
+    # 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?
+      return if controller_name == 'queries' && %w[show run].include?(action_name)
+
+      raise ActionController::RoutingError, 'Unauthorized'
+    end
+  end
+end
+
+Blazer::BaseController.prepend(Blazer::BaseControllerDecorator) unless Blazer::BaseController.ancestors.include?(Blazer::BaseControllerDecorator)

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

@@ -0,0 +1,23 @@
+module Spree
+  module Admin
+    class EventBlazerQueriesController < Spree::Admin::ResourceController
+      def model_class
+        SpreeCmCommissioner::TaxonBlazerQuery
+      end
+
+      def object_name
+        'spree_cm_commissioner_taxon_blazer_query'
+      end
+
+      def create
+        event_blazer = SpreeCmCommissioner::TaxonBlazerQuery.new(taxon_id: params[:event_id], blazer_query_id: params[:blazer_query_id])
+        if event_blazer.save
+          flash[:success] = I18n.t('event_blazer_queries.success')
+        else
+          flash[:alert] = event_blazer.errors.full_messages.join(', ')
+        end
+        redirect_to blazer.query_path(id: event_blazer.blazer_query_id, event_id: event_blazer.taxon_id)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        class ActiveHomepageEventsController < Spree::Api::V2::ResourceController
+          private
+
+          def collection
+            @collection ||= model_class.active_homepage_events
+          end
+
+          def model_class
+            Spree::Taxon
+          end
+
+          def collection_serializer
+            Spree::V2::Storefront::ActiveHomepageEventSerializer
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/tenant/account/orders_controller.rb

@@ -0,0 +1,48 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        module Account
+          class OrdersController < BaseController
+            around_action :wrap_with_multitenant_without
+            before_action :require_spree_current_user
+
+            def collection
+              scope
+            end
+
+            def resource
+              @resource ||= scope.find_by!(number: params[:id])
+            end
+
+            private
+
+            def wrap_with_multitenant_without(&block)
+              MultiTenant.without(&block)
+            end
+
+            def allowed_sort_attributes
+              super << :completed_at
+            end
+
+            def scope
+              spree_current_user.orders.complete
+            end
+
+            def collection_serializer
+              Spree::V2::Tenant::OrderSerializer
+            end
+
+            def resource_serializer
+              Spree::V2::Tenant::OrderSerializer
+            end
+
+            def model_class
+              Spree::Order
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/spree_cm_commissioner/order_decorator.rb

@@ -38,6 +38,7 @@ module SpreeCmCommissioner
       base.has_many :vendors, through: :products, class_name: 'Spree::Vendor'
       base.has_many :taxons, through: :products, class_name: 'Spree::Taxon'
       base.has_many :guests, through: :line_items, class_name: 'SpreeCmCommissioner::Guest'
+      base.has_many :guest_card_classes, class_name: 'SpreeCmCommissioner::GuestCardClass', through: :variants
 
       base.delegate :customer, to: :user, allow_nil: true
 

data/app/models/spree_cm_commissioner/role_decorator.rb

@@ -4,7 +4,16 @@ module SpreeCmCommissioner
       base.has_many :role_permissions, class_name: 'SpreeCmCommissioner::RolePermission'
       base.has_many :permissions, through: :role_permissions, class_name: 'SpreeCmCommissioner::Permission'
 
+      base.belongs_to :vendor, optional: true
+
+      base.scope :non_vendor, -> { where(vendor_id: nil) }
+
       base.accepts_nested_attributes_for :role_permissions, allow_destroy: true
+
+      base._validators.reject! { |key, _| key == :name }
+      base._validate_callbacks.each { |c| c.filter.attributes.delete(:name) if c.filter.respond_to?(:attributes) }
+
+      base.validates :name, uniqueness: { scope: :vendor_id, allow_blank: true }
     end
   end
 end

data/app/models/spree_cm_commissioner/taxon_blazer_query.rb

@@ -0,0 +1,8 @@
+module SpreeCmCommissioner
+  class TaxonBlazerQuery < SpreeCmCommissioner::Base
+    belongs_to :taxon, class_name: 'Spree::Taxon'
+    belongs_to :blazer_query, class_name: 'Blazer::Query'
+
+    validates :taxon_id, uniqueness: { scope: :blazer_query_id, message: I18n.t('event_blazer_queries.fail') }
+  end
+end

data/app/models/spree_cm_commissioner/taxon_decorator.rb

@@ -1,7 +1,7 @@
 module SpreeCmCommissioner
   module TaxonDecorator
     # rubocop:disable Metrics/MethodLength
-    def self.prepended(base)
+    def self.prepended(base) # rubocop:disable Metrics/AbcSize
       base.include SpreeCmCommissioner::TaxonKind
       base.include SpreeCmCommissioner::Transit::TaxonBitwise
 
@@ -54,6 +54,18 @@ module SpreeCmCommissioner
       base.has_many :invite_user_events, through: :user_events, class_name: 'SpreeCmCommissioner::InviteUserEvent'
 
       base.has_many :line_items, through: :products
+      base.has_many :event_blazer_queries, class_name: 'SpreeCmCommissioner::TaxonBlazerQuery'
+      base.has_many :blazer_queries, through: :event_blazer_queries, class_name: 'Blazer::Query'
+
+      def base.active_homepage_events
+        joins(:homepage_section_relatables)
+          .joins("INNER JOIN spree_taxons taxon ON taxon.id = cm_homepage_section_relatables.relatable_id
+                  AND cm_homepage_section_relatables.relatable_type = 'Spree::Taxon'"
+                )
+          .joins('INNER JOIN cm_homepage_sections ON cm_homepage_section_relatables.homepage_section_id = cm_homepage_sections.id')
+          .where(cm_homepage_sections: { tenant_id: nil, active: true })
+          .where(kind: :event)
+      end
     end
     # rubocop:enable Metrics/MethodLength
 

data/app/models/spree_cm_commissioner/trip_connection.rb

@@ -0,0 +1,30 @@
+module SpreeCmCommissioner
+  class TripConnection < ApplicationRecord
+    attr_accessor :hours, :minutes
+
+    belongs_to :from_trip, class_name: 'Spree::Variant'
+    belongs_to :to_trip, class_name: 'Spree::Variant'
+
+    validate :both_trip_cannot_be_the_same
+    before_validation :calculate_connection_time_minutes
+
+    private
+
+    def calculate_connection_time_minutes
+      return if from_trip.nil? || to_trip.nil?
+
+      connection_time_in_minutes = (to_trip.options.departure_time - from_trip.options.arrival_time) / 60
+      if connection_time_in_minutes.between?(0, 180)
+        self.connection_time_minutes = connection_time_in_minutes
+      else
+        errors.add(:base, 'Connection time should be between 0 and 180 minutes')
+      end
+    end
+
+    def both_trip_cannot_be_the_same
+      return unless from_trip.id == to_trip.id
+
+      errors.add(:base, 'Both trip cannot be the same')
+    end
+  end
+end

data/app/models/spree_cm_commissioner/user_decorator.rb

@@ -55,6 +55,15 @@ module SpreeCmCommissioner
       base.has_many :places, through: :user_places, class_name: 'SpreeCmCommissioner::Place'
     end
 
+    def permissions_for_vendor(vendor_id)
+      permissions.joins(role_permissions: :role).where(spree_roles: { vendor_id: vendor_id })
+    end
+
+    # override
+    def has_spree_role?(role_name) # rubocop:disable Naming/PredicateName
+      spree_roles.non_vendor.exists?(name: role_name)
+    end
+
     def super_admin?
       has_spree_role?('super_admin')
     end

data/app/overrides/spree/admin/taxons/_form/hide_video_banner.html.erb.deface

@@ -0,0 +1,7 @@
+<!-- insert_before "erb[loud]:contains('field_container :hide_from_nav')" -->
+
+<%= f.field_container :hide_video_banner, class: ['custom-control', 'custom-checkbox', 'my-4'] do %>
+  <%= f.check_box :hide_video_banner, class: 'custom-control-input' %>
+  <%= f.label :hide_video_banner, Spree.t(:hide_video_banner), class: 'custom-control-label' %>
+  <%= f.error_message_on :hide_video_banner %>
+<% end %>

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

@@ -0,0 +1,18 @@
+module Spree
+  module V2
+    module Storefront
+      class ActiveHomepageEventSerializer < BaseSerializer
+        attributes :name, :pretty_name, :permalink, :seo_title,
+                   :description, :meta_title, :meta_description, :meta_keywords,
+                   :depth, :updated_at, :custom_redirect_url, :kind,
+                   :subtitle, :from_date, :to_date
+
+        attribute  :is_root, &:root?
+        attribute  :is_child, &:child?
+        attribute  :is_leaf, &:leaf?
+
+        has_one    :category_icon, serializer: ::SpreeCmCommissioner::V2::Storefront::AssetSerializer
+      end
+    end
+  end
+end

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

@@ -14,7 +14,7 @@ module Spree
 
           base.attributes :custom_redirect_url, :kind, :subtitle, :from_date, :to_date,
                           :background_color, :foreground_color, :show_badge_status,
-                          :purchasable_on, :vendor_id, :available_on
+                          :purchasable_on, :vendor_id, :available_on, :hide_video_banner
 
           base.attribute :purchasable_on_app do |taxon|
             taxon.purchasable_on == 'app' || taxon.purchasable_on == 'both'

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

@@ -0,0 +1,10 @@
+module Spree
+  module V2
+    module Tenant
+      class BookingCardClassSerializer < GuestCardClassSerializer
+        attributes :name, :class_type
+        has_one :background_image, serializer: SpreeCmCommissioner::V2::Storefront::AssetSerializer
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Spree
+  module V2
+    module Tenant
+      class GuestCardClassSerializer < BaseSerializer
+        attributes :id, :name
+
+        belongs_to :taxon, serializer: Spree::V2::Storefront::TaxonSerializer
+      end
+    end
+  end
+end

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

@@ -2,6 +2,7 @@ module Spree
   module V2
     module Tenant
       class OrderSerializer < Spree::V2::Storefront::CartSerializer
+        has_many :guest_card_classes, serializer: Spree::V2::Tenant::BookingCardClassSerializer
       end
     end
   end

data/app/views/blazer/queries/_content.html.erb

@@ -0,0 +1,85 @@
+<% blazer_title @query.name %>
+
+<div class="topbar">
+  <div class="container">
+    <div class="row" style="padding-top: 13px;">
+      <div class="col-sm-9">
+        <%= render partial: "blazer/nav" %>
+        <h3 style="line-height: 34px; display: inline; margin-left: 5px;">
+          <%= @query.name %>
+        </h3>
+      </div>
+      <div class="col-sm-3 text-right">
+        <%= link_to "Edit", edit_query_path(@query, params: variable_params(@query)), class: "btn btn-default", disabled: !@query.editable?(blazer_user) %>
+        <%= link_to "Fork", new_query_path(params: {variables: variable_params(@query), fork_query_id: @query.id, data_source: @query.data_source, name: @query.name}), class: "btn btn-info" %>
+
+        <% if !@error && @success %>
+          <%= button_to "Download", run_queries_path(format: "csv"), params: @run_data, class: "btn btn-primary" %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div style="margin-bottom: 60px;"></div>
+
+<% if @sql_errors.any? %>
+  <div class="alert alert-danger">
+    <ul>
+      <% @sql_errors.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+    </ul>
+  </div>
+<% end %>
+
+<% if @query.description.present? %>
+  <p style="white-space: pre-line;"><%= @query.description %></p>
+<% end %>
+
+<div style="display: flex;">
+  <%= render partial: "blazer/variables", locals: { action: query_path(@query) } %>
+  <% if !@error && @success && params[:event_id].present? %>
+    <div>
+      <%= link_to 'Save Event',
+                  spree.admin_event_blazer_queries_path(event_id: params[:event_id], blazer_query_id: params[:id].split('-').first),
+                  method: :post,
+                  class: "btn btn-primary",
+                  style: "margin-left: 10px;" %>
+    </div>
+  <% end %>
+</div>
+
+<% if flash[:success] %>
+  <div class="alert alert-success">
+    <%= flash[:success] %>
+  </div>
+<% elsif flash[:alert] %>
+  <div class="alert alert-danger">
+    <%= flash[:alert] %>
+  </div>
+<% end %>
+
+
+<pre id="code"><code><%= @statement.display_statement %></code></pre>
+
+<% if @success %>
+  <div id="results">
+    <p class="text-muted">Loading...</p>
+  </div>
+
+  <script>
+    function showRun(data) {
+      $("#results").html(data)
+      $("#results table").stupidtable(stupidtableCustomSettings).stickyTableHeaders({fixedOffset: 60})
+    }
+
+    function showError(message) {
+      $("#results").addClass("query-error").html(message)
+    }
+
+    <%= blazer_js_var "data", @run_data %>
+
+    runQuery(data, showRun, showError)
+  </script>
+<% end %>

data/app/views/blazer/queries/embed/_content.html.erb

@@ -0,0 +1,85 @@
+<div class="topbar">
+  <div class="row" style="padding-top: 13px; margin: 0;">
+    <div class="col-sm-9"></div>
+    <div class="col-sm-3 text-right">
+      <%= render partial: 'blazer/queries/embed/download_button' %>
+    </div>
+  </div>
+</div>
+<div style="margin-bottom: 10px;"></div>
+
+<% if @success %>
+  <div id="results" style="font-family: 'Poppins', sans-serif;"></div>
+    <p class="text-muted">Loading...</p>
+  </div>
+
+  <script>
+    function showRun(data) {
+      $("#results").html(data)
+      $("#results table").stupidtable(stupidtableCustomSettings).stickyTableHeaders({fixedOffset: 60})
+    }
+
+    function showError(message) {
+      $("#results").addClass("query-error").html(message)
+    }
+
+    <%= blazer_js_var "data", @run_data %>
+
+    runQuery(data, showRun, showError)
+  </script>
+<% end %>
+
+
+<% theme = cookies[:theme] %>
+<%
+  colors = {
+    'dark' => { background: '#1a1f26', text: '#fff', table_background: 'oklch(25.33% 0.016 252.42)', border: '#2f353d' },
+    'light' => { background: '#f7f9fa', text: '#000', table_background: '#fff', border: '#E5E7EB' }
+  }
+  theme_colors = colors[theme] || colors['light']
+%>
+
+<style>
+  .topbar {
+    background-color: <%= theme_colors[:background] %>;
+  }
+
+  #results table {
+    background-color: <%= theme_colors[:table_background] %>;
+    color: <%= theme_colors[:text] %>;
+    border: none;
+  }
+
+  #results table th,
+  #results table td {
+    font-size: 16px;
+    padding: 15px;
+    border-bottom: 1px solid <%= theme_colors[:border] %>;
+  }
+
+  #results table th {
+    font-weight: 700;
+    background-color: <%= theme_colors[:table_background] %>;
+  }
+
+  #results table td {
+    font-size: 14px;
+  }
+
+  .download-btn {
+    background-color: <%= theme_colors[:table_background] %>;
+    border: 1px solid <%= theme_colors[:border] %>;
+    border-radius: 50%;
+    width: 40px;
+    height: 40px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .download-btn svg {
+    width: 15px;
+    height: 15px;
+    fill: <%= theme_colors[:text] %>;
+  }
+</style>

data/app/views/blazer/queries/embed/_download_button.html.erb

@@ -0,0 +1,7 @@
+<% if !@error && @success %>
+  <%= button_to run_queries_path(format: "csv"), params: @run_data, class: "download-btn" do %>
+    <svg width="18" height="19" viewBox="0 0 18 19" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path d="M0 17H18V19H0V17ZM10 11.1716L16.0711 5.1005L17.4853 6.51472L9 15L0.51472 6.51472L1.92893 5.1005L8 11.1716V0H10V11.1716Z" />
+    </svg>
+  <% end %>
+<% end %>

data/app/views/blazer/queries/show.html.erb

@@ -0,0 +1,12 @@
+<% if params[:embed].present? %>
+<%= render partial: "blazer/queries/embed/content" %>
+<% else %>
+  <%= render partial: "content" %>
+<% end %>
+
+<script>
+  var code = $("#code code");
+  if (code.text().length < 10000) {
+    hljs.highlightElement(code.get(0));
+  }
+</script>

data/app/views/layouts/blazer/application.html.erb

@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title><%= blazer_title ? blazer_title : "Blazer" %></title>
+
+    <link rel="preconnect" href="https://fonts.googleapis.com">
+    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+    <link href="https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap" rel="stylesheet">
+
+    <meta charset="utf-8" />
+    <%= favicon_link_tag "blazer/favicon.png" %>
+    <% if defined?(Propshaft::Railtie) %>
+      <%= stylesheet_link_tag "blazer/bootstrap-propshaft", "blazer/bootstrap", "blazer/selectize", "blazer/github", "blazer/daterangepicker", "blazer/application" %>
+      <%= javascript_include_tag "blazer/jquery", "blazer/rails-ujs", "blazer/stupidtable", "blazer/stupidtable-custom-settings", "blazer/jquery.stickytableheaders", "blazer/selectize", "blazer/highlight.min", "blazer/moment", "blazer/moment-timezone-with-data", "blazer/daterangepicker", "blazer/chart.umd", "blazer/chartjs-adapter-date-fns.bundle", "blazer/chartkick", "blazer/mapkick.bundle", "blazer/ace/ace", "blazer/ace/ext-language_tools", "blazer/ace/theme-twilight", "blazer/ace/mode-sql", "blazer/ace/snippets/text", "blazer/ace/snippets/sql", "blazer/Sortable", "blazer/bootstrap", "blazer/vue.global.prod", "blazer/routes", "blazer/queries", "blazer/fuzzysearch", "blazer/application" %>
+    <% else %>
+      <%= stylesheet_link_tag "blazer/application" %>
+      <%= javascript_include_tag "blazer/application" %>
+    <% end %>
+    <script>
+      <%= blazer_js_var "rootPath", root_path %>
+    </script>
+    <%= csrf_meta_tags %>
+  </head>
+  <body>
+    <% if params[:embed].present? %>
+      <div>
+        <%= yield %>
+      </div>
+    <% else %>
+      <div class="container">
+        <%= yield %>
+      </div>
+    <% end %>
+  </body>
+</html>

data/config/initializers/spree_permitted_attributes.rb

@@ -34,6 +34,7 @@ module Spree
       show_badge_status
       purchasable_on
       available_on
+      hide_video_banner
       vendor_id
     ]
 

data/config/locales/en.yml

@@ -573,4 +573,7 @@ en:
     url_expired: 'Invitation link is expired'
     already_invited: 'Failed: User already invited to event'
     update_fail: 'Failed: to Update invite user'
+  event_blazer_queries:
+    success: 'Event saved Successfully'
+    fail: 'Event already saved'
 

data/config/locales/km.yml

@@ -417,4 +417,8 @@ km:
     accept_fail: 'បរាជ័យក្នុងការទទួលយកការអញ្ជើញ'
     url_expired: 'តំណ​អញ្ជើញ​បាន​ផុត​កំណត់'
     already_invited: 'បរាជ័យ៖ អ្នកប្រើប្រាស់បានអញ្ជើញចូលរួមព្រឹត្តិការណ៍រួចហើយ'
-    update_fail: 'បរាជ័យ៖ ធ្វើបច្ចុប្បន្នភាពអ្នកប្រើប្រាស់អញ្ជើញ'
+    update_fail: 'បរាជ័យ៖ ធ្វើបច្ចុប្បន្នភាពអ្នកប្រើប្រាស់អញ្ជើញ'
+
+  event_blazer_queries:
+    success: 'បានរក្សាទុកព្រឹត្តិការណ៍ដោយជោគជ័យ'
+    fail: 'បានរក្សាទុកព្រឹត្តិការណ៍រួចហើយs'

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'
 
@@ -267,6 +272,7 @@ Spree::Core::Engine.add_routes do
     resources :tenants do
       resources :vendors, controller: :tenant_vendors
     end
+    resources :event_blazer_queries
   end
 
   resources :events, controller: 'events/base' do
@@ -463,6 +469,9 @@ Spree::Core::Engine.add_routes do
         resource :account, controller: :account, only: %i[show update]
         resource :account_deletions, only: %i[destroy]
         resource :account_recovers, only: [:update]
+        namespace :account do
+          resources :orders, controller: :orders, only: %i[index show]
+        end
 
         resource :cart, controller: :cart, only: %i[show create destroy] do
           post   :add_item
@@ -498,6 +507,7 @@ Spree::Core::Engine.add_routes do
         resource :s3_signed_urls
         resource :profile_images, only: %i[update destroy]
         resources :line_items, only: %i[index show]
+        resources :guest_card_classes
       end
 
       namespace :storefront do
@@ -577,6 +587,7 @@ Spree::Core::Engine.add_routes do
           resources :homepage_sections, only: [:index]
           resource :homepage_background, controller: :homepage_background, only: [:show]
         end
+        resources :active_homepage_events, only: [:index]
 
         resources :qr_urls, only: [:show]
         resources :guest_qrs, only: [:show]

data/db/migrate/20250321041406_create_trip_connections.rb

@@ -0,0 +1,12 @@
+class CreateTripConnections < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cm_trip_connections, if_not_exists: true do |t|
+      t.references :from_trip, null: false, foreign_key: { to_table: :spree_variants }, index: true,if_not_exists: true
+      t.references :to_trip, null: false, foreign_key: { to_table: :spree_variants }, index: true, if_not_exists: true
+      t.integer :connection_time_minutes, null: false, if_not_exists: true
+      t.text :description, null: true, if_not_exists: true
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20250327074327_add_hide_video_banner_to_spree_taxon.rb

@@ -0,0 +1,5 @@
+class AddHideVideoBannerToSpreeTaxon < ActiveRecord::Migration[7.0]
+  def change
+    add_column :spree_taxons, :hide_video_banner, :boolean, default: false, if_not_exists: true
+  end
+end

data/db/migrate/20250328072717_add_description_to_spree_roles.rb

@@ -0,0 +1,5 @@
+class AddDescriptionToSpreeRoles < ActiveRecord::Migration[7.0]
+  def change
+    add_column :spree_roles, :description, :text
+  end
+end

data/db/migrate/20250328072841_add_vendor_id_to_spree_roles.rb

@@ -0,0 +1,6 @@
+class AddVendorIdToSpreeRoles < ActiveRecord::Migration[7.0]
+  def change
+    add_column :spree_roles, :vendor_id, :integer, if_not_exists: true
+    add_index :spree_roles, :vendor_id
+  end
+end

data/db/migrate/20250328072947_remove_unique_constraint_from_name_in_spree_roles.rb

@@ -0,0 +1,7 @@
+class RemoveUniqueConstraintFromNameInSpreeRoles < ActiveRecord::Migration[7.0]
+  def change
+    if index_exists?(:spree_roles, :name, unique: true)
+      remove_index :spree_roles, :name
+    end
+  end
+end

data/db/migrate/20250403040036_install_blazer.rb

@@ -0,0 +1,47 @@
+class InstallBlazer < ActiveRecord::Migration[7.0]
+  def change
+    create_table :blazer_queries do |t|
+      t.references :creator
+      t.string :name
+      t.text :description
+      t.text :statement
+      t.string :data_source
+      t.string :status
+      t.timestamps null: false
+    end
+
+    create_table :blazer_audits do |t|
+      t.references :user
+      t.references :query
+      t.text :statement
+      t.string :data_source
+      t.datetime :created_at
+    end
+
+    create_table :blazer_dashboards do |t|
+      t.references :creator
+      t.string :name
+      t.timestamps null: false
+    end
+
+    create_table :blazer_dashboard_queries do |t|
+      t.references :dashboard
+      t.references :query
+      t.integer :position
+      t.timestamps null: false
+    end
+
+    create_table :blazer_checks do |t|
+      t.references :creator
+      t.references :query
+      t.string :state
+      t.string :schedule
+      t.text :emails
+      t.text :slack_channels
+      t.string :check_type
+      t.text :message
+      t.datetime :last_run_at
+      t.timestamps null: false
+    end
+  end
+end

data/db/migrate/20250403083001_create_spree_cm_commissioner_taxon_blazer_query.rb

@@ -0,0 +1,9 @@
+class CreateSpreeCmCommissionerTaxonBlazerQuery < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cm_taxon_blazer_queries,if_not_exists: true  do |t|
+      t.references :taxon, foreign_key: { to_table: :spree_taxons }, null: false, index: true
+      t.references :blazer_query,  foreign_key: { to_table: :blazer_queries }, null: false, index: true
+      t.timestamps
+    end
+  end
+end

data/docs/sql/events/active_homepage_events.sql

@@ -0,0 +1,14 @@
+SELECT
+*
+FROM spree_taxons
+
+INNER JOIN cm_homepage_section_relatables
+    ON spree_taxons.id = cm_homepage_section_relatables.relatable_id
+    AND cm_homepage_section_relatables.relatable_type = 'Spree::Taxon'
+
+INNER JOIN cm_homepage_sections
+    ON cm_homepage_section_relatables.homepage_section_id = cm_homepage_sections.id
+
+WHERE cm_homepage_sections.tenant_id IS NULL
+    AND cm_homepage_sections.active = TRUE
+    AND spree_taxons.kind = 2

data/lib/generators/spree_cm_commissioner/install/install_generator.rb

@@ -12,10 +12,10 @@ module SpreeCmCommissioner
 
       def add_migrations
         gems = %i[
+          blazer
           spree_multi_vendor
           spree_cm_commissioner
         ]
-
         gems.each do |gem|
           run "bundle exec rake railties:install:migrations FROM=#{gem}"
         end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '1.8.5'.freeze
+  VERSION = '1.8.6-beta1'.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.0'
   s.metadata['rubygems_mfa_required'] = 'true'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 1.8.5
+  version: 1.8.6.pre.beta1
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-26 00:00:00.000000000 Z
+date: 2025-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -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.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: Add (optional) extension description here
 email: you@example.com
 executables: []
@@ -657,6 +671,7 @@ files:
 - app/assets/stylesheets/spree_cm_commissioner/telegram/telegram_bot.css.scss
 - app/assets/stylesheets/spree_cm_commissioner/vehicle_seat.css
 - app/controllers/.gitkeep
+- app/controllers/blazer/base_controller_decorator.rb
 - app/controllers/concerns/spree/billing/order_parents_concern.rb
 - app/controllers/concerns/spree/billing/payment_creatable.rb
 - app/controllers/concerns/spree/billing/payment_fireable.rb
@@ -674,6 +689,7 @@ files:
 - app/controllers/spree/admin/classifications_controller.rb
 - app/controllers/spree/admin/customer_notifications_controller.rb
 - app/controllers/spree/admin/device_tokens_controller.rb
+- app/controllers/spree/admin/event_blazer_queries_controller.rb
 - app/controllers/spree/admin/feature_images_controller.rb
 - app/controllers/spree/admin/google_wallets_controller.rb
 - app/controllers/spree/admin/guest_card_classes_controller.rb
@@ -761,6 +777,7 @@ files:
 - app/controllers/spree/api/v2/storefront/account_checker_controller.rb
 - app/controllers/spree/api/v2/storefront/account_deletions_controller.rb
 - app/controllers/spree/api/v2/storefront/account_recovers_controller.rb
+- app/controllers/spree/api/v2/storefront/active_homepage_events_controller.rb
 - app/controllers/spree/api/v2/storefront/anonymous_line_items_controller.rb
 - app/controllers/spree/api/v2/storefront/anonymous_orders_controller.rb
 - app/controllers/spree/api/v2/storefront/cart_guests_controller.rb
@@ -812,6 +829,7 @@ files:
 - app/controllers/spree/api/v2/storefront/waiting_room_sessions_controller.rb
 - app/controllers/spree/api/v2/storefront/wished_items_controller.rb
 - app/controllers/spree/api/v2/storefront/wishlists_controller_decorator.rb
+- app/controllers/spree/api/v2/tenant/account/orders_controller.rb
 - app/controllers/spree/api/v2/tenant/account_checker_controller.rb
 - app/controllers/spree/api/v2/tenant/account_controller.rb
 - app/controllers/spree/api/v2/tenant/account_deletions_controller.rb
@@ -1211,6 +1229,7 @@ files:
 - app/models/spree_cm_commissioner/store_decorator.rb
 - app/models/spree_cm_commissioner/subscription.rb
 - app/models/spree_cm_commissioner/taxon_app_banner.rb
+- app/models/spree_cm_commissioner/taxon_blazer_query.rb
 - app/models/spree_cm_commissioner/taxon_brand_logo.rb
 - app/models/spree_cm_commissioner/taxon_category_icon.rb
 - app/models/spree_cm_commissioner/taxon_decorator.rb
@@ -1222,6 +1241,7 @@ files:
 - app/models/spree_cm_commissioner/telegram_bot.rb
 - app/models/spree_cm_commissioner/tenant.rb
 - app/models/spree_cm_commissioner/trip.rb
+- app/models/spree_cm_commissioner/trip_connection.rb
 - app/models/spree_cm_commissioner/trip_stop.rb
 - app/models/spree_cm_commissioner/user_decorator.rb
 - app/models/spree_cm_commissioner/user_deletion_survey.rb
@@ -1350,6 +1370,7 @@ files:
 - app/overrides/spree/admin/taxons/_form/available_on.html.erb.deface
 - app/overrides/spree/admin/taxons/_form/background_color_and_foreground_color.html.erb.deface
 - app/overrides/spree/admin/taxons/_form/custom_redirect_url.html.erb.deface
+- app/overrides/spree/admin/taxons/_form/hide_video_banner.html.erb.deface
 - app/overrides/spree/admin/taxons/_form/kind_html.erb.deface
 - app/overrides/spree/admin/taxons/_form/purchasable_on_status.html.erb.deface
 - app/overrides/spree/admin/taxons/_form/show_badge_status.html.erb.deface
@@ -1422,6 +1443,7 @@ files:
 - app/serializers/spree/v2/organizer/ticket_serializer.rb
 - app/serializers/spree/v2/organizer/user_serializer.rb
 - app/serializers/spree/v2/storefront/accommodation_serializer.rb
+- app/serializers/spree/v2/storefront/active_homepage_event_serializer.rb
 - app/serializers/spree/v2/storefront/address_serializer_decorator.rb
 - app/serializers/spree/v2/storefront/cart_serializer_decorator.rb
 - app/serializers/spree/v2/storefront/customer_notification_serializer.rb
@@ -1452,8 +1474,10 @@ files:
 - app/serializers/spree/v2/tenant/address_serializer.rb
 - app/serializers/spree/v2/tenant/asset_serializer.rb
 - app/serializers/spree/v2/tenant/base_serializer.rb
+- app/serializers/spree/v2/tenant/booking_card_class_serializer.rb
 - app/serializers/spree/v2/tenant/customer_notification_serializer.rb
 - app/serializers/spree/v2/tenant/digital_link_serializer.rb
+- app/serializers/spree/v2/tenant/guest_card_class_serializer.rb
 - app/serializers/spree/v2/tenant/guest_serializer.rb
 - app/serializers/spree/v2/tenant/homepage_section_relatable_serializer.rb
 - app/serializers/spree/v2/tenant/homepage_section_serializer.rb
@@ -1575,6 +1599,11 @@ files:
 - app/services/spree_cm_commissioner/webhooks/subscribers/handle_request_decorator.rb
 - app/services/spree_cm_commissioner/webhooks/subscribers/make_request.rb
 - app/services/spree_cm_commissioner/webhooks/subscribers/queue_requests_decorator.rb
+- app/views/blazer/queries/_content.html.erb
+- app/views/blazer/queries/embed/_content.html.erb
+- app/views/blazer/queries/embed/_download_button.html.erb
+- app/views/blazer/queries/show.html.erb
+- app/views/layouts/blazer/application.html.erb
 - app/views/shared/_asset_field.html.erb
 - app/views/shared/_calendar.html.erb
 - app/views/shared/_kind_field.html.erb
@@ -2279,11 +2308,19 @@ files:
 - db/migrate/20250307073003_add_tenant_id_to_cm_customer_notifications.rb
 - db/migrate/20250307083809_remove_tenant_id_from_cm_notifications.rb
 - db/migrate/20250314013434_add_available_on_to_spree_taxons.rb
+- db/migrate/20250321041406_create_trip_connections.rb
+- db/migrate/20250327074327_add_hide_video_banner_to_spree_taxon.rb
+- db/migrate/20250328072717_add_description_to_spree_roles.rb
+- db/migrate/20250328072841_add_vendor_id_to_spree_roles.rb
+- db/migrate/20250328072947_remove_unique_constraint_from_name_in_spree_roles.rb
+- db/migrate/20250403040036_install_blazer.rb
+- db/migrate/20250403083001_create_spree_cm_commissioner_taxon_blazer_query.rb
 - docker-compose.yml
 - docs/option_types/attr_types.md
 - docs/private_key.pem
 - docs/public_key.pem
 - docs/spree_core/add_new_promotion.md
+- docs/sql/events/active_homepage_events.sql
 - docs/sql/subscriptions/remaining_subscriptions.sql
 - docs/webhook/sqs.rb
 - docs/webhook/sqs/params_job_complete.json
@@ -2416,9 +2453,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubygems_version: 3.4.1