spree_cm_commissioner 2.0.3.pre.pre6 → 2.0.3.pre.pre.pre7

data/app/queries/spree_cm_commissioner/trip_query.rb

@@ -1,134 +1,155 @@
 module SpreeCmCommissioner
   class TripQuery
-    attr_reader :origin_id, :destination_id, :date, :vendor_id, :number_of_guests, :params
+    include SpreeCmCommissioner::Transit::TripHelper
 
-    def initialize(origin_id:, destination_id:, date:, vendor_id: nil, number_of_guests: nil, params: {}) # rubocop:disable Metrics/ParameterLists
+    attr_reader :origin_id, :destination_id, :travel_date, :params
+
+    def initialize(origin_id:, destination_id:, travel_date:, params: {})
       @origin_id = origin_id
       @destination_id = destination_id
-      @date = date.to_date == Time.zone.now.to_date ? Time.zone.now : Time.zone.parse(date.to_s)
-      @vendor_id = vendor_id
-      @number_of_guests = number_of_guests || 1
+      @travel_date = travel_date
+      @travel_date = Time.zone.now if travel_date.to_date == Time.zone.now.to_date
       @params = params
-      @page = (params[:page] || 1).to_i
-      @per_page = params[:per_page]
     end
 
     def call
-      return Kaminari.paginate_array([]) if date.to_date < Date.current
-
-      paginated_relation = direct_trips
-      return Kaminari.paginate_array([]) if paginated_relation.empty?
+      return [] if travel_date.to_date < Date.current
 
-      unique_trips = paginated_relation.uniq(&:id)
-      results_array = unique_trips.map do |trip|
-        result = build_trip_result(trip)
-        SpreeCmCommissioner::TripQueryResult.new([result])
-      end
-
-      Kaminari.paginate_array(
-        results_array,
-        total_count: unique_trips.size,
-        limit: unique_trips.size,
-        offset: paginated_relation.offset_value
-      )
+      direct_results = direct_trips.map { |trip| SpreeCmCommissioner::TripQueryResult.new([trip]) }
+      connected_results = connected_trips || []
+      direct_results + connected_results
     end
 
     def direct_trips
-      @inventory_sql ||= product_inventory_totals
-      result = SpreeCmCommissioner::Trip
-               .select(<<~SQL.squish)
-                 cm_trips.*,
-                 boarding.departure_time AS boarding_departure_time,
-                 boarding.stop_place_id AS boarding_stop_id, boarding.stop_name AS boarding_stop_name,
-                 drop_off.stop_name AS drop_off_stop_name, drop_off.stop_place_id AS drop_off_stop_id,
-                 drop_off.arrival_time AS drop_off_arrival_time,
-                 COALESCE(iv.quantity_available, 0) AS quantity_available,
-                 COALESCE(iv.max_capacity, 0) AS max_capacity,
-                 origin_places.name AS origin_place_name, dest_places.name AS destination_place_name,
-                 prices.amount AS amount, prices.compare_at_amount AS compare_at_amount,
-                 prices.currency AS currency
-               SQL
-               .includes(vendor: :logo, vehicle: :option_values)
-               .joins(<<~SQL.squish)
-                 INNER JOIN cm_trip_stops AS boarding ON boarding.trip_id = cm_trips.id AND boarding.stop_type = 0
-                 INNER JOIN cm_trip_stops AS drop_off ON drop_off.trip_id = cm_trips.id AND drop_off.stop_type = 1
-                 INNER JOIN cm_places AS origin_places ON origin_places.id = cm_trips.origin_place_id
-                 INNER JOIN cm_places AS dest_places ON dest_places.id = cm_trips.destination_place_id
-                 INNER JOIN spree_variants AS master ON master.product_id = cm_trips.product_id AND master.is_master = true
-                 INNER JOIN spree_prices AS prices ON prices.variant_id = master.id AND prices.deleted_at IS NULL
-               SQL
-               .where('(boarding.location_place_id = ? OR boarding.stop_place_id = ? OR cm_trips.origin_place_id = ?)
-                        AND (drop_off.location_place_id = ? OR drop_off.stop_place_id = ? OR cm_trips.destination_place_id = ?)',
-                      origin_id, origin_id, origin_id, destination_id, destination_id, destination_id
-               )
-               .joins("INNER JOIN (#{@inventory_sql.to_sql}) iv ON cm_trips.product_id = iv.product_id")
+      result = Spree::Variant
+               .select('spree_variants.id AS variant_id,
+                        vendors.id AS vendor_id,
+                        vendors.name AS vendor_name,
+                        routes.name AS route_name,
+                        routes.short_name AS short_name,
+                        boarding.stop_id AS origin_id,
+                        drop_off.stop_id AS destination_id,
+                        boarding.stop_name AS origin,
+                        drop_off.stop_name AS destination,
+                        trips.departure_time AS departure_time,
+                        trips.duration AS duration,
+                        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 = 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')
+      result = result.where(vendors: { id: params[:vendor_id] }) if params[:vendor_id].present?
+      result = result.where('boarding.stop_id = ? AND drop_off.stop_id = ?', origin_id, destination_id)
+                     .where('trips.departure_time > ? AND trips.departure_time <= ?',
+                            travel_date.strftime('%H:%M:%S'),
+                            travel_date.end_of_day.strftime('%H:%M:%S')
+                           )
 
-      result = result.where(vendor_id: vendor_id) if vendor_id.present?
-      @per_page.to_i.positive? ? result.page(@page).per(@per_page) : result.page(@page)
+      result.map do |trip|
+        trip_result_options = {
+          trip_id: trip[:variant_id],
+          vendor_id: trip[:vendor_id],
+          vendor_name: trip[:vendor_name],
+          route_name: trip[:route_name],
+          short_name: trip[:short_name],
+          detail: trip[:variant_id],
+          origin_id: trip[:origin_id],
+          origin: trip[:origin],
+          destination_id: trip[:destination_id],
+          destination: trip[:destination],
+          vehicle_id: trip[:vehicle_id],
+          departure_time: parse_time(trip[:departure_time]),
+          duration: trip[:duration]
+        }
+        SpreeCmCommissioner::TripResult.new(trip_result_options)
+      end
     end
 
-    def product_inventory_totals
-      Spree::Product
-        .select(
-          'spree_products.id AS product_id,
-              SUM(cm_inventory_items.max_capacity) AS max_capacity,
-              SUM(cm_inventory_items.quantity_available) AS quantity_available'
-        )
-        .joins(variants: :inventory_items)
-        .where('cm_inventory_items.inventory_date = ? AND cm_inventory_items.quantity_available >= ?', @date.to_date, @number_of_guests)
-        .group('spree_products.id')
-    end
+    def connected_trips # rubocop:disable Metrics/MethodLength
+      result = SpreeCmCommissioner::TripConnection
+               .joins('
+                INNER JOIN spree_variants variant1 ON variant1.id = cm_trip_connections.from_trip_id
+                INNER JOIN spree_variants variant2 ON variant2.id = cm_trip_connections.to_trip_id
+                INNER JOIN spree_products AS routes1 ON routes1.id = variant1.product_id
+                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_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'
+                     )
+               .select('cm_trip_connections.id AS id,
+                        trip1.variant_id AS trip1_id,
+                        trip1.origin_id AS trip1_origin_id,
+                        trip1.destination_id AS trip1_destination_id,
+                        trip1.departure_time AS trip1_departure_time,
+                        trip1.duration AS trip1_duration,
+                        routes1.short_name AS route1_short_name,
+                        routes1.name AS route1_name,
+                        trip1.vehicle_id AS trip1_vehicle,
+                        vendor1.name AS trip1_vendor_name,
+                        trip2.variant_id AS trip2_id,
+                        trip2.origin_id AS trip2_origin_id,
+                        trip2.destination_id AS trip2_destination_id,
+                        trip2.departure_time AS trip2_departure_time,
+                        trip2.duration AS trip2_duration,
+                        trip2.vehicle_id AS trip2_vehicle,
+                        routes2.short_name AS route2_short_name,
+                        routes2.name AS route2_name,
+                        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.stop_id = ? AND trip2_destination.stop_id = ?', origin_id, destination_id)
+      result = result.where('vendor1.id = ? OR vendor2.id = ?', params[:vendor_id], params[:vendor_id]) if params[:vendor_id].present?
+      result = result.where('trip1.departure_time > ? AND trip1.departure_time <= ?', travel_date.strftime('%H:%M:%S'),
+                            travel_date.end_of_day.strftime('%H:%M:%S')
+      ).uniq
 
-    private
+      return [] if result.blank?
 
-    def build_trip_result(trip)
-      vehicle = trip&.vehicle
-      vendor = trip&.vendor
-      trip_result_options = {
-        id: trip&.id,
-        departure_time: trip&.departure_time,
-        duration: trip&.duration,
-        allow_seat_selection: trip&.allow_seat_selection,
-        route_type: trip&.route_type,
-        origin_place: {
-          id: trip&.origin_place_id,
-          name: trip&.origin_place_name
-        },
-        destination_place: {
-          id: trip&.destination_place_id,
-          name: trip&.destination_place_name
-        },
-        vehicle_id: trip&.vehicle_id,
-        vehicle: vehicle,
-        vendor_id: trip&.vendor_id,
-        vendor: vendor,
-        product_id: trip&.product_id,
-        price: trip&.amount,
-        currency: trip&.currency,
-        compare_at_amount: trip&.compare_at_amount,
-        boarding: build_boarding_info(trip),
-        drop_off: build_drop_off_info(trip),
-        quantity_available: trip&.quantity_available,
-        max_capacity: trip&.max_capacity,
-        amenities: (trip.vehicle&.option_values || [])
-      }
-      SpreeCmCommissioner::TripResult.new(trip_result_options)
+      build_trip_query_result(result)
     end
 
-    def build_boarding_info(trip)
-      {
-        stop_id: trip&.boarding_stop_id,
-        stop_name: trip&.boarding_stop_name,
-        departure_time: trip&.boarding_departure_time
-      }
-    end
+    private
 
-    def build_drop_off_info(trip)
-      {
-        stop_id: trip&.drop_off_stop_id,
-        stop_name: trip&.drop_off_stop_name,
-        arrival_time: trip&.drop_off_arrival_time
-      }
+    def build_trip_query_result(connections)
+      connections.map do |trip|
+        from_trip = {
+          trip_id: trip[:trip1_id],
+          origin_id: trip[:trip1_origin_id],
+          destination_id: trip[:trip1_destination_id],
+          departure_time: parse_time(trip[:trip1_departure_time]),
+          duration: trip[:trip1_duration],
+          vendor_name: trip[:trip1_vendor_name],
+          route_name: trip[:route1_name],
+          short_name: trip[:route1_short_name],
+          vehicle_id: trip[:trip1_vehicle],
+          origin: trip[:trip1_origin],
+          destination: trip[:trip2_origin]
+        }
+        to_trip = {
+          trip_id: trip[:trip2_id],
+          origin_id: trip[:trip2_origin_id],
+          destination_id: trip[:trip2_destination_id],
+          departure_time: parse_time(trip[:trip2_departure_time]),
+          duration: trip[:trip2_duration],
+          vendor_name: trip[:trip2_vendor_name],
+          route_name: trip[:route2_name],
+          short_name: trip[:route2_short_name],
+          vehicle_id: trip[:trip2_vehicle],
+          origin: trip[:trip2_origin],
+          destination: trip[:trip2_destination]
+        }
+        data = [SpreeCmCommissioner::TripResult.new(from_trip),
+                SpreeCmCommissioner::TripResult.new(to_trip)
+                ]
+        SpreeCmCommissioner::TripQueryResult.new(data, connection_id: trip[:id])
+      end
     end
   end
 end

data/app/queries/spree_cm_commissioner/trip_search_query.rb

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

@@ -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/queries/spree_cm_commissioner/vendor_stop_place_query.rb

@@ -0,0 +1,54 @@
+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/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(:province_id).value(:integer)
-      required(:adult).value(:integer)
-      required(:children).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/serializers/spree/v2/storefront/line_item_serializer_decorator.rb

@@ -4,7 +4,6 @@ module Spree
       module LineItemSerializerDecorator
         def self.prepended(base)
           base.attributes :from_date, :to_date, :need_confirmation, :product_type, :event_status, :amount, :display_amount,
-                          :checkin_date, :checkout_date,
                           :number, :qr_data,
                           :kyc, :kyc_fields, :remaining_total_guests, :number_of_guests,
                           :completion_steps, :available_social_contact_platforms, :allow_anonymous_booking, :discontinue_on,

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

@@ -7,7 +7,7 @@ module SpreeCmCommissioner
         attributes :first_name, :last_name, :dob, :gender, :kyc_fields, :other_occupation, :created_at, :updated_at,
                    :qr_data, :social_contact_platform, :social_contact, :available_social_contact_platforms,
                    :age, :emergency_contact, :other_organization, :expectation, :upload_later, :address, :formatted_bib_number, :phone_number,
-                   :token, :country_code, :contact
+                   :token, :country_code, :contact, :data_fill_stage_phase
 
         # temporary, once app release after cm-app v1.9.1, we no longer need this.
         attribute :seat_number do |object|
@@ -22,8 +22,6 @@ module SpreeCmCommissioner
         belongs_to :nationality, serializer: Spree::V2::Storefront::TaxonSerializer
         belongs_to :line_item, serializer: Spree::V2::Storefront::LineItemSerializer
 
-        has_many :guest_dynamic_fields, serializer: SpreeCmCommissioner::V2::Storefront::GuestDynamicFieldSerializer
-
         has_one :id_card, serializer: Spree::V2::Storefront::IdCardSerializer
         has_one :check_in
 

data/app/services/spree_cm_commissioner/vehicle_option_value_creator.rb

@@ -0,0 +1,11 @@
+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/admin/stock_managements/_variant_stock_items.html.erb

@@ -17,11 +17,9 @@
           </td>
           <td class="text-center d-flex flex-column align-items-center justify-content-center">
             <div style="width: 90px;">
-              <%= form_tag admin_product_stock_managements_path(product_id: params[:product_id], variant_id: variant.id, stock_location_id: stock_location.id), method: :post do %>
+              <%= form_tag admin_stock_items_path(variant_id: variant.id, stock_location_id: stock_location.id), method: :post do %>
                 <div class="input-group input-group-sm">
                   <%= number_field_tag 'stock_movement[quantity]', 0, class: 'form-control text-center p-0' %>
-                  <%= hidden_field_tag 'stock_movement[originator_id]', spree_current_user.id %>
-                  <%= hidden_field_tag 'stock_movement[originator_type]', spree_current_user.class.name %>
                   <div class="input-group-append">
                     <%= button_tag(class: 'btn btn-outline-success pl-2 pr-1') do %>
                       <%= svg_icon(name: 'arrow-left-right.svg', classes: "icon", width: 14, height: 14) %>
@@ -34,10 +32,7 @@
           <td class="text-center">
             <% if item.persisted? && can?(:update, item) %>
               <%= form_tag admin_stock_item_path(item), method: :put, class: 'toggle_stock_item_backorderable' do %>
-                <%= check_box_tag 'stock_item[backorderable]', true, item.backorderable?,
-                  class: 'stock_item_backorderable',
-                  id: "stock_item_backorderable_#{stock_location.id}",
-                  onclick: "if (!confirm('Are you sure to change backorderable status?')) { this.checked = !this.checked; }" %>
+                <%= check_box_tag 'stock_item[backorderable]', true, item.backorderable?, class: 'stock_item_backorderable', id: "stock_item_backorderable_#{stock_location.id}" %>
               <% end %>
             <% else %>
               <%= 'N/A' %>