spree_cm_commissioner 2.0.1.pre.pre2 → 2.0.2.pre.pre

data/app/models/spree_cm_commissioner/stop.rb

@@ -1,23 +0,0 @@
-require_dependency 'spree_cm_commissioner'
-
-module SpreeCmCommissioner
-  class Stop < SpreeCmCommissioner::Place
-    belongs_to :branch, class_name: 'SpreeCmCommissioner::Branch'
-    belongs_to :state,  class_name: 'Spree::State', optional: true
-    belongs_to :vendor, class_name: 'Spree::Vendor'
-
-    after_save :add_to_option_value
-
-    def validate_reference?
-      false
-    end
-
-    def add_to_option_value
-      origin = Spree::OptionType.find_by(attr_type: 'origin')&.id
-      destination = Spree::OptionType.find_by(attr_type: 'destination')&.id
-
-      Spree::OptionValue.create(option_type_id: origin, name: name, presentation: id)
-      Spree::OptionValue.create(option_type_id: destination, name: name, presentation: id)
-    end
-  end
-end

data/app/models/spree_cm_commissioner/vehicle_seat.rb

@@ -1,11 +0,0 @@
-module SpreeCmCommissioner
-  class VehicleSeat < SpreeCmCommissioner::Base
-    belongs_to :vehicle_type, class_name: 'SpreeCmCommissioner::VehicleType', dependent: :destroy
-    has_many :line_item_seats, class_name: 'SpreeCmCommissioner::LineItemSeat', dependent: :destroy
-    counter_culture :vehicle_type, column_name: proc { |model|
-                                                  model.seat_type.in?(%w[normal vip]) && model.vehicle_type.allow_seat_selection == true ? 'vehicle_seats_count' : nil # rubocop:disable Layout/LineLength
-                                                },
-                                   column_names: { ['cm_vehicle_seats.seat_type IN (?)', %i[0 2]] => 'vehicle_seats_count' }
-    enum seat_type: %i[normal empty vip driver].freeze
-  end
-end

data/app/models/spree_cm_commissioner/vehicle_type.rb

@@ -1,76 +0,0 @@
-module SpreeCmCommissioner
-  class VehicleType < SpreeCmCommissioner::Base
-    include SpreeCmCommissioner::RouteType
-
-    after_commit :recalculate_vehicle_seats_count, if: -> { saved_change_to_allow_seat_selection? && allow_seat_selection }
-    after_commit :set_vehicles_attributes
-
-    has_many :vehicle_seats, class_name: 'SpreeCmCommissioner::VehicleSeat', dependent: :destroy
-    has_many :option_value_vehicle_types, class_name: 'SpreeCmCommissioner::OptionValueVehicleType'
-    has_many :option_values, through: :option_value_vehicle_types, class_name: 'Spree::OptionValue'
-    has_many :vehicles, class_name: 'SpreeCmCommissioner::Vehicle', dependent: :destroy
-    belongs_to :vendor, class_name: 'Spree::Vendor'
-
-    validates :code, presence: true
-    validates :code, uniqueness: true
-    validates :name, presence: true
-    validates :name, uniqueness: true
-    accepts_nested_attributes_for :vehicle_seats, allow_destroy: true
-
-    state_machine :status, initial: :draft do
-      event :draft do
-        transition to: :draft
-      end
-      after_transition to: :draft, do: :after_draft
-
-      event :activate do
-        transition to: :active
-      end
-      after_transition to: :active, do: :after_activate
-
-      event :archive do
-        transition to: :archived
-      end
-      after_transition to: :archived, do: :after_archive
-    end
-
-    self.whitelisted_ransackable_attributes = %w[name code route_type id status]
-
-    def after_activate; end
-    def after_archive; end
-    def after_draft; end
-
-    def set_vehicles_attributes
-      vehicles.each(&:set_attributes)
-      vehicles.each(&:save)
-    end
-
-    def recalculate_vehicle_seats_count
-      self.vehicle_seats_count = vehicle_seats.where(seat_type: %w[normal vip]).count
-      save
-    end
-
-    def seat_layers
-      grouped_seats = SpreeCmCommissioner::VehicleSeat.where(vehicle_type_id: id).group_by(&:layer).transform_values do |seats|
-        seats.group_by(&:row).transform_values do |row_seats|
-          row_seats.sort_by(&:column).map do |seat|
-            {
-              row: seat.row,
-              column: seat.column,
-              label: seat.label,
-              layer: seat.layer,
-              seat_type: seat.seat_type,
-              created_at: seat.created_at,
-              vehicle_type_id: seat.vehicle_type_id
-            }
-          end
-        end
-      end
-      grouped_seats.map do |_layer, layer_seats|
-        layer_seats.map do |_row, row_seats|
-          row_seats
-        end
-      end
-    end
-  end
-end

data/app/models/spree_cm_commissioner/vendor_stop.rb

@@ -1,10 +0,0 @@
-require_dependency 'spree_cm_commissioner'
-module SpreeCmCommissioner
-  class VendorStop < ApplicationRecord
-    belongs_to :vendor, class_name: 'Spree::Vendor'
-    belongs_to :stop, class_name: 'SpreeCmCommissioner::Place'
-
-    validates :trip_count, numericality: { greater_than_or_equal_to: 0 }
-    enum :stop_type, { boarding: 0, drop_off: 1 }
-  end
-end

data/app/queries/spree_cm_commissioner/trip_search_query.rb

@@ -1,76 +0,0 @@
-module SpreeCmCommissioner
-  class TripSearchQuery
-    attr_reader :origin_id, :destination_id, :vendor_id, :date
-
-    def initialize(origin_id:, destination_id:, date:, vendor_id: nil)
-      @origin_id = origin_id
-      @destination_id = destination_id
-      @vendor_id = vendor_id
-      @date = date
-    end
-
-    def call
-      trips_info.map do |trip|
-        trip_result_options = {
-          trip_id: trip.trip_id,
-          vendor_id: trip.vendor_id,
-          vendor_name: trip.vendor_name,
-          route_name: trip.route_name,
-          short_name: trip.short_name,
-          detail: trip.trip_id,
-          origin_id: trip.origin_id,
-          origin: trip.origin,
-          destination_id: trip.destination_id,
-          destination: trip.destination,
-          total_sold: trip.total_sold,
-          total_seats: trip.total_seats,
-          vehicle_id: trip.vehicle_id,
-          departure_time: trip.departure_time.strftime('%H:%M'),
-          duration: trip.duration
-        }
-        SpreeCmCommissioner::TripResult.new(trip_result_options)
-      end
-    end
-
-    def trips_info
-      result = Spree::Variant.select('spree_variants.id as trip_id,
-                              spree_vendors.id as vendor_id,
-                              spree_vendors.name as vendor_name,
-                              routes.name as route_name,
-                              routes.short_name as short_name,
-                              details.id as detail_id,
-                              boarding.stop_id as origin_id,
-                              drop_off.stop_id as destination_id,
-                              details.departure_time as departure_time,
-                              details.duration as duration,
-                              boarding.stop_name as origin,
-                              drop_off.stop_name as destination,
-                              COALESCE(ts.total_sold, 0) as total_sold,
-                              cm_vehicles.number_of_seats as total_seats,
-                              cm_vehicles.id as vehicle_id
-                            '
-                                    )
-                             .joins('INNER JOIN spree_products routes ON routes.id = spree_variants.product_id')
-                             .joins('INNER JOIN cm_trips details on details.product_id = routes.id')
-                             .joins('INNER JOIN cm_vehicles ON cm_vehicles.id = details.vehicle_id')
-                             .joins("INNER JOIN cm_trip_stops boarding ON boarding.trip_id = details.id AND boarding.stop_type = '0'")
-                             .joins("INNER JOIN cm_trip_stops drop_off ON drop_off.trip_id = details.id AND drop_off.stop_type = '1'")
-                             .joins('INNER JOIN spree_vendors ON spree_vendors.id = spree_variants.vendor_id')
-                             .joins("LEFT JOIN (#{total_sold.to_sql}) ts ON spree_variants.id = ts.trip_id")
-
-      # TODO: migrat to new table: vehicle, orign and destination
-      result = result.where(boarding: { stop_id: origin_id }, drop_off: { stop_id: destination_id })
-      result = result.where(vendor_id: vendor_id) if vendor_id.present?
-      result
-    end
-
-    def total_sold
-      Spree::Variant.select('spree_variants.id as trip_id, SUM(spree_line_items.quantity) as total_sold')
-                    .joins('INNER JOIN spree_line_items ON spree_line_items.variant_id = spree_variants.id')
-                    .joins('INNER JOIN spree_orders ON spree_orders.id = spree_line_items.order_id')
-                    .where(spree_orders: { state: 'complete' })
-                    .where(spree_line_items: { date: date })
-                    .group('spree_variants.id')
-    end
-  end
-end

data/app/queries/spree_cm_commissioner/variant_availability/non_permanent_stock_query.rb

@@ -1,45 +0,0 @@
-module SpreeCmCommissioner
-  module VariantAvailability
-    class NonPermanentStockQuery
-      attr_reader :variant, :except_line_item_id, :error_message
-
-      def initialize(variant:, except_line_item_id: nil)
-        @variant = variant
-        @except_line_item_id = except_line_item_id
-        @error_message = nil
-      end
-
-      def available?(quantity)
-        reserve_variants =
-          Spree::LineItem
-          .complete
-          .select('(SUM(DISTINCT spree_stock_items.count_on_hand) - SUM(spree_line_items.quantity)) AS available_quantity')
-          .joins(variant: :stock_items)
-          .where(variant_id: variant.id)
-          .where.not(id: except_line_item_id)
-          .group(:variant_id)
-
-        # there is a case when variant does not have any purchaces yet, it will return empty & always available true.
-        # in this case, we check with stock items directly.
-
-        available_quantity = if reserve_variants.any?
-                               reserve_variants.sum(&:available_quantity)
-                             else
-                               variant.stock_items.sum(:count_on_hand)
-                             end
-        if available_quantity >= quantity
-          true
-        elsif available_quantity == 1
-          @error_message = I18n.t('variant_availability.item_available_instock')
-          false
-        elsif available_quantity <= 0
-          @error_message = I18n.t('variant_availability.items_out_of_stock')
-          false
-        else
-          @error_message = I18n.t('variant_availability.items_available_instock', available_quantity: available_quantity)
-          false
-        end
-      end
-    end
-  end
-end

data/app/queries/spree_cm_commissioner/variant_availability/permanent_stock_query.rb

@@ -1,55 +0,0 @@
-module SpreeCmCommissioner
-  module VariantAvailability
-    class PermanentStockQuery
-      attr_reader :variant, :from_date, :to_date, :except_line_item_id
-
-      def initialize(variant:, from_date:, to_date:, except_line_item_id: nil)
-        @variant = variant
-        @from_date = from_date
-        @to_date = to_date
-        @except_line_item_id = except_line_item_id
-      end
-
-      def available?(quantity)
-        (from_date..from_date).all? do |booking_date|
-          booked_date_quantity[booking_date].nil? ||
-            (booked_date_quantity[booking_date] - quantity) >= 0
-        end
-      end
-
-      def booked_date_quantity
-        dates_sql = ApplicationRecord.sanitize_sql_array(
-          [
-            'SELECT date FROM generate_series(?::date, ?::date, ?) AS date',
-            from_date,
-            to_date,
-            date_interval
-          ]
-        )
-
-        @booked_variants ||=
-          Spree::LineItem
-          .complete
-          .select(
-            '(SUM(DISTINCT spree_stock_items.count_on_hand) - SUM(spree_line_items.quantity)) AS available_quantity',
-            'dates.date AS reservation_date'
-          )
-          .joins(variant: :stock_items)
-          .where(variant_id: variant.id)
-          .where.not(id: except_line_item_id)
-          .joins("INNER JOIN (#{dates_sql}) dates ON dates.date >= spree_line_items.from_date AND dates.date < spree_line_items.to_date")
-          .group(:variant_id, :reservation_date)
-          .order(:reservation_date)
-          .each_with_object({}) do |record, hash|
-            hash[record.reservation_date.to_date] = record.available_quantity
-          end
-      end
-
-      # override this for product that have
-      # different date time interval than 1 day.
-      def date_interval
-        '1 day'
-      end
-    end
-  end
-end

data/app/queries/spree_cm_commissioner/vendor_stop_place_query.rb

@@ -1,54 +0,0 @@
-module SpreeCmCommissioner
-  class VendorStopPlaceQuery
-    attr_reader :query, :vendor_id, :stop_type, :reference_stop_id
-
-    def initialize(query:, vendor_id:, stop_type: :boarding, reference_stop_id: nil)
-      @query = query.to_s.strip
-      @vendor_id = vendor_id
-      @stop_type = stop_type
-      @reference_stop_id = reference_stop_id
-    end
-
-    def call
-      results = vendor_stops
-      return [] if results.empty?
-
-      places = results.includes(:stop).map(&:stop).compact.uniq
-
-      format_places(places)
-    end
-
-    private
-
-    def vendor_stops
-      scope = base_scope
-      return scope if query.blank?
-
-      scope = scope.where.not(stop_id: reference_stop_id) if reference_stop_id.present?
-      scope.where('cm_places.name ILIKE ?', "%#{query}%")
-    end
-
-    def base_scope
-      SpreeCmCommissioner::VendorStop
-        .joins(:stop)
-        .where(vendor_id: vendor_id)
-        .where(stop_type: stop_type)
-        .order(trip_count: :desc)
-        .where.not(trip_count: 0)
-    end
-
-    def format_places(places)
-      places
-        .sort_by { |p| [-p.depth, -p.lft] }
-        .filter_map do |place|
-          next if place.depth.zero?
-
-          {
-            id: place.id,
-            parent_id: place.parent_id,
-            name: place.self_and_ancestors.map(&:name).reverse.join(', ')
-          }
-        end
-    end
-  end
-end

data/app/services/spree_cm_commissioner/vehicle_option_value_creator.rb

@@ -1,11 +0,0 @@
-module SpreeCmCommissioner
-  class VehicleOptionValueCreator
-    def self.call(vehicle)
-      vehicle_option_type = Spree::OptionType.vehicle
-
-      value = vehicle_option_type.option_values.where(name: vehicle.id).first_or_initialize
-      value.presentation = vehicle.code
-      value.save
-    end
-  end
-end

data/app/views/spree_cm_commissioner/order_mailer/tenant/_customer_info.html.erb

@@ -1,42 +0,0 @@
-<div class="content-cell">
-<div class="container">
-  <h2><%= I18n.t('mail.order_mailer.customer_info') %></h2>
-  <div class="flex two-columns">
-    <div class="two-columns-item">
-      <div class="flex two-columns-item_detail">
-        <div class="two-columns_icon"><%= image_tag "mailer/tenant_user.png", class: "mail-icon" %></div>
-        <div class="two-columns_text-container">
-          <p class="two-columns_title">Name</p>
-          <p class="two-columns_description"><%= user_full_name(order) %></p>
-        </div>
-      </div>
-      <div class="flex two-columns-item_detail">
-        <div class="two-columns_icon"><%= image_tag "mailer/mail.png", class: "mail-icon" %></div>
-        <div class="two-columns_text-container">
-          <p class="two-columns_title">Email</p>
-          <% if order.email.present? %>
-            <p class="two-columns_description"><%= link_to order.email, "mailto:#{order.email}" %></p>
-          <% end %>
-        </div>
-      </div>
-    </div>
-    <div class="vertical-separater"></div>
-    <div class="two-columns-item">
-      <div class="flex two-columns-item_detail">
-        <div class="two-columns_icon"><%= image_tag "mailer/tenant_phone.png", class: "mail-icon" %></div>
-        <div class="two-columns_text-container">
-          <p class="two-columns_title">Contact</p>
-          <% if order.phone_number.present? || order.intel_phone_number.present? %>
-            <p class="two-columns_description">
-              <%= link_to(
-                    order.phone_number || order.intel_phone_number,
-                    "tel:#{order.phone_number || order.intel_phone_number}") %>
-            </p>
-          <% end %>
-        </div>
-      </div>
-    </div>
-  </div>
-  <hr>
-</div>
-</div>

data/app/views/spree_cm_commissioner/order_mailer/tenant/_footer.html.erb

@@ -1,25 +0,0 @@
-<div class="email-footer_inner">
-  <div class="mb-24"><%= store.description%></div>
-  <div class="mb-24 f-14"><%= store.address%></div>
-  <h2 class="mb-24">Connect with us</h2>
-  <table class="mb-24 social_icons">
-    <tbody>
-      <tr>
-        <% if store.facebook? %>
-          <td class="social_icon">
-            <%= link_to store.facebook, target: :_blank do %>
-              <%= image_tag "mailer/facebook.png", class: "mail-icon"%>
-            <% end %>
-          </td>
-        <% end %>
-        <% if store.instagram?%>
-          <td class="social_icon">
-            <%= link_to store.instagram, target: :_blank do %>
-              <%= image_tag "mailer/instagram.png", class: "mail-icon"%>
-            <% end %>
-          </td>
-        <% end %>
-      </tr>
-    </tbody>
-  </table>
-</div>

data/app/views/spree_cm_commissioner/order_mailer/tenant/_greeting.html.erb

@@ -1,19 +0,0 @@
-<div id="greeting-card-1">
-  <div>
-    <div class="header">
-      <h1><%=@order.store.name %></h1>
-      <% if @vendor_logo_url.present? %>
-        <img src="<%= @vendor_logo_url %>" alt="Vendor Logo" class="icon-hang-meas">
-      <% end %>
-    </div>
-    <div class="booking-confirm">
-      <%= I18n.t('mail.order_mailer.booking_confirm') %>
-    </div>
-    <div class="hello">
-      <%= I18n.t('mail.order_mailer.hello', full_name: user_full_name(order)) %>
-    </div>
-    <div class="description">
-      <%= I18n.t('mail.order_mailer.booking_event', order_number: @order.number || 'NA') %>
-    </div>
-  </div>
-</div>

data/app/views/spree_cm_commissioner/order_mailer/tenant/_support_contact.html.erb

@@ -1,33 +0,0 @@
-<div class="content-cell">
-<div class="container">
-  <h2><%= I18n.t('mail.order_mailer.bookmeplus_support')%></h2>
-  <div class="flex two-columns">
-    <div class="two-columns-item">
-      <div class="flex two-columns-item_detail">
-        <div class="two-columns_icon"><%= image_tag "mailer/tenant_phone.png", class: "mail-icon"%></div>
-        <div class="two-columns_text-container">
-          <p class="two-columns_title">Contact</p>
-          <% if current_store.contact_phone.present? %>
-            <p class="two-columns_description">
-              <%= link_to current_store.contact_phone, "tel:#{current_store.contact_phone}" %>
-            </p>
-          <% end %>
-        </div>
-      </div>
-    </div>
-    <div class="vertical-separater"></div>
-    <div class="two-columns-item">
-      <div class="flex two-columns-item_detail">
-        <div class="two-columns_icon"><%= image_tag "mailer/mail.png", class: "mail-icon"%></div>
-        <div class="two-columns_text-container">
-          <p class="two-columns_title">Email</p>
-            <p class="two-columns_description">
-          <%= @vendor&.support_email.present? ? link_to(@vendor.support_email, "mailto:#{@vendor.support_email}") : "N/A" %>
-          </p>
-
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-</div>

data/db/migrate/20250709073455_add_email_fields_to_spree_vendors.rb

@@ -1,6 +0,0 @@
-class AddEmailFieldsToSpreeVendors < ActiveRecord::Migration[7.0]
-  def change
-    add_column :spree_vendors, :from_email, :string, if_not_exists: true
-    add_column :spree_vendors, :support_email, :string, if_not_exists: true
-  end
-end

data/db/migrate/20250715103333_remove_indexes_from_cm_user_identity_providers.rb

@@ -1,13 +0,0 @@
-class RemoveIndexesFromCmUserIdentityProviders < ActiveRecord::Migration[7.0]
-  def change
-    execute <<-SQL
-      ALTER TABLE cm_user_identity_providers
-      DROP CONSTRAINT IF EXISTS index_cm_user_identity_providers_on_identity_type_and_sub;
-    SQL
-
-    execute <<-SQL
-      ALTER TABLE cm_user_identity_providers
-      DROP CONSTRAINT IF EXISTS index_cm_user_identity_providers_on_user_id_and_identity_type;
-    SQL
-  end
-end

data/lib/spree_cm_commissioner/test_helper/factories/branch_factory.rb

@@ -1,12 +0,0 @@
-FactoryBot.define do
-
-  factory :cm_branch , class: SpreeCmCommissioner::Branch do
-    name { 'testBranch'}
-    lat { 11.11 }
-    lon { 11.11}
-    formatted_phone_number { generate(:phone_number) }
-    formatted_address { "test_address" }
-    state
-    vendor
-  end
-end

data/lib/spree_cm_commissioner/test_helper/factories/departure_time_option_type_factory.rb

@@ -1,8 +0,0 @@
-FactoryBot.define do
-  factory :departure_time, class: Spree::OptionType do
-    name { 'departure_time' }
-    attr_type { 'departure_time' }
-    kind {'variant'}
-    presentation { '' }
-  end
-end

data/lib/spree_cm_commissioner/test_helper/factories/duration_option_type_factory.rb

@@ -1,8 +0,0 @@
-FactoryBot.define do
-  factory :duration, class: Spree::OptionType do
-    name { 'duration' }
-    attr_type { 'duration' }
-    kind {'variant'}
-    presentation { '' }
-  end
-end

data/lib/spree_cm_commissioner/test_helper/factories/line_item_seat_factory.rb

@@ -1,7 +0,0 @@
-FactoryBot.define do
-  factory :line_item_seat, class: SpreeCmCommissioner::LineItemSeat do
-    line_item_id {}
-    seat_id {}
-    date { Date.today }
-  end
-end

data/lib/spree_cm_commissioner/test_helper/factories/stop_factory.rb

@@ -1,14 +0,0 @@
-FactoryBot.define do
-
-  factory :cm_stop , class: SpreeCmCommissioner::Stop do
-    code { 'TS'}
-    name { 'testStop'}
-    formatted_phone_number { generate(:phone_number) }
-    formatted_address { "test_address" }
-    lat { 11.11 }
-    lon { 11.11}
-    branch { create(:cm_branch) }
-    state
-    vendor
-  end
-end

data/lib/spree_cm_commissioner/test_helper/factories/transit_place_factory.rb

@@ -1,8 +0,0 @@
-FactoryBot.define do
-  factory :transit_place, class: Spree::Taxon do
-    transient do
-      taxonomy  { Spree::Taxonomy.place}
-    end
-    parent{ taxonomy.root }
-  end
-end

data/lib/spree_cm_commissioner/test_helper/factories/vehicle_option_type_factory.rb

@@ -1,8 +0,0 @@
-FactoryBot.define do
-  factory :vehicle_option_type, class: Spree::OptionType do
-    name { 'vehicle_option_type' }
-    attr_type { 'vehicle' }
-    kind {'variant'}
-    presentation { '' }
-  end
-end