spree_cm_commissioner 2.1.4.pre.pre2 → 2.1.5.pre.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19693ce0f2d458c8aee1e33adb30cfe8d93a677ed03264461875af642715232a
-  data.tar.gz: e8ccfec004c7bf2ed0f1fc27a2c245d5d49d226840657d49879285ff19d920ab
+  metadata.gz: 06e22965144e75388dd801148c7d38580aee08856973332edc2c40ad31f6772a
+  data.tar.gz: 1b33b7d645b36c9ccf42444dfa09aa7826a43d9c8e2a3dd0aaaa6d1668f6643d
 SHA512:
-  metadata.gz: afbc732740cd50c3063bb46522354248c0853592626b2413fce054d2015af1874230c84213f8a731141365d36d2975a87b5e84ea1d2548dd9d17a9a34fe5e6d0
-  data.tar.gz: b8247a31d8a5974c4bb894124d4f180047b354994dd2458e2ae383568793633b41bd3b5897106e51e8a43f4876520780ab04d160ffce3b2048f975b139181f53
+  metadata.gz: 781da351e0880acf7f46fbbc060844a31f26b322d781fc17ad1da51ac4a3e7d0a9c991d2fb4921ec1cc1e89a255c2abf9457c3bf7c163108838b199cb9865054
+  data.tar.gz: 6322d9ef0cca35c6d225cb91917cb3e49a6a96221b60025103f09f607658eaf0c797d0d37f6ad44b3c183a5f7c8d6a64afd0326de016047cf005dfb8ae200b4b

data/Gemfile.lock

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

data/app/interactors/spree_cm_commissioner/sms.rb

@@ -8,8 +8,7 @@ module  SpreeCmCommissioner
         create_sms_log(sms_options)
         create_message(sms_options)
       rescue StandardError => e
-        context.sms_log.error = e.message
-        context.sms_log.save
+        context.sms_log.update(error: e.message, status: :failed)
         context.fail!(message: e.message)
 
         log_error_to_telegram(e.message)
@@ -29,7 +28,7 @@ module  SpreeCmCommissioner
     # sms adapter can decide whether to update additional sms log fields
     def update_sms_log(attributes)
       attributes = attributes.slice(:external_ref)
-      context.sms_log.update(attributes)
+      context.sms_log.update(attributes.merge(status: :sent))
     end
 
     def create_sms_log(sms_options)

data/app/models/spree_cm_commissioner/guest.rb

@@ -51,7 +51,8 @@ module SpreeCmCommissioner
     preference :telegram_user_verified_at, :string
 
     before_validation :set_event_id
-    before_validation :assign_seat_number, if: -> { bib_number.present? }
+    before_validation :assign_seat_number_with_bib, if: -> { bib_number.present? }
+    before_validation :assign_seat_number_with_block, if: -> { will_save_change_to_block_id? }
 
     before_create :generate_bib, if: -> { line_item.reload && variant.bib_pre_generation_on_create? }
 
@@ -147,13 +148,17 @@ module SpreeCmCommissioner
       self.event_id ||= line_item&.event_id
     end
 
-    def assign_seat_number
+    def assign_seat_number_with_block
+      self.seat_number = block.present? ? block.label : nil
+    end
+
+    def assign_seat_number_with_bib
       return if seat_number.present? # avoid reassign seat to guest
 
-      assign_seat_number!
+      assign_seat_number_with_bib!
     end
 
-    def assign_seat_number!
+    def assign_seat_number_with_bib!
       index = bib_number - 1
       positions = line_item.variant.seat_number_positions || []
 

data/app/models/spree_cm_commissioner/line_item_decorator.rb

@@ -29,6 +29,7 @@ module SpreeCmCommissioner
       base.before_create :add_due_date, if: :subscription?
 
       base.validate :ensure_not_exceed_max_quantity_per_order, if: -> { variant&.max_quantity_per_order.present? }
+      base.validate :ensure_all_guests_have_blocks, if: -> { variant&.blocks&.any? }
 
       base.whitelisted_ransackable_associations |= %w[guests order]
       base.whitelisted_ransackable_attributes |= %w[number to_date from_date vendor_id]
@@ -217,7 +218,13 @@ module SpreeCmCommissioner
     private
 
     def ensure_not_exceed_max_quantity_per_order
-      errors.add(:quantity, 'exceeded_max_quantity_per_order') if quantity > variant.max_quantity_per_order
+      errors.add(:quantity, I18n.t('line_item.validation.exceeded_max_quantity_per_order')) if quantity > variant.max_quantity_per_order
+    end
+
+    def ensure_all_guests_have_blocks
+      return if number_of_guests == guests.map(&:block_id).compact.uniq.size
+
+      errors.add(:base, I18n.t('line_item.validation.seats_are_required'))
     end
 
     def update_vendor_id

data/app/models/spree_cm_commissioner/sms_log.rb

@@ -2,5 +2,7 @@ require_dependency 'spree_cm_commissioner'
 
 module SpreeCmCommissioner
   class SmsLog < ApplicationRecord
+    enum send_type: { otp: 0 }
+    enum status: { queued: 0, sent: 1, failed: 2 }
   end
 end

data/config/initializers/spree_permitted_attributes.rb

@@ -2,11 +2,13 @@ module Spree
   module PermittedAttributes
     @@vendor_attributes << :logo
 
+    # Permitted all guest attributes for now as permitting only some guest attributes is not working by design
+    # of spree add_item service, if we want to only permit some guest attributes,
+    # we need to override most part of add_item service.
     @@line_item_attributes += %i[
       from_date
       to_date
-      line_item_seats_attributes
-      date
+      guests_attributes
     ]
 
     @@user_attributes += %i[

data/config/locales/en.yml

@@ -49,16 +49,16 @@ en:
     empty_info: "No vendor information available."
 
   telegram_bot:
-      empty_info: "No <b>Telegram Bot</b> found"
+    empty_info: "No <b>Telegram Bot</b> found"
 
   guest_card_classes:
     empty_info: "No guest card classes information available."
     background_image: "Background Image"
   guest_dynamic_field:
-      errors:
-        pre_registration_required: "is required before ticket issuance"
-        post_registration_required: "must be completed after purchase"
-        during_check_in_required: "is required during check-in"
+    errors:
+      pre_registration_required: "is required before ticket issuance"
+      post_registration_required: "must be completed after purchase"
+      during_check_in_required: "is required during check-in"
   google_wallet:
     note: "Click <b>Create</b> or <b> Update</b> to connect to Google Wallet after filled all information "
     google_wallet_class_created: "Google Wallet class created successfully."
@@ -105,6 +105,12 @@ en:
       out_of_stock: "%{variant_name} is out of stock"
     product_kind_option_types:
       empty_info: "<b>Note:</b> Set service option types to service first. To edit, go to <b>Details</b> tab > <b>Option Types</b>"
+
+  line_item:
+    validation:
+      exceeded_max_quantity_per_order: "Exceeded maximum quantity per order"
+      seats_are_required: "Seats are required for all guests"
+
   vectors:
     icons:
       info_rules: 'Only allow <b>%{allow_extensions}</b> files. Icons are stored inside "images/" folder, eg. app/assets/images/backend-adjust.svg.'
@@ -152,8 +158,8 @@ en:
   orders:
     total: "Total: %{orders_count} invoices"
     update_order_status:
-      success: 'Order Status update successfully'
-      fail: 'Order Status fail to update '
+      success: "Order Status update successfully"
+      fail: "Order Status fail to update "
 
   account_deletion:
     title:
@@ -193,7 +199,7 @@ en:
     send_failed_or_method_not_support: "Send failed or method not support"
     subscribe: "Use Service"
     full_name: "name"
-    store_credits: 'Credits'
+    store_credits: "Credits"
     address: "Address"
     billing_address: "Billing Address"
     shipping_address: "Shipping Address"
@@ -280,9 +286,9 @@ en:
       match_any: "Some line items must from selected age group"
       match_all: "All line items must from selected age group"
     billing:
-      six_month_discount: '6 Months discount'
+      six_month_discount: "6 Months discount"
       twelve_month_discount: "12 Months discount"
-      penalty_rate: 'Penalty Rate in %'
+      penalty_rate: "Penalty Rate in %"
       penalty_label: "Penalty Label"
       customer_id: "Customer ID"
       subscription:
@@ -343,11 +349,11 @@ en:
           fails: "Invoice for this month is already exist "
         customers: "Customers"
         apply_promotion:
-         success: "Promotion Created"
-         fails: "Promotion Creation Failed"
+          success: "Promotion Created"
+          fails: "Promotion Creation Failed"
         delete_promotion:
-         success: "Promotion deleted"
-         fails: "Promotion Deletion Failed"
+          success: "Promotion deleted"
+          fails: "Promotion Deletion Failed"
       service_start_date: "Service Start Date"
       export: "Export"
       select_year: "Select Year"
@@ -602,30 +608,29 @@ en:
 
   variant_availability:
     item_available_instock: Only 1 item available in stock.
-    items_available_instock:  Only %{available_quantity} items available in stock.
-    items_out_of_stock:  Item out of Stock.
+    items_available_instock: Only %{available_quantity} items available in stock.
+    items_out_of_stock: Item out of Stock.
 
   account_link:
     failure: "Failed to link your %{identity_type} account: %{reason}"
   s3:
     image:
       upload:
-        fail: 'Failed to fetch the image'
-        not_found: 'Image not found'
+        fail: "Failed to fetch the image"
+        not_found: "Image not found"
   amenity:
     update_success: Option Type updated successfully.
   user_roles_assigner:
-    user_not_found: 'User not found'
-    roles_empty: 'Roles are empty'
-    roles_required: 'Roles are required'
-    user_already_assigned: 'User already assigned to this vendor'
+    user_not_found: "User not found"
+    roles_empty: "Roles are empty"
+    roles_required: "Roles are required"
+    user_already_assigned: "User already assigned to this vendor"
   invite:
-    url_not_found: 'Invite link not found or have been expired'
-    accept_fail: 'Failed to accept invite'
-    url_expired: 'Invitation link is expired'
-    already_invited: 'Failed: User already invited to event'
-    update_fail: 'Failed: to Update invite user'
+    url_not_found: "Invite link not found or have been expired"
+    accept_fail: "Failed to accept invite"
+    url_expired: "Invitation link is expired"
+    already_invited: "Failed: User already invited to event"
+    update_fail: "Failed: to Update invite user"
   event_blazer_queries:
-    success: 'Event saved Successfully'
-    fail: 'Event already saved'
-
+    success: "Event saved Successfully"
+    fail: "Event already saved"

data/config/locales/km.yml

@@ -55,7 +55,7 @@ km:
     empty_info: "មិនមានព័ត៌មានអំពីអ្នកលក់ទេ"
 
   telegram_bot:
-      empty_info: "No <b>Telegram Bot</b> found"
+    empty_info: "No <b>Telegram Bot</b> found"
 
   guest_card_classes:
     empty_info: "មិនមានព័ត៌មានអំពីកាតភ្ញៀវទេ"
@@ -97,6 +97,11 @@ km:
     product_kind_option_types:
       empty_info: "<b>ចំណាំ:</b> កំណត់ប្រភេទសម្រាប់ផលិតផល. ដើម្បីកែប្រែ, សូមចូលទៅ <b>លម្អិត</b> tab > <b>ប្រភេទ</b>"
 
+  line_item:
+    validation:
+      exceeded_max_quantity_per_order: "លើសពីបរិមាណអតិបរមាក្នុងមួយការបញ្ជាទិញ"
+      seats_are_required: "ត្រូវការលេខកៅអីសម្រាប់ភ្ញៀវទាំងអស់"
+
   subscription:
     validation:
       out_of_range: "Subscription date is out of range."
@@ -174,7 +179,7 @@ km:
     send_failed_or_method_not_support: "Send failed or method not support"
     subscribe: "ប្រើសេវាកម្ម"
     full_name: "ឈ្មោះពេញ"
-    store_credits: 'Credits'
+    store_credits: "Credits"
     address: "អាសយដ្ឋាន"
     billing_address: "អាសយដ្ឋានទូទាត់"
     shipping_address: "អាសយដ្ឋានប្រើ​ប្រាស់"
@@ -252,9 +257,9 @@ km:
       match_any: "Some line items must from selected age group"
       match_all: "All line items must from selected age group"
     billing:
-      six_month_discount: 'Six Month discount'
+      six_month_discount: "Six Month discount"
       twelve_month_discount: "Twelve Month discount"
-      penalty_rate: 'ការផាកពិន័យគិតជាភាគរយ'
+      penalty_rate: "ការផាកពិន័យគិតជាភាគរយ"
       code: "code"
       name: "name"
       logo: "logo"
@@ -400,29 +405,29 @@ km:
 
   variant_availability:
     item_available_instock: ទំនិញក្នុងស្តុកមានតែ 1 ប៉ុណ្ណោះ
-    items_available_instock:  ទំនិញក្នុងស្តុកមានតែ %{available_quantity} ប៉ុណ្ណោះ
-    items_out_of_stock:  ទំនិញអស់ពីស្តុក
+    items_available_instock: ទំនិញក្នុងស្តុកមានតែ %{available_quantity} ប៉ុណ្ណោះ
+    items_out_of_stock: ទំនិញអស់ពីស្តុក
 
   account_link:
     failure: "បរាជ័យក្នុងការភ្ជាប់គណនី %{identity_type}: %{reason}"
   s3:
     image:
       upload:
-        fail: 'បានបរាជ័យក្នុងការទាញយករូបភាព'
-        not_found: 'រកមិនឃើញរូបភាព'
+        fail: "បានបរាជ័យក្នុងការទាញយករូបភាព"
+        not_found: "រកមិនឃើញរូបភាព"
   user_roles_assigner:
-    user_not_found: 'រកមិនឃើញអ្នកប្រើប្រាស់'
-    roles_empty: 'តួនាទីគឺទទេ'
-    roles_required: 'តួនាទីត្រូវបានទាមទារ'
-    user_already_assigned: 'អ្នកប្រើប្រាស់បានបង្កើតតួនាទីរួចហើយ'
+    user_not_found: "រកមិនឃើញអ្នកប្រើប្រាស់"
+    roles_empty: "តួនាទីគឺទទេ"
+    roles_required: "តួនាទីត្រូវបានទាមទារ"
+    user_already_assigned: "អ្នកប្រើប្រាស់បានបង្កើតតួនាទីរួចហើយ"
 
   invite:
-    url_not_found: 'រកមិនឃើញតំណអញ្ជើញ ឬផុតកំណត់ហើយ'
-    accept_fail: 'បរាជ័យក្នុងការទទួលយកការអញ្ជើញ'
-    url_expired: 'តំណ​អញ្ជើញ​បាន​ផុត​កំណត់'
-    already_invited: 'បរាជ័យ៖ អ្នកប្រើប្រាស់បានអញ្ជើញចូលរួមព្រឹត្តិការណ៍រួចហើយ'
-    update_fail: 'បរាជ័យ៖ ធ្វើបច្ចុប្បន្នភាពអ្នកប្រើប្រាស់អញ្ជើញ'
+    url_not_found: "រកមិនឃើញតំណអញ្ជើញ ឬផុតកំណត់ហើយ"
+    accept_fail: "បរាជ័យក្នុងការទទួលយកការអញ្ជើញ"
+    url_expired: "តំណ​អញ្ជើញ​បាន​ផុត​កំណត់"
+    already_invited: "បរាជ័យ៖ អ្នកប្រើប្រាស់បានអញ្ជើញចូលរួមព្រឹត្តិការណ៍រួចហើយ"
+    update_fail: "បរាជ័យ៖ ធ្វើបច្ចុប្បន្នភាពអ្នកប្រើប្រាស់អញ្ជើញ"
 
   event_blazer_queries:
-    success: 'បានរក្សាទុកព្រឹត្តិការណ៍ដោយជោគជ័យ'
-    fail: 'បានរក្សាទុកព្រឹត្តិការណ៍រួចហើយs'
+    success: "បានរក្សាទុកព្រឹត្តិការណ៍ដោយជោគជ័យ"
+    fail: "បានរក្សាទុកព្រឹត្តិការណ៍រួចហើយs"

data/db/migrate/20250912084944_add_send_type_to_sms_log.rb

@@ -0,0 +1,9 @@
+class AddSendTypeToSmsLog < ActiveRecord::Migration[7.0]
+  def change
+      add_column :cm_sms_logs, :send_type, :integer, default: 0, null: false, if_not_exists: true
+      add_index :cm_sms_logs, :from_number, if_not_exists: true
+      if column_exists?(:cm_sms_logs, :status)
+        change_column_null :cm_sms_logs, :status, false, 0
+      end
+  end
+end

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.1.4-pre2'.freeze
+  VERSION = '2.1.5-pre3'.freeze
 
   module_function
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.1.4.pre.pre2
+  version: 2.1.5.pre.pre3
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-12 00:00:00.000000000 Z
+date: 2025-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree
@@ -2743,6 +2743,7 @@ files:
 - db/migrate/20250911100835_add_variant_id_to_cm_blocks.rb
 - db/migrate/20250911174607_add_metadata_columns_to_cm_vehicles.rb
 - db/migrate/20250911174653_add_metadata_columns_to_cm_trips.rb
+- db/migrate/20250912084944_add_send_type_to_sms_log.rb
 - docker-compose.yml
 - docs/option_types/attr_types.md
 - docs/private_key.pem