spree_cm_commissioner 1.21.0 → 2.0.0.pre.pre

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

@@ -38,25 +38,10 @@ module Spree
           def update
             spree_authorize! :update, spree_current_order, order_token
 
-            begin
-              if guest_params[:guest_dynamic_fields_attributes]
-                resource.guest_dynamic_fields.destroy_all
-
-                guest_params[:guest_dynamic_fields_attributes].each do |attr|
-                  field = build_dynamic_field(attr)
-                  field.save!
-                end
-              end
-
-              resource.assign_attributes(guest_params.except(:guest_dynamic_fields_attributes))
-
-              if resource.save
-                render_serialized_payload { serialize_resource(resource) }
-              else
-                render_error_payload(resource.errors, 400)
-              end
-            rescue ActiveRecord::RecordInvalid => e
-              render_error_payload(e.record.errors, 400)
+            if resource.update(guest_params)
+              render_serialized_payload { serialize_resource(resource) }
+            else
+              render_error_payload(resource, 400)
             end
           end
 
@@ -91,20 +76,9 @@ module Spree
               :upload_later,
               :country_code,
               :contact,
-              guest_dynamic_fields_attributes: %i[id dynamic_field_id dynamic_field_option_id value _destroy]
+              guest_dynamic_fields_attributes: %i[id dynamic_field_id value _destroy]
             )
           end
-
-          def build_dynamic_field(attr)
-            field = resource.guest_dynamic_fields.build(attr.except(:id))
-
-            if field.dynamic_field.requires_dynamic_field_options?
-              option = field.dynamic_field.dynamic_field_options.find_by(id: field.value)
-              field.dynamic_field_option = option if option
-            end
-
-            field
-          end
         end
       end
     end

data/app/controllers/spree/api/v2/storefront/queue_cart/line_items_controller.rb

@@ -12,9 +12,9 @@ module Spree
               spree_authorize! :update, spree_current_order, order_token
               spree_authorize! :show, @variant
 
-              availability_checker = SpreeCmCommissioner::Stock::AvailabilityChecker.new(@variant)
+              availability_checker = SpreeCmCommissioner::Stock::AvailabilityChecker.new(@variant, add_item_params[:options])
 
-              unless availability_checker.can_supply?(add_item_params[:quantity].to_i, add_item_params[:options])
+              unless availability_checker.can_supply?(add_item_params[:quantity].to_i)
                 return render_error_payload(availability_checker.error_message || I18n.t('variant_availability.items_out_of_stock'))
               end
 

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

@@ -27,8 +27,6 @@ module Spree
           end
 
           def complete
-            return render_serialized_payload { serialized_current_order } if spree_current_order.confirm? || spree_current_order.complete?
-
             spree_authorize! :update, spree_current_order, order_token
 
             result = complete_service.call(order: spree_current_order)

data/app/controllers/spree_cm_commissioner/admin/variants_controller_decorator.rb

@@ -37,7 +37,7 @@ module SpreeCmCommissioner
         bit_fields = SpreeCmCommissioner::KycBitwise::BIT_FIELDS.keys
 
         if permitted_resource_params[:use_product_kyc] == '1'
-          permitted_resource_params[:kyc] = nil
+          permitted_resource_params[:kyc] = @product.kyc
         else
           @kyc_result = calculate_kyc_value(params[:variant])
           permitted_resource_params[:kyc] = @kyc_result

data/app/controllers/spree_cm_commissioner/api/v2/storefront/checkout_controller_decorator.rb

@@ -6,17 +6,6 @@ module SpreeCmCommissioner
           def self.prepended(base)
             base.include SpreeCmCommissioner::OrderConcern
           end
-
-          # Override Spree's default behavior:
-          # By default, Spree raises an error if `complete` is called on a completed or confirmed order.
-          # We want to allow this call to succeed, so the API can be used both to:
-          # - complete the order (if it's not yet complete), or
-          # - return the latest state of a confirmed or completed order without raising a forbidden error.
-          def complete
-            return render_serialized_payload { serialized_current_order } if spree_current_order.confirm? || spree_current_order.complete?
-
-            super
-          end
         end
       end
     end

data/app/controllers/spree_cm_commissioner/well_known_controller.rb

@@ -3,42 +3,18 @@ module SpreeCmCommissioner
     before_action :identify_request_source
     rescue_from StandardError, with: :handle_error
 
-    def assetlinks_json
-      render_platform_link(:android)
-    end
-
-    def apple_app_site_association
-      render_platform_link(:ios)
-    end
-
-    private
-
-    def render_platform_link(platform)
-      fetcher_class = platform_link_finder(platform)
-
-      result = fetcher_class.call(
-        store: @store,
-        tenant: @tenant,
-        refreshed: params[:_refreshed].present?
-      )
-
-      if result.success? && result.contents.present?
-        render json: result.contents
+    def show
+      case params[:id]
+      when 'assetlinks.json'
+        render_preference(:preferred_assetlinks)
+      when 'apple-app-site-association'
+        render_preference(:preferred_apple_app_site_association)
       else
         render_not_found
       end
     end
 
-    def platform_link_finder(platform)
-      case platform
-      when :android
-        SpreeCmCommissioner::AssetLinksFetcher
-      when :ios
-        SpreeCmCommissioner::AppleAppSiteAssociationFetcher
-      else
-        render_not_found
-      end
-    end
+    private
 
     def identify_request_source
       host = params[:original_host].presence || request.host.downcase
@@ -49,6 +25,16 @@ module SpreeCmCommissioner
       @tenant = result.tenant
     end
 
+    def render_preference(preference_key)
+      if @store&.send(preference_key).present?
+        render json: @store.send(preference_key)
+      elsif @tenant&.send(preference_key).present?
+        render json: @tenant.send(preference_key)
+      else
+        render_not_found
+      end
+    end
+
     def render_not_found
       render json: { error: 'Not found' }, status: :not_found
     end

data/app/factory/spree_cm_commissioner/invite_guest_claimed_telegram_message_factory.rb

@@ -1,17 +1,26 @@
-# <p>📣 --- <b>[NEW GUEST CLAIMED INVITATION]</b> ---</p>
-
-# <p>✨ <b>Ticket Successfully Claimed!</b> ✨</p>
-
-# <p><b>🙍 Claimed By</b><br>
-# Name: Orng SreyMoch<br>
-# Tel: <code>0966827830</code></p>
-
-# <p><b>Run Ticket + 2 way bus ticket + Tent</b><br>
-# <i>👉 Distance: 5km, Tent: tent (1 people), and T-shirt: S</i><br>
-# <i>🗓️ May 30, 2025 -> Jun 30, 2025</i></p>
-
-# <p><b>📑 Order Number:</b><br>
-# <code>R172627517</code></p>
+# 🎟️ --- [TICKET CLAIMED] ---
+#
+# Order Number:
+# <code>R621016753</code>
+#
+# ✅ <b>Ticket Successfully Claimed!</b>
+#
+# [ x1 ]
+# <b>5km Running Ticket</b>
+# <i>👉 Distance: 5km, T-shirt: M</i>
+# <i>🗓️ Nov 15, 2023</i>
+# <i>🏪 Temple Run with Sai</i>
+#
+# [ x2 ]
+# <b>5km Running Ticket</b>
+# <i>👉 Distance: 5km, T-shirt: S</i>
+# <i>🗓️ Nov 15, 2023 -> Nov 17, 2023</i>
+# <i>🏪 Temple Run with Sai</i>
+#
+# <b>🙍 Claimed By</b>
+# Name: Vaneath Awesome
+# Tel: <code>+85570760548</code>
+# Email: <code>admin_dev@cm.com</code>
 
 module SpreeCmCommissioner
   class InviteGuestClaimedTelegramMessageFactory < TelegramMessageFactory
@@ -35,39 +44,77 @@ module SpreeCmCommissioner
     # override
     def body
       text = []
-      text << '<p>📣 --- <b>[NEW GUEST CLAIMED INVITATION]</b> ---</p>'
-      text << '<p>✨ <b>Ticket Successfully Claimed!</b> ✨</p>'
-      text << '<p><b>🙍 Claimed By</b><br>'
-      text << "Name: #{guest.first_name} #{guest.last_name}<br>"
-      text << "Tel: <code>#{guest.phone_number}</code></p>"
-
-      selected_line_items.each do |item|
-        text << line_item_block(item)
-      end
-
-      text << "<p><b>📑 Order Number:</b><br><code>#{order.number}</code></p>"
-
-      text.join("\n")
+      text << "Order Number:\n<code>#{order.number}</code>\n"
+      text << "\n✅ <b>Ticket Successfully Claimed!</b>\n"
+      text << selected_line_items.map { |item| line_item_content(item) }.compact.join("\n\n")
+      text.compact.join("\n")
     end
 
-    def line_item_block(item)
-      parts = []
-      parts << "<p><b>#{item.product.name}</b><br>"
+    def line_item_content(line_item)
+      text = []
 
-      details = []
-      details << "👉 #{item.options_text}" if item.options_text.present?
-      details << pretty_date_for(item) if item.date_present?
+      text << bold(line_item.product.name.to_s)
+      text << "Quantity: #{line_item.quantity}"
+      text << italic("👉 #{line_item.options_text}") if line_item.options_text.present?
+      text << italic(pretty_date_for(line_item)) if pretty_date_for(line_item).present?
+      text << italic("🏪 #{line_item.vendor.name}") if line_item.vendor&.name.present? && vendor.blank?
 
-      parts << details.map { |d| "<i>#{d}</i><br>" }.join
-      parts << '</p>'
-      parts.join("\n")
+      text.compact.join("\n")
     end
 
     def pretty_date_for(line_item)
+      return nil unless line_item.date_present?
+
       from_date = pretty_date(line_item.from_date)
       to_date = pretty_date(line_item.to_date)
 
-      from_date == to_date ? "🗓️ #{from_date}" : "🗓️ #{from_date} -> #{to_date}"
+      if from_date == to_date
+        "🗓️ #{from_date}"
+      else
+        "🗓️ #{from_date} -> #{to_date}"
+      end
+    end
+
+    # override
+    def footer
+      text = []
+
+      text << bold('🙍 Claimed By')
+      text << "Name: #{guest.first_name} #{guest.last_name}" if guest.first_name.present? || guest.last_name.present?
+      text << "Tel: #{inline_code(guest.intel_phone_number)}" if guest.intel_phone_number.present?
+
+      if show_details_link && order.guests.any?
+        text << ''
+        text << 'View Tickets:'
+        text += generate_guests_links(order.guests)
+      end
+
+      text.compact.join("\n")
+    end
+
+    # Result:
+    # | No. A24 | No. A24 |
+    # | No. A24 | No. A24 |
+    # | No. A24 | No. A24 |
+    # | No. A24 | No. A24 |
+    # | No. A24 | No. A24 |
+    # | No. A24 |
+    def generate_guests_links(guests, guests_per_row = 2)
+      rows = (guests.size.to_f / guests_per_row).ceil
+      formatted_rows = []
+
+      rows.times do |i|
+        row_guests = guests.slice(i * guests_per_row, guests_per_row)
+        formatted_row = row_guests.map do |guest|
+          button_label = guest.seat_number.present? ? "No. #{guest.seat_number}" : "No. #{guest.formatted_bib_number || 'N/A'}"
+          link = Rails.application.routes.url_helpers.guest_cards_url(guest.token)
+          "| <a href='#{link}'>#{button_label}</a>"
+        end.join(' ')
+
+        formatted_rows << ("#{formatted_row} |")
+      end
+
+      formatted_rows
     end
   end
 end

data/app/finders/spree_cm_commissioner/accommodations/find.rb

@@ -0,0 +1,37 @@
+module SpreeCmCommissioner
+  module Accommodations
+    class Find
+      attr_reader :from_date, :to_date, :state_id, :number_of_guests
+
+      def initialize(from_date:, to_date:, state_id:, number_of_adults:, number_of_kids:)
+        @from_date = from_date
+        @to_date = to_date
+        @state_id = state_id
+        @number_of_guests = number_of_adults.to_i + number_of_kids.to_i
+      end
+
+      def execute
+        scope
+          .where(default_state_id: state_id)
+          .where(inventory_items: { inventory_date: stay_dates })
+          .where('CAST(spree_variants.public_metadata->\'cm_options\'->>\'number-of-adults\' AS INTEGER) +
+                  CAST(spree_variants.public_metadata->\'cm_options\'->>\'number-of-kids\' AS INTEGER) >= ?', number_of_guests
+          )
+          .where('inventory_items.quantity_available > 0')
+          .distinct
+      end
+
+      private
+
+      def scope
+        Spree::Vendor
+          .joins(variants: :inventory_items)
+          .where(primary_product_type: :accommodation, state: :active)
+      end
+
+      def stay_dates
+        from_date..to_date
+      end
+    end
+  end
+end

data/app/finders/spree_cm_commissioner/accommodations/find_variant.rb

@@ -0,0 +1,32 @@
+module SpreeCmCommissioner
+  module Accommodations
+    class FindVariant
+      attr_reader :vendor_id, :from_date, :to_date, :number_of_guests
+
+      def initialize(vendor_id:, from_date:, to_date:, number_of_adults:, number_of_kids:)
+        @vendor_id = vendor_id
+        @from_date = from_date
+        @to_date = to_date
+        @number_of_guests = number_of_adults.to_i + number_of_kids.to_i
+      end
+
+      def execute
+        Spree::Variant
+          .joins(:inventory_items)
+          .where(vendor_id: vendor_id)
+          .where(inventory_items: { inventory_date: stay_dates })
+          .where('CAST(public_metadata->\'cm_options\'->>\'number-of-adults\' AS INTEGER) +
+                  CAST(public_metadata->\'cm_options\'->>\'number-of-kids\' AS INTEGER) >= ?', number_of_guests
+          )
+          .where('inventory_items.quantity_available > 0')
+          .distinct
+      end
+
+      private
+
+      def stay_dates
+        from_date..to_date
+      end
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/ensure_correct_product_type.rb

@@ -0,0 +1,40 @@
+module SpreeCmCommissioner
+  class EnsureCorrectProductType < BaseInteractor
+    def call
+      Spree::Product
+        .left_joins(variants_including_master: %i[inventory_items line_items])
+        .where(
+          'spree_variants.product_type IS NULL OR
+          spree_variants.product_type != spree_products.product_type OR
+
+          cm_inventory_items.product_type IS NULL OR
+          cm_inventory_items.product_type != spree_products.product_type OR
+
+          spree_line_items.product_type IS NULL OR
+          spree_line_items.product_type != spree_products.product_type OR
+
+          spree_products.product_type IS NOT NULL
+          '
+        )
+        .distinct.find_each do |product|
+        sync_product_type_for(product)
+      end
+    end
+
+    def sync_product_type_for(product)
+      product_type = Spree::Variant.product_types[product.product_type]
+
+      product.variants_including_master
+             .where('spree_variants.product_type IS NULL OR spree_variants.product_type != ?', product_type)
+             .update_all(product_type: product_type) # rubocop:disable Rails/SkipsModelValidations
+
+      product.line_items
+             .where('spree_line_items.product_type IS NULL OR spree_line_items.product_type != ?', product_type)
+             .update_all(product_type: product_type) # rubocop:disable Rails/SkipsModelValidations
+
+      product.inventory_items
+             .where('cm_inventory_items.product_type IS NULL OR cm_inventory_items.product_type != ?', product_type)
+             .update_all(product_type: product_type) # rubocop:disable Rails/SkipsModelValidations
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/inventory_item_syncer.rb

@@ -0,0 +1,25 @@
+module SpreeCmCommissioner
+  class InventoryItemSyncer < BaseInteractor
+    # inventory_id_and_quantities = [{ inventory_id: inventory_item1.id, quantity: 5 } ]
+    delegate :inventory_id_and_quantities, to: :context
+
+    def call
+      ActiveRecord::Base.transaction do
+        inventory_items.each do |inventory_item|
+          quantity = inventory_id_and_quantities.find { |item| item[:inventory_id] == inventory_item.id }&.dig(:quantity) || 0
+          adjust_quantity_available(inventory_item, quantity)
+        end
+      end
+    end
+
+    private
+
+    def adjust_quantity_available(inventory_item, quantity)
+      inventory_item.update!(quantity_available: inventory_item.quantity_available + quantity)
+    end
+
+    def inventory_items
+      @inventory_items ||= InventoryItem.where(id: inventory_id_and_quantities.pluck(:inventory_id))
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/pin_code_sender.rb

@@ -18,6 +18,7 @@ module  SpreeCmCommissioner
 
     def send_sms
       options = {
+        from: sender_name(context.tenant),
         to: context.pin_code.contact,
         body: I18n.t('pincode_sender.sms.body', code: context.pin_code.code, readable_type: context.pin_code.readable_type)
       }

data/app/interactors/spree_cm_commissioner/sms.rb

@@ -42,7 +42,7 @@ module  SpreeCmCommissioner
     end
 
     def sms_options
-      opts = { to: context.to, body: context.body }
+      opts = { from: context.from, to: context.to, body: context.body }
       opts[:to] = sanitize(opts[:to]) if opts[:to].present?
       opts[:from] = from_number
       opts

data/app/interactors/spree_cm_commissioner/stock/inventory_item_resetter.rb

@@ -0,0 +1,44 @@
+module SpreeCmCommissioner
+  module Stock
+    class InventoryItemResetter < BaseInteractor
+      delegate :inventory_item, to: :context
+
+      def call
+        max_capacity = variant_total_inventory
+        total_purchases = variant_total_purchases
+        quantity_available = [max_capacity - total_purchases, 0].max
+
+        updated = inventory_item.update(max_capacity: max_capacity, quantity_available: quantity_available)
+        return context.fail!(message: 'Failed to update inventory item', errors: inventory_item.errors.full_messages) unless updated
+
+        clear_inventory_cache
+      end
+
+      def variant_total_inventory
+        # for shipment, total_on_hand is not orignal stock. shipment does subtract the stock.
+        # to get desire result, we need to add to total_purchase.
+        if inventory_item.variant.delivery_required?
+          inventory_item.variant.total_on_hand.to_i + variant_total_purchases
+        else
+          inventory_item.variant.total_on_hand.to_i
+        end
+      end
+
+      def variant_total_purchases
+        scope = inventory_item.variant.complete_line_items
+
+        if inventory_item.permanent_stock?
+          scope.where('? BETWEEN from_date AND to_date', inventory_item.inventory_date).sum(:quantity).to_i
+        else
+          scope.sum(:quantity).to_i
+        end
+      end
+
+      def clear_inventory_cache
+        SpreeCmCommissioner.redis_pool.with do |redis|
+          redis.del(inventory_item.redis_key)
+        end
+      end
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/stock/inventory_items_adjuster.rb

@@ -0,0 +1,13 @@
+module SpreeCmCommissioner
+  module Stock
+    class InventoryItemsAdjuster < BaseInteractor
+      delegate :variant, :quantity, to: :context
+
+      def call
+        variant.inventory_items.active.find_each do |inventory_item|
+          inventory_item.adjust_quantity!(quantity)
+        end
+      end
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/stock/inventory_items_generator.rb

@@ -0,0 +1,15 @@
+module SpreeCmCommissioner
+  module Stock
+    class InventoryItemsGenerator < BaseInteractor
+      delegate :variant, to: :context
+
+      def call
+        if variant.permanent_stock?
+          SpreeCmCommissioner::Stock::PermanentInventoryItemsGenerator.call(variant_ids: [variant.id])
+        else
+          variant.create_default_non_permanent_inventory_item! unless variant.default_inventory_item_exist?
+        end
+      end
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/stock/permanent_inventory_items_generator.rb

@@ -0,0 +1,75 @@
+module SpreeCmCommissioner
+  module Stock
+    class PermanentInventoryItemsGenerator < BaseInteractor
+      delegate :variant_ids, to: :context
+
+      def variants_per_batch = 1000
+
+      def pre_inventory_days_for(variant)
+        context.pre_inventory_days || variant.pre_inventory_days
+      end
+
+      def call
+        variants.in_batches(of: variants_per_batch) do |batch|
+          generate_inventory_items_for_batch(batch)
+        end
+      end
+
+      private
+
+      def generate_inventory_items_for_batch(batch)
+        total_on_hand_by_variant = total_on_hand_for(batch)
+        batch.each do |variant|
+          count_on_hand = total_on_hand_by_variant[variant.id] || 0
+          generate_inventory_items_for_variant(variant, count_on_hand)
+        end
+      end
+
+      def generate_inventory_items_for_variant(variant, count_on_hand)
+        inventory_dates_for(variant).each do |inventory_date|
+          next if inventory_exist?(variant, inventory_date)
+
+          create_inventory_item(variant, inventory_date, count_on_hand)
+        end
+      end
+
+      def inventory_dates_for(variant)
+        start_date = Time.zone.tomorrow
+        end_date = Time.zone.today + pre_inventory_days_for(variant)
+
+        (start_date..end_date)
+      end
+
+      def inventory_exist?(variant, inventory_date)
+        variant.inventory_items.exists?(inventory_date: inventory_date)
+      end
+
+      def create_inventory_item(variant, inventory_date, count_on_hand)
+        variant.inventory_items.create!(
+          inventory_date: inventory_date,
+          quantity_available: count_on_hand,
+          max_capacity: count_on_hand,
+          product_type: variant.product_type
+        )
+      end
+
+      # Returns a hash: { variant_id => total_on_hand, ... }
+      def total_on_hand_for(variants)
+        variant_ids = variants.pluck(:id)
+
+        Spree::StockItem
+          .joins(:stock_location)
+          .where(deleted_at: nil, variant_id: variant_ids)
+          .where(spree_stock_locations: { active: true })
+          .group(:variant_id)
+          .sum(:count_on_hand)
+      end
+
+      def variants
+        scope = Spree::Variant.active.with_permanent_stock.where(is_master: false)
+        scope = scope.where(id: variant_ids) if variant_ids.present?
+        scope
+      end
+    end
+  end
+end

data/app/interactors/spree_cm_commissioner/stock/stock_movement_creator.rb

@@ -0,0 +1,32 @@
+module SpreeCmCommissioner
+  module Stock
+    class StockMovementCreator < BaseInteractor
+      delegate :variant_id, :stock_location_id, :current_store, :stock_movement_params, to: :context
+
+      def call
+        variant = current_store.variants.find(variant_id)
+
+        return context.fail!(message: Spree.t(:doesnt_track_inventory)) unless variant.track_inventory?
+
+        stock_location = Spree::StockLocation.find(stock_location_id)
+        stock_movement = stock_location.stock_movements.build(stock_movement_params)
+        stock_movement.stock_item = stock_location.set_up_stock_item(variant)
+
+        if stock_movement.save
+          adjust_inventory_items_async(variant_id, stock_movement.quantity)
+          context.stock_movement = stock_movement
+        else
+          context.fail!(message: stock_movement.errors.full_messages.join(', '))
+        end
+      end
+
+      private
+
+      def adjust_inventory_items_async(variant_id, quantity)
+        CmAppLogger.log(label: "#{self.class.name}#adjust_inventory_items_async", data: { variant_id: variant_id, quantity: quantity }) do
+          SpreeCmCommissioner::Stock::InventoryItemsAdjusterJob.perform_later(variant_id: variant_id, quantity: quantity)
+        end
+      end
+    end
+  end
+end