fix: ensure expected order ID is correctly calculated and displayed in emails

Author: vegimcarkaxhija

Model/SecondChanceRepository.php

@@ -415,8 +415,11 @@ public function getSecondChanceByToken($token)
         // Recreate quote with Second Chance suffix
         $order = $this->orderFactory->create()->loadByIncrementId($secondChance->getOrderId());
         if ($order->getId()) {
-            // Find available increment ID with suffix (e.g., orderId-1, orderId-2, etc.)
-            $newOrderId = $this->setAvailableIncrementId($secondChance->getOrderId(), $order);
+            $newOrderId = $secondChance->getLastOrderId();
+
+            if (!$newOrderId) {
+                $newOrderId = $this->setAvailableIncrementId($secondChance->getOrderId(), $order);
+            }
 
             // Recreate the quote
             $quote = $this->quoteRecreate->duplicate($order);
@@ -428,7 +431,8 @@ public function getSecondChanceByToken($token)
                 $this->logging->addDebug('Second Chance: Order ID suffix applied to new quote', [
                     'quote_id' => $quote->getId(),
                     'reserved_order_id' => $newOrderId,
-                    'original_order_id' => $secondChance->getOrderId()
+                    'original_order_id' => $secondChance->getOrderId(),
+                    'was_pre_calculated' => !empty($secondChance->getLastOrderId())
                 ]);
             }
         }
@@ -519,6 +523,12 @@ public function getSecondChanceCollection($step, $store)
                     continue;
                 }
 
+                // Calculate and store the expected order ID before sending email
+                $expectedOrderId = $this->setAvailableIncrementId($item->getOrderId(), $order);
+                if ($expectedOrderId) {
+                    $item->setLastOrderId($expectedOrderId);
+                }
+
                 // Send email
                 $this->sendMail($order, $item, $step);
 
@@ -566,8 +576,16 @@ public function sendMail($order, $secondChance, $step)
             '_scope_to_url' => true
         ]);
 
+        // Get the expected order ID (should be pre-calculated and stored in last_order_id)
+        $expectedOrderId = $secondChance->getLastOrderId();
+        if (!$expectedOrderId) {
+            $expectedOrderId = $this->setAvailableIncrementId($secondChance->getOrderId(), $order);
+        }
+
         $this->logging->addDebug('Second Chance email URL generated', [
             'order_id' => $order->getIncrementId(),
+            'expected_order_id' => $expectedOrderId,
+            'step' => $step,
             'store_id' => $store->getId(),
             'store_code' => $store->getCode(),
             'locale' => $store->getConfig('general/locale/code'),
@@ -600,6 +618,7 @@ public function sendMail($order, $secondChance, $step)
 
             $templateVars = [
                 'order' => $order,
+                'expected_order_id' => $expectedOrderId ?: $order->getIncrementId(),
                 'checkout_url' => $checkoutUrl,
                 'store' => $store,
                 'customer_name' => $order->getCustomerName(),

view/frontend/email/buckaroo_second_chance_first.html

@@ -23,6 +23,7 @@
 "var billing_address|raw":"Billing Address",
 "var shipping_address|raw":"Shipping Address",
 "var order.increment_id":"Order Id",
+"var expected_order_id":"Expected Order Id",
 "var payment_html|raw":"Payment Details",
 "var checkout_url":"Checkout URL",
 "var customer_name":"Customer Name",
@@ -48,7 +49,7 @@
     </tr>
     <tr class="email-summary">
         <td>
-            <h1>{{trans 'Your Order <span class="no-link">#%increment_id</span>' increment_id=$order.increment_id |raw}}</h1>
+            <h1>{{trans 'Your Order <span class="no-link">#%increment_id</span>' increment_id=$expected_order_id |raw}}</h1>
             <p>{{trans 'Order Total: %order_total' order_total=$order.formatPrice($order.getGrandTotal()) |raw}}</p>
         </td>
     </tr>

view/frontend/email/buckaroo_second_chance_second.html

@@ -23,6 +23,7 @@
 "var billing_address|raw":"Billing Address",
 "var shipping_address|raw":"Shipping Address",
 "var order.increment_id":"Order Id",
+"var expected_order_id":"Expected Order Id",
 "var payment_html|raw":"Payment Details",
 "var checkout_url":"Checkout URL",
 "var customer_name":"Customer Name",
@@ -48,7 +49,7 @@
     </tr>
     <tr class="email-summary">
         <td>
-            <h1 style="color: #d43f00;">{{trans 'Final Notice - Order <span class="no-link">#%increment_id</span>' increment_id=$order.increment_id |raw}}</h1>
+            <h1 style="color: #d43f00;">{{trans 'Final Notice - Order <span class="no-link">#%increment_id</span>' increment_id=$expected_order_id |raw}}</h1>
             <p style="font-size: 18px; color: #d43f00; font-weight: bold;">{{trans 'Order Total: %order_total' order_total=$order.formatPrice($order.getGrandTotal()) |raw}}</p>
         </td>
     </tr>