spree_cm_commissioner 2.8.7.pre.pre1 → 2.8.7.pre.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 423377b68ab98a03dc1b8c6cf94df82ed330255cd5b5249e6fbd3efd97507e96
-  data.tar.gz: ced4f7bb4506a6d0652a305cba71c57b117328a5e3b7a55a7cdeb3755aa4d057
+  metadata.gz: 5f8d7b76d756c273ceb72a1549b5ecd5b0226957d7e126c534eb6a0823658a13
+  data.tar.gz: d191fab60ac9d96c42677d0190a2a0f5546e98febe9c7fd72587874c0310a62c
 SHA512:
-  metadata.gz: 41d86b9d82bbc702c8a04bff0b474c1daebbfed2cf0b0bb8b50fa8ee56358930e0cd98899d936f394ca005e62f93c92bfe8fc6cd8cbdf6d90e6db885c5a14d8e
-  data.tar.gz: ba9caa729146ca74e0ac1155f48ca54fa7baec727ffbf6d6ce591c872cf97688baa5b9efc7dcc1ef3e9b288ba1ea506c1d8b74b79e6e1a0cc236421fcdbdb004
+  metadata.gz: 4b75b6d9677233ba25b3bce1f7c36629b63304486e1c90e05d89cbb38c6b4d5a065709b9fcb85ddfb50cc95f2d3c2965f02c86127fbf84d0373277f52420bba8
+  data.tar.gz: 5241b014525d37014ba84baae757d9738de28bca55b71542d68745a710c58593138f66ba3f4e11653da6bf2e48df76f17b2938f389756eba6fdc486e713d6d7e

data/Gemfile.lock

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

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

@@ -9,6 +9,7 @@ module Spree
         q['s'] ||= 'created_at desc'
         q['created_at_gt'] = parse_time_or_nil(q['created_at_gt'], :beginning_of_day) if q['created_at_gt'].present?
         q['created_at_lt'] = parse_time_or_nil(q['created_at_lt'], :end_of_day) if q['created_at_lt'].present?
+        normalize_enum_filters!(q)
 
         @search = scope.ransack(q)
         result_scope = @search.result(distinct: true)
@@ -18,7 +19,11 @@ module Spree
                  .page(params[:page])
                  .per(params[:per_page] || Spree::Backend::Config[:admin_orders_per_page])
 
-        @status_counts = result_scope.reorder(nil).group(:status).count
+        # Status tab counts must reflect every other filter but NOT the status filter, so
+        # each tab shows how many holds it would return (otherwise selecting one status
+        # zeroes out all the other tabs).
+        @status_counts = scope.ransack(q.except('status_eq')).result(distinct: true)
+                              .reorder(nil).group(:status).count
       end
 
       def release
@@ -44,6 +49,20 @@ module Spree
 
       private
 
+      # `status` and `release_reason` are integer-backed enums. Ransack casts a string
+      # value for an integer column with String#to_i, so "payment_locked" becomes 0
+      # (== :pending) and every label silently filters to the wrong status. Translate
+      # enum labels to their stored integer before searching.
+      def normalize_enum_filters!(query)
+        {
+          'status_eq' => SpreeCmCommissioner::InventoryHold.statuses,
+          'release_reason_eq' => SpreeCmCommissioner::InventoryHold.release_reasons
+        }.each do |key, mapping|
+          value = query[key]
+          query[key] = mapping[value.to_s] if value.present? && mapping.key?(value.to_s)
+        end
+      end
+
       def back_params
         raw_params = params[:back_params].presence || params
         ActionController::Parameters.new(raw_params).permit(:page, :per_page, q: {})

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

@@ -30,13 +30,18 @@ module Spree
           private
 
           def collection
+            # WARNING: Do NOT remove .order(id: :desc).
+            # Mobile relies on this ordering for paginated order_histories.
+            # Removing it will cause mobile to paginate by oldest records first (last 10 oldest),
+            # breaking the "most recent orders" display on the order history screen.
+            # It related to user cancel or complete order flow, which relies on the most recent orders being returned first.
             if spree_current_user.present?
-              spree_current_user.orders.not_archived
+              spree_current_user.orders.not_archived.order(id: :desc)
             else
               order_tokens = Array(params[:order_tokens])
               return Spree::Order.none if order_tokens.empty?
 
-              Spree::Order.not_archived.without_user.where(token: order_tokens)
+              Spree::Order.not_archived.without_user.where(token: order_tokens).order(id: :desc)
             end
           end
 

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

@@ -37,13 +37,18 @@ module Spree
           end
 
           def collection
+            # WARNING: Do NOT remove .order(id: :desc).
+            # Mobile relies on this ordering for paginated order_histories.
+            # Removing it will cause mobile to paginate by oldest records first (last 10 oldest),
+            # breaking the "most recent orders" display on the order history screen.
+            # It related to user cancel or complete order flow, which relies on the most recent orders being returned first.
             if spree_current_user.present?
-              spree_current_user.orders.not_archived
+              spree_current_user.orders.not_archived.order(id: :desc)
             else
               order_tokens = Array(params[:order_tokens])
               return Spree::Order.none if order_tokens.empty?
 
-              Spree::Order.not_archived.without_user.where(token: order_tokens)
+              Spree::Order.not_archived.without_user.where(token: order_tokens).order(id: :desc)
             end
           end
 

data/app/mailers/spree/order_mailer_decorator.rb

@@ -33,6 +33,7 @@ module Spree
         @brand_color = @order.tenant.preferred_brand_primary_color
       end
       @product_type = @order.products.first&.product_type || 'accommodation'
+      @is_email = true
 
       subject = build_subject(resend)
 
@@ -86,6 +87,7 @@ module Spree
 
       @current_store = @order.store
       @product_type = @line_item.product_type
+      @is_email = true
 
       subject = "#{@current_store&.name} Booking Confirmation ##{@order.number}"
 

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

@@ -1,7 +1,7 @@
 # Make sure to put this concern below other concern or methods that generating additional order info like guests, seat number, etc.
 # This will ensure that when each notification is sent with neccessary data.
 module SpreeCmCommissioner
-  module OrderStateMachine
+  module OrderStateMachine # rubocop:disable Metrics/ModuleLength
     extend ActiveSupport::Concern
 
     included do # rubocop:disable Metrics/BlockLength
@@ -273,7 +273,18 @@ module SpreeCmCommissioner
 
     def send_order_request_telegram_confirmation_alert_to_vendor; end
 
+    # Telegram order alerts are sent unless EVERY purchased product opts out.
+    # Default is true (see product_decorator), so existing orders are unaffected.
+    # Checked at enqueue time so disabled products create no telegram jobs at all.
+    def telegram_alert_enabled?
+      return @telegram_alert_enabled if defined?(@telegram_alert_enabled)
+
+      @telegram_alert_enabled = line_items.any?(&:enable_telegram_alert?)
+    end
+
     def send_order_complete_telegram_alert_to_vendors
+      return unless telegram_alert_enabled?
+
       vendor_list.each do |vendor|
         title = '🎫 --- [NEW ORDER FROM BOOKME+] ---'
         chat_id = vendor.preferred_telegram_chat_id
@@ -289,6 +300,8 @@ module SpreeCmCommissioner
     end
 
     def notify_order_complete_telegram_notification_to_user
+      return unless telegram_alert_enabled?
+
       SpreeCmCommissioner::OrderCompleteTelegramSenderJob.perform_later(order_id: id) if user_id.present?
     end
 
@@ -305,6 +318,8 @@ module SpreeCmCommissioner
     end
 
     def send_order_requested_telegram_alert_to_store
+      return unless telegram_alert_enabled?
+
       title = '🔔 --- [NEW REQUESTED BY USER] ---'
       chat_id = store.preferred_telegram_order_request_alert_chat_id
       factory = OrderTelegramMessageFactory.new(title: title, order: self)
@@ -312,6 +327,8 @@ module SpreeCmCommissioner
     end
 
     def send_order_accepted_telegram_alert_to_store
+      return unless telegram_alert_enabled?
+
       title = '✅ --- [ORDER ACCEPTED BY VENDOR] ---'
       chat_id = store.preferred_telegram_order_request_alert_chat_id
       factory = OrderTelegramMessageFactory.new(title: title, order: self)
@@ -319,6 +336,8 @@ module SpreeCmCommissioner
     end
 
     def send_order_rejected_telegram_alert_to_store
+      return unless telegram_alert_enabled?
+
       title = '❌ --- [ORDER REJECTED BY VENDOR] ---'
       chat_id = store.preferred_telegram_order_request_alert_chat_id
       factory = OrderTelegramMessageFactory.new(title: title, order: self)
@@ -327,6 +346,7 @@ module SpreeCmCommissioner
 
     def run_order_complete_alerts
       return unless ENV['ORDER_INTEGRITY_TELEGRAM_ALERT_ENABLED'] == 'yes'
+      return unless telegram_alert_enabled?
 
       # Allow async payment processors time to settle before checking for alerts
       SpreeCmCommissioner::TelegramAlerts::OrderIntegrityCheckJob
@@ -335,6 +355,8 @@ module SpreeCmCommissioner
     end
 
     def send_order_complete_telegram_alert_to_store
+      return unless telegram_alert_enabled?
+
       title = '🎫 --- [NEW ORDER] ---'
       chat_id = store.preferred_telegram_order_alert_chat_id
       factory = OrderTelegramMessageFactory.new(title: title, order: self)

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

@@ -11,6 +11,8 @@ module SpreeCmCommissioner
                :allow_self_check_in?,
                :required_self_check_in_location,
                :required_self_check_in_location?,
+               :enable_telegram_alert,
+               :enable_telegram_alert?,
                to: :product
     end
   end

data/app/models/spree_cm_commissioner/product_decorator.rb

@@ -132,6 +132,7 @@ module SpreeCmCommissioner
 
       base.store_public_metadata :open_dated_validity_days, :integer, default: 90
       base.store_public_metadata :enable_inventory_hold, :boolean, default: false
+      base.store_public_metadata :enable_telegram_alert, :boolean, default: true
 
       base.store_private_metadata :advertise_weight, :integer, default: 1
       base.store_private_metadata :video_url, :string

data/app/overrides/spree/admin/orders/_search/payment_number_search_field.html.erb.deface

@@ -0,0 +1,8 @@
+<!-- insert_after ".date-range-filter" -->
+
+<div class="col-12 col-lg-4">
+  <div class="form-group">
+    <%= label_tag :q_payments_number_cont, 'Payment Number' %>
+    <%= f.text_field :payments_number_cont, class: 'form-control' %>
+  </div>
+</div>

data/app/overrides/spree/admin/products/_form/enable_telegram_alert.html.erb.deface

@@ -0,0 +1,14 @@
+<!-- insert_after "[data-hook='admin_product_form_promotionable']" -->
+
+<div>
+  <%= f.field_container :enable_telegram_alert do %>
+    <%= f.label :enable_telegram_alert do %>
+      <%= f.check_box :enable_telegram_alert %>
+      <%= Spree.t(:enable_telegram_alert) %>
+    <% end %>
+    <small class="form-text text-muted">
+      When enabled, Telegram order alerts are sent for this product. Turn off for
+      high-volume products to avoid flooding Telegram with order notifications.
+    </small>
+  <% end %>
+</div>

data/app/services/spree_cm_commissioner/cart/add_guest.rb

@@ -13,9 +13,23 @@ module SpreeCmCommissioner
           create_blank_guest(line_item)
           increase_quantity(line_item) if should_increase_quantity?(line_item)
           recalculate_cart(order, line_item)
-
-          success(order: order, line_item: line_item)
         end
+
+        success(order: order, line_item: line_item)
+      rescue ActiveRecord::RecordInvalid => e
+        # Convert ONLY the out-of-stock failure into a failure result. The stock validator
+        # tags its error with the type :selected_quantity_not_available (see
+        # Spree::Stock::AvailabilityValidator), so we match on that type rather than on any
+        # RecordInvalid. The raise rolls back the lock transaction (so the blank guest is
+        # not persisted); returning it as a failure lets the caller render the overridden
+        # availability message instead of a 500.
+        #
+        # Anything else a different line item validation, or an invalid order/shipment
+        # raised by recalculate_cart is re-raised so genuine backend errors are not
+        # masked behind an empty quantity error.
+        raise unless e.record == line_item && e.record.errors.of_kind?(:quantity, :selected_quantity_not_available)
+
+        failure(e.record)
       end
 
       private

data/app/views/spree_cm_commissioner/order_mailer/purchased_items/_items.html.erb

@@ -61,15 +61,18 @@
               <% end %>
             </td>
           </tr>
-          <tr>
-            <td></td>
-            <td align="left" style="padding-top:6px;">
-              <%= link_to(
-                raw('<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" style="display: inline-block; vertical-align: middle; margin-right: 8px;"><rect width="5" height="5" x="3" y="3" rx="1"/><rect width="5" height="5" x="16" y="3" rx="1"/><rect width="5" height="5" x="3" y="16" rx="1"/><path d="M21 16h-3a2 2 0 0 0-2 2v3"/><path d="M21 21v.01"/><path d="M12 7v3a2 2 0 0 1-2 2H7"/><path d="M3 12h.01"/><path d="M12 3h.01"/><path d="M12 16v.01"/><path d="M16 12h1"/><path d="M21 12v.01"/><path d="M12 21v-1"/></svg> View Your Digital Ticket'),
-                custom_product_line_item_url(line_item), class: "btn-primary", target: :_blank
-              ) %>
-            </td>
-          </tr>
+          <%# In the email only, hide the ticket link for app-only products. %>
+          <% unless @is_email && line_item&.product&.purchasable_on_app? %>
+            <tr>
+              <td></td>
+              <td align="left" style="padding-top:6px;">
+                <%= link_to(
+                  raw('<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" style="display: inline-block; vertical-align: middle; margin-right: 8px;"><rect width="5" height="5" x="3" y="3" rx="1"/><rect width="5" height="5" x="16" y="3" rx="1"/><rect width="5" height="5" x="3" y="16" rx="1"/><path d="M21 16h-3a2 2 0 0 0-2 2v3"/><path d="M21 21v.01"/><path d="M12 7v3a2 2 0 0 1-2 2H7"/><path d="M3 12h.01"/><path d="M12 3h.01"/><path d="M12 16v.01"/><path d="M16 12h1"/><path d="M21 12v.01"/><path d="M12 21v-1"/></svg> View Your Digital Ticket'),
+                  custom_product_line_item_url(line_item), class: "btn-primary", target: :_blank
+                ) %>
+              </td>
+            </tr>
+          <% end %>
         </table>
       </td>
     </tr>

data/config/initializers/spree_permitted_attributes.rb

@@ -6,6 +6,9 @@ module Spree
     @@vendor_attributes << :logo
     @@vendor_attributes << :service_origin_id
 
+    # store_accessor key (public_metadata), not a DB column, so it must be permitted explicitly
+    @@product_attributes << :enable_telegram_alert unless @@product_attributes.include?(:enable_telegram_alert)
+
     # 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.

data/config/locales/en.yml

@@ -220,6 +220,7 @@ en:
       reversion_error: "Cannot eliminate here yet. This contestant appears in a later session."
     is_open_dated: "Is Open Dated Trip?"
     description: "Description"
+    enable_telegram_alert: Enable Telegram Alert
     registered_by:
       system_registered: "System Registered"
       self_registered: "Self Registered"
@@ -417,6 +418,9 @@ en:
       zero: "Rooms are not available on %{date}"
       one: "Only 1 room available on %{date}"
       other: "Only %{count} rooms available on %{date}"
+    # Overrides Spree core's "selected of %{item} is not available." Must stay under
+    # `spree:` -- Spree::Stock::AvailabilityValidator looks it up as Spree.t(:selected_quantity_not_available).
+    selected_quantity_not_available: "Not enough %{item} are available for the quantity you selected. Please try again."
     auto_apply: "Auto apply"
     auto_apply_info: "Path & code will be removed"
     transit:
@@ -740,7 +744,7 @@ en:
   inventory_hold:
     acquire:
       success: "Item reserved for %{minutes} minutes"
-      insufficient_stock: "Sorry, this item is no longer available."
+      insufficient_stock: "Some items in your cart are currently held by another customer or no longer available. Please update your cart or try again shortly."
       limit_exceeded: "You have too many pending reservations. Please complete or cancel a reservation before trying another."
       system_error: "We encountered an issue reserving this item. Please try again."
       lock_timeout: "Another reservation is in progress for this order. Please wait and try again."

data/config/locales/km.yml

@@ -359,6 +359,7 @@ km:
         unknown: "មិនស្គាល់"
     upsupported_payment: "មិនស្គាល់ការបង់ប្រាក់"
     selected_item_not_available_on_date: "Selected item not available on %{date}"
+    selected_quantity_not_available: "%{item} នៅសល់តិចជាងការអ្នកស្នើសុំរបស់អ្នក ឬអស់ពីស្តុក សូមព្យាយាមម្ដងទៀត។"
     auto_apply: "ដាក់ប្រើដោយស្វ័យប្រវត្តិ"
     auto_apply_info: "Path & code will be removed"
     device_tokens: "Device Tokens"
@@ -538,7 +539,7 @@ km:
   inventory_hold:
     acquire:
       success: "ទំនិញត្រូវបានកក់រយៈពេល %{minutes} នាទី"
-      insufficient_stock: "សុំទោស! ទំនិញមិនមានស្តុកគ្រប់គ្រាន់សម្រាប់ការកក់របស់អ្នកទេ។"
+      insufficient_stock: "ទំនិញមួយចំនួននៅក្នុងកន្ត្រករបស់អ្នកកំពុងត្រូវបានកក់ដោយអតិថិជនផ្សេងទៀត ឬលែងមានស្តុក។ សូមកែប្រែកន្ត្រករបស់អ្នក ឬព្យាយាមម្តងទៀតក្នុងពេលបន្តិចទៀត។"
       limit_exceeded: "អ្នកមានការកក់ដែលរង់ចាំច្រើនពេក។ សូមបញ្ចប់ ឬលុបការកក់មួយមុនពេលព្យាយាមវិញ។"
       system_error: "មានបញ្ហាក្នុងការកក់ទំនិញនេះ។ សូមព្យាយាមម្តងទៀត។"
       lock_timeout: "កំពុងកក់សម្រាប់ការបញ្ជាទិញនេះ។ សូមរង់ចាំ ហើយព្យាយាមម្តងទៀត។"

data/lib/spree_cm_commissioner/version.rb

@@ -1,5 +1,5 @@
 module SpreeCmCommissioner
-  VERSION = '2.8.7.pre.pre1'.freeze
+  VERSION = '2.8.7.pre.pre2'.freeze
 
   module_function
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_cm_commissioner
 version: !ruby/object:Gem::Version
-  version: 2.8.7.pre.pre1
+  version: 2.8.7.pre.pre2
 platform: ruby
 authors:
 - You
@@ -1779,6 +1779,7 @@ files:
 - app/overrides/spree/admin/orders/_search/intel_phone_number_search_field.html.erb.deface
 - app/overrides/spree/admin/orders/_search/line_item_number_search_field.html.erb.deface
 - app/overrides/spree/admin/orders/_search/payment_method_search_field.html.erb.deface
+- app/overrides/spree/admin/orders/_search/payment_number_search_field.html.erb.deface
 - app/overrides/spree/admin/orders/_search/vendor_search_field.html.erb.deface
 - app/overrides/spree/admin/orders/customer_details/_form/phone_number_field.html.erb.deface
 - app/overrides/spree/admin/payment_methods/_form/display_on_field.html.erb.deface
@@ -1791,6 +1792,7 @@ files:
 - app/overrides/spree/admin/products/_form/available_on.html.erb.deface
 - app/overrides/spree/admin/products/_form/discontinue_on.html.erb.deface
 - app/overrides/spree/admin/products/_form/enable_inventory_hold.html.erb.deface
+- app/overrides/spree/admin/products/_form/enable_telegram_alert.html.erb.deface
 - app/overrides/spree/admin/products/_form/industry_taxons.html.erb.deface
 - app/overrides/spree/admin/products/_form/need_confirmation_checkbox.html.erb.deface
 - app/overrides/spree/admin/products/_form/option_types.html.erb.deface