@@ -557,6 +557,7 @@ public function wps_tofw_render_partial_tracking( $order ) {
557557
558558 const wps_tofw_trackingLinks = <?php echo wp_json_encode ( $ wps_tofw_tracking_numbers ); ?> ;
559559 const wps_tofw_productMap = <?php echo wp_json_encode ( $ wps_tofw_products ); ?> ;
560+ const wps_otfw_popup_tracking_page = <?php echo json_encode ( get_option ( 'wps_tofwp_enable_track_order_popup ' ) ); ?> ;
560561
561562 wps_tofw_table.querySelectorAll("tbody tr.woocommerce-table__line-item").forEach(function(wps_tofw_row){
562563 const wps_tofw_productName = wps_tofw_row.querySelector(".woocommerce-table__product-name a")?.innerText.trim();
@@ -566,9 +567,15 @@ public function wps_tofw_render_partial_tracking( $order ) {
566567 wps_tofw_td.className = "tracking-link-col";
567568
568569 if (wps_tofw_productId && wps_tofw_trackingLinks[wps_tofw_productId]) {
569- wps_tofw_td.innerHTML = '<a href="<?php echo esc_url ( home_url ( '/track-your-order/? ' ) ); ?> '
570+ if ( 'on' === wps_otfw_popup_tracking_page ) {
571+ wps_tofw_td.innerHTML = '<a href="<?php echo esc_url ( home_url ( '/track-your-order/? ' ) ); ?> '
572+ + wps_tofw_trackingLinks[wps_tofw_productId]
573+ + '&TB_iframe=true&popup_type=track_order" target="_blank" class="wps-tofw-track-btn thickbox">Track Order</a>';
574+ } else {
575+ wps_tofw_td.innerHTML = '<a href="<?php echo esc_url ( home_url ( '/track-your-order/? ' ) ); ?> '
570576 + wps_tofw_trackingLinks[wps_tofw_productId]
571577 + '" target="_blank" class="wps-tofw-track-btn">Track Order</a>';
578+ }
572579 } else {
573580 wps_tofw_td.textContent = '-';
574581 }
@@ -658,6 +665,8 @@ public function wps_split_parent_into_children( $parent_order_id ) {
658665 $ child ->calculate_totals ( false );
659666 $ child ->add_order_note ( sprintf ( 'Created as child order of #%d for item #%d. ' , $ parent_order_id , $ item_id ) );
660667 $ child ->update_meta_data ( '_wps_is_child_order ' , 'yes ' );
668+ $ child ->update_meta_data ( '_wps_parent_item_id ' , $ item_id );
669+ $ child ->update_meta_data ( '_wps_parent_order_id ' , $ parent_order_id );
661670 $ child ->save ();
662671
663672 $ child_ids [ $ item ->get_product_id () ] = $ child ->get_id ();
0 commit comments