spree_cm_commissioner 2.0.3.pre.pre5 → 2.0.3.pre.pre8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de104e725d2f24613de706e3246bdc7d316520fac6eb9b21789a6b2f2c45ab06
-  data.tar.gz: df640f714603d5d38bb33ad1b7ded9f66ca5126610bf2d8bdeba79890e7ac090
+  metadata.gz: 0a6380c1548ccc1bbd8756837c2a3d4fc629613fa39f4f4949580c62f3c6fd97
+  data.tar.gz: 30371e0f95da706ac53f81141745cd36d88a9c631feb9de813fd6c2a00c4d641
 SHA512:
-  metadata.gz: 782d5091a568ece086d739de4c0e8b9e1a00a97302b68d1cc982b8f9a5718fb5c4cfa928f9310427e69e11fd34211c54893104fbacbc8293d8033bf4d2213ad0
-  data.tar.gz: 8aeca4178f0bf6ce687b9cd2dffd5d648db14f1c2a5537964e6e728a73801362495d370d32509029408ec7d9d5d8fe88094fbd3da392b61e68446f4ad58b5e68
+  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.pre5)
+    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/operator/event_charts_controller.rb

@@ -11,17 +11,11 @@ module Spree
             types = ADDITIONAL_FIELDS + kyc_fields
 
             resources = types.map do |type|
-              event_chart = SpreeCmCommissioner::EventChartQueries.new(
-                taxon_id: params[:taxon_id],
-                chart_type: type,
-                refreshed: params[:refreshed] || false
-              ).call
-
               # Create unique ID by using chart_type as the identifier
               SpreeCmCommissioner::EventChart.new(
                 id: type.to_s,
-                chart_type: event_chart.chart_type,
-                product_charts: event_chart.product_charts
+                chart_type: type,
+                product_charts: nil
               )
             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

@@ -0,0 +1,29 @@
+module Spree
+  module Api
+    module V2
+      module Storefront
+        class TripPlacesController < ::Spree::Api::V2::ResourceController
+          # override
+          def collection
+            base_scope = model_class.joins(:location_vendor_places).distinct
+
+            if params[:q].present?
+              @search = base_scope.ransack(params[:q])
+              @search.result
+            else
+              base_scope
+            end
+          end
+
+          def model_class
+            SpreeCmCommissioner::Place
+          end
+
+          def collection_serializer
+            SpreeCmCommissioner::V2::Storefront::TripPlaceSerializer
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,6 +8,8 @@ module Spree
               origin_id: params[:origin_id],
               destination_id: params[:destination_id],
               date: params[:date],
+              vendor_id: params[:vendor_id],
+              number_of_guests: params[:number_of_guests],
               params: params
             ).call
 
@@ -27,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/controllers/spree_cm_commissioner/admin/products_controller_decorator.rb

@@ -5,6 +5,7 @@ module SpreeCmCommissioner
         # spree update user sign_in_count
         base.around_action :set_writing_role, only: %i[index]
         base.after_action :set_tenant_after_update, only: %i[update]
+        base.before_action :merge_industry_taxons_into_taxons, only: [:update]
       end
 
       # Override
@@ -50,6 +51,19 @@ module SpreeCmCommissioner
 
       protected
 
+      def merge_industry_taxons_into_taxons
+        return if params[:product].blank?
+
+        industry_ids = Array(params[:product][:industry_taxon_ids]).compact_blank
+        taxon_ids = Array(params[:product][:taxon_ids]).compact_blank
+
+        merged_ids = (taxon_ids + industry_ids).uniq
+
+        params[:product][:taxon_ids] = merged_ids
+
+        params[:product].delete(:industry_taxon_ids)
+      end
+
       def find_resource
         product_scope.with_deleted.includes(vendor: :tenant).friendly.find(params[:id])
       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/interactors/spree_cm_commissioner/transit/draft_order_creator.rb

@@ -53,6 +53,8 @@ module SpreeCmCommissioner
 
         legs.each do |leg|
           leg_line_items = build_line_items_for!(leg, order, current_leg_date)
+          leg_line_items = insert_saved_guests_per_line_items_leg(leg_line_items)
+
           all_line_items.concat(leg_line_items)
           current_leg_date = leg_line_items.last.to_date.to_date if leg_line_items.any?
         end
@@ -85,13 +87,11 @@ module SpreeCmCommissioner
             }
           )
 
-          build_guests!(line_item, seat_selections)
-
-          line_item
+          build_guests_for!(line_item, seat_selections)
         end
       end
 
-      def build_guests!(line_item, seat_selections)
+      def build_guests_for!(line_item, seat_selections)
         block_ids = seat_selections.flat_map(&:block_ids)
 
         if block_ids.any? && block_ids.size != line_item.quantity
@@ -101,6 +101,19 @@ module SpreeCmCommissioner
         Array.new(line_item.quantity) do |index|
           line_item.guests.new(block_id: block_ids[index])
         end
+
+        line_item
+      end
+
+      def insert_saved_guests_per_line_items_leg(line_items)
+        line_items.flat_map(&:guests).each_with_index do |guest, index|
+          context.saved_guests ||= []
+          context.saved_guests << SpreeCmCommissioner::SavedGuest.new if context.saved_guests[index].blank?
+
+          guest.saved_guest = context.saved_guests[index]
+        end
+
+        line_items
       end
 
       def calculate_line_item_duration!(date:, departure_time:, arrival_time:)

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

@@ -3,7 +3,7 @@ module SpreeCmCommissioner
     extend ActiveSupport::Concern
 
     included do
-      enum kind: { category: 0, cms: 1, event: 2, occupation: 3, nationality: 4, organization: 5 }
+      enum kind: { category: 0, cms: 1, event: 2, occupation: 3, nationality: 4, organization: 5, transit: 6, industry: 7 }
     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/address_decorator.rb

@@ -8,6 +8,12 @@ module SpreeCmCommissioner
       base.validates :country, presence: true, if: :require_country?
     end
 
+    # override to return false instead of true
+    # in case no country
+    def require_zipcode?
+      country ? country.zipcode_required? : false
+    end
+
     def require_address1?
       false
     end
@@ -22,9 +28,17 @@ module SpreeCmCommissioner
   end
 end
 
-unless Spree::Address.included_modules.include?(SpreeCmCommissioner::AddressDecorator)
-  # remove validators for the specified attributes
-  %i[address1 city country].each { |attr| Spree::Address._validators.delete(attr) }
+if Spree::Address.included_modules.exclude?(SpreeCmCommissioner::AddressDecorator)
+  keys = %i[address1 city country]
+
+  Spree::Address._validators.reject! { |key, _| keys.include?(key) }
+  Spree::Address._validate_callbacks.each do |c|
+    next unless c.filter.respond_to?(:attributes)
+
+    c.filter.attributes.delete(:address1)
+    c.filter.attributes.delete(:city)
+    c.filter.attributes.delete(:country)
+  end
 
   Spree::Address.prepend(SpreeCmCommissioner::AddressDecorator)
 end