spree_cm_commissioner 1.10.0.pre.pre → 1.10.0

data/app/queries/spree_cm_commissioner/trip_query.rb

@@ -34,11 +34,11 @@ module SpreeCmCommissioner
                         trips.vehicle_id AS vehicle_id'
                       )
                .joins('INNER JOIN cm_trips AS trips ON trips.variant_id = spree_variants.id')
-               .joins('INNER JOIN cm_trip_stops AS boarding ON boarding.trip_id = trips.id AND boarding.stop_type = 0')
-               .joins('INNER JOIN cm_trip_stops AS drop_off ON drop_off.trip_id = trips.id AND drop_off.stop_type = 1')
+               .joins('INNER JOIN cm_trip_stops AS boarding ON boarding.trip_id = spree_variants.id AND boarding.stop_type = 0')
+               .joins('INNER JOIN cm_trip_stops AS drop_off ON drop_off.trip_id = spree_variants.id AND drop_off.stop_type = 1')
                .joins('INNER JOIN spree_vendors AS vendors ON vendors.id = spree_variants.vendor_id')
                .joins('INNER JOIN spree_products AS routes ON routes.id = spree_variants.product_id')
-               .where('trips.origin_id = ? AND trips.destination_id = ?', origin_id, destination_id)
+               .where('boarding.stop_id = ? AND drop_off.stop_id = ?', origin_id, destination_id)
 
       result.map do |trip|
         trip_result_options = {
@@ -69,9 +69,9 @@ module SpreeCmCommissioner
                  INNER JOIN spree_products AS routes2 ON routes2.id = variant2.product_id
                  INNER JOIN cm_trips AS trip1 ON trip1.variant_id = cm_trip_connections.from_trip_id
                  INNER JOIN cm_trips AS trip2 ON trip2.variant_id = cm_trip_connections.to_trip_id
-                 INNER JOIN cm_places trip1_origin ON trip1_origin.id = trip1.origin_id
-                 INNER JOIN cm_places trip2_origin ON trip2_origin.id = trip2.origin_id
-                 INNER JOIN cm_places trip2_destination ON trip2_destination.id = trip2.destination_id
+                 INNER JOIN cm_trip_stops trip1_origin ON trip1_origin.trip_id = variant1.id AND trip1_origin.stop_type = 0
+                 INNER JOIN cm_trip_stops trip2_origin ON trip2_origin.trip_id = variant2.id AND trip2_origin.stop_type = 0
+                 INNER JOIN cm_trip_stops trip2_destination ON trip2_destination.trip_id = variant2.id AND trip2_destination.stop_type = 1
                  INNER JOIN spree_vendors AS vendor1 ON vendor1.id = variant1.vendor_id
                  INNER JOIN spree_vendors AS vendor2 ON vendor2.id = variant2.vendor_id'
                      )
@@ -93,12 +93,12 @@ module SpreeCmCommissioner
                         trip2.vehicle_id AS trip2_vehicle,
                         routes2.short_name AS route2_short_name,
                         routes2.name AS route2_name,
-                        trip1_origin.name AS trip1_origin,
-                        trip2_origin.name AS trip2_origin,
-                        trip2_destination.name AS trip2_destination,
+                        trip1_origin.stop_name AS trip1_origin,
+                        trip2_origin.stop_name AS trip2_origin,
+                        trip2_destination.stop_name AS trip2_destination,
                         vendor2.name AS trip2_vendor_name'
-                      )
-               .where('trip1_origin.id = ? AND trip2_destination.id = ?', origin_id, destination_id)
+                      ).where('trip1_origin.stop_id = ? AND trip2_destination.stop_id = ?', origin_id, destination_id
+                      ).uniq
 
       return [] if result.blank?
 

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

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

@@ -0,0 +1,55 @@
+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/request_schemas/spree_cm_commissioner/accommodation_request_schema.rb

@@ -3,9 +3,6 @@ module SpreeCmCommissioner
     params do
       required(:from_date).value(:date)
       required(:to_date).value(:date)
-      required(:state_id).value(:integer)
-      required(:number_of_adults).value(:integer)
-      required(:number_of_kids).value(:integer)
     end
 
     rule(:from_date, :to_date) do

data/app/request_schemas/spree_cm_commissioner/application_request_schema.rb

@@ -11,7 +11,7 @@ module SpreeCmCommissioner
     end
 
     def error_message
-      errors.map { |error| "#{error.path.join(', ')}: #{error.text}" }.to_sentence
+      errors.map(&:text).join(', ')
     end
 
     private

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

@@ -9,12 +9,10 @@ module Spree
 
         attributes :total_inventory, :service_availabilities
 
-        # Deprecated
         attribute :total_booking do |vendor|
           vendor.respond_to?(:total_booking) ? vendor.total_booking : 0
         end
 
-        # Deprecated
         attribute :remaining do |vendor|
           vendor.respond_to?(:remaining) ? vendor.remaining : vendor.total_inventory
         end

data/app/views/spree/admin/stock_managements/index.html.erb

@@ -19,7 +19,10 @@
       <% @variants.each do |variant| %>
         <tr id="<%= spree_dom_id variant %>" data-hook="admin_product_stock_management_index_rows">
           <td class="image text-center">
-            <%= small_image(variant) %>
+              <%= small_image(variant) %>
+              <div class="mt-4">
+                Reserved Stock: <%= @reserved_stocks[variant.id] || 0 %></strong>
+              </div>
           </td>
           <td>
             <%= variant.sku_and_options_text %>
@@ -32,37 +35,14 @@
                 <% end %>
               </div>
             <% end if can?(:update, @product) && can?(:update, variant) %>
-
-            <% if defined?(@reserved_stocks) %>
-              <div>
-                <span type="button" data-toggle="popover" data-trigger="hover" data-placement="right" data-content="This product stock will renew every day">
-                  <%= svg_icon name: "cart-check.svg", width: '14', height: '14' %>
-                </span>
-                <%= label_tag "reserved_stock#{variant.id}", "Reserved Stock: #{@reserved_stocks[variant.id] || 0}", class: "m-0" %>
-              </div>
-            <% end %>
-
             <% if variant.permanent_stock? %>
               <div>
                 <span type="button" data-toggle="popover" data-trigger="hover" data-placement="right" data-content="This product stock will renew every day">
                     <%= svg_icon name: "info-circle-fill.svg", width: '14', height: '14' %>
                 </span>
-                <%= label_tag "permanent_stock_#{ variant.id }", Spree.t(:permanent_stock), class: "m-0" %>
+                <%= label_tag "permanent_stock_#{ variant.id }", Spree.t(:permanent_stock) %>
               </div>
             <% end %>
-
-            <% if defined?(@inventory_items) %>
-              <% @inventory_items[variant.id]&.each do |inventory_item| %>
-                <div>
-                  <%= svg_icon name: "handbag.svg", width: '14', height: '14' %>
-                  <%= label_tag "max_capacity_#{ inventory_item.id }", "Max capacity: #{inventory_item.max_capacity}", class: "m-0" %>
-                </div>
-                <div>
-                  <%= svg_icon name: "approve.svg", width: '14', height: '14' %>
-                  <%= label_tag "quantity_available_#{ inventory_item.id }", "Quantity available: #{inventory_item.quantity_available}", class: "m-0" %>
-                </div>
-              <% end %>
-            <% end %>
           </td>
 
           <td colspan="3" class="stock_location_info">
@@ -73,9 +53,3 @@
     </tbody>
   </table>
 </div>
-
-<%= turbo_frame_tag "calendar", src: calendar_admin_product_stock_managements_path(year: params[:year]) do %>
-  <div class="spinner-border mt-2" role="status">
-    <span class="sr-only">Loading...</span>
-  </div>
-<% end if @product.permanent_stock? %>

data/config/routes.rb

@@ -138,11 +138,7 @@ Spree::Core::Engine.add_routes do
         end
       end
 
-      resources :stock_managements do
-        collection do
-          get :calendar
-        end
-      end
+      resources :stock_managements
 
       resources :product_completion_steps do
         collection do
@@ -523,8 +519,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
@@ -550,10 +544,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/docker-compose.yml

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

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

@@ -40,8 +40,8 @@ module SpreeCmCommissioner
                          after: %r{//= require spree/backend}, verbose: true
 
         # For NPM support
-        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\"",
+        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
 

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/variant_factory.rb

@@ -1,40 +1,19 @@
 FactoryBot.define do
   factory :cm_base_variant, parent: :base_variant do
-    is_master { false }
-
     transient do
       total_inventory { 10 }
-      backorderable { false }
     end
 
     after :create do |variant, evaluator|
       variant.stock_items.first.adjust_count_on_hand(evaluator.total_inventory)
-      variant.stock_items.update_all(backorderable: evaluator.backorderable)
     end
   end
 
-  factory :cm_variant, parent: :cm_base_variant do
-    product { create(:product) }
-
-    transient do
-      number_of_adults { nil }
-      number_of_kids { nil }
-    end
-
-    after(:create) do |variant, evaluator|
-      if evaluator.number_of_adults.present?
-        number_of_adults = create(:cm_option_type, :number_of_adults)
-        variant.product.option_types << number_of_adults
-        variant.option_values << create(:cm_option_value, presentation: evaluator.number_of_adults, name: evaluator.number_of_adults, option_type: number_of_adults)
-      end
-
-      if evaluator.number_of_kids.present?
-        number_of_kids = create(:cm_option_type, :number_of_kids)
-        variant.product.option_types << number_of_kids
-        variant.option_values << create(:cm_option_value, presentation: evaluator.number_of_kids, name: evaluator.number_of_kids, option_type: number_of_kids)
-      end
-
-      variant.save!
+  factory :cm_variant, parent: :variant do
+    product do
+      stock_locations = [create(:stock_location)]
+      product = create(:product, vendor: create(:active_vendor, stock_locations: stock_locations))
+      product
     end
   end
 
@@ -45,13 +24,12 @@ FactoryBot.define do
       duration { "1" }
       route { }
     end
-
     before(:create) do |trip, evaluator|
       trip.product = evaluator.route
 
       trip.option_values = [evaluator.departure_time, evaluator.duration]
-    end
 
+    end
     after(:create) do |trip, evaluator|
       trip.stock_items = [create(:stock_item, variant: trip, stock_location: evaluator.product.vendor.stock_locations.first)]
       trip.stock_items.first.adjust_count_on_hand(10)

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '1.10.0-pre'.freeze
+  VERSION = '1.10.0'.freeze
 
   module_function
 

data/lib/spree_cm_commissioner.rb

@@ -19,7 +19,6 @@ require 'spree_cm_commissioner/user_session_jwt_token'
 require 'spree_cm_commissioner/trip_result'
 require 'spree_cm_commissioner/trip_query_result'
 require 'spree_cm_commissioner/trip_seat_layout_result'
-require 'spree_cm_commissioner/cached_inventory_item'
 
 require 'activerecord_multi_tenant'
 require 'google/cloud/recaptcha_enterprise'
@@ -45,36 +44,3 @@ require 'cm_app_logger'
 require 'counter_culture'
 
 require 'byebug' if Rails.env.development? || Rails.env.test?
-
-module SpreeCmCommissioner
-  class << self
-    # Allows overriding the default Redis connection pool with a custom one
-    attr_writer :redis_pool
-
-    def redis_pool
-      @redis_pool ||= default_redis_pool
-    end
-
-    # Resets the Redis pool, useful for testing or reinitialization
-    def reset_redis_pool
-      @redis_pool = nil
-    end
-
-    private
-
-    def default_redis_pool
-      pool_size = ENV.fetch('REDIS_POOL_SIZE', '5').to_i
-      timeout = ENV.fetch('REDIS_TIMEOUT', '5').to_i
-      redis_url = ENV.fetch('REDIS_URL', 'redis://localhost:6379/12')
-
-      ConnectionPool.new(size: pool_size, timeout: timeout) do
-        Redis.new(url: redis_url, timeout: timeout)
-      end
-    end
-  end
-
-  # Provides a configuration block for customizing SpreeCmCommissioner settings
-  def self.configure
-    yield self
-  end
-end

data/spree_cm_commissioner.gemspec

@@ -54,11 +54,6 @@ Gem::Specification.new do |s|
   s.add_dependency "rqrcode", "~> 2.0"
   s.add_dependency "premailer-rails"
   s.add_dependency 'counter_culture', '~> 3.2'
-  # Redis
-  s.add_dependency 'redis'
-  s.add_dependency 'redis-rails'
-  s.add_dependency 'connection_pool'
-
   s.add_development_dependency 'pg'
   s.add_development_dependency 'spree_dev_tools'
   s.add_dependency 'blazer', '~> 3.0.4'