spree_cm_commissioner 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d84958e990097b26c5a1550acf0683bb9901bfbb7dc3cc2e5e0057eb9f292a3
-  data.tar.gz: 9e5112083a317fb9ae6e7bf07802d9e02cd86ae1fe0589e2214fc19c7dd476e4
+  metadata.gz: 3da0bd043e4ceca1f57afecc1bab6fbc58c960ba296f7fffa42b449a2475f8f8
+  data.tar.gz: 974c8e19e026fa90254594447a9735be039371ae6d0bc11a24c9cdf3b86dfd8c
 SHA512:
-  metadata.gz: 8cbed043afc749ce07bf954a558fe4a1f692c6ae0d06b06d1c8f54bdd0f1069e1ea8d956ce2bb90240ba781a14afc55400d7167f1d4604b0127b3bb79142cb23
-  data.tar.gz: f4dec3ddd14ac3654c0434cc2c9c81fcb7b6a16d10a87cdd89c353bc0c0f7571867e73494564149b5fb7fc983619f4dcb839bd52af5cc9bfb1da8f181de55757
+  metadata.gz: 4b1d418758d9880e50dd1481b095f4cad76cc106ca0a950b694d2a87c053bf7f48655029c52939f33bf099db0a7d84048f0482d488a20ac720f1b6f8015a687e
+  data.tar.gz: 93b3ffb94424ba4a4ed46e5cde3303dc33c54a58417dd1a0750a5cb56d3638778d1fa5ceb75cf812617c33e12ae3c38c6402b7719ddfa53b2ce9567a8bb860e4

data/Gemfile.lock

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

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

@@ -49,6 +49,8 @@ module Spree
         place_json = Base64.strict_decode64(place_base_64_content)
         place_hash = JSON.parse(place_json)
 
+        place_hash = place_hash.except('lft', 'rgt', 'parent_id', 'depth')
+
         @place = SpreeCmCommissioner::Place.where(reference: place_hash['reference']).first_or_initialize do |place|
           place.assign_attributes(place_hash)
         end

data/app/controllers/spree/api/v2/organizer/invite_guests_controller.rb

@@ -0,0 +1,70 @@
+module Spree
+  module Api
+    module V2
+      module Organizer
+        class InviteGuestsController < ::Spree::Api::V2::Organizer::BaseController
+          before_action :load_invite_guest_by_token, only: :show
+          before_action :load_invite_guest, :assign_line_item_data, only: :update
+
+          def show
+            render_serialized_payload { serialize_resource(@invite_guest) }
+          end
+
+          def update
+            return render_error(:revoked) if @invite_guest.revoked?
+            return render_error(:closed) if @invite_guest.expired?
+            return render_error(:fully_claimed) if @invite_guest.fully_claimed?
+
+            guest = @line_item.guests.new(guest_params)
+
+            if guest.save
+              @invite_guest.update(claimed_status: :claimed) if @line_item.guests.count == @invite_guest.quantity
+              render json: SpreeCmCommissioner::V2::Storefront::GuestSerializer.new(guest.reload).serializable_hash
+            else
+              render_error_payload(guest.errors.full_messages.to_sentence)
+            end
+          end
+
+          private
+
+          def load_invite_guest_by_token
+            @invite_guest = SpreeCmCommissioner::InviteGuest.find_by(token: params[:id])
+          rescue ActiveRecord::RecordNotFound
+            render_error_payload(I18n.t('invite.url_not_found'))
+          end
+
+          def load_invite_guest
+            @invite_guest = SpreeCmCommissioner::InviteGuest.find(params[:id])
+          end
+
+          def assign_line_item_data
+            @line_item = @invite_guest.order.line_items.first
+            @guests = @line_item.guests
+          end
+
+          def render_error(message)
+            render json: { errors: message }
+          end
+
+          def guest_params
+            params.require(:invite_guest).permit(
+              :first_name,
+              :last_name,
+              :dob,
+              :gender,
+              :age,
+              :emergency_contact,
+              :phone_number,
+              :address,
+              :other_organization
+            )
+          end
+
+          def resource_serializer
+            ::Spree::V2::Organizer::InviteGuestSerializer
+          end
+        end
+      end
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/order_importer/multi_guest.rb

@@ -0,0 +1,31 @@
+module SpreeCmCommissioner
+  module OrderImporter
+    class MultiGuest < BaseInteractor
+      delegate :params, :quantity, to: :context
+
+      def call
+        return context.fail!(message: 'variant_id_is_required') if params[:variant_id].blank?
+        return context.fail!(message: 'email_or_phone_is_required') if params[:order_email].blank? && params[:order_phone_number].blank?
+
+        context.order = construct_order
+        context.fail!(message: context.order.errors.full_messages.to_sentence) unless context.order.save
+      end
+
+      def construct_order
+        Spree::Order.new(
+          email: params[:order_email],
+          phone_number: params[:order_phone_number],
+          completed_at: Date.current,
+          state: 'complete',
+          payment_state: 'paid',
+          line_items_attributes: [
+            {
+              quantity: quantity.to_i,
+              variant_id: params[:variant_id]
+            }
+          ]
+        )
+      end
+    end
+  end
+end

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

@@ -98,13 +98,12 @@ module SpreeCmCommissioner
       line_items.each do |line_item|
         next if line_item.event.nil?
 
-        event_id = line_item.event.parent_id
-        SpreeCmCommissioner::EventTransactionalMailer.send_to_participant(event_id, user.id).deliver_later
+        SpreeCmCommissioner::EventTransactionalMailer.send_to_participant(line_item.event_id, user.id).deliver_later
       end
     end
 
     def user_has_email?
-      user.email.present?
+      user.present? && user.email.present?
     end
 
     # allow authorized user to accept all requested line items

data/app/models/spree_cm_commissioner/invite_guest.rb

@@ -0,0 +1,23 @@
+module SpreeCmCommissioner
+  class InviteGuest < SpreeCmCommissioner::Base
+    enum invite_type: { invite: 0, open: 1, sponsor: 2 }
+    enum claimed_status: { active: 0, claimed: 1, revoked: 2 }
+
+    belongs_to :variant, class_name: 'Spree::Variant'
+    belongs_to :order, class_name: 'Spree::Order'
+    belongs_to :event, class_name: 'Spree::Taxon'
+
+    self.whitelisted_ransackable_attributes = %w[claimed_status]
+
+    def expired?
+      expiration_date.present? && expiration_date < Time.current
+    end
+
+    def fully_claimed?
+      return false unless order.present? && order.line_items.any?
+
+      line_item = order.line_items.first
+      line_item.guests.count >= order.line_items.first.number_of_guests
+    end
+  end
+end

data/app/models/spree_cm_commissioner/place.rb

@@ -17,7 +17,7 @@ module SpreeCmCommissioner
     has_many :products, through: :product_places
 
     has_many :children, -> { order(:lft) }, class_name: 'SpreeCmCommissioner::Place', foreign_key: :parent_id, dependent: :destroy
-    has_many :vendor_stops, class_name: 'SpreeCmCommissioner::VendorStop', dependent: :destroy
+    has_many :vendor_stops, class_name: 'SpreeCmCommissioner::VendorStop', dependent: :destroy, foreign_key: :stop_id
 
     def self.ransackable_attributes(auth_object = nil)
       super & %w[name code]

data/app/models/spree_cm_commissioner/product_place.rb

@@ -1,6 +1,7 @@
 module SpreeCmCommissioner
   class ProductPlace < Base
     self.inheritance_column = '_type_disabled'
+    acts_as_list column: :position
 
     belongs_to :product, class_name: 'Spree::Product', optional: false
     belongs_to :place, class_name: 'SpreeCmCommissioner::Place', optional: false

data/app/models/spree_cm_commissioner/taxon_decorator.rb

@@ -55,6 +55,8 @@ module SpreeCmCommissioner
       base.has_many :crew_invites, class_name: 'SpreeCmCommissioner::CrewInvite', dependent: :destroy
       base.has_many :invite_user_events, through: :user_events, class_name: 'SpreeCmCommissioner::InviteUserEvent'
 
+      base.has_many :invite_guests, class_name: 'SpreeCmCommissioner::InviteGuest', foreign_key: :event_id
+
       base.has_many :line_items, through: :products
       base.has_many :event_line_items, class_name: 'Spree::LineItem', foreign_key: :event_id
 

data/app/serializers/spree/v2/organizer/invite_guest_serializer.rb

@@ -0,0 +1,13 @@
+module Spree
+  module V2
+    module Organizer
+      class InviteGuestSerializer < BaseSerializer
+        attributes :email, :quantity, :token, :invite_type, :claimed_status, :issued_to, :expiration_date,
+                   :claimed_at, :email_send_at, :created_at, :updated_at, :remark
+        belongs_to :variant, serializer: SpreeCmCommissioner::V2::Storefront::EventVariantSerializer
+        belongs_to :order, serializer: Spree::V2::Storefront::OrderSerializer
+        belongs_to :event, serializer: Spree::V2::Storefront::TaxonSerializer
+      end
+    end
+  end
+end

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

@@ -6,7 +6,8 @@ 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
+                   :age, :emergency_contact, :other_organization, :expectation, :upload_later, :address, :formatted_bib_number, :phone_number,
+                   :token
 
         # temporary, once app release after cm-app v1.9.1, we no longer need this.
         attribute :seat_number do |object|

data/app/views/spree_cm_commissioner/event_transactional_mailer/_mailer_stylesheets.html.erb

@@ -131,6 +131,8 @@
     text-decoration: none;
     font-weight: 500;
     font-size: 14px;
+    width: 10rem;
+    max-width: 90%;
   }
 
   .cta-button:hover {

data/config/routes.rb

@@ -450,6 +450,7 @@ Spree::Core::Engine.add_routes do
         resources :images
         resource :s3_signed_urls
         resources :invites
+        resources :invite_guests, only: %i[show update]
       end
 
       namespace :tenant do

data/db/migrate/20250422014417_create_spree_cm_commissioner_invite_guest.rb

@@ -0,0 +1,21 @@
+class CreateSpreeCmCommissionerInviteGuest < ActiveRecord::Migration[7.0]
+  def change
+    create_table :cm_invite_guests, if_not_exists: true do |t|
+      t.references :variant, foreign_key: { to_table: :spree_variants }, null: true, index: true
+      t.references :order, foreign_key: { to_table: :spree_orders }, null: true, index: true
+      t.references :event, foreign_key: { to_table: :spree_taxons }, null: true, index: true
+      t.string :email, index: true
+      t.integer :quantity, default: 1
+      t.string :token, null: false, unique: true, index: true
+      t.integer :invite_type, default: 0
+      t.integer :claimed_status, default: 0
+      t.string :issued_to
+      t.datetime :expiration_date
+      t.text :remark
+      t.datetime :expires_at
+      t.datetime :claimed_at
+      t.datetime :email_send_at
+      t.timestamps
+    end
+  end
+end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '1.12.0'.freeze
+  VERSION = '1.13.0'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-26 00:00:00.000000000 Z
+date: 2025-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -779,6 +779,7 @@ files:
 - app/controllers/spree/api/v2/operator/taxons_controller.rb
 - app/controllers/spree/api/v2/organizer/base_controller.rb
 - app/controllers/spree/api/v2/organizer/images_controller.rb
+- app/controllers/spree/api/v2/organizer/invite_guests_controller.rb
 - app/controllers/spree/api/v2/organizer/invites_controller.rb
 - app/controllers/spree/api/v2/organizer/s3_signed_urls_controller.rb
 - app/controllers/spree/api/v2/organizer/ticket_images_controller.rb
@@ -1034,6 +1035,7 @@ files:
 - app/interactors/spree_cm_commissioner/order_accepted_state_updater.rb
 - app/interactors/spree_cm_commissioner/order_complete_notification_sender.rb
 - app/interactors/spree_cm_commissioner/order_complete_telegram_sender.rb
+- app/interactors/spree_cm_commissioner/order_importer/multi_guest.rb
 - app/interactors/spree_cm_commissioner/order_importer/single_guest.rb
 - app/interactors/spree_cm_commissioner/order_rejected_notification_sender.rb
 - app/interactors/spree_cm_commissioner/order_rejected_state_updater.rb
@@ -1211,6 +1213,7 @@ files:
 - app/models/spree_cm_commissioner/import.rb
 - app/models/spree_cm_commissioner/imports/import_order.rb
 - app/models/spree_cm_commissioner/invite.rb
+- app/models/spree_cm_commissioner/invite_guest.rb
 - app/models/spree_cm_commissioner/invite_user_event.rb
 - app/models/spree_cm_commissioner/invite_user_taxon.rb
 - app/models/spree_cm_commissioner/invoice.rb
@@ -1498,6 +1501,7 @@ files:
 - app/serializers/spree/v2/organizer/asset_serializer.rb
 - app/serializers/spree/v2/organizer/base_serializer.rb
 - app/serializers/spree/v2/organizer/image_serializer.rb
+- app/serializers/spree/v2/organizer/invite_guest_serializer.rb
 - app/serializers/spree/v2/organizer/invite_serializer.rb
 - app/serializers/spree/v2/organizer/s3_signed_url_serializer.rb
 - app/serializers/spree/v2/organizer/taxon_serializer.rb
@@ -2405,6 +2409,7 @@ files:
 - db/migrate/20250404050117_add_archived_at_to_spree_orders.rb
 - db/migrate/20250407092556_add_variant_id_to_cm_trips.rb
 - db/migrate/20250418072528_add_nested_set_columns_to_places.rb
+- db/migrate/20250422014417_create_spree_cm_commissioner_invite_guest.rb
 - db/migrate/20250425084929_add_description_to_spree_prototypes.rb
 - db/migrate/20250425085938_add_preferences_to_spree_prototypes.rb
 - db/migrate/20250428025645_add_slug_to_spree_prototypes.rb