spree_cm_commissioner 2.5.14 → 2.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 574ed1a0c32a052dce78787ecfa40603a68f033ff8a113f3ae7a91e415656fe6
-  data.tar.gz: 3640a360d2df37c723529f091136e1491c2a0cf61515993d6ebd502e01b3996f
+  metadata.gz: e1489014b8629a83035954b981e4b2e7cdfdcb70159c2e871e9152c3916668ae
+  data.tar.gz: ee0ec5e1f58355695e006f00d7952a09ca379283eab18591bba435d1c535fffb
 SHA512:
-  metadata.gz: 893ac42ed0c4c306260bd8b578fed2619d7ee65daf13d009228f81ae2047a98e164983b89b0345344d384cffe1f88989c20b717685e40a38c5abf8a159609e77
-  data.tar.gz: 5d145d664bbba939d59f2a5797ff96494993c911b2dba2159a23c8accafce6bc0e9719b7e62697f1bebd2f2ef7151544031a47f9993eb8311c745ef84c76283d
+  metadata.gz: 1f3cafbb00e42a98ec6f80ad52266e476cde61f2d4d6215f80cdc95c7af604c5f754aea35139331a8dcf98ccbc25f43378d94c815732cbc0fa8185ae8373e58a
+  data.tar.gz: 6562e8994dde887a43e598a29239ca6e8295967db6bfc0d8fa506ec56a69097ad293f1f83355c8db6db671ad433d3cc07f7009e67688450418c868e9c9de3814

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.5.14)
+    spree_cm_commissioner (2.5.15)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront

data/app/controllers/concerns/spree/admin/service_calendars_concern.rb

@@ -0,0 +1,93 @@
+module Spree
+  module Admin
+    module ServiceCalendarsConcern
+      extend ActiveSupport::Concern
+
+      included do
+        new_action.before :set_exception_rules
+
+        helper 'spree_cm_commissioner/admin/service_calendars'
+      end
+
+      def update_status
+        if @object.update(active: !@object.active)
+          flash[:success] = flash_message_for(@object, :successfully_updated)
+        else
+          flash[:error] = @object.errors.full_messages.to_sentence
+        end
+
+        redirect_to collection_url
+      rescue ActiveRecord::RecordInvalid => e
+        flash[:error] = e.message
+        redirect_to collection_url
+      end
+
+      protected
+
+      def model_class
+        SpreeCmCommissioner::ServiceCalendar
+      end
+
+      def object_name
+        'spree_cm_commissioner_service_calendars'
+      end
+
+      def permitted_resource_params
+        service_calendar_params = params.require(:spree_cm_commissioner_service_calendar)
+                                        .permit(:calendarable_id, :calendarable_type, :start_date, :end_date,
+                                                :monday, :tuesday, :wednesday, :thursday, :friday, :saturday, :sunday
+                                        )
+        service_calendar_params[:exception_rules] = build_exception_rules(params[:spree_cm_commissioner_service_calendar][:exception_rules])
+        service_calendar_params
+      end
+
+      private
+
+      def build_exception_rules(exception_rules)
+        exception_rules.values.reject! { |rule| rule['from'].blank? || rule['to'].blank? || rule['type'].blank? } || exception_rules.values
+      end
+
+      def collection
+        load_calendarable
+
+        @objects = model_class.where(
+          calendarable_type: calendarable_type,
+          calendarable_id: calendarable_id
+        ).order(id: :desc)
+      end
+
+      def set_exception_rules
+        @exception_rules = [{ from: DateTime.now, to: DateTime.now, type: 'exclusion', reason: nil }]
+      end
+
+      def build_resource
+        today = Time.zone.today
+        model_class.new(start_date: today, end_date: today.next_year(3),
+                        exception_rules: [{ from: nil, to: nil, type: 'inclusion' }]
+        )
+      end
+
+      def set_calendarable
+        @object.calendarable_type = calendarable_type
+        @object.calendarable_id   = calendarable_id
+      end
+
+      # To be implemented by including controllers
+      def load_calendarable
+        raise NotImplementedError, 'must implement load_calendarable'
+      end
+
+      def calendarable
+        raise NotImplementedError, 'must implement calendarable'
+      end
+
+      def calendarable_id
+        calendarable.id
+      end
+
+      def calendarable_type
+        calendarable.class.name
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+module Spree
+  module Admin
+    class ProductServiceCalendarsController < Spree::Admin::ResourceController
+      include Spree::Admin::ServiceCalendarsConcern
+
+      before_action :load_product
+      before_action :ensure_product_type_supports_calendar
+      before_action :ensure_product_has_no_calendar, only: %i[new create]
+
+      create.before :set_calendarable
+      update.before :set_calendarable
+
+      protected
+
+      def collection_url(options = {})
+        admin_product_product_service_calendars_url(options)
+      end
+
+      private
+
+      def load_product
+        @product ||= (Spree::Product.find_by(slug: params[:product_id]) || Spree::Product.find_by(id: params[:product_id]))
+      end
+
+      def ensure_product_type_supports_calendar
+        return if @product.permanent_stock?
+
+        flash[:error] = I18n.t('vendor.service_calendars.not_available_for_product_type')
+        redirect_to edit_admin_product_url(@product)
+      end
+
+      def ensure_product_has_no_calendar
+        return if @product.service_calendar.blank?
+
+        flash[:error] = I18n.t('vendor.service_calendars.already_has_calendar')
+        redirect_to admin_product_product_service_calendars_url(@product)
+      end
+
+      def load_calendarable
+        load_product
+      end
+
+      def calendarable
+        @product
+      end
+    end
+  end
+end

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

@@ -0,0 +1,84 @@
+module Spree
+  module Admin
+    class SpriteImportController < BaseController
+      before_action :load_menu
+      before_action :reload_menu_with_attachment, only: [:show]
+      before_action :load_sprite_data, only: %i[show new edit create update]
+
+      def show; end
+
+      def new; end
+
+      def edit; end
+
+      def create
+        result = sprite_import_service.call
+        handle_service_result(result, :new)
+      end
+
+      def update
+        result = sprite_import_service.update
+        handle_service_result(result, :edit)
+      end
+
+      def destroy
+        @menu.sprite_file.purge if @menu.sprite_file.attached?
+        @menu.sprite_positions = {}
+        @menu.sprite_padding = 16
+        @menu.sprite_gap = 16
+        @menu.sprite_icon_size = 64
+        @menu.save!
+        flash[:success] = 'Sprite removed successfully!' # rubocop:disable Rails/I18nLocaleTexts
+        redirect_to spree.admin_menu_sprite_import_path(@menu)
+      end
+
+      private
+
+      def load_menu
+        @menu = Spree::Menu.find(params[:menu_id])
+      end
+
+      def reload_menu_with_attachment
+        data_loader = sprite_data_loader_service
+        result = data_loader.reload_menu_with_attachment
+        @menu = result[:menu]
+        @sprite_url = result[:sprite_url]
+      end
+
+      def load_sprite_data
+        data_loader = sprite_data_loader_service
+        sprite_data = data_loader.load_sprite_data
+        @menu_items = sprite_data[:menu_items]
+        @existing_positions = sprite_data[:existing_positions]
+        @sprite_url = sprite_data[:sprite_url] if sprite_data[:sprite_url]
+      end
+
+      def sprite_import_service
+        SpreeCmCommissioner::SpriteImportService.new(
+          menu: @menu,
+          sprite_file: params[:sprite_file],
+          sprite_settings: {
+            padding: params[:sprite_padding],
+            gap: params[:sprite_gap],
+            icon_size: params[:sprite_icon_size]
+          },
+          positions_params: params[:positions]
+        )
+      end
+
+      def sprite_data_loader_service
+        SpreeCmCommissioner::SpriteDataLoaderService.new(@menu)
+      end
+
+      def handle_service_result(result, render_action)
+        if result.success?
+          flash[:success] = result.value[:message]
+          redirect_to spree.admin_menu_sprite_import_path(@menu)
+        else
+          flash[:error] = result.value
+          render render_action
+        end
+      end
+    end
+  end
+end

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

@@ -5,6 +5,12 @@ module Spree
         base.before_action :build_assets, only: %i[create update]
       end
 
+      # override
+      def new
+        @taxon.parent_id = params[:parent_id] if params[:parent_id].present?
+        super
+      end
+
       def remove_category_icon
         remove_asset(@taxon.category_icon)
       end

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

@@ -1,92 +1,31 @@
 module Spree
   module Admin
     class VendorServiceCalendarsController < Spree::Admin::ResourceController
-      before_action :load_vendor
-      new_action.before :set_exception_rules
-
-      create.before :set_vendor
-      update.before :set_vendor
-
-      helper 'spree_cm_commissioner/admin/service_calendars'
+      include Spree::Admin::ServiceCalendarsConcern
 
-      def update_status
-        if @object.update(active: !@object.active)
-          flash[:success] = flash_message_for(@object, :successfully_updated)
-        else
-          flash[:error] = @object.errors.full_messages.to_sentence
-        end
+      before_action :load_vendor
 
-        redirect_to admin_vendor_vendor_service_calendars_url
-      rescue ActiveRecord::RecordInvalid => e
-        flash[:error] = e.message
-        redirect_to admin_vendor_vendor_service_calendars_url
-      end
+      create.before :set_calendarable
+      update.before :set_calendarable
 
       protected
 
-      def model_class
-        SpreeCmCommissioner::ServiceCalendar
-      end
-
-      def object_name
-        'spree_cm_commissioner_service_calendars'
-      end
-
       def collection_url(options = {})
         admin_vendor_vendor_service_calendars_url(options)
       end
 
-      def permitted_resource_params
-        service_calendar_params = params.require(:spree_cm_commissioner_service_calendar)
-                                        .permit(:calendarable_id, :calendarable_type, :start_date, :end_date,
-                                                :monday, :tuesday, :wednesday, :thursday, :friday, :saturday, :sunday
-                                        )
-        service_calendar_params[:exception_rules] = build_exception_rules(params[:spree_cm_commissioner_service_calendar][:exception_rules])
-        service_calendar_params
-      end
-
       private
 
       def load_vendor
         @vendor ||= (Spree::Vendor.find_by(slug: params[:vendor_id]) || Spree::Vendor.find_by(id: params[:vendor_id]))
       end
 
-      def set_vendor
-        @object.calendarable_type = calendarable_type
-        @object.calendarable_id   = calendarable_id
-      end
-
-      def build_exception_rules(exception_rules)
-        exception_rules.values.reject! { |rule| rule['from'].blank? || rule['to'].blank? || rule['type'].blank? } || exception_rules.values
-      end
-
-      def collection
+      def load_calendarable
         load_vendor
-
-        @objects = model_class.where(
-          calendarable_type: calendarable_type,
-          calendarable_id: calendarable_id
-        ).order(id: :desc)
-      end
-
-      def set_exception_rules
-        @exception_rules = [{ from: DateTime.now, to: DateTime.now, type: 'exclusion', reason: nil }]
-      end
-
-      # it load before :load_vendor
-      def build_resource
-        today = Time.zone.today
-        model_class.new(start_date: today, end_date: today.next_year(3),
-                        exception_rules: [{ from: nil, to: nil, type: 'inclusion' }]
-        )
-      end
-
-      def calendarable_id
-        @vendor.id
       end
 
-      def calendarable_type
-        @vendor.class.name
+      def calendarable
+        @vendor
       end
     end
   end

data/app/helpers/spree_cm_commissioner/admin/homepage_segment_helper.rb

@@ -13,6 +13,8 @@ module SpreeCmCommissioner
           'badge badge-warning text-uppercase'
         when :things_to_do
           'badge badge-success text-uppercase'
+        when :football
+          'badge badge-dark text-uppercase'
         else
           'badge'
         end

data/app/helpers/spree_cm_commissioner/admin/service_calendars_helper.rb

@@ -5,9 +5,16 @@ module SpreeCmCommissioner
         label = resource.active ? 'Active' : 'Disabled'
         btn_active_class = resource.active ? 'btn-primary' : 'btn-warning'
 
+        # Determine the correct URL based on the calendarable type
+        url = if resource.calendarable_type == 'Spree::Product'
+                update_status_admin_product_product_service_calendar_path(resource.calendarable, resource)
+              else
+                update_status_admin_vendor_vendor_service_calendar_url(resource.calendarable, resource)
+              end
+
         button_to(
           label,
-          update_status_admin_vendor_vendor_service_calendar_url(resource.calendarable, resource),
+          url,
           form: { data: { confirm: 'Are you sure?' }, class: "btn btn-sm btn-active #{btn_active_class}" },
           method: :patch
         )

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

@@ -7,7 +7,8 @@ module SpreeCmCommissioner
       ticket: 0b00010,
       tour: 0b00100,
       accommodation: 0b01000,
-      things_to_do: 0b10000
+      things_to_do: 0b10000,
+      football: 0b100000
     }.freeze
 
     BIT_SEGMENT.each do |segment, bit_value|

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

@@ -0,0 +1,32 @@
+module SpreeCmCommissioner
+  module LineItemOpenDatedTrippable
+    extend ActiveSupport::Concern
+
+    included do
+      include SpreeCmCommissioner::StoreMetadata
+
+      # Open dated trip metadata
+      store_public_metadata :is_open_dated, :boolean, default: false
+      store_public_metadata :redeemed_trip_id, :integer # Which trip chosen for redemption
+
+      # Alias existing columns for better semantic meaning
+      alias_attribute :valid_until, :to_date        # Expiration date
+      alias_attribute :redeemed_at, :accepted_at    # Redemption timestamp
+    end
+
+    # Check if ticket has been redeemed
+    def redeemed?
+      redeemed_at.present?
+    end
+
+    # Check if ticket is expired
+    def expired?
+      valid_until.present? && valid_until.to_date < Date.current
+    end
+
+    # Check if ticket can be redeemed
+    def can_redeem?
+      is_open_dated? && !redeemed? && !expired?
+    end
+  end
+end

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

@@ -25,10 +25,10 @@ module SpreeCmCommissioner
     included do
       validates :direction, inclusion: { in: DIRECTION }, allow_nil: true
       validates :trip_id, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
-      validates :boarding_trip_stop_id, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
-      validates :drop_off_trip_stop_id, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
       validates :service_origin_id, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
 
+      validate :validate_trip_stops_for_scheduled_trips
+
       validates :passenger_count, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
 
       # Groups LineItems by trip fields. Some fields can be null,
@@ -125,6 +125,19 @@ module SpreeCmCommissioner
 
     private
 
+    def validate_trip_stops_for_scheduled_trips
+      return if trip_id.blank? || trip_id.zero?
+
+      trip = SpreeCmCommissioner::Trip.find_by(id: trip_id)
+      return unless trip # Skip if trip doesn't exist (will be caught by other validations)
+      return if trip.open_dated? # Skip validation for open-dated trips
+
+      # For scheduled trips, require valid trip stops
+      errors.add(:boarding_trip_stop_id, 'must be greater than 0') if boarding_trip_stop_id.present? && boarding_trip_stop_id <= 0
+
+      errors.add(:drop_off_trip_stop_id, 'must be greater than 0') if drop_off_trip_stop_id.present? && drop_off_trip_stop_id <= 0
+    end
+
     def set_public_metadata_object(key, value)
       if value.nil?
         public_metadata.delete(key)

data/app/models/spree_cm_commissioner/line_item_decorator.rb

@@ -80,6 +80,7 @@ module SpreeCmCommissioner
       base.include SpreeCmCommissioner::Integrations::IntegrationMappable
       base.include SpreeCmCommissioner::ProductType
       base.include SpreeCmCommissioner::ProductDelegation
+      base.include SpreeCmCommissioner::LineItemOpenDatedTrippable
       base.include SpreeCmCommissioner::KycBitwise
     end
 

data/app/models/spree_cm_commissioner/menu_decorator.rb

@@ -0,0 +1,33 @@
+module SpreeCmCommissioner
+  module MenuDecorator
+    extend ActiveSupport::Concern
+
+    included do
+      include SpreeCmCommissioner::StoreMetadata
+
+      store_public_metadata :sprite_positions, :hash, default: {}
+      store_public_metadata :sprite_padding, :integer, default: 16
+      store_public_metadata :sprite_gap, :integer, default: 16
+      store_public_metadata :sprite_icon_size, :integer, default: 64
+
+      has_one_attached :sprite_file
+    end
+
+    def get_sprite_position(menu_item_id)
+      pos = sprite_positions[menu_item_id.to_s] || { 'x' => 0, 'y' => 0, 'width' => 64, 'height' => 64 }
+      pos.with_indifferent_access
+    end
+
+    def update_sprite_positions(positions_hash)
+      self.sprite_positions = positions_hash
+    end
+
+    def sprite_url
+      return nil unless sprite_file.attached?
+
+      Rails.application.routes.url_helpers.cdn_image_url(sprite_file)
+    end
+  end
+end
+
+Spree::Menu.include SpreeCmCommissioner::MenuDecorator unless Spree::Menu.included_modules.include?(SpreeCmCommissioner::MenuDecorator)

data/app/models/spree_cm_commissioner/order_decorator.rb

@@ -15,6 +15,7 @@ module SpreeCmCommissioner
       base.after_commit :increment_route_order_count, on: :create
 
       base.store_private_metadata :preload_trip_ids, :array, default: []
+      base.store_public_metadata :order_options, :array, default: []
 
       base.validates :promo_total, base::MONEY_VALIDATION
       base.validate :validate_channel_prefix, if: :channel_changed?

data/app/overrides/spree/admin/menus/edit/add_import_sprite_button.html.erb.deface

@@ -0,0 +1,94 @@
+<!-- insert_before "h5:contains('settings')" -->
+<%
+  sprite_attached = @menu.respond_to?(:sprite_file) && @menu.sprite_file.attached?
+  sprite_url = @menu.respond_to?(:sprite_url) ? @menu.sprite_url : nil
+%>
+
+<div data-hook="sprite_management" class="card mb-3">
+  <div class="card-header">
+    <div class="row">
+      <div class="col d-flex">
+        <h5 class="mb-0 align-self-center">Sprite Management</h5>
+      </div>
+      <div class="col d-flex justify-content-end">
+        <% if sprite_attached %>
+          <%= link_to spree.admin_menu_sprite_import_path(@menu), class: 'btn btn-outline-secondary align-self-center mr-2' do %>
+            <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="3" y="3" width="18" height="18" rx="2" ry="2"/><circle cx="8.5" cy="8.5" r="1.5"/><polyline points="21 15 16 10 5 21"/></svg>
+            View Sprite
+          <% end %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+
+  <div class="card-body">
+    <% if sprite_attached %>
+      <div class="row">
+        <div class="col-md-7">
+          <div class="card bg-light border-0">
+            <div class="card-body py-3">
+              <div class="row">
+                <div class="col-sm-6">
+                  <dl class="mb-0">
+                    <dt class="text-muted small text-uppercase">File</dt>
+                    <dd class="mb-2"><%= @menu.sprite_file.filename %></dd>
+
+                    <dt class="text-muted small text-uppercase">File Size</dt>
+                    <dd class="mb-0"><%= number_to_human_size(@menu.sprite_file.byte_size) %></dd>
+                  </dl>
+                </div>
+                <div class="col-sm-6">
+                  <dl class="mb-0">
+                    <dt class="text-muted small text-uppercase">Icon Size</dt>
+                    <dd class="mb-2"><%= @menu.sprite_icon_size || 64 %> x <%= @menu.sprite_icon_size || 64 %> px</dd>
+
+                    <dt class="text-muted small text-uppercase">Total Icons</dt>
+                    <dd class="mb-0">
+                      <span class="badge badge-info" style="font-size: 0.85em;"><%= @menu.total_icons %></span>
+                    </dd>
+                  </dl>
+                </div>
+              </div>
+              <div class="mt-2 pt-2 border-top">
+                <small class="text-muted">
+                  Last updated: <%= @menu.sprite_file.created_at.strftime("%b %d, %Y at %H:%M") if @menu.sprite_file.created_at %>
+                </small>
+              </div>
+              <% if sprite_url %>
+                <div class="mt-1">
+                  <small class="text-muted text-break" style="font-size: 0.75em; word-break: break-all;">CDN: <%= sprite_url %></small>
+                </div>
+              <% end %>
+            </div>
+          </div>
+        </div>
+        <div class="col-md-5">
+          <div class="card border-0 bg-light h-100">
+            <div class="card-body d-flex align-items-center justify-content-center p-3">
+              <% if sprite_url %>
+                <%= image_tag sprite_url, class: "img-fluid", style: "max-height: 180px; border-radius: 4px;" %>
+              <% else %>
+                <span class="text-muted">No preview available</span>
+              <% end %>
+            </div>
+          </div>
+        </div>
+      </div>
+    <% else %>
+      <div class="text-center py-5">
+        <div class="mb-3">
+          <svg width="64" height="64" viewBox="0 0 24 24" fill="none" stroke="#adb5bd" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">
+            <rect x="3" y="3" width="18" height="18" rx="2" ry="2"/>
+            <circle cx="8.5" cy="8.5" r="1.5"/>
+            <polyline points="21 15 16 10 5 21"/>
+          </svg>
+        </div>
+        <h5>No Sprite Imported Yet</h5>
+        <p class="text-muted mb-4" style="max-width: 360px; margin: 0 auto;">
+          Import a sprite sheet to serve all menu icons in a single optimized image.
+        </p>
+        <%= link_to "Import Sprite", spree.new_admin_menu_sprite_import_path(@menu), class: "btn btn-primary" %>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/overrides/spree/admin/shared/_product_tabs/service_calendars.html.erb.deface

@@ -0,0 +1,8 @@
+<!-- insert_after "erb[loud]:contains('current == :stock')" -->
+
+<%= content_tag :li, class: 'nav-item' do %>
+  <%= link_to_with_icon 'calendar.svg',
+    t('vendor.service_calendars.service_calendar'),
+    admin_product_product_service_calendars_path(@product),
+    class: "nav-link #{'active' if current == :service_calendars}" %>
+<% end if can?(:create, SpreeCmCommissioner::ServiceCalendar) && !@product.deleted? && @product.permanent_stock? %>

data/app/serializers/spree_cm_commissioner/v2/storefront/menu_serializer_decorator.rb

@@ -0,0 +1,32 @@
+module SpreeCmCommissioner
+  module V2
+    module Storefront
+      module MenuSerializerDecorator
+        def self.prepended(base)
+          base.attributes :sprite_url
+
+          base.attribute :icon_positions do |menu|
+            positions = menu.sprite_positions || {}
+            ordered_items = menu.menu_items.where.not(parent_id: nil).order(:lft)
+            ordered_items.each_with_object({}) do |item, hash|
+              id = item.id.to_s
+              next unless positions.key?(id)
+
+              pos = positions[id]
+              hash[id] = {
+                'x' => pos['x'],
+                'y' => pos['y'],
+                'width' => pos['width'],
+                'height' => pos['height']
+              }
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+if Spree::V2::Storefront::MenuSerializer.included_modules.exclude?(SpreeCmCommissioner::V2::Storefront::MenuSerializerDecorator)
+  Spree::V2::Storefront::MenuSerializer.prepend(SpreeCmCommissioner::V2::Storefront::MenuSerializerDecorator)
+end