spree_cm_commissioner 2.0.3.pre.pre6 → 2.0.3.pre.pre8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3386c245e402dd11660e1215a50dac52acfd59950f95afb03117bff6c56053a5
-  data.tar.gz: 551927bdc54caee21d0ca26601c2d42b5ee0cd14b5c4264da1a5ae3968270d4d
+  metadata.gz: 0a6380c1548ccc1bbd8756837c2a3d4fc629613fa39f4f4949580c62f3c6fd97
+  data.tar.gz: 30371e0f95da706ac53f81141745cd36d88a9c631feb9de813fd6c2a00c4d641
 SHA512:
-  metadata.gz: f8c9f527ea17e43fabfcf7ecba55e70887a51a31a85849e918cf508cc8bc8d6a3b6f6165f534139fad9704902a7aea8875b58798514caf63882b2914534cc693
-  data.tar.gz: ca8d78212f84afd5091ac23617a88d49b096cc526e84a3aedc2c9b432fe02aaf55546a5a54bfe8c0704be30a72050d01c7be88a505b37abea3f4d634a1829ea5
+  metadata.gz: 362e42693a4d2ef816db1a3465efe55f789753d1ee1ffa9a9795dbe727be4b03b0088f9c888274589ddb604b76cc6143c7119388f9094a6b66c185e9f8b6b8dc
+  data.tar.gz: ab28c8455539f16d82b0c7c24fc74ab9f1947679e296b4b849785820fba719ed09aadfb0338c570304b1c874d83d6d20743cd40f176801c6bf529a90f3401bee

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    spree_cm_commissioner (2.0.3.pre.pre6)
+    spree_cm_commissioner (2.0.3.pre.pre8)
       activerecord-multi-tenant
       activerecord_json_validator (~> 2.1, >= 2.1.3)
       aws-sdk-cloudfront

data/app/controllers/spree/admin/locations_controller.rb

@@ -0,0 +1,62 @@
+module Spree
+  module Admin
+    class LocationsController < Spree::Admin::ResourceController
+      def index
+        @search = model_class.ransack(params[:q])
+        @locations = @search.result.order(created_at: :desc).page(params[:page]).per(15)
+      end
+
+      def create
+        if location_exist?
+          flash[:error] = I18n.t('location.already_exist')
+          render :new, status: :unprocessable_entity and return
+        end
+
+        location = model_class.new(permitted_resource_params)
+
+        if location.save
+          flash[:success] = flash_message_for(location, :successfully_created)
+          redirect_to spree.admin_locations_path
+        else
+          flash.now[:error] = location.errors.full_messages.to_sentence
+          render :new, status: :unprocessable_entity
+        end
+      end
+
+      private
+
+      def location_exist?
+        SpreeCmCommissioner::Place.find_by(reference: permitted_resource_params[:reference])
+      end
+
+      # overrided
+      def model_class
+        SpreeCmCommissioner::Place
+      end
+
+      # override
+      def object_name
+        'spree_cm_commissioner_location'
+      end
+
+      def collection_url(options = {})
+        admin_locations_url(options)
+      end
+
+      def edit_object_url(object = nil, options = {})
+        edit_admin_location_url(object || @object, options)
+      end
+
+      # overrided
+      def new_object_url(options = {})
+        new_admin_location_url(options)
+      end
+
+      def permitted_resource_params
+        params.require(:spree_cm_commissioner_place).permit(:name, :lat, :lon, :formatted_address, :types, :reference,
+                                                            :vicinity, :icon, :rating
+        )
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/platform/places_controller.rb

@@ -41,10 +41,13 @@ module Spree
 
           def struct_places_with_id(places)
             places.map do |place|
+              short_addr = place.vicinity || place.formatted_address
+              name = "#{place.name} - #{short_addr}"
+
               place_struct = Struct.new(:id, :name, :base_64_content)
               place_struct.new(
                 id: place.reference,
-                name: place.name,
+                name: name,
                 base_64_content: Base64.strict_encode64(place.to_json)
               )
             end

data/app/controllers/spree/api/v2/storefront/dynamic_fields_controller.rb

@@ -0,0 +1,42 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        class DynamicFieldsController < ::Spree::Api::V2::ResourceController
+          before_action :load_product
+
+          # override
+          def collection
+            return @collection if defined?(@collection)
+
+            dynamic_fields = @product.dynamic_fields
+            if params[:phase].present?
+              requested_phase = params[:phase].to_s
+              if SpreeCmCommissioner::DynamicField.data_fill_stages.key?(requested_phase)
+                dynamic_fields = dynamic_fields.where(data_fill_stage: requested_phase)
+              end
+            end
+
+            @collection = dynamic_fields.order(:position)
+          end
+
+          private
+
+          def load_product
+            return render_error_payload({ error: 'product_id is required' }, 400) if params[:product_id].blank?
+
+            @product ||= Spree::Product.find(params[:product_id])
+          end
+
+          def collection_serializer
+            SpreeCmCommissioner::V2::Storefront::DynamicFieldSerializer
+          end
+
+          def model_class
+            SpreeCmCommissioner::DynamicField
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/api/v2/storefront/guests_controller.rb

@@ -29,6 +29,7 @@ module Spree
             resource = scope.new(guest_params)
 
             if resource.save
+              resource.save_and_move_to_next_stage
               render_serialized_payload(201) { serialize_resource(resource) }
             else
               render_error_payload(resource.errors, 400)
@@ -54,6 +55,7 @@ module Spree
                 resource.save!
               end
 
+              resource.save_and_move_to_next_stage
               render_serialized_payload { serialize_resource(resource) }
             rescue ActiveRecord::RecordInvalid => e
               render_error_payload(e.record.errors, 400)

data/app/controllers/spree/api/v2/storefront/trip_places_controller.rb

@@ -20,7 +20,7 @@ module Spree
           end
 
           def collection_serializer
-            Spree::V2::Storefront::TripPlaceSerializer
+            SpreeCmCommissioner::V2::Storefront::TripPlaceSerializer
           end
         end
       end

data/app/controllers/spree/api/v2/storefront/trip_search_controller.rb

@@ -29,7 +29,7 @@ module Spree
           end
 
           def serialize_collection(collection)
-            serialized_data = Spree::V2::Storefront::TripQueryResultSerializer.new(
+            serialized_data = SpreeCmCommissioner::V2::Storefront::TripQueryResultSerializer.new(
               collection,
               include: default_resource_includes,
               params: serializer_params

data/app/controllers/spree/api/v2/storefront/trips_controller.rb

@@ -0,0 +1,24 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        class TripsController < ::Spree::Api::V2::ResourceController
+          # override
+          def resource
+            model_class.find(params[:id])
+          end
+
+          # override
+          def model_class
+            SpreeCmCommissioner::Trip
+          end
+
+          # override
+          def resource_serializer
+            SpreeCmCommissioner::V2::Storefront::TripSerializer
+          end
+        end
+      end
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/billing_address_creator.rb

@@ -0,0 +1,33 @@
+module SpreeCmCommissioner
+  class BillingAddressCreator < BaseInteractor
+    delegate :order, to: :context
+
+    def call
+      validate_context!
+      create_address
+    end
+
+    private
+
+    def validate_context!
+      context.fail!(message: 'Order is missing') unless order
+    end
+
+    def create_address
+      line_item = order.line_items.first
+      guest = line_item&.guests&.first
+
+      billing_address = order.build_bill_address(
+        firstname: guest&.first_name,
+        lastname: guest&.last_name,
+        phone: order.intel_phone_number || order.phone_number
+      )
+
+      context.fail!(message: billing_address.errors.full_messages.to_sentence) unless billing_address.save!
+      # Persist association on the order so subsequent reloads reflect the new billing address
+      order.update!(bill_address: billing_address)
+
+      context.billing_address = billing_address
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/create_vendor.rb

@@ -8,6 +8,7 @@ module SpreeCmCommissioner
       ActiveRecord::Base.transaction do
         create_vendor
         assign_vendor_to_user
+        create_logo
         create_role
       end
     end
@@ -30,9 +31,18 @@ module SpreeCmCommissioner
       context.user.vendors << @vendor
     end
 
+    def create_logo
+      return if context.logo.blank?
+
+      vendor_logo = SpreeCmCommissioner::VendorLogo.create(viewable: @vendor, attachment: context.logo)
+      return if vendor_logo.persisted?
+
+      context.fail!(message: vendor_logo.errors.full_messages.join(', '))
+    end
+
     def create_role
       role = context.user.spree_roles.create(
-        name: "#{@vendor.name.downcase.parameterize(separator: '-')}-organizer",
+        name: "#{@vendor.id}-organizer",
         vendor_id: @vendor.id,
         presentation: 'Organizer'
       )

data/app/interactors/spree_cm_commissioner/google_places_fetcher.rb

@@ -11,6 +11,7 @@ module SpreeCmCommissioner
           types: json['types'].blank? ? '' : json['types'][0],
           name: json['name'],
           vicinity: json['vicinity'],
+          formatted_address: json['formatted_address'],
           lat: json['geometry']['location']['lat'],
           lon: json['geometry']['location']['lng'],
           icon: json['icon'],

data/app/interactors/spree_cm_commissioner/intercity_taxi_order_creator.rb

@@ -0,0 +1,106 @@
+module SpreeCmCommissioner
+  class IntercityTaxiOrderCreator < BaseInteractor
+    delegate :trip, :raw_params, :current_vendor, to: :context
+
+    def call
+      validate_context!
+
+      ActiveRecord::Base.transaction do
+        build_order_params
+        create_order
+        create_billing_address
+        advance_order
+      end
+    end
+
+    private
+
+    def validate_context!
+      context.fail!(message: 'Trip is missing') unless trip
+      context.fail!(message: 'Raw parameters are missing') unless raw_params
+      context.fail!(message: 'Current vendor is missing') unless current_vendor
+    end
+
+    def build_order_params
+      context.order_params = build_taxi_booking_params
+    end
+
+    def build_taxi_booking_params
+      permitted_params = raw_params.require(:order).permit(
+        :intel_phone_number,
+        :email,
+        :store_id,
+        line_items_attributes: [
+          :remark,
+          :variant_id,
+          :quantity,
+          :vendor_id,
+          :from_date,
+          :to_date,
+          :currency,
+          :direction,
+          :trip_id,
+          :pickup_place_name,
+          :drop_off_place_name,
+          :pickup_lat,
+          :pickup_lng,
+          :drop_off_lat,
+          :drop_off_lng,
+          :passenger_count,
+          :pickup_oob_confirmed,
+          :drop_off_oob_confirmed,
+          { guests_attributes: %i[
+            first_name last_name gender age nationality_id
+          ]
+}
+        ]
+      )
+
+      process_line_items_attributes(permitted_params)
+      permitted_params
+    end
+
+    def process_line_items_attributes(params)
+      date_param = raw_params[:date] || Date.current.to_s
+
+      params[:line_items_attributes].each_value do |item|
+        pickup_time_minutes = item[:from_date]
+        combined_datetime = "#{date_param} #{pickup_time_minutes}"
+
+        item[:from_date] = combined_datetime
+        item[:to_date] = combined_datetime
+        item[:variant_id] = load_variant
+        item[:vendor_id] = current_vendor.id
+        item[:quantity] = 1
+        item[:currency] = 'USD'
+        item[:direction] = 'outbound'
+        item[:trip_id] = trip.id
+      end
+    end
+
+    def create_order
+      context.order = Spree::Order.create(context.order_params)
+
+      context.fail!(message: context.order.errors.full_messages.to_sentence) unless context.order.persisted?
+    end
+
+    def create_billing_address
+      return if context.order.bill_address.present?
+
+      SpreeCmCommissioner::BillingAddressCreator.call(
+        order: context.order
+      )
+    end
+
+    def advance_order
+      context.order.update_with_updater!
+
+      advance_service = Spree::Api::Dependencies.storefront_checkout_advance_service.constantize
+      advance_service.call(order: context.order)
+    end
+
+    def load_variant
+      trip.product.master.id
+    end
+  end
+end

data/app/models/concerns/spree_cm_commissioner/variant_options_concern.rb

@@ -29,6 +29,7 @@ module SpreeCmCommissioner
                :bib_pre_generation_on_create?,
                :seat_number_positions,
                :seat_number_layouts,
+               :seat_type,
                to: :options
     end
 

data/app/models/spree_cm_commissioner/guest.rb

@@ -226,62 +226,6 @@ module SpreeCmCommissioner
       save!
     end
 
-    def missing_dynamic_fields_for_stage(stage)
-      required_fields = line_item.product.dynamic_fields.where(data_fill_stage: stage)
-      filled_ids = guest_dynamic_fields.map(&:dynamic_field_id)
-
-      required_fields.reject { |field| filled_ids.include?(field.id) }
-    end
-
-    def all_required_dynamic_fields_completed?(stage)
-      missing_dynamic_fields_for_stage(stage).blank?
-    end
-
-    def validate_dynamic_fields_for_phase(phase)
-      required_fields = line_item.product.dynamic_fields.where(data_fill_stage: phase)
-      filled_ids = guest_dynamic_fields.map(&:dynamic_field_id)
-
-      required_fields.each do |field|
-        errors.add(:base, "#{field.label} is required for #{phase} phase") unless filled_ids.include?(field.id)
-      end
-    end
-
-    def pre_registration_completed?
-      return true unless line_item.product.dynamic_fields.pre_registration.any?
-
-      pre_registration_fields_completed?
-    end
-
-    def post_registration_completed?
-      return true unless line_item.product.dynamic_fields.post_registration.any?
-
-      post_registration_fields_completed?
-    end
-
-    def check_in_completed?
-      return true unless line_item.product.dynamic_fields.during_check_in.any?
-
-      check_in_fields_completed?
-    end
-
-    def current_collection_phase
-      if check_in.present?
-        :during_check_in
-      elsif line_item.order.completed?
-        :post_registration
-      else
-        :pre_registration
-      end
-    end
-
-    def phase_completion_status
-      {
-        pre_registration: pre_registration_completed?,
-        post_registration: post_registration_completed?,
-        during_check_in: check_in_completed?
-      }
-    end
-
     # bib_number: 345, bib_prefix: 5KM, bib_zerofill: 5 => return 5KM00345
     # bib_number: 345, bib_prefix: 5KM, bib_zerofill: 2 => return 5KM345
     def formatted_bib_number
@@ -318,6 +262,111 @@ module SpreeCmCommissioner
       block_ids = line_item.order.blocks.pluck(:id)
       line_item.order.update(preload_block_ids: block_ids)
     end
+
+    def all_required_dynamic_fields_completed?(stage)
+      missing_dynamic_fields_for_stage(stage).blank?
+    end
+
+    state_machine :data_fill_stage_phase, initial: 'pre_registration' do
+      state 'pre_registration', value: 'pre_registration'
+      state 'post_registration', value: 'post_registration'
+      state 'during_check_in', value: 'during_check_in'
+      state 'completed', value: 'completed'
+
+      event :complete_pre_registration do
+        transition 'pre_registration' => 'post_registration',
+                   if: -> (guest) { guest.pre_registration_completed? && guest.post_registration_fields? }
+        transition 'pre_registration' => 'during_check_in',
+                   if: -> (guest) { guest.pre_registration_completed? && !guest.post_registration_fields? && guest.during_check_in_fields? }
+        transition 'pre_registration' => 'completed',
+                   if: -> (guest) { guest.pre_registration_completed? && !guest.post_registration_fields? && !guest.during_check_in_fields? }
+      end
+
+      event :complete_post_registration do
+        transition 'post_registration' => 'during_check_in',
+                   if: -> (guest) { guest.post_registration_completed? && guest.during_check_in_fields? }
+        transition 'post_registration' => 'completed',
+                   if: -> (guest) { guest.post_registration_completed? && !guest.during_check_in_fields? }
+      end
+
+      event :complete_check_in do
+        transition 'during_check_in' => 'completed',
+                   if: -> (guest) { guest.check_in_completed? }
+      end
+    end
+
+    def save_and_move_to_next_stage(_transition = nil)
+      # Trigger state machine transitions based on completion status
+      case data_fill_stage_phase
+      when 'pre_registration'
+        complete_pre_registration! if pre_registration_completed?
+      when 'post_registration'
+        complete_post_registration! if post_registration_completed?
+      when 'during_check_in'
+        complete_check_in! if check_in_completed?
+      end
+    end
+
+    def completed_phases
+      phases = []
+      phases << 'pre_registration' if pre_registration_completed?
+      phases << 'post_registration' if post_registration_completed?
+      phases << 'during_check_in' if check_in_completed?
+      phases
+    end
+
+    def pre_registration_completed?
+      return true unless line_item&.product&.dynamic_fields&.pre_registration&.any?
+
+      required_fields = line_item.product.dynamic_fields.pre_registration.pluck(:id)
+      filled_fields = guest_dynamic_fields.where(dynamic_field_id: required_fields).pluck(:dynamic_field_id)
+      (required_fields - filled_fields).empty?
+    end
+
+    def post_registration_completed?
+      return true unless line_item&.product&.dynamic_fields&.post_registration&.any?
+
+      required_fields = line_item.product.dynamic_fields.post_registration.pluck(:id)
+      filled_fields = guest_dynamic_fields.where(dynamic_field_id: required_fields).pluck(:dynamic_field_id)
+      (required_fields - filled_fields).empty?
+    end
+
+    def check_in_completed?
+      return true unless line_item&.product&.dynamic_fields&.during_check_in&.any?
+
+      required_fields = line_item.product.dynamic_fields.during_check_in.pluck(:id)
+      filled_fields = guest_dynamic_fields.where(dynamic_field_id: required_fields).pluck(:dynamic_field_id)
+      (required_fields - filled_fields).empty?
+    end
+
+    def pre_registration_fields?
+      line_item&.product&.dynamic_fields&.pre_registration&.any?
+    end
+
+    def post_registration_fields?
+      line_item&.product&.dynamic_fields&.post_registration&.any?
+    end
+
+    def during_check_in_fields?
+      line_item&.product&.dynamic_fields&.during_check_in&.any?
+    end
+
+    private
+
+    def product_dynamic_fields
+      @product_dynamic_fields ||= line_item.product.dynamic_fields
+    end
+
+    def missing_dynamic_fields_for_stage(stage)
+      return [] if line_item.blank? || line_item.product.blank?
+
+      # Cache product dynamic fields to avoid multiple queries
+      @product_dynamic_fields ||= line_item.product.dynamic_fields
+      required_fields = @product_dynamic_fields.where(data_fill_stage: stage)
+      filled_ids = guest_dynamic_fields&.pluck(:dynamic_field_id) || []
+
+      required_fields.reject { |field| filled_ids.include?(field.id) }
+    end
   end
 end
 # rubocop:enable Metrics/ClassLength

data/app/models/spree_cm_commissioner/guest_dynamic_field.rb

@@ -4,10 +4,13 @@ module SpreeCmCommissioner
     belongs_to :dynamic_field, class_name: 'SpreeCmCommissioner::DynamicField', optional: false
     belongs_to :dynamic_field_option, class_name: 'SpreeCmCommissioner::DynamicFieldOption', optional: true
 
-    validates :value, presence: true
     validate :validate_value_format, if: -> { value.present? && dynamic_field.present? }
     validate :validate_option_reference, if: -> { dynamic_field_option.present? }
+    validate :validate_phase_sequence
     validate :check_required_fields_based_on_phase
+    validate :reject_empty_string_for_text_fields
+
+    after_commit :sync_guest_data_fill_stage_phase
 
     private
 
@@ -15,6 +18,8 @@ module SpreeCmCommissioner
       return if dynamic_field.blank?
 
       case dynamic_field.data_type.to_s
+      when 'text', 'textarea'
+        errors.add(:value, "can't be blank") if value.is_a?(String) && value.strip == ''
       when 'number'
         errors.add(:value, 'must be a number') unless value.to_s.match?(/\A\d+\z/)
       when 'boolean'
@@ -40,44 +45,49 @@ module SpreeCmCommissioner
       errors.add(:dynamic_field_option, 'must belong to the same dynamic field')
     end
 
-    def before_checkin_phase?
-      guest.present? && guest.line_item.present? && guest.check_in.nil?
-    end
+    def validate_phase_sequence
+      return if dynamic_field.blank? || guest.blank?
 
-    def after_purchase_phase?
-      guest.present? && guest.line_item.present? && guest.line_item.completed? && guest.check_in.nil?
+      case dynamic_field.data_fill_stage.to_sym
+      when :post_registration
+        errors.add(:base, 'Must complete pre_registration fields first') unless guest.pre_registration_completed?
+      when :during_check_in
+        unless guest.post_registration_completed? || !guest.post_registration_fields?
+          errors.add(:base, 'Must complete post_registration fields first')
+        end
+      end
     end
 
-    def during_checkin_phase?
-      guest.present? && guest.check_in.present?
-    end
+    def field_required_in_current_phase?
+      return false if dynamic_field.blank? || guest.blank?
 
-    def pre_registration_required?
-      dynamic_field.data_fill_stage.to_sym == :pre_registration &&
+      case dynamic_field.data_fill_stage.to_sym
+      when :pre_registration, :post_registration
         guest.line_item.order.completed? && guest.check_in.blank?
+      when :during_check_in
+        guest.check_in.present?
+      else
+        false
+      end
     end
 
-    def post_registration_required?
-      dynamic_field.data_fill_stage.to_sym == :post_registration &&
-        guest.line_item.order.completed? && guest.check_in.blank?
+    def check_required_fields_based_on_phase
+      return if dynamic_field.blank? || value.present?
+      return unless field_required_in_current_phase?
+
+      errors.add(:value, I18n.t("guest_dynamic_field.errors.#{dynamic_field.data_fill_stage}_required"))
     end
 
-    def during_check_in_required?
-      dynamic_field.data_fill_stage.to_sym == :during_check_in &&
-        guest.check_in.present?
+    def sync_guest_data_fill_stage_phase
+      guest&.save_and_move_to_next_stage
     end
 
-    def check_required_fields_based_on_phase
-      return if dynamic_field.blank? || value.present?
+    def reject_empty_string_for_text_fields
+      return if dynamic_field.blank?
+      return unless %w[text textarea].include?(dynamic_field.data_type.to_s)
+      return unless value.is_a?(String)
 
-      case dynamic_field.data_fill_stage.to_sym
-      when :pre_registration
-        errors.add(:value, I18n.t('guest_dynamic_field.errors.pre_registration_required')) if pre_registration_required?
-      when :post_registration
-        errors.add(:value, I18n.t('guest_dynamic_field.errors.post_registration_required')) if post_registration_required?
-      when :during_check_in
-        errors.add(:value, I18n.t('guest_dynamic_field.errors.during_check_in_required')) if during_check_in_required?
-      end
+      errors.add(:value, "can't be blank") if value.strip == ''
     end
   end
 end