Changeset 3254637
- Timestamp:
- 03/12/2025 09:23:55 AM (13 months ago)
- Location:
- trackship-for-woocommerce
- Files:
-
- 8 edited
-
tags/1.9.1/includes/customizer/assets/customizer.js (modified) (2 diffs)
-
tags/1.9.1/includes/customizer/trackship-customizer.php (modified) (4 diffs)
-
tags/1.9.1/readme.txt (modified) (1 diff)
-
tags/1.9.1/templates/emails/tracking-info.php (modified) (4 diffs)
-
trunk/includes/customizer/assets/customizer.js (modified) (2 diffs)
-
trunk/includes/customizer/trackship-customizer.php (modified) (4 diffs)
-
trunk/readme.txt (modified) (1 diff)
-
trunk/templates/emails/tracking-info.php (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trackship-for-woocommerce/tags/1.9.1/includes/customizer/assets/customizer.js
r3254477 r3254637 233 233 var pend_change = jQuery(".pending_change_event").text(); 234 234 jQuery('.pending_change_event').append(pend_change.includes('&#shipping_provider_logo') ? '' : '&#shipping_provider_logo'); 235 });236 237 jQuery(document).on("change", ".zoremmail-checkbox.ts_last_event", function () {238 if (jQuery(this).prop("checked") == true) {239 jQuery("#tracking_widget_privew").contents().find( '.tracking_widget_last_event' ).show();240 } else {241 jQuery("#tracking_widget_privew").contents().find( '.tracking_widget_last_event' ).hide();242 }243 var pend_change = jQuery(".pending_change_event").text();244 jQuery('.pending_change_event').append(pend_change.includes('&#ts_last_event') ? '' : '&#ts_last_event');245 235 }); 246 236 … … 631 621 change: function(e, ui) { 632 622 var color = ui.color.toString(); 633 jQuery("#tracking_widget_privew").contents().find('div.tracking_index.display-table, div.tracking_index .tracking_widget_bottom , .tracking_widget_last_event' ).css( 'border-color', color );623 jQuery("#tracking_widget_privew").contents().find('div.tracking_index.display-table, div.tracking_index .tracking_widget_bottom' ).css( 'border-color', color ); 634 624 var pend_color = jQuery(".pending_color_event").text(); 635 625 jQuery('.pending_color_event').append(pend_color.includes('&#border_color') ? '' : '&#border_color'); -
trackship-for-woocommerce/tags/1.9.1/includes/customizer/trackship-customizer.php
r3254477 r3254637 284 284 'show_trackship_branding' => 1, 285 285 'shipping_provider_logo' => 1, 286 'ts_last_event' => 0,287 286 // Tracking form's defauls 288 287 'form_tab_view' => 'both', … … 329 328 $show_trackship_branding = $this->get_value( 'shipment_email_settings', 'show_trackship_branding', $status ); 330 329 $shipping_provider_logo = $this->get_value( 'shipment_email_settings', 'shipping_provider_logo', $status ); 331 $ts_last_event = $this->get_value( 'shipment_email_settings', 'ts_last_event', $status );332 330 $reminder_days = $this->get_value( 'shipment_email_settings', 'pickupreminder_days', $status ); 333 331 … … 567 565 'show' => true, 568 566 'class' => 'ts4wc_provider_logo', 569 ),570 'ts_last_event' => array(571 'title' => esc_html__( 'Display latest event', 'trackship-for-woocommerce' ),572 'default' => $ts_last_event,573 'type' => 'checkbox',574 'option_name'=> 'shipment_email_settings',575 'option_type'=> 'array',576 'show' => true,577 'class' => 'ts_last_event',578 567 ), 579 568 // Tracking Page Settings … … 1348 1337 'est_delivery_date' => '2021-07-30 15:28:02', 1349 1338 'shipment_status' => $status, 1350 'last_event' => 'A shipping label has been prepared for your item. A delivery date will be provided when USPS receives the package; contact the shipper or shipping partner with any inquiries.',1351 'last_event_time' => '2021-07-28 18:18:56'1352 1339 ); 1353 1340 } -
trackship-for-woocommerce/tags/1.9.1/readme.txt
r3254477 r3254637 140 140 = 1.9.1 - 2025-03-12 = 141 141 * Enhancement - Added integration with Omnisend. 142 * Enhancement - Shipment status emails now display the latest tracking event.143 142 * Enhancement - Added more filters to TrackShip Shipments for shipment status customization. 144 143 * Fix - Resolved a CSS conflict on the WooCommerce order page. -
trackship-for-woocommerce/tags/1.9.1/templates/emails/tracking-info.php
r3254477 r3254637 21 21 $font_color = trackship_for_woocommerce()->ts_actions->get_option_value_from_array( 'shipment_email_settings', 'font_color', '#333'); 22 22 $shipping_provider_logo = trackship_for_woocommerce()->ts_actions->get_option_value_from_array( 'shipment_email_settings', 'shipping_provider_logo', 1); 23 $ts_last_event = trackship_for_woocommerce()->ts_actions->get_option_value_from_array( 'shipment_email_settings', 'ts_last_event', 0);24 23 $class = $ts4wc_preview ? 'hide' : ''; 25 24 ?> … … 104 103 <?php } ?> 105 104 </div> 106 <?php if ( $shipment_row->last_event ) { ?>107 <div class="tracking_widget_email tracking_widget_last_event <?php echo !$ts_last_event ? esc_attr($class) : ''; ?>">108 <p style="margin:0 0 5px;"><strong><?php echo esc_html( date_i18n( 'F j, Y g:i a', strtotime( $shipment_row->last_event_time ) ) ) ?></strong></p>109 <p class="twe_last_event" style="margin:0"><?php echo $shipment_row->last_event; ?></p>110 </div>111 <?php } ?>112 105 </div> 113 106 <?php } ?> … … 146 139 border-color: <?php echo esc_html( $border_color ); ?>; 147 140 } 148 .tracking_widget_bottom , .tracking_widget_last_event{141 .tracking_widget_bottom { 149 142 border-top: 1px solid <?php echo esc_html( $border_color ); ?>; 150 143 } … … 173 166 .mb-0{margin:0;} 174 167 .v-align-top{vertical-align:top;} 175 .twe_last_event { margin: 0; }176 168 @media screen and (max-width: 460px) { 177 169 .tracking_widget_track_button {width:100%; margin-top: 15px;} -
trackship-for-woocommerce/trunk/includes/customizer/assets/customizer.js
r3254473 r3254637 233 233 var pend_change = jQuery(".pending_change_event").text(); 234 234 jQuery('.pending_change_event').append(pend_change.includes('&#shipping_provider_logo') ? '' : '&#shipping_provider_logo'); 235 });236 237 jQuery(document).on("change", ".zoremmail-checkbox.ts_last_event", function () {238 if (jQuery(this).prop("checked") == true) {239 jQuery("#tracking_widget_privew").contents().find( '.tracking_widget_last_event' ).show();240 } else {241 jQuery("#tracking_widget_privew").contents().find( '.tracking_widget_last_event' ).hide();242 }243 var pend_change = jQuery(".pending_change_event").text();244 jQuery('.pending_change_event').append(pend_change.includes('&#ts_last_event') ? '' : '&#ts_last_event');245 235 }); 246 236 … … 631 621 change: function(e, ui) { 632 622 var color = ui.color.toString(); 633 jQuery("#tracking_widget_privew").contents().find('div.tracking_index.display-table, div.tracking_index .tracking_widget_bottom , .tracking_widget_last_event' ).css( 'border-color', color );623 jQuery("#tracking_widget_privew").contents().find('div.tracking_index.display-table, div.tracking_index .tracking_widget_bottom' ).css( 'border-color', color ); 634 624 var pend_color = jQuery(".pending_color_event").text(); 635 625 jQuery('.pending_color_event').append(pend_color.includes('&#border_color') ? '' : '&#border_color'); -
trackship-for-woocommerce/trunk/includes/customizer/trackship-customizer.php
r3254473 r3254637 284 284 'show_trackship_branding' => 1, 285 285 'shipping_provider_logo' => 1, 286 'ts_last_event' => 0,287 286 // Tracking form's defauls 288 287 'form_tab_view' => 'both', … … 329 328 $show_trackship_branding = $this->get_value( 'shipment_email_settings', 'show_trackship_branding', $status ); 330 329 $shipping_provider_logo = $this->get_value( 'shipment_email_settings', 'shipping_provider_logo', $status ); 331 $ts_last_event = $this->get_value( 'shipment_email_settings', 'ts_last_event', $status );332 330 $reminder_days = $this->get_value( 'shipment_email_settings', 'pickupreminder_days', $status ); 333 331 … … 567 565 'show' => true, 568 566 'class' => 'ts4wc_provider_logo', 569 ),570 'ts_last_event' => array(571 'title' => esc_html__( 'Display latest event', 'trackship-for-woocommerce' ),572 'default' => $ts_last_event,573 'type' => 'checkbox',574 'option_name'=> 'shipment_email_settings',575 'option_type'=> 'array',576 'show' => true,577 'class' => 'ts_last_event',578 567 ), 579 568 // Tracking Page Settings … … 1348 1337 'est_delivery_date' => '2021-07-30 15:28:02', 1349 1338 'shipment_status' => $status, 1350 'last_event' => 'A shipping label has been prepared for your item. A delivery date will be provided when USPS receives the package; contact the shipper or shipping partner with any inquiries.',1351 'last_event_time' => '2021-07-28 18:18:56'1352 1339 ); 1353 1340 } -
trackship-for-woocommerce/trunk/readme.txt
r3254473 r3254637 140 140 = 1.9.1 - 2025-03-12 = 141 141 * Enhancement - Added integration with Omnisend. 142 * Enhancement - Shipment status emails now display the latest tracking event.143 142 * Enhancement - Added more filters to TrackShip Shipments for shipment status customization. 144 143 * Fix - Resolved a CSS conflict on the WooCommerce order page. -
trackship-for-woocommerce/trunk/templates/emails/tracking-info.php
r3254473 r3254637 21 21 $font_color = trackship_for_woocommerce()->ts_actions->get_option_value_from_array( 'shipment_email_settings', 'font_color', '#333'); 22 22 $shipping_provider_logo = trackship_for_woocommerce()->ts_actions->get_option_value_from_array( 'shipment_email_settings', 'shipping_provider_logo', 1); 23 $ts_last_event = trackship_for_woocommerce()->ts_actions->get_option_value_from_array( 'shipment_email_settings', 'ts_last_event', 0);24 23 $class = $ts4wc_preview ? 'hide' : ''; 25 24 ?> … … 104 103 <?php } ?> 105 104 </div> 106 <?php if ( $shipment_row->last_event ) { ?>107 <div class="tracking_widget_email tracking_widget_last_event <?php echo !$ts_last_event ? esc_attr($class) : ''; ?>">108 <p style="margin:0 0 5px;"><strong><?php echo esc_html( date_i18n( 'F j, Y g:i a', strtotime( $shipment_row->last_event_time ) ) ) ?></strong></p>109 <p class="twe_last_event" style="margin:0"><?php echo $shipment_row->last_event; ?></p>110 </div>111 <?php } ?>112 105 </div> 113 106 <?php } ?> … … 146 139 border-color: <?php echo esc_html( $border_color ); ?>; 147 140 } 148 .tracking_widget_bottom , .tracking_widget_last_event{141 .tracking_widget_bottom { 149 142 border-top: 1px solid <?php echo esc_html( $border_color ); ?>; 150 143 } … … 173 166 .mb-0{margin:0;} 174 167 .v-align-top{vertical-align:top;} 175 .twe_last_event { margin: 0; }176 168 @media screen and (max-width: 460px) { 177 169 .tracking_widget_track_button {width:100%; margin-top: 15px;}
Note: See TracChangeset
for help on using the changeset viewer.