spree_cm_commissioner 2.0.3.pre.pre4 → 2.0.3.pre.pre6

data/app/models/spree_cm_commissioner/trip.rb

@@ -1,31 +1,40 @@
-require_dependency 'spree_cm_commissioner'
 module SpreeCmCommissioner
-  class Trip < SpreeCmCommissioner::Base
+  class Trip < Base
+    include SpreeCmCommissioner::RouteType
+
     attr_accessor :hours, :minutes, :seconds
 
     before_validation :convert_duration_to_seconds
 
+    belongs_to :vendor, class_name: 'Spree::Vendor', inverse_of: :trips, optional: false
     belongs_to :product, class_name: 'Spree::Product', inverse_of: :trip, optional: false
+
     belongs_to :vehicle, class_name: 'SpreeCmCommissioner::Vehicle', optional: false
-    belongs_to :origin, class_name: 'SpreeCmCommissioner::Place', optional: true
-    belongs_to :destination, class_name: 'SpreeCmCommissioner::Place', optional: true
+
+    belongs_to :origin_place, class_name: 'SpreeCmCommissioner::Place', optional: false
+    belongs_to :destination_place, class_name: 'SpreeCmCommissioner::Place', optional: false
 
     has_many :trip_blazer_queries, as: :queryable, class_name: 'SpreeCmCommissioner::BlazerQueryable'
     has_many :blazer_queries, through: :trip_blazer_queries, source: :blazer_query, class_name: 'Blazer::Query'
 
     has_many :trip_stops, class_name: 'SpreeCmCommissioner::TripStop', dependent: :destroy
+    has_many :boarding_trip_stops, -> { boarding.order('departure_time ASC NULLS LAST, id ASC') }, class_name: 'SpreeCmCommissioner::TripStop'
+    has_many :drop_off_trip_stops, -> { drop_off.order('arrival_time ASC NULLS LAST') }, class_name: 'SpreeCmCommissioner::TripStop'
+
     has_many :variants, through: :product
     has_many :inventory_items, through: :variants
-    belongs_to :variant, class_name: 'Spree::Variant'
-
-    belongs_to :route, class_name: 'Spree::Product'
-    belongs_to :vehicle, class_name: 'SpreeCmCommissioner::Vehicle'
-    validates :departure_time, presence: true
+    has_many :variant_blocks, through: :variants
+    has_many :blocks, through: :variant_blocks
 
     validates :departure_time, presence: true
     validates :duration, numericality: { greater_than: 0 }
     validate :origin_and_destination_cannot_be_the_same
 
+    accepts_nested_attributes_for :trip_stops, :product, allow_destroy: true
+
+    self.whitelisted_ransackable_associations = %w[product vehicle]
+    self.whitelisted_ransackable_attributes = %w[origin_place_id destination_place_id]
+
     def convert_duration_to_seconds
       return if hours.blank? && minutes.blank? && seconds.blank?
 
@@ -50,7 +59,7 @@ module SpreeCmCommissioner
     private
 
     def origin_and_destination_cannot_be_the_same
-      return unless origin_id == destination_id
+      return unless origin_place_id == destination_place_id
 
       errors.add(:base, 'Origin and destination cannot be the same')
     end

data/app/models/spree_cm_commissioner/trip_connection.rb

@@ -1,7 +1,7 @@
 module SpreeCmCommissioner
-  class TripConnection < ApplicationRecord
-    belongs_to :from_trip, class_name: 'Spree::Variant'
-    belongs_to :to_trip, class_name: 'Spree::Variant'
+  class TripConnection < Base
+    belongs_to :from_trip, class_name: 'SpreeCmCommissioner::Trip'
+    belongs_to :to_trip, class_name: 'SpreeCmCommissioner::Trip'
 
     validate :both_trip_cannot_be_the_same
     before_validation :calculate_connection_time_minutes
@@ -12,8 +12,8 @@ module SpreeCmCommissioner
     def calculate_connection_time_minutes
       return if from_trip.nil? || to_trip.nil?
 
-      arrival_seconds   = from_trip.trip.arrival_time.seconds_since_midnight
-      departure_seconds = to_trip.trip.departure_time.seconds_since_midnight
+      arrival_seconds   = from_trip.arrival_time.seconds_since_midnight
+      departure_seconds = to_trip.departure_time.seconds_since_midnight
 
       layover_seconds = departure_seconds - arrival_seconds
       layover_seconds += 86_400 if layover_seconds.negative?

data/app/models/spree_cm_commissioner/trip_stop.rb

@@ -1,36 +1,25 @@
-require_dependency 'spree_cm_commissioner'
 module SpreeCmCommissioner
-  class TripStop < SpreeCmCommissioner::Base
+  class TripStop < Base
     acts_as_list column: :sequence, scope: :trip_id
     enum :stop_type, { boarding: 0, drop_off: 1 }
 
-    belongs_to :trip, class_name: 'Spree::Variant'
-    belongs_to :stop, class_name: 'SpreeCmCommissioner::Place'
+    belongs_to :trip, class_name: 'SpreeCmCommissioner::Trip', optional: false
+    belongs_to :stop_place, class_name: 'SpreeCmCommissioner::Place', optional: false
+    belongs_to :location_place, class_name: 'SpreeCmCommissioner::Place', optional: false
 
     before_validation :set_stop_name
-    after_destroy :decrement_trip_count
-    after_commit :create_vendor_stop
-    validates :stop_id, uniqueness: { scope: :trip_id }
+    validates :stop_place_id, uniqueness: { scope: :trip_id }
 
     def set_stop_name
-      self.stop_name = stop.name if stop.present?
+      self.stop_name = stop_place.name if stop_place.present?
     end
 
-    def create_vendor_stop
-      vendor_stop = vendor.vendor_stops.where(stop_id: stop_id, stop_type: stop_type).first_or_create
-      vendor_stop.update(trip_count: vendor_stop.trip_count.to_i + 1)
+    def self.ransackable_attributes(_auth_object = nil)
+      %w[stop_name stop_type]
     end
 
-    private
-
-    def decrement_trip_count
-      vendor.vendor_stops.where(stop_id: stop_id, stop_type: stop_type).find_each do |vendor_stop|
-        vendor_stop.update(trip_count: [vendor_stop.trip_count - 1, 0].max)
-      end
-    end
-
-    def vendor
-      Spree::Product.find(trip&.product_id).vendor
+    def self.ransackable_associations(_auth_object = nil)
+      ['stop_place']
     end
   end
 end

data/app/models/spree_cm_commissioner/variant_block.rb

@@ -0,0 +1,17 @@
+module SpreeCmCommissioner
+  class VariantBlock < Base
+    belongs_to :variant, class_name: 'Spree::Variant', optional: false
+    belongs_to :trip, class_name: 'SpreeCmCommissioner::Trip', optional: false
+    belongs_to :block, class_name: 'SpreeCmCommissioner::Block', optional: false
+
+    validates :block_id, uniqueness: { scope: %i[variant_id trip_id] }
+
+    before_validation :set_trip, if: -> { trip_id.blank? }
+
+    private
+
+    def set_trip
+      self.trip = variant&.product&.trip
+    end
+  end
+end

data/app/models/spree_cm_commissioner/variant_decorator.rb

@@ -1,6 +1,7 @@
 module SpreeCmCommissioner
   module VariantDecorator
-    def self.prepended(base)
+    def self.prepended(base) # rubocop:disable Metrics/AbcSize
+      base.include SpreeCmCommissioner::ProductType
       base.include SpreeCmCommissioner::ProductDelegation
       base.include SpreeCmCommissioner::VariantOptionsConcern
       base.include SpreeCmCommissioner::KycBitwise
@@ -20,24 +21,21 @@ module SpreeCmCommissioner
       base.has_many :video_on_demands, class_name: 'SpreeCmCommissioner::VideoOnDemand', dependent: :destroy
       base.has_many :complete_line_items, -> { complete }, class_name: 'Spree::LineItem'
 
+      base.has_many :variant_blocks, class_name: 'SpreeCmCommissioner::VariantBlock', dependent: :destroy
+      base.has_many :blocks, class_name: 'SpreeCmCommissioner::Block', through: :variant_blocks
+
       base.has_many :variant_guest_card_class, class_name: 'SpreeCmCommissioner::VariantGuestCardClass'
       base.has_many :guest_card_classes, class_name: 'SpreeCmCommissioner::GuestCardClass', through: :variant_guest_card_class
 
+      base.has_many :inventory_items, class_name: 'SpreeCmCommissioner::InventoryItem'
+
       base.scope :subscribable, -> { active.joins(:product).where(product: { subscribable: true, status: :active }) }
-      base.has_one :trip,
-                   class_name: 'SpreeCmCommissioner::Trip'
-      base.has_many :trip_stops, class_name: 'SpreeCmCommissioner::TripStop', dependent: :destroy, foreign_key: :trip_id
-      base.accepts_nested_attributes_for :option_values
-      base.after_commit :sync_trip, if: :transit?
-      base.accepts_nested_attributes_for :trip_stops, allow_destroy: true
-      base.after_commit :create_trip_stops, if: :transit?
-    end
+      base.scope :with_permanent_stock, -> { where(product_type: base::PERMANENT_STOCK_PRODUCT_TYPES) }
+      base.scope :with_non_permanent_stock, -> { where.not(product_type: base::PERMANENT_STOCK_PRODUCT_TYPES) }
 
-    def create_trip_stops
-      return if is_master?
+      base.accepts_nested_attributes_for :option_values
 
-      trip_stops.find_or_create_by(stop_type: :boarding, stop_id: options.origin)
-      trip_stops.find_or_create_by(stop_type: :drop_off, stop_id: options.destination)
+      base.before_save -> { self.product_type = product.product_type }, if: -> { product_type.nil? }
     end
 
     def delivery_required?
@@ -53,8 +51,20 @@ module SpreeCmCommissioner
       super || product.discontinued?
     end
 
-    def permanent_stock?
-      accommodation?
+    def default_inventory_item_exist?
+      inventory_items.exists?(inventory_date: nil)
+    end
+
+    def create_default_non_permanent_inventory_item!(quantity_available: nil, max_capacity: nil)
+      return if product_type.blank? # handle in case product not exist for variant.
+      return unless should_track_inventory?
+      return if default_inventory_item_exist?
+
+      inventory_items.create!(
+        product_type: product_type,
+        quantity_available: [0, quantity_available || total_on_hand].max,
+        max_capacity: [0, max_capacity || total_on_hand].max
+      )
     end
 
     # override
@@ -72,30 +82,26 @@ module SpreeCmCommissioner
       "#{display_sku} - #{display_price}"
     end
 
-    def transit?
-      product.product_type == 'transit'
-    end
-
     # override
-    def in_stock?
-      available_quantity.positive?
+    def in_stock?(options = {})
+      SpreeCmCommissioner::Stock::AvailabilityChecker.new(self, options).can_supply?
     end
 
-    private
+    def price_for_date(currency:, date:)
+      currency = currency.upcase
 
-    def total_purchases
-      Spree::LineItem.complete.where(variant_id: id).sum(:quantity).to_i
+      prices.joins(:inventory_item)
+            .find_by(
+              currency: currency,
+              inventory_item: { inventory_date: date }
+            )
     end
 
-    def available_quantity
-      stock_count = stock_items.sum(&:count_on_hand)
-      return stock_count if delivery_required?
-
-      stock_count - total_purchases
-    end
+    private
 
     def update_vendor_price
-      return unless vendor.present? && product&.product_type == vendor&.primary_product_type
+      return unless vendor.present? && product_type == vendor&.primary_product_type
+      return if price.blank?
 
       vendor.update(min_price: price) if vendor.min_price.nil? || price < vendor.min_price
       vendor.update(max_price: price) if vendor.max_price.nil? || price > vendor.max_price
@@ -119,22 +125,6 @@ module SpreeCmCommissioner
         end
       end
     end
-
-    def sync_trip
-      return unless product.product_type == 'transit'
-
-      trip = SpreeCmCommissioner::Trip.find_or_initialize_by(variant_id: id)
-
-      trip.assign_attributes(
-        product_id: product_id,
-        origin_id: options.origin,
-        destination_id: options.destination,
-        departure_time: options.departure_time,
-        duration: options.total_duration_in_seconds,
-        vehicle_id: options.vehicle
-      )
-      trip.save
-    end
   end
 end
 

data/app/models/spree_cm_commissioner/variant_options.rb

@@ -143,28 +143,5 @@ module SpreeCmCommissioner
     def number_of_guests
       number_of_adults + number_of_kids
     end
-
-    def origin
-      @origin ||= option_value_name_for(option_type_name: 'origin')&.to_i
-    end
-
-    def destination
-      @destination ||= option_value_name_for(option_type_name: 'destination')&.to_i
-    end
-
-    def vehicle
-      @vehicle ||= option_value_name_for(option_type_name: 'vehicle')&.to_i
-    end
-
-    def allow_seat_selection
-      @allow_seat_selection ||= option_value_name_for(option_type_name: 'allow-seat-selection')&.to_i
-    end
-
-    def departure_time
-      @departure_time ||= begin
-        time = option_value_name_for(option_type_name: 'departure-time')
-        Time.zone.parse(time) if time.present?
-      end
-    end
   end
 end

data/app/models/spree_cm_commissioner/vehicle.rb

@@ -1,29 +1,24 @@
-require_dependency 'spree_cm_commissioner'
-
 module SpreeCmCommissioner
-  class Vehicle < SpreeCmCommissioner::Base
-    include SpreeCmCommissioner::RouteType
+  class Vehicle < Base
+    include SpreeCmCommissioner::VehicleType
 
-    belongs_to :vehicle_type, class_name: 'SpreeCmCommissioner::VehicleType'
-    has_one :primary_photo, -> { order(position: :asc) }, class_name: 'SpreeCmCommissioner::VehiclePhoto', as: :viewable, dependent: :destroy
     belongs_to :vendor, class_name: 'Spree::Vendor'
 
-    after_commit :create_vehicle_option_value
+    has_one :primary_photo, -> { order(position: :asc) }, class_name: 'SpreeCmCommissioner::VehiclePhoto', as: :viewable, dependent: :destroy
+    has_one :seat_layout, as: :layoutable, class_name: 'SpreeCmCommissioner::SeatLayout', dependent: :destroy
 
-    has_many :vehicle_photo, class_name: 'SpreeCmCommissioner::VehiclePhoto', as: :viewable, dependent: :destroy
-    has_many :vehicle_seats, class_name: 'SpreeCmCommissioner::VehicleSeat', through: :vehicle_type
+    has_many :vehicle_photos, class_name: 'SpreeCmCommissioner::VehiclePhoto', as: :viewable, dependent: :destroy
 
     has_many :vehicle_option_types, class_name: 'SpreeCmCommissioner::VehicleOptionType', dependent: :destroy
     has_many :option_value_vehicles, class_name: 'SpreeCmCommissioner::OptionValueVehicle', dependent: :destroy
-
+    has_many :option_values, through: :option_value_vehicles, class_name: 'Spree::OptionValue'
     validates :code, uniqueness: { scope: :vendor_id }, presence: true
-    validates :license_plate, uniqueness: {}, allow_blank: true
+    validates :license_plate, uniqueness: true, allow_blank: true
 
-    def create_vehicle_option_value
-      SpreeCmCommissioner::VehicleOptionValueCreator.call(self)
-    end
+    self.whitelisted_ransackable_attributes = %w[license_plate code vehicle_type]
 
-    self.whitelisted_ransackable_attributes = %w[license_plate code]
-    self.whitelisted_ransackable_associations = %w[vehicle_type]
+    def display_name
+      "#{code} (#{license_plate})"
+    end
   end
 end

data/app/models/spree_cm_commissioner/vendor_decorator.rb

@@ -36,21 +36,17 @@ module SpreeCmCommissioner
       base.has_many :vendor_kind_option_values,
                     through: :option_value_vendors, source: :option_value
 
-      base.has_many :branches, lambda {
-                                 where(cm_vendor_places: { place_type: 0 })
-                               }, through: :vendor_places, class_name: 'SpreeCmCommissioner::VendorPlace'
-      base.has_many :stops, -> { where(cm_vendor_places: { place_type: 1 }) }, through: :vendor_places, class_name: 'SpreeCmCommissioner::VendorPlace'
-      base.has_many :locations, -> { where(cm_vendor_places: { place_type: 2 }) },
-                    through: :vendor_places, class_name: 'SpreeCmCommissioner::VendorPlace'
+      base.has_many :branches, -> { branch }, class_name: 'SpreeCmCommissioner::VendorPlace'
+      base.has_many :stops, -> { stop }, class_name: 'SpreeCmCommissioner::VendorPlace'
+      base.has_many :locations, -> { location }, class_name: 'SpreeCmCommissioner::VendorPlace'
+
+      base.has_many :branch_places, through: :branches, class_name: 'SpreeCmCommissioner::Place', source: :place
+      base.has_many :stop_places, through: :stops, class_name: 'SpreeCmCommissioner::Place', source: :place
+      base.has_many :location_places, through: :locations, class_name: 'SpreeCmCommissioner::Place', source: :place
 
       base.has_many :places,
                     through: :nearby_places, source: :place, class_name: 'SpreeCmCommissioner::Place'
 
-      base.has_many :vendor_stops, class_name: 'SpreeCmCommissioner::VendorStop', dependent: :destroy
-      base.has_many :boarding_points, -> { where(cm_vendor_stops: { stop_type: 0 }) },
-                    through: :vendor_stops, source: :stop, class_name: 'SpreeCmCommissioner::Place'
-      base.has_many :drop_off_points, -> { where(cm_vendor_stops: { stop_type: 1 }) },
-                    through: :vendor_stops, source: :stop, class_name: 'SpreeCmCommissioner::Place'
       base.has_many :dynamic_fields, class_name: 'SpreeCmCommissioner::DynamicField', foreign_key: :vendor_id, dependent: :destroy
 
       base.has_one  :logo, as: :viewable, dependent: :destroy, class_name: 'SpreeCmCommissioner::VendorLogo'
@@ -81,12 +77,16 @@ module SpreeCmCommissioner
       base.has_many :promotion_categories, class_name: 'Spree::PromotionCategory', foreign_key: :vendor_id, dependent: :destroy
 
       base.has_many :homepage_section_relatables,
+                    as: :relatable,
                     class_name: 'SpreeCmCommissioner::HomepageSectionRelatable',
-                    dependent: :destroy, inverse_of: :relatable
+                    dependent: :destroy,
+                    inverse_of: :relatable
 
-      base.has_many :vehicle_types, class_name: 'SpreeCmCommissioner::VehicleType', dependent: :destroy
       base.has_many :vehicles, class_name: 'SpreeCmCommissioner::Vehicle', dependent: :destroy
-      # base.has_many :vehicles, through: :vehicle_types, class_name: 'SpreeCmCommissioner::Vehicle', dependent: :destroy
+      base.has_many :trips, class_name: 'SpreeCmCommissioner::Trip', dependent: :destroy
+      base.has_many :trip_stops, through: :trips, class_name: 'SpreeCmCommissioner::TripStop'
+      base.has_many :boarding_trip_stops, through: :trips, class_name: 'SpreeCmCommissioner::TripStop', source: :boarding_trip_stops
+      base.has_many :drop_off_trip_stops, through: :trips, class_name: 'SpreeCmCommissioner::TripStop', source: :drop_off_trip_stops
 
       base.validates :account_name, :account_number, presence: true, if: lambda {
                                                                            payment_qrcode.present? && Spree::Store.default.code.include?('billing')

data/app/models/spree_cm_commissioner/vendor_place.rb

@@ -5,15 +5,25 @@ module SpreeCmCommissioner
 
     belongs_to :vendor, class_name: 'Spree::Vendor', optional: false
     belongs_to :place, class_name: 'SpreeCmCommissioner::Place', optional: false
+    belongs_to :location, class_name: 'SpreeCmCommissioner::VendorPlace', optional: true
+
+    has_many :branches, -> { branch }, class_name: 'SpreeCmCommissioner::VendorPlace', foreign_key: :location_id, dependent: :restrict_with_error
+    has_many :stops, -> { stop }, class_name: 'SpreeCmCommissioner::VendorPlace', foreign_key: :location_id, dependent: :restrict_with_error
 
     validates :place_type, presence: true
     validates :place_id, uniqueness: { scope: %i[vendor_id place_type] }
+    validates :location, presence: true, if: -> { branch? || stop? }
 
     accepts_nested_attributes_for :place, allow_destroy: true
 
-    scope :branches,  -> { where(place_type: :branch) }
-    scope :stops,     -> { where(place_type: :stop) }
-    scope :locations, -> { where(place_type: :location) }
+    # include place when using these delegate to avoid N+1
+    def display_name
+      place&.name
+    end
+
+    def self.ransackable_associations(_auth_object = nil)
+      ['place']
+    end
 
     def selected
       vendor.selected_place_references.include?(place&.reference)

data/app/overrides/spree/admin/products/_form/industry_taxons.html.erb.deface

@@ -0,0 +1,26 @@
+<!-- insert_after "[data-hook='admin_product_form_taxons']" -->
+
+<div data-hook="admin_product_form_industry_taxons">
+  <%= f.field_container :industry_taxons do %>
+    <%= f.label :industry_taxon_ids, Spree.t(:Industries) %>
+
+    <% if can? :modify, Spree::Classification %>
+      <%= f.select :industry_taxon_ids, options_from_collection_for_select(@product.industry_taxons, :id, :pretty_name, @product.industry_taxon_ids),
+                                { include_hidden: true },
+                                  multiple: true,
+                                  data: { autocomplete_url_value: 'taxons_api_v2',
+                                          autocomplete_return_attr_value: 'pretty_name',
+                                          autocomplete_multiple_value: true,
+                                          autocomplete_additional_url_params_value: "q[kind_eq]=7" } %>
+    <% elsif @product.industry_taxons.any? %>
+      <ul class="text_list">
+        <% @product.industry_taxons.each do |taxon| %>
+          <li><%= taxon.name %></li>
+        <% end %>
+      </ul>
+    <% else %>
+      <div class="alert alert-info"><%= Spree.t(:no_resource_found, resource: :taxons) %></div>
+    <% end %>
+
+  <% end %>
+</div>

data/app/overrides/spree/admin/products/_form/taxons.html.erb.deface

@@ -0,0 +1,26 @@
+<!-- replace "[data-hook='admin_product_form_taxons']" -->
+
+<div data-hook="admin_product_form_taxons">
+  <%= f.field_container :taxons do %>
+    <%= f.label :taxon_ids, Spree.t(:taxons) %>
+
+    <% if can? :modify, Spree::Classification %>
+      <%= f.select :taxon_ids, options_from_collection_for_select(@product.taxons, :id, :pretty_name, @product.taxon_ids.reject { |id| @product.industry_taxon_ids.include?(id) }),
+                                { include_hidden: true },
+                                  multiple: true,
+                                  data: { autocomplete_url_value: 'taxons_api_v2',
+                                          autocomplete_return_attr_value: 'pretty_name',
+                                          autocomplete_multiple_value: true,
+                                          autocomplete_additional_url_params_value: "q[kind_not_eq]=7" } %>
+    <% elsif @product.taxons.any? %>
+      <ul class="text_list">
+        <% @product.taxons.each do |taxon| %>
+          <li><%= taxon.name %></li>
+        <% end %>
+      </ul>
+    <% else %>
+      <div class="alert alert-info"><%= Spree.t(:no_resource_found, resource: :taxons) %></div>
+    <% end %>
+
+  <% end %>
+</div>