spree_cm_commissioner 2.0.1.pre.pre → 2.0.1.pre.pre1

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

@@ -0,0 +1,25 @@
+<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

@@ -0,0 +1,19 @@
+<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

@@ -0,0 +1,33 @@
+<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/config/initializers/spree_permitted_attributes.rb

@@ -60,10 +60,5 @@ module Spree
       age
       gender
     ]
-
-    @@stock_movement_attributes += %i[
-      originator_type
-      originator_id
-    ]
   end
 end

data/config/routes.rb

@@ -138,21 +138,7 @@ Spree::Core::Engine.add_routes do
         end
       end
 
-      resources :stock_managements do
-        collection do
-          get :calendar
-        end
-      end
-
-      resources :variants do
-        resources :inventory_items, only: %i[show create] do
-          member do
-            patch :reset
-            patch :update_prices
-            delete :delete_prices
-          end
-        end
-      end
+      resources :stock_managements
 
       resources :product_completion_steps do
         collection do
@@ -545,8 +531,6 @@ Spree::Core::Engine.add_routes do
       end
 
       namespace :storefront do
-        resources :inventory_item
-
         resources :waiting_room_sessions, only: :create
         resources :vattanac_banks, only: %i[create]
         resource :cart, controller: :cart, only: %i[show create destroy] do
@@ -572,10 +556,7 @@ Spree::Core::Engine.add_routes do
         resource :cart_guests, only: %i[create destroy]
         resources :cart_payment_method_groups, only: %i[index]
 
-        resources :accommodations, only: %i[index show] do
-          resources :variants, only: %i[index show], module: :accommodations
-        end
-
+        resources :accommodations, only: %i[index show]
         resources :line_items, only: %i[index show]
         resources :account_checker
         resource :account_recovers, only: [:update]

data/db/migrate/20240202080634_update_counter_cache_of_vehicle_type.rb

@@ -1,7 +1,5 @@
 class UpdateCounterCacheOfVehicleType < ActiveRecord::Migration[7.0]
-  def up
-    if defined?(SpreeCmCommissioner::VehicleSeat) && SpreeCmCommissioner::VehicleSeat.respond_to?(:counter_culture_fix_counts)
+    def up
       SpreeCmCommissioner::VehicleSeat.counter_culture_fix_counts
     end
-  end
 end

data/db/migrate/20250709073455_add_email_fields_to_spree_vendors.rb

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,13 @@
+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/docker-compose.yml

@@ -20,7 +20,7 @@ services:
 
     volumes:
       - .:/gem
-      - ./vendor/bundle:/gem/vendor/bundle
+      - /gem/vendor/bundle
 
     # depends_on:
     #   - db

data/lib/cm_app_logger.rb

@@ -1,18 +1,11 @@
 # lib/cm_app_logger.rb
 module CmAppLogger
   def self.log(label:, data: nil)
-    message = { label: label, data: data }
-    start_time = Time.current
-    Rails.logger.info(message.to_json)
-
-    return unless block_given?
-
-    # Capture the block’s return value and return it to preserve existing behavior for callers expecting that value.
-    block_result = yield
+    message = {
+      label: label,
+      data: data
+    }
 
-    message[:start_time] = start_time
-    message[:duration_ms] = (Time.current - start_time) * 1000
     Rails.logger.info(message.to_json)
-    block_result
   end
 end

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

@@ -11,9 +11,14 @@ module SpreeCmCommissioner
       end
 
       def add_migrations
-        run 'bundle exec rake railties:install:migrations FROM=spree_multi_vendor'
-        run 'bundle exec rake railties:install:migrations FROM=spree_cm_commissioner'
-        run 'bundle exec rails generate paper_trail:install'
+        gems = %i[
+          spree_multi_vendor
+          spree_cm_commissioner
+        ]
+
+        gems.each do |gem|
+          run "bundle exec rake railties:install:migrations FROM=#{gem}"
+        end
       end
 
       def run_migrations
@@ -35,17 +40,9 @@ module SpreeCmCommissioner
                          after: %r{//= require spree/backend}, verbose: true
 
         # For NPM support
-        if File.exist?(File.join(destination_root, 'app/javascript/spree_dashboard'))
-          template 'app/javascript/spree_dashboard/spree_cm_commissioner/utilities.js'
-          inject_into_file 'app/javascript/spree_dashboard/spree-dashboard.js', "\nimport \"./spree_cm_commissioner/utilities.js\"",
-                           after: %r{import "@spree/dashboard"}, verbose: true
-        else
-          Logger.new($stdout).debug <<~MSG
-            SpreeCmCommissioner: JavaScript files for the dashboard are missing.
-            Please move your JavaScript files to the appropriate location in
-            app/javascript/spree_dashboard.
-          MSG
-        end
+        template 'app/javascript/spree_cm_commissioner/utilities.js'
+        inject_into_file 'app/javascript/spree-dashboard.js', "\nimport \"./spree_cm_commissioner/utilities.js\"",
+                         after: %r{import "@spree/dashboard"}, verbose: true
       end
 
       def install_telegram_web_bot

data/lib/generators/spree_cm_commissioner/install/templates/app/javascript/{spree_dashboard/spree_cm_commissioner → spree_cm_commissioner}/utilities.js

@@ -6,7 +6,3 @@ const $ = jquery;
 document.addEventListener("spree:load", function () {
   $('[data-toggle="popover"]').popover();
 });
-
-document.documentElement.addEventListener("turbo:frame-load", (event) => {
-  $('[data-toggle="popover"]').popover();
-});

data/lib/spree_cm_commissioner/calendar_event.rb

@@ -2,7 +2,7 @@ module SpreeCmCommissioner
   class CalendarEvent
     attr_reader :from_date, :to_date, :title, :options
 
-    def initialize(from_date:, to_date:, title: nil, options: nil)
+    def initialize(from_date:, to_date:, title:, options:)
       @from_date = from_date
       @to_date = to_date
       @title = title
@@ -23,15 +23,5 @@ module SpreeCmCommissioner
         )
       end
     end
-
-    def self.from_inventory_items(inventory_items)
-      inventory_items.map do |item|
-        CalendarEvent.new(
-          from_date: item.inventory_date,
-          to_date: item.inventory_date,
-          options: { inventory_item: item }
-        )
-      end
-    end
   end
 end

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

@@ -0,0 +1,12 @@
+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

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,8 @@
+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/guest_factory.rb

@@ -1,5 +1,4 @@
 FactoryBot.define do
-  # use cm_guest instead for consistency
   factory :guest, class: SpreeCmCommissioner::Guest do
     line_item { |a| a.association(:line_item) }
     first_name { FFaker::Name.name }
@@ -8,13 +7,4 @@ FactoryBot.define do
     dob { '1986-03-28' }
     token { SecureRandom.hex(32) }
   end
-
-  factory :cm_guest, class: SpreeCmCommissioner::Guest do
-    line_item { |a| a.association(:line_item) }
-    first_name { FFaker::Name.name }
-    last_name { FFaker::Name.name }
-    gender { 1 }
-    dob { '1986-03-28' }
-    token { SecureRandom.hex(32) }
-  end
 end

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

@@ -17,7 +17,7 @@ FactoryBot.define do
     end
 
     factory :cm_product_homepage_section_relatable do
-      relatable { create(:cm_product) }
+      relatable { create(:product) }
     end
 
     factory :cm_taxon_homepage_section_relatable do

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

@@ -16,7 +16,7 @@ FactoryBot.define do
     variant { product.master }
 
     factory :cm_need_confirmation_line_item do
-      product { create(:cm_product, need_confirmation: true) }
+      product { create(:product, need_confirmation: true) }
     end
 
     factory :cm_kyc_line_item do

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

@@ -0,0 +1,7 @@
+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/option_type_factory.rb

@@ -9,12 +9,6 @@ FactoryBot.define do
       presentation { 'location' }
     end
 
-    trait :vehicle do
-      attr_type { :string }
-      name { 'vehicle' }
-      presentation { 'vehicle' }
-    end
-
     trait :start_date do
       attr_type { :date }
       name { 'start-date' }
@@ -153,6 +147,36 @@ FactoryBot.define do
       presentation { 'seat-number-positions' }
     end
 
+    trait :origin do
+      attr_type { :origin }
+      name { 'origin' }
+      presentation { 'origin' }
+    end
+
+    trait :destination do
+      attr_type { :destination }
+      name { 'destination' }
+      presentation { 'destination' }
+    end
+
+    trait :departure_time do
+      attr_type { :time }
+      name { 'departure-time' }
+      presentation { 'departure-time' }
+    end
+
+    trait :vehicle do
+      attr_type { :vehicle_id }
+      name { 'vehicle' }
+      presentation { 'vehicle' }
+    end
+
+    trait :allow_seat_selection do
+      attr_type { :boolean }
+      name { 'allow-seat-selection' }
+      presentation { 'allow-seat-selection' }
+    end
+
     initialize_with { Spree::OptionType.where(name: name).first_or_initialize }
   end
 end

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

@@ -1,2 +1,38 @@
 FactoryBot.define do
+  factory :transit_order, class: Spree::Order do
+    bill_address
+    ship_address
+    state {'complete'}
+    payment_state {'paid'}
+
+    transient do
+      line_items_count       { 1 }
+      shipment_cost          { 100 }
+      shipping_method_filter { Spree::ShippingMethod::DISPLAY_ON_FRONT_END }
+      seats {}
+      variant {}
+      quantity {}
+      date { Date.today }
+      selected_seats {[]}
+      line_item_seats_attributes{[]}
+    end
+
+    after(:create) do |order, evaluator|
+      if evaluator.quantity.nil? && evaluator.seats.present?
+        @line_item_seats_attributes =  evaluator.seats.map do |seat|
+          {seat_id: seat.id, date: evaluator.date, variant_id: evaluator.variant.id}
+        end
+        create(:line_item, order: order, variant: evaluator.variant, date: evaluator.date, line_item_seats_attributes: @line_item_seats_attributes)
+        order.line_items.reload
+      else
+        create(:line_item, order: order, variant: evaluator.variant, date: evaluator.date, quantity: evaluator.quantity)
+      end
+
+      stock_location = order.line_items&.first&.variant&.stock_items&.first&.stock_location || create(:stock_location)
+      create(:shipment, order: order, cost: evaluator.shipment_cost, stock_location: stock_location)
+      order.shipments.reload
+
+      order.update_with_updater!
+    end
+  end
 end

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

@@ -1,19 +1,6 @@
 FactoryBot.define do
-  factory :cm_product_in_stock, parent: :product_in_stock do
-    product_type { :ecommerce }
-  end
-
-  factory :cm_product_with_option_types, parent: :product_with_option_types do
-    product_type { :ecommerce }
-  end
-
-  factory :cm_base_product, parent: :base_product do
-    product_type { :ecommerce }
-  end
-
-  factory :cm_product, parent: :product do
+  factory :cm_product, parent: :base_product do
     vendor { Spree::Vendor.first || create(:cm_vendor) }
-    product_type { :ecommerce }
 
     before(:create) do |product|
       create(:stock_location) unless Spree::StockLocation.any?
@@ -46,6 +33,35 @@ FactoryBot.define do
       end
     end
 
+    factory :route do
+      route_type {:automobile}
+      product_type { :transit }
+      before(:create) do |route, evaluator|
+        create(:stock_location) unless Spree::StockLocation.any?
+        if route.stores.empty?
+          default_store = Spree::Store.default.persisted? ? Spree::Store.default : nil
+          store = default_store || create(:store)
+
+          route.stores << [store]
+        end
+      end
+      after(:create) do |route, evaluator|
+        trip = route.master
+        trip.permanent_stock = 10
+        trip.stock_items = [create(:stock_item, variant: trip, stock_location: route.vendor.stock_locations.first)]
+        trip.stock_items.first.adjust_count_on_hand(10)
+
+        # option types
+        route.option_types << create(:cm_option_type, :origin)
+        route.option_types << create(:cm_option_type, :destination)
+        route.option_types << create(:cm_option_type, :departure_time)
+        route.option_types << create(:cm_option_type, :duration_in_hours)
+        route.option_types << create(:cm_option_type, :duration_in_minutes)
+        route.option_types << create(:cm_option_type, :allow_seat_selection)
+        route.option_types << create(:cm_option_type, :vehicle)
+      end
+    end
+
     factory :cm_subscribable_product do
       option_types { [
         create(:cm_option_type, :month),
@@ -69,7 +85,7 @@ FactoryBot.define do
         option_value2 = create(:cm_option_value, presentation: "#{evaluator.due_date} Days", name: evaluator.due_date.to_s, option_type: product.option_types[1])
         option_value3 = create(:cm_option_value, presentation: "#{evaluator.payment_option}", name: evaluator.payment_option.to_s, option_type: product.option_types[2])
 
-        variant = create(:cm_variant, price: product.price, product: product)
+        variant = create(:variant, price: product.price, product: product)
         variant.option_values = [option_value1, option_value2, option_value3]
         variant.save!
 
@@ -87,7 +103,7 @@ FactoryBot.define do
       end
 
       after(:create) do |product, evaluator|
-        variant = create(:cm_variant, price: product.price, product: product)
+        variant = create(:variant, price: product.price, product: product)
         variant.save!
 
         variant.stock_items.first.adjust_count_on_hand(evaluator.total_inventory)
@@ -120,12 +136,12 @@ FactoryBot.define do
           create(:cm_option_value, presentation: 'Yes', name: '1', option_type: product.option_types.find_by(name: 'bib-pre-generation-on-create'))
         end
 
-        variant1 = create(:cm_variant, price: product.price, product: product)
+        variant1 = create(:variant, price: product.price, product: product)
         variant1.option_values = [option_value1]
         variant1.option_values << bib_pre_generation_option_value if evaluator.bib_pre_generation_on_create
         variant1.save!
 
-        variant2 = create(:cm_variant, price: product.price, product: product)
+        variant2 = create(:variant, price: product.price, product: product)
         variant2.option_values = [option_value2]
         variant2.option_values << bib_pre_generation_option_value if evaluator.bib_pre_generation_on_create
         variant2.save!

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

@@ -24,8 +24,8 @@ FactoryBot.define do
         # variant will add itself to all stock_locations in an after_create
         # creating a product will automatically create a master variant
         store = Spree::Store.first || create(:store)
-        product_1 = create(:cm_product, stores: [store])
-        product_2 = create(:cm_product, stores: [store])
+        product_1 = create(:product, stores: [store])
+        product_2 = create(:product, stores: [store])
 
         stock_location.stock_items.where(variant_id: product_1.master.id).first.adjust_count_on_hand(10)
         stock_location.stock_items.where(variant_id: product_2.master.id).first.adjust_count_on_hand(20)

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

@@ -0,0 +1,14 @@
+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

@@ -0,0 +1,8 @@
+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/trip_factory.rb

@@ -1,14 +1,6 @@
 FactoryBot.define do
-  factory :cm_trip, class: SpreeCmCommissioner::Trip do
-    departure_time { Time.zone.now.change(hour: 8, min: 0) } # example 8:00 AM
-    duration { 3600 } # 1 hour in seconds
-    allow_seat_selection { true }
-
-    product { create(:cm_product, product_type: :transit) }
-
-    association :vendor, factory: :cm_transit_vendor
-    association :vehicle, factory: :cm_vehicle
-    association :origin_place, factory: :cm_place
-    association :destination_place, factory: :cm_place
+  factory :trip_connection, class: 'SpreeCmCommissioner::TripConnection' do
+    association :from_trip, factory: :variant
+    association :to_trip, factory: :variant
   end
 end

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

@@ -1,5 +1,5 @@
 FactoryBot.define do
-  factory :user_identity_provider, class: SpreeCmCommissioner::UserIdentityProvider do
+  factory :cm_user_identity_provider, class: SpreeCmCommissioner::UserIdentityProvider do
     sequence(:sub) { |n| "sub-#{n}" }
     identity_type { SpreeCmCommissioner::UserIdentityProvider.identity_types[:google] }
     email { 'fake@example.com' }