spree_cm_commissioner 2.3.1 → 2.3.2.pre.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87608fab14f473c498987cb8ecf0793926b031a1368d9a1d03f05fc3bf03e819
-  data.tar.gz: 9472eaf172e1346757684e9c2b69cec671053927d1a99739f13d0eea1fcb17ce
+  metadata.gz: 4090589caa9f83b8b2020e1ed20383647e2671b87692bcecf57f2f455bee7a58
+  data.tar.gz: 8cd128d3b2764b6ba6b309c8e0c9b71108b7057ccdd4e03fe92ec4e9d8702d9a
 SHA512:
-  metadata.gz: b3da7fbad39575ce43d6b39e088c24ec878095d88a6652e4dd07d87ae0b474403ef368dba1233e0a2d3a2084a03c45d1932c20eee21ee6a65f99e0cb8e4d1e1d
-  data.tar.gz: 92f4f8a8a446c765568b23b8a1183f7f2f83a499a608a59a34ab315314bf4ea256fbb8264da0da2e80ad0dab527a9fed4c8498a9c77342e186f61386dfad735b
+  metadata.gz: 692a3b8079e7f44d84556a826f8519ece6226334b28f78b194829f908f005902a4aaa34f18683aecbb161450197f3c808a82d84545fcc868975306ae45b396a5
+  data.tar.gz: e5e0191151979f1476f7ba43fe46ce13dd346c9d44d729d18da9fcff587004c21c7f028bc814356fa2c08a3a32dc867e3bd155ccc0f7659761ab7a9a6201b9b9

data/Gemfile.lock

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

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

@@ -4,6 +4,7 @@ module Spree
       belongs_to 'spree/product', find_by: :slug
 
       before_action :load_step_types, if: :member_action?
+      before_action :build_assets, only: %i[create update]
 
       def load_step_types
         @step_types = [
@@ -14,10 +15,13 @@ module Spree
 
       # override
       def permitted_resource_params
+        return @permitted_resource_params if defined?(@permitted_resource_params)
+
         key = ActiveModel::Naming.param_key(@object)
         permit_keys = params.require(key).keys
 
-        params.require(key).permit(permit_keys)
+        @permitted_resource_params = params.require(key).permit(permit_keys)
+        @permitted_resource_params
       end
 
       # @overrided
@@ -54,6 +58,18 @@ module Spree
       def location_after_save
         edit_object_url(@object)
       end
+
+      def remove_banner
+        @object.banner&.destroy
+        flash[:success] = Spree.t(:successfully_removed)
+        redirect_to edit_object_url(@object)
+      end
+
+      private
+
+      def build_assets
+        @object.build_banner(attachment: permitted_resource_params.delete(:banner)) if permitted_resource_params[:banner].present?
+      end
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Spree
   module Admin
     class TenantsController < Spree::Admin::ResourceController
-      before_action :load_vector_icons, only: %i[new edit]
+      before_action :load_vector_icons, only: %i[new edit create update]
 
       # override
       def collection

data/app/controllers/spree/api/v2/storefront/intercity_taxi/draft_orders_controller.rb

@@ -4,12 +4,16 @@ module Spree
       module Storefront
         module IntercityTaxi
           class DraftOrdersController < ::Spree::Api::V2::ResourceController
+            include Spree::Api::V2::Storefront::OrderConcern
+            include SpreeCmCommissioner::OrderConcern
+
+            before_action :ensure_order, only: :update
             def create
               order = SpreeCmCommissioner::IntercityTaxiOrder::Create.call(
                 trip_id: params[:trip_id],
                 from_date: params[:from_date],
                 to_date: params[:to_date],
-                user_id: params[:user_id],
+                user: spree_current_user,
                 quantity: params[:quantity]
               )
 
@@ -20,8 +24,8 @@ module Spree
 
             def update
               order = SpreeCmCommissioner::IntercityTaxiOrder::Update.call(
-                order_number: params[:id],
-                params: params
+                order: spree_current_order,
+                order_params: intercity_taxi_update_order_params
               )
 
               render_serialized_payload { serialize_resource(order) }
@@ -29,6 +33,43 @@ module Spree
               render_error_payload(e.message)
             end
 
+            private
+
+            def intercity_taxi_update_order_params
+              params.require(:order).permit(
+                line_items_attributes: %i[
+                  id
+                  pickup_place_name
+                  drop_off_place_name
+                  from_date
+                  pickup_lat
+                  pickup_lng
+                  pickup_oob_confirmed
+                  drop_off_lat
+                  drop_off_lng
+                  drop_off_oob_confirmed
+                  distance_km
+                  ordered_points
+                  base_km
+                  detour_pickup_km
+                  detour_dropoff_km
+                  extra_pickup_km
+                  extra_dropoff_km
+                  estimated_time_minutes
+                  remark
+                  passenger_count
+                ]
+              )
+            end
+
+            def required_schema
+              if action_name == 'create'
+                SpreeCmCommissioner::IntercityTaxiDraftOrderSchema
+              else
+                SpreeCmCommissioner::IntercityTaxiDraftOrderUpdateSchema
+              end
+            end
+
             def resource_serializer
               SpreeCmCommissioner::V2::Storefront::IntercityTaxiCartSerializer
             end

data/app/controllers/spree/api/v2/tenant/intercity_taxi/draft_orders_controller.rb

@@ -0,0 +1,81 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        module IntercityTaxi
+          class DraftOrdersController < BaseController
+            include Spree::Api::V2::Storefront::OrderConcern
+            include SpreeCmCommissioner::OrderConcern
+
+            before_action :ensure_order, only: :update
+            def create
+              order = SpreeCmCommissioner::IntercityTaxiOrder::Create.call(
+                trip_id: params[:trip_id],
+                from_date: params[:from_date],
+                to_date: params[:to_date],
+                quantity: params[:quantity],
+                user: spree_current_user
+              )
+
+              render_serialized_payload { serialize_resource(order) }
+            rescue StandardError => e
+              render_error_payload(e.message)
+            end
+
+            def update
+              order = SpreeCmCommissioner::IntercityTaxiOrder::Update.call(
+                order: spree_current_order,
+                order_params: intercity_taxi_update_order_params
+              )
+
+              render_serialized_payload { serialize_resource(order) }
+            rescue StandardError => e
+              render_error_payload(e.message)
+            end
+
+            private
+
+            def intercity_taxi_update_order_params
+              params.require(:order).permit(
+                line_items_attributes: %i[
+                  id
+                  pickup_place_name
+                  drop_off_place_name
+                  from_date
+                  pickup_lat
+                  pickup_lng
+                  pickup_oob_confirmed
+                  drop_off_lat
+                  drop_off_lng
+                  drop_off_oob_confirmed
+                  distance_km
+                  ordered_points
+                  base_km
+                  detour_pickup_km
+                  detour_dropoff_km
+                  extra_pickup_km
+                  extra_dropoff_km
+                  estimated_time_minutes
+                  remark
+                  passenger_count
+                ]
+              )
+            end
+
+            def required_schema
+              if action_name == 'create'
+                SpreeCmCommissioner::IntercityTaxiDraftOrderSchema
+              else
+                SpreeCmCommissioner::IntercityTaxiDraftOrderUpdateSchema
+              end
+            end
+
+            def resource_serializer
+              SpreeCmCommissioner::V2::Storefront::IntercityTaxiCartSerializer
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class TripPlacesController < BaseController
+          def index
+            render_serialized_payload do
+              serialize_collection(paginated_collection)
+            end
+          end
+
+          private
+
+          def paginated_collection
+            collection.page(params[:page]).per(params[:per_page])
+          end
+
+          def collection
+            @collection ||= begin
+              base_scope = scope
+
+              if params[:q].present?
+                @search = base_scope.ransack(params[:q])
+                @search.result
+              else
+                base_scope
+              end
+            end
+          end
+
+          def scope
+            model_class.joins(:location_vendor_places)
+                       .where(location_vendor_places: { tenant_id: @tenant.id })
+                       .distinct
+          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/tenant/trip_search_controller.rb

@@ -0,0 +1,103 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class TripSearchController < BaseController
+          CACHE_EXPIRES_IN = 5.minutes
+
+          def index
+            render_serialized_payload do
+              Rails.cache.fetch(collection_cache_key, collection_cache_opts) do
+                trips = SpreeCmCommissioner::TripQuery.new(
+                  origin_id: params[:origin_id],
+                  destination_id: params[:destination_id],
+                  date: params[:date],
+                  route_type: params[:route_type],
+                  number_of_guests: params[:number_of_guests],
+                  tenant_id: @tenant.id,
+                  params: params
+                ).call
+
+                serialize_collection(trips)
+              end
+            end
+          end
+
+          private
+
+          # override from ContentCacheable
+          def max_age
+            CACHE_EXPIRES_IN.to_i
+          end
+
+          # override
+          def collection_cache_key
+            cache_key_parts = [
+              'trip_search',
+              @tenant.id,
+              params[:origin_id],
+              params[:destination_id],
+              params[:date],
+              params[:route_type],
+              params[:number_of_guests],
+              resource_includes&.sort&.join(','),
+              sparse_fields&.sort&.join(','),
+              serializer_params.to_json,
+              params[:page]&.to_s&.strip,
+              params[:per_page]&.to_s&.strip
+            ].compact.join('-')
+
+            Digest::MD5.hexdigest(cache_key_parts)
+          end
+
+          # override
+          def collection_cache_opts
+            {
+              namespace: Spree::Api::Config[:api_v2_collection_cache_namespace],
+              expires_in: CACHE_EXPIRES_IN
+            }
+          end
+
+          # override
+          def default_resource_includes
+            [
+              'trips.vendor',
+              'trips.vendor.logo',
+              'trips.vehicle',
+              'trips.vehicle.vehicle_photos',
+              'trips.amenities'
+            ]
+          end
+
+          def serialize_collection(collection)
+            serialized_data = SpreeCmCommissioner::V2::Storefront::TripQueryResultSerializer.new(
+              collection,
+              include: default_resource_includes,
+              params: serializer_params
+            ).serializable_hash
+            serialized_data[:meta] = {
+              count: collection.size,
+              total_count: collection.respond_to?(:total_count) ? collection.total_count : collection.size,
+              current_page: collection.respond_to?(:current_page) ? collection.current_page : 1,
+              per_page: collection.respond_to?(:limit_value) ? collection.limit_value : collection.size,
+              pages: collection.respond_to?(:total_pages) ? collection.total_pages : 1,
+              next_page: collection.respond_to?(:next_page) ? collection.next_page : nil,
+              prev_page: collection.respond_to?(:prev_page) ? collection.prev_page : nil
+            }
+            serialized_data
+          end
+
+          # override
+          def serializer_params
+            params.permit(:include).to_hash
+          end
+
+          # override
+          def required_schema
+            SpreeCmCommissioner::TripSearchRequestSchema
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+module Spree
+  module Api
+    module V2
+      module Tenant
+        class TripsController < BaseController
+          def show
+            resource = scope.find(params[:id])
+
+            render_serialized_payload do
+              serialize_resource(resource)
+            end
+          end
+
+          private
+
+          def scope
+            model_class.joins(:vendor)
+                       .where(spree_vendors: { tenant_id: @tenant.id })
+          end
+
+          def model_class
+            SpreeCmCommissioner::Trip
+          end
+
+          def resource_serializer
+            SpreeCmCommissioner::V2::Storefront::TripSerializer
+          end
+        end
+      end
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/create_ticket.rb

@@ -48,6 +48,8 @@ module SpreeCmCommissioner
         name: 'ticket-type',
         presentation: 'Ticket Type'
       )
+      # auto assign the option type to the ticket
+      @ticket.option_types << @option_type unless @ticket.option_types.include?(@option_type)
 
       @option_value = Spree::OptionValue.find_or_create_by!(
         name: @ticket.name,

data/app/interactors/spree_cm_commissioner/host_matcher.rb

@@ -22,7 +22,7 @@ module SpreeCmCommissioner
     end
 
     def find_tenant(normalized_host)
-      SpreeCmCommissioner::Tenant.find_by(host: "https://#{normalized_host}")
+      SpreeCmCommissioner::Tenant.find_by(host: normalized_host)
     end
   end
 end

data/app/interactors/spree_cm_commissioner/vendor_creation_telegram_alert_sender.rb

@@ -22,7 +22,7 @@ module SpreeCmCommissioner
     end
 
     def admin_chat_id
-      ENV.fetch('EXCEPTION_NOTIFIER_TELEGRAM_CHANNEL_ID', nil)
+      Spree::Store.default&.preferred_telegram_new_vendor_alert_chat_id
     end
   end
 end

data/app/mailers/spree/order_mailer_decorator.rb

@@ -37,22 +37,21 @@ module Spree
 
     def setup_tenant_and_store
       @tenant = @order.tenant
-      if @tenant.present?
-        @brand_color = @tenant.preferences[:brand_primary_color]
-        @vendor_logo_url = @tenant.active_vendor&.logo&.original_url
-        @current_store = @tenant
-      else
-        @current_store = @order.store
-      end
+      @current_store = @order.store
+      return if @tenant.blank?
+
+      @brand_color = @tenant.preferences[:brand_primary_color]
+      @vendor_logo_url = @tenant.active_vendor&.logo&.original_url
     end
 
     def build_subject(resend)
       prefix = resend ? "[#{Spree.t(:resend).upcase}] " : ''
-      "#{prefix}#{@current_store&.name} Booking Confirmation ##{@order.number}"
+      store_name = @tenant.present? ? @tenant.name : @current_store&.name
+      "#{prefix}#{store_name} Booking Confirmation ##{@order.number}"
     end
 
     def store_url
-      @tenant.present? ? @current_store.host : @current_store.url
+      @tenant.present? ? @tenant.url : @current_store.url
     end
 
     def ticket_email(guest, email)

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

@@ -50,9 +50,9 @@ module SpreeCmCommissioner
       private
 
       def tenant_link_or_default(tenant, default_link)
-        return default_link unless tenant.respond_to?(:host)
+        return default_link unless tenant.respond_to?(:url)
 
-        site = tenant.host.to_s.strip
+        site = tenant.url.to_s.strip
         site.presence || default_link
       rescue StandardError
         default_link

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

@@ -6,6 +6,7 @@ module SpreeCmCommissioner
       preference :sms_sender_id, :string
       preference :telegram_order_alert_chat_id, :string
       preference :telegram_order_request_alert_chat_id, :string
+      preference :telegram_new_vendor_alert_chat_id, :string
       preference :assetlinks, :string, default: ''
       preference :apple_app_site_association, :string, default: ''
     end

data/app/models/spree_cm_commissioner/product_completion_step.rb

@@ -4,6 +4,8 @@ module SpreeCmCommissioner
 
     belongs_to :product, class_name: '::Spree::Product', optional: false
 
+    has_one :banner, as: :viewable, dependent: :destroy, class_name: 'SpreeCmCommissioner::ProductCompletionStepBanner'
+
     # When a completion step is changed, regenerate completion steps for all line items
     # of the product so they reflect the latest step configuration.
     after_destroy :regenerate_line_items_completion_steps
@@ -28,7 +30,8 @@ module SpreeCmCommissioner
         action_label: action_label,
         action_url: action_url_for(line_item),
         completed_at: existing_data&.dig('completed_at'),
-        completed: completed?(line_item)
+        completed: completed?(line_item),
+        banner_url: banner.present? ? banner.original_url : nil
       }
     end
 

data/app/models/spree_cm_commissioner/product_completion_step_banner.rb

@@ -0,0 +1,12 @@
+module SpreeCmCommissioner
+  class ProductCompletionStepBanner < Asset
+    # 16x9 aspect ratio
+    def asset_styles
+      {
+        mini: '160x90>',
+        small: '480x270>',
+        medium: '960x540>'
+      }
+    end
+  end
+end