fix: update expected order ID format for second chance emails and improve template variables

Author: vegimcarkaxhija

Model/SecondChanceRepository.php

@@ -524,10 +524,14 @@ public function getSecondChanceCollection($step, $store)
                 }
 
                 // Calculate and store the expected order ID before sending email
-                $expectedOrderId = $this->setAvailableIncrementId($item->getOrderId(), $order);
-                if ($expectedOrderId) {
-                    $item->setLastOrderId($expectedOrderId);
-                }
+                // For step 1: Always use -1 suffix (first reminder)
+                // For step 2: Always use -2 suffix (second reminder)
+                // This makes it easy for customer support to identify which email led to the order
+                $suffix = ($step == 1) ? '-1' : '-2';
+                $expectedOrderId = $item->getOrderId() . $suffix;
+                
+                // Store it so when customer clicks, we use the same ID
+                $item->setLastOrderId($expectedOrderId);
 
                 // Send email
                 $this->sendMail($order, $item, $step);
@@ -610,22 +614,34 @@ public function sendMail($order, $secondChance, $step)
             'email' => $senderEmail,
         ];
 
-        // Prepare template variables
+        // Prepare template variables (matching original SecondChance module)
         try {
             $paymentHtml = $this->getPaymentHtml($order);
             $billingAddress = $this->getFormattedBillingAddress($order);
             $shippingAddress = $this->getFormattedShippingAddress($order);
 
             $templateVars = [
                 'order' => $order,
+                'order_id' => $order->getId(),
                 'expected_order_id' => $expectedOrderId ?: $order->getIncrementId(),
+                'billing' => $order->getBillingAddress(),
+                'payment_html' => $paymentHtml,
+                'formattedBillingAddress' => $billingAddress,
+                'formattedShippingAddress' => $shippingAddress,
+                'billing_address' => $billingAddress, // Keep for backward compatibility
+                'shipping_address' => $shippingAddress, // Keep for backward compatibility
                 'checkout_url' => $checkoutUrl,
                 'store' => $store,
+                'created_at_formatted' => $order->getCreatedAtFormatted(2),
+                'secondChanceToken' => $secondChance->getToken(),
                 'customer_name' => $order->getCustomerName(),
                 'customer_email' => $order->getCustomerEmail(),
-                'payment_html' => $paymentHtml,
-                'billing_address' => $billingAddress,
-                'shipping_address' => $shippingAddress,
+                'order_data' => [
+                    'customer_name' => $order->getCustomerName(),
+                    'is_not_virtual' => $order->getIsNotVirtual(),
+                    'email_customer_note' => $order->getEmailCustomerNote(),
+                    'frontend_status_label' => $order->getFrontendStatusLabel()
+                ]
             ];
         } catch (Exception $e) {
             $this->logging->addError('Error preparing template variables: ' . $e->getMessage());

view/frontend/email/buckaroo_second_chance_first.html

@@ -20,14 +20,17 @@
 -->
 <!--@subject {{trans "Complete your order - %store_name" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
-"var billing_address|raw":"Billing Address",
-"var shipping_address|raw":"Shipping Address",
+"var formattedBillingAddress|raw":"Billing Address",
+"var formattedShippingAddress|raw":"Shipping Address",
 "var order.increment_id":"Order Id",
 "var expected_order_id":"Expected Order Id",
+"var order_data.email_customer_note|escape|nl2br":"Email Order Note",
+"layout handle=\"sales_email_order_items\" order_id=$order_id area=\"frontend\"":"Order Items Grid",
 "var payment_html|raw":"Payment Details",
 "var checkout_url":"Checkout URL",
 "var customer_name":"Customer Name",
-"var customer_email":"Customer Email"
+"var customer_email":"Customer Email",
+"var order.getShippingDescription":"Shipping Description"
 } @-->
 
 {{template config_path="design/email/header_template"}}
@@ -59,12 +62,12 @@ <h1>{{trans 'Your Order <span class="no-link">#%increment_id</span>' increment_i
                 <tr>
                     <td class="address-details">
                         <h3>{{trans "Billing Information"}}</h3>
-                        <p>{{var billing_address|raw}}</p>
+                        <p>{{var formattedBillingAddress|raw}}</p>
                     </td>
-                    {{depend shipping_address}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="address-details">
                         <h3>{{trans "Shipping Information"}}</h3>
-                        <p>{{var shipping_address|raw}}</p>
+                        <p>{{var formattedShippingAddress|raw}}</p>
                     </td>
                     {{/depend}}
                 </tr>
@@ -88,19 +91,7 @@ <h3>{{trans "Shipping Method"}}</h3>
                 </a>
             </div>
 
-            <table class="order-items">
-                <thead>
-                    <tr>
-                        <th>{{trans "Product"}}</th>
-                        <th>{{trans "SKU"}}</th>
-                        <th>{{trans "Qty"}}</th>
-                        <th>{{trans "Price"}}</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {{layout handle="sales_email_order_items" order=$order area="frontend"}}
-                </tbody>
-            </table>
+            {{layout handle="sales_email_order_items" order_id=$order_id area="frontend"}}
         </td>
     </tr>
 </table>

view/frontend/email/buckaroo_second_chance_second.html

@@ -20,14 +20,17 @@
 -->
 <!--@subject {{trans "Last chance to complete your order - %store_name" store_name=$store.getFrontendName()}} @-->
 <!--@vars {
-"var billing_address|raw":"Billing Address",
-"var shipping_address|raw":"Shipping Address",
+"var formattedBillingAddress|raw":"Billing Address",
+"var formattedShippingAddress|raw":"Shipping Address",
 "var order.increment_id":"Order Id",
 "var expected_order_id":"Expected Order Id",
+"var order_data.email_customer_note|escape|nl2br":"Email Order Note",
+"layout handle=\"sales_email_order_items\" order_id=$order_id area=\"frontend\"":"Order Items Grid",
 "var payment_html|raw":"Payment Details",
 "var checkout_url":"Checkout URL",
 "var customer_name":"Customer Name",
-"var customer_email":"Customer Email"
+"var customer_email":"Customer Email",
+"var order.getShippingDescription":"Shipping Description"
 } @-->
 
 {{template config_path="design/email/header_template"}}
@@ -59,12 +62,12 @@ <h1 style="color: #d43f00;">{{trans 'Final Notice - Order <span class="no-link">
                 <tr>
                     <td class="address-details">
                         <h3>{{trans "Billing Information"}}</h3>
-                        <p>{{var billing_address|raw}}</p>
+                        <p>{{var formattedBillingAddress|raw}}</p>
                     </td>
-                    {{depend shipping_address}}
+                    {{depend order_data.is_not_virtual}}
                     <td class="address-details">
                         <h3>{{trans "Shipping Information"}}</h3>
-                        <p>{{var shipping_address|raw}}</p>
+                        <p>{{var formattedShippingAddress|raw}}</p>
                     </td>
                     {{/depend}}
                 </tr>
@@ -91,19 +94,7 @@ <h3>{{trans "Shipping Method"}}</h3>
                 </a>
             </div>
 
-            <table class="order-items">
-                <thead>
-                    <tr>
-                        <th>{{trans "Product"}}</th>
-                        <th>{{trans "SKU"}}</th>
-                        <th>{{trans "Qty"}}</th>
-                        <th>{{trans "Price"}}</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {{layout handle="sales_email_order_items" order=$order area="frontend"}}
-                </tbody>
-            </table>
+            {{layout handle="sales_email_order_items" order_id=$order_id area="frontend"}}
 
             <div style="margin-top: 30px; padding: 15px; background-color: #f5f5f5; border-left: 4px solid #1979c3;">
                 <p style="margin: 0; font-style: italic;">