Advanced Shipment Tracking for WooCommerce - Version 3.2.1.2

Version Description

  • Enhancement - Improved the TrackShip tracking page customizer
  • Enhancement - Updated design of Tracking tracking page
  • Enhancement - Updated design of TrackShip analytics widget on WordPress dashboard
Download this release

Release Info

Developer zorem
Plugin Icon 128x128 Advanced Shipment Tracking for WooCommerce
Version 3.2.1.2
Comparing to
See all releases

Code changes from version 3.2.1.1 to 3.2.1.2

Files changed (18) hide show
  1. assets/css/admin.css +20 -13
  2. assets/css/front.css +22 -6
  3. assets/css/trackship.css +39 -10
  4. assets/js/customizer-scripts.js +37 -60
  5. includes/class-wc-advanced-shipment-tracking-admin.php +2 -27
  6. includes/class-wc-advanced-shipment-tracking-front.php +32 -20
  7. includes/class-wc-advanced-shipment-tracking-trackship.php +2 -1
  8. includes/customizer/class-wc-tracking-page-customizer.php +5 -4
  9. includes/customizer/class-wcast-customizer.php +2 -3
  10. includes/views/admin_options_bulk_upload.php +3 -3
  11. includes/views/admin_options_settings.php +2 -2
  12. includes/views/admin_options_shipping_provider.php +4 -4
  13. includes/views/admin_status_notifications.php +1 -3
  14. includes/views/front/layout1_tracking_details.php +107 -18
  15. includes/views/front/preview_tracking_page.php +107 -63
  16. includes/views/trackship_settings.php +1 -1
  17. readme.txt +5 -0
  18. woocommerce-advanced-shipment-tracking.php +2 -2
assets/css/admin.css CHANGED
@@ -288,7 +288,7 @@ input.tab_input_1:checked + label{
288
  font-size: 14px;
289
  line-height: 32px;
290
  height: 35px;
291
- padding: 0 20px;
292
  }
293
  .wp-core-ui .btn_ast2{
294
  background: #005B9A;
@@ -298,7 +298,7 @@ input.tab_input_1:checked + label{
298
  font-size: 14px;
299
  line-height: 32px;
300
  height: 35px;
301
- padding: 0 20px;
302
  }
303
 
304
  .wp-core-ui .btn_red {
@@ -319,7 +319,7 @@ input.tab_input_1:checked + label{
319
  font-size: 14px;
320
  line-height: 32px;
321
  height: 35px;
322
- padding: 0 20px;
323
  }
324
  .wp-core-ui .btn_ast_transparent{
325
  background: transparent;
@@ -329,10 +329,8 @@ input.tab_input_1:checked + label{
329
  font-size: 14px;
330
  line-height: 32px;
331
  height: 35px;
332
- padding: 0 20px;
333
- color: #005B9A;
334
- font-weight: 700;
335
- text-transform: uppercase;
336
  }
337
  .wp-core-ui .btn_large {
338
  line-height: 36px;
@@ -340,6 +338,9 @@ input.tab_input_1:checked + label{
340
  padding: 0 20px;
341
  font-size: 15px;
342
  }
 
 
 
343
  .launch_customizer_label{
344
  line-height: 40px;
345
  }
@@ -624,6 +625,10 @@ span.provider_name {
624
  margin-bottom: 5px;
625
  display: block;
626
  }
 
 
 
 
627
 
628
  #search_provider{
629
  width: 225px;
@@ -985,6 +990,9 @@ a.reset_default_provider {
985
  margin-top: 0;
986
  margin-bottom: 0px;
987
  }
 
 
 
988
  .woocommerce.zorem_admin_layout table.form-table.upload_csv_table{
989
  table-layout: auto;
990
  }
@@ -1345,7 +1353,10 @@ section.widget_tab_section {
1345
  pointer-events: auto;
1346
  }
1347
  .order-status-table td:last-child{
1348
- text-align:left;
 
 
 
1349
  }
1350
  .order-status-table .order-label{
1351
  display: -webkit-inline-box;
@@ -1492,9 +1503,8 @@ table.provder_table td:last-child{
1492
  width: 40px;
1493
  }
1494
  table.provder_table td:nth-last-child(2){
1495
- width: 80px;
1496
  }
1497
-
1498
  table.provder_table .provider_actions_btn{
1499
  color: #005b9a;
1500
  font-size: 12px;
@@ -2017,9 +2027,6 @@ ul.csv_error_details_ul li:before{
2017
  height: 25px;
2018
  width: 25px;
2019
  }
2020
- .status_shipped_label{
2021
- text-align:left;
2022
- }
2023
 
2024
  .ast-row {
2025
  -js-display: flex;
288
  font-size: 14px;
289
  line-height: 32px;
290
  height: 35px;
291
+ padding: 0 10px;
292
  }
293
  .wp-core-ui .btn_ast2{
294
  background: #005B9A;
298
  font-size: 14px;
299
  line-height: 32px;
300
  height: 35px;
301
+ padding: 0 10px;
302
  }
303
 
304
  .wp-core-ui .btn_red {
319
  font-size: 14px;
320
  line-height: 32px;
321
  height: 35px;
322
+ padding: 0 10px;
323
  }
324
  .wp-core-ui .btn_ast_transparent{
325
  background: transparent;
329
  font-size: 14px;
330
  line-height: 32px;
331
  height: 35px;
332
+ padding: 0 10px;
333
+ color: #005B9A;
 
 
334
  }
335
  .wp-core-ui .btn_large {
336
  line-height: 36px;
338
  padding: 0 20px;
339
  font-size: 15px;
340
  }
341
+ .wp-core-ui .btn_icon {
342
+ padding: 0 15px 0 0;
343
+ }
344
  .launch_customizer_label{
345
  line-height: 40px;
346
  }
625
  margin-bottom: 5px;
626
  display: block;
627
  }
628
+ .default_label {
629
+ font-size: 12px;
630
+ vertical-align: top;
631
+ }
632
 
633
  #search_provider{
634
  width: 225px;
990
  margin-top: 0;
991
  margin-bottom: 0px;
992
  }
993
+ .woocommerce.zorem_admin_layout table.form-table.order-status-table{
994
+ table-layout: auto;
995
+ }
996
  .woocommerce.zorem_admin_layout table.form-table.upload_csv_table{
997
  table-layout: auto;
998
  }
1353
  pointer-events: auto;
1354
  }
1355
  .order-status-table td:last-child{
1356
+ text-align:right;
1357
+ }
1358
+ .woocommerce.zorem_admin_layout table.form-table.order-status-table td.status_shipped_label{
1359
+ text-align:left;
1360
  }
1361
  .order-status-table .order-label{
1362
  display: -webkit-inline-box;
1503
  width: 40px;
1504
  }
1505
  table.provder_table td:nth-last-child(2){
1506
+ width: 90px;
1507
  }
 
1508
  table.provder_table .provider_actions_btn{
1509
  color: #005b9a;
1510
  font-size: 12px;
2027
  height: 25px;
2028
  width: 25px;
2029
  }
 
 
 
2030
 
2031
  .ast-row {
2032
  -js-display: flex;
assets/css/front.css CHANGED
@@ -36,7 +36,7 @@ form.order_track_form input {
36
  margin: 15px auto 0;
37
  padding: 0;
38
  border: 1px solid #ccc;
39
- max-width: 800px;
40
  position: relative;
41
  }
42
  .trackship_branding {
@@ -202,7 +202,8 @@ form.order_track_form input {
202
  background-color: #cd2128;
203
  }
204
  .tracking_destination_details_by_date {
205
- margin-bottom: 10px;
 
206
  border-bottom: 1px solid #e0e0e0;
207
  }
208
  .tracking-detail .provider_image{
@@ -210,14 +211,20 @@ form.order_track_form input {
210
  border-radius: 5px;
211
  }
212
  .tracking-detail .tracking-details {
213
- padding: 0 20px;
214
  font-size: 14px;
215
  }
 
 
 
 
 
 
216
  ul.timeline {
217
  list-style: none!important;
218
  position: relative;
219
  padding: 0 0 0 20px !important;
220
- margin: 0 0 20px;
221
  }
222
  ul.timeline:before {
223
  content: ' ';
@@ -229,8 +236,17 @@ ul.timeline:before {
229
  height: 100%;
230
  }
231
  ul.timeline > li {
232
- margin: 10px 0;
233
- padding-left: 20px;
 
 
 
 
 
 
 
 
 
234
  }
235
  ul.timeline > li:before {
236
  content: url('../images/timeline-round.png');
36
  margin: 15px auto 0;
37
  padding: 0;
38
  border: 1px solid #ccc;
39
+ max-width: 600px;
40
  position: relative;
41
  }
42
  .trackship_branding {
202
  background-color: #cd2128;
203
  }
204
  .tracking_destination_details_by_date {
205
+ margin-bottom: 10px;
206
+ padding-bottom: 15px;
207
  border-bottom: 1px solid #e0e0e0;
208
  }
209
  .tracking-detail .provider_image{
211
  border-radius: 5px;
212
  }
213
  .tracking-detail .tracking-details {
214
+ padding: 0 20px 10px;
215
  font-size: 14px;
216
  }
217
+ .tracking_details_by_date {
218
+ margin-bottom: 10px;
219
+ }
220
+ .view_old_details,.hide_old_details{
221
+ color: #2196f3;
222
+ }
223
  ul.timeline {
224
  list-style: none!important;
225
  position: relative;
226
  padding: 0 0 0 20px !important;
227
+ margin: 0;
228
  }
229
  ul.timeline:before {
230
  content: ' ';
236
  height: 100%;
237
  }
238
  ul.timeline > li {
239
+ margin: 0;
240
+ padding: 10px 20px 0;
241
+ }
242
+ ul.timeline.new-details > li:first-child{
243
+ padding: 0 20px 10px;
244
+ }
245
+ ul.timeline > li:first-child{
246
+ padding: 0 20px 0;
247
+ }
248
+ ul.timeline.new-details > li:last-child{
249
+ padding: 0 20px 10px;
250
  }
251
  ul.timeline > li:before {
252
  content: url('../images/timeline-round.png');
assets/css/trackship.css CHANGED
@@ -434,12 +434,14 @@ p.delivered_message {
434
  font-size: 14px;
435
  line-height: 32px;
436
  height: 35px;
437
- padding: 0 20px;
438
  color: #59c889;
439
- background: #fafafa;
440
- font-weight: 700;
 
 
 
441
  }
442
-
443
  .trackship_status_section {
444
  width: 50%;
445
  float: left;
@@ -455,13 +457,21 @@ p.delivered_message {
455
  clear: both;
456
  display: table;
457
  }
458
- .wp-core-ui .btn_large.api_connected .dashicons {
459
  vertical-align: middle;
460
  margin-right: 5px;
461
  }
462
  .trackship_status_table tr td:last-child{
463
  text-align:right;
464
  }
 
 
 
 
 
 
 
 
465
  #trackship_dashboard_widget .inside{
466
  padding: 0;
467
  margin: 0;
@@ -483,17 +493,36 @@ p.delivered_message {
483
  border-bottom: 1px solid #e0e0e0;
484
  }
485
  #trackship_dashboard_widget .ts-widget-content h3{
486
- margin: 0;
487
- font-weight: 400;
488
- font-size: 16px;
 
489
  }
490
  .ts-widget-content .ts-widget-analytics-number{
491
- font-size: 24px;
492
- display: block;
 
 
 
 
 
 
493
  }
494
  .ts-widget-footer{
495
  padding: 15px;
496
  }
 
 
 
 
 
 
 
 
 
 
 
 
497
  .ts-widget-footer a{
498
  color: #2196f3;
499
  }
434
  font-size: 14px;
435
  line-height: 32px;
436
  height: 35px;
437
+ padding: 0 10px;
438
  color: #59c889;
439
+ background: #fafafa;
440
+ }
441
+ .wp-core-ui .btn_ts_transparent:focus{
442
+ outline: 0;
443
+ box-shadow: none;
444
  }
 
445
  .trackship_status_section {
446
  width: 50%;
447
  float: left;
457
  clear: both;
458
  display: table;
459
  }
460
+ .wp-core-ui .api_connected .dashicons {
461
  vertical-align: middle;
462
  margin-right: 5px;
463
  }
464
  .trackship_status_table tr td:last-child{
465
  text-align:right;
466
  }
467
+ #trackship_dashboard_widget .hndle{
468
+ justify-content: left;
469
+ }
470
+ #trackship_dashboard_widget .hndle small{
471
+ font-size: 11px;
472
+ color: #3c4758;
473
+ margin: 0 0 0 5px;
474
+ }
475
  #trackship_dashboard_widget .inside{
476
  padding: 0;
477
  margin: 0;
493
  border-bottom: 1px solid #e0e0e0;
494
  }
495
  #trackship_dashboard_widget .ts-widget-content h3{
496
+ margin: 0 0 5px;
497
+ font-weight: 400;
498
+ font-size: 14px;
499
+ color: #3f4856;
500
  }
501
  .ts-widget-content .ts-widget-analytics-number{
502
+ font-size: 18px;
503
+ font-weight: 600;
504
+ color: #3c4758;
505
+ margin: 0 5px 0 0;
506
+ line-height: 26px;
507
+ }
508
+ .ts-widget-content .ts-widget__section span{
509
+ vertical-align: middle;
510
  }
511
  .ts-widget-footer{
512
  padding: 15px;
513
  }
514
+ .ts-widget-footer:after {
515
+ content: '';
516
+ display: contents;
517
+ clear: both;
518
+ }
519
+ .ts-widget-footer img{
520
+ width: 80px;
521
+ margin-top: 3px;
522
+ }
523
+ .ts-widget-footer a.ts_link{
524
+ float: right;
525
+ }
526
  .ts-widget-footer a{
527
  color: #2196f3;
528
  }
assets/js/customizer-scripts.js CHANGED
@@ -8,71 +8,48 @@ jQuery(document).ready(function() {
8
  /**
9
  * Change description
10
  */
11
- jQuery('#customize-theme-controls #accordion-section-themes').hide();
12
-
13
- if(wcast_customizer.wcast_enable_delivered_email == 'yes'){
14
- jQuery('#customize-control-wcast_delivered_email_settings-wcast_enable_delivered_status_email input').prop('disabled', true);
15
- }
16
-
17
- if(jQuery("#customize-control-woocommerce_customer_delivered_order_settings-wcast_enable_delivered_ga_tracking input").prop("checked") != true){
18
- jQuery('#customize-control-woocommerce_customer_delivered_order_settings-wcast_delivered_analytics_link').hide();
19
- }
20
- });
21
-
22
- jQuery(document).on("change", "#customize-control-woocommerce_customer_delivered_order_settings-wcast_enable_delivered_ga_tracking input", function(){
23
- if(jQuery(this).prop("checked") == true){
24
- jQuery('#customize-control-woocommerce_customer_delivered_order_settings-wcast_delivered_analytics_link').show();
25
- } else{
26
- jQuery('#customize-control-woocommerce_customer_delivered_order_settings-wcast_delivered_analytics_link').hide();
27
- }
28
  });
29
 
30
- jQuery(document).on("change", "#_customize-input-customizer_delivered_order_settings_enabled", function(){
31
- if(jQuery(this).prop("checked") == true){
32
- jQuery('#customize-control-wcast_delivered_email_settings-wcast_enable_delivered_status_email input').prop('disabled', true);
33
- } else{
34
- jQuery('#customize-control-wcast_delivered_email_settings-wcast_enable_delivered_status_email input').removeAttr('disabled');
35
- }
36
- });
37
- // Handle mobile button click
38
- function custom_size_mobile() {
39
- // get email width.
40
- var email_width = '684';
41
- var ratio = email_width/304;
42
- var framescale = 100/ratio;
43
- var framescale = framescale/100;
44
- jQuery('#customize-preview iframe').width(email_width+'px');
45
- jQuery('#customize-preview iframe').css({
46
- '-webkit-transform' : 'scale(' + framescale + ')',
47
- '-moz-transform' : 'scale(' + framescale + ')',
48
- '-ms-transform' : 'scale(' + framescale + ')',
49
- '-o-transform' : 'scale(' + framescale + ')',
50
- 'transform' : 'scale(' + framescale + ')'
51
- });
52
- }
53
- jQuery('#customize-footer-actions .preview-mobile').click(function(e) {
54
- custom_size_mobile();
55
  });
56
- jQuery('#customize-footer-actions .preview-desktop').click(function(e) {
57
- jQuery('#customize-preview iframe').width('100%');
58
- jQuery('#customize-preview iframe').css({
59
- '-webkit-transform' : 'scale(1)',
60
- '-moz-transform' : 'scale(1)',
61
- '-ms-transform' : 'scale(1)',
62
- '-o-transform' : 'scale(1)',
63
- 'transform' : 'scale(1)'
64
- });
 
 
 
65
  });
66
- jQuery('#customize-footer-actions .preview-tablet').click(function(e) {
67
- jQuery('#customize-preview iframe').width('100%');
68
- jQuery('#customize-preview iframe').css({
69
- '-webkit-transform' : 'scale(1)',
70
- '-moz-transform' : 'scale(1)',
71
- '-ms-transform' : 'scale(1)',
72
- '-o-transform' : 'scale(1)',
73
- 'transform' : 'scale(1)'
74
- });
75
  });
 
76
 
77
  (function ( api ) {
78
  api.section( 'custom_order_status_email', function( section ) {
8
  /**
9
  * Change description
10
  */
11
+ jQuery('#customize-theme-controls #accordion-section-themes').hide();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
12
  });
13
 
14
+ // Handle mobile button click
15
+ function custom_size_mobile() {
16
+ // get email width.
17
+ var email_width = '684';
18
+ var ratio = email_width/304;
19
+ var framescale = 100/ratio;
20
+ var framescale = framescale/100;
21
+ jQuery('#customize-preview iframe').width(email_width+'px');
22
+ jQuery('#customize-preview iframe').css({
23
+ '-webkit-transform' : 'scale(' + framescale + ')',
24
+ '-moz-transform' : 'scale(' + framescale + ')',
25
+ '-ms-transform' : 'scale(' + framescale + ')',
26
+ '-o-transform' : 'scale(' + framescale + ')',
27
+ 'transform' : 'scale(' + framescale + ')'
 
 
 
 
 
 
 
 
 
 
 
28
  });
29
+ }
30
+ jQuery('#customize-footer-actions .preview-mobile').click(function(e) {
31
+ custom_size_mobile();
32
+ });
33
+ jQuery('#customize-footer-actions .preview-desktop').click(function(e) {
34
+ jQuery('#customize-preview iframe').width('100%');
35
+ jQuery('#customize-preview iframe').css({
36
+ '-webkit-transform' : 'scale(1)',
37
+ '-moz-transform' : 'scale(1)',
38
+ '-ms-transform' : 'scale(1)',
39
+ '-o-transform' : 'scale(1)',
40
+ 'transform' : 'scale(1)'
41
  });
42
+ });
43
+ jQuery('#customize-footer-actions .preview-tablet').click(function(e) {
44
+ jQuery('#customize-preview iframe').width('100%');
45
+ jQuery('#customize-preview iframe').css({
46
+ '-webkit-transform' : 'scale(1)',
47
+ '-moz-transform' : 'scale(1)',
48
+ '-ms-transform' : 'scale(1)',
49
+ '-o-transform' : 'scale(1)',
50
+ 'transform' : 'scale(1)'
51
  });
52
+ });
53
 
54
  (function ( api ) {
55
  api.section( 'custom_order_status_email', function( section ) {
includes/class-wc-advanced-shipment-tracking-admin.php CHANGED
@@ -78,8 +78,6 @@ class WC_Advanced_Shipment_Tracking_Admin {
78
 
79
  add_action( 'wp_ajax_wc_ast_upload_csv_form_update', array( $this, 'upload_tracking_csv_fun') );
80
 
81
- add_action( 'wp_ajax_update_delivered_order_email_status', array( $this, 'update_delivered_order_email_status_fun') );
82
-
83
  add_action( 'admin_footer', array( $this, 'footer_function'),1 );
84
 
85
  add_action( 'wp_ajax_update_email_preview_order', array( $this, 'update_email_preview_order_fun') );
@@ -440,16 +438,7 @@ class WC_Advanced_Shipment_Tracking_Admin {
440
  <?php } ?>
441
  <td class="forminp" <?php if($array['type'] == 'desc'){ ?> colspan=2 <?php } ?>>
442
  <?php if( $array['type'] == 'checkbox' ){
443
- if($id === 'wcast_enable_delivered_email'){
444
- $wcast_enable_delivered_email = get_option('woocommerce_customer_delivered_order_settings');
445
-
446
- if($wcast_enable_delivered_email['enabled'] == 'yes' || $wcast_enable_delivered_email['enabled'] == 1){
447
- $checked = 'checked';
448
- } else{
449
- $checked = '';
450
- }
451
-
452
- } elseif($id === 'wcast_enable_partial_shipped_email'){
453
  $wcast_enable_partial_shipped_email = get_option('woocommerce_customer_partial_shipped_order_settings');
454
 
455
  if($wcast_enable_partial_shipped_email['enabled'] == 'yes' || $wcast_enable_partial_shipped_email['enabled'] == 1){
@@ -1369,20 +1358,6 @@ class WC_Advanced_Shipment_Tracking_Admin {
1369
  exit;
1370
  }
1371
 
1372
- /*
1373
- * update delivered order email status
1374
- */
1375
- public function update_delivered_order_email_status_fun(){
1376
- $wcast_enable_delivered_email = get_option('woocommerce_customer_delivered_order_settings');
1377
- $opt = array(
1378
- 'enabled' => wc_clean($_POST['wcast_enable_delivered_email']),
1379
- 'subject' => $wcast_enable_delivered_email['subject'],
1380
- 'heading' => $wcast_enable_delivered_email['heading'],
1381
- );
1382
- update_option( 'woocommerce_customer_delivered_order_settings', $opt );
1383
- exit;
1384
- }
1385
-
1386
  /*
1387
  * Change completed order email title to Shipped Order
1388
  */
@@ -1593,7 +1568,7 @@ class WC_Advanced_Shipment_Tracking_Admin {
1593
 
1594
  <label for="make_default_<?php echo $d_s_p->id; ?>" id="default_label_<?php echo $d_s_p->id; ?>" class="<?php if($d_s_p->display_in_order != 1) { echo 'disable_label'; } ?>">
1595
  <input type="checkbox" id="make_default_<?php echo $d_s_p->id; ?>" name="make_provider_default" data-id="<?php echo $d_s_p->id; ?>" class="make_provider_default" value="<?php echo sanitize_title( $d_s_p->provider_name )?>" <?php if( $default_provider == sanitize_title( $d_s_p->provider_name ) )echo 'checked';?> <?php if($d_s_p->display_in_order != 1) { echo 'disabled'; } ?>>
1596
- <?php _e( 'default', 'woo-advanced-shipment-tracking' ); ?>
1597
  </label>
1598
  </td>
1599
  <?php do_action('ast_shipping_provider_column_content_after_api_name', $d_s_p->provider_name); ?>
78
 
79
  add_action( 'wp_ajax_wc_ast_upload_csv_form_update', array( $this, 'upload_tracking_csv_fun') );
80
 
 
 
81
  add_action( 'admin_footer', array( $this, 'footer_function'),1 );
82
 
83
  add_action( 'wp_ajax_update_email_preview_order', array( $this, 'update_email_preview_order_fun') );
438
  <?php } ?>
439
  <td class="forminp" <?php if($array['type'] == 'desc'){ ?> colspan=2 <?php } ?>>
440
  <?php if( $array['type'] == 'checkbox' ){
441
+ if($id === 'wcast_enable_partial_shipped_email'){
 
 
 
 
 
 
 
 
 
442
  $wcast_enable_partial_shipped_email = get_option('woocommerce_customer_partial_shipped_order_settings');
443
 
444
  if($wcast_enable_partial_shipped_email['enabled'] == 'yes' || $wcast_enable_partial_shipped_email['enabled'] == 1){
1358
  exit;
1359
  }
1360
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1361
  /*
1362
  * Change completed order email title to Shipped Order
1363
  */
1568
 
1569
  <label for="make_default_<?php echo $d_s_p->id; ?>" id="default_label_<?php echo $d_s_p->id; ?>" class="<?php if($d_s_p->display_in_order != 1) { echo 'disable_label'; } ?>">
1570
  <input type="checkbox" id="make_default_<?php echo $d_s_p->id; ?>" name="make_provider_default" data-id="<?php echo $d_s_p->id; ?>" class="make_provider_default" value="<?php echo sanitize_title( $d_s_p->provider_name )?>" <?php if( $default_provider == sanitize_title( $d_s_p->provider_name ) )echo 'checked';?> <?php if($d_s_p->display_in_order != 1) { echo 'disabled'; } ?>>
1571
+ <span class="default_label"><?php _e( 'default', 'woo-advanced-shipment-tracking' ); ?></span>
1572
  </label>
1573
  </td>
1574
  <?php do_action('ast_shipping_provider_column_content_after_api_name', $d_s_p->provider_name); ?>
includes/class-wc-advanced-shipment-tracking-front.php CHANGED
@@ -213,10 +213,15 @@ class WC_Advanced_Shipment_Tracking_Front {
213
  wp_enqueue_script( 'front-js' );
214
 
215
  global $wpdb;
216
-
217
- $border_color = get_option('wc_ast_select_border_color');
218
- $hide_tracking_events = get_option('wc_ast_hide_tracking_events');
219
- $tracking_page_layout = get_option('wc_ast_select_tracking_page_layout','t_layout_1'); ?>
 
 
 
 
 
220
 
221
  <style>
222
  <?php if($border_color){ ?>
@@ -230,6 +235,11 @@ class WC_Advanced_Shipment_Tracking_Front {
230
  border-top: 1px solid <?php echo $border_color; ?>;
231
  }
232
  <?php } ?>
 
 
 
 
 
233
  </style>
234
  <?php
235
 
@@ -336,11 +346,11 @@ class WC_Advanced_Shipment_Tracking_Front {
336
  echo $this->layout1_progress_bar($tracker);
337
  }
338
 
339
- if( !empty($trackind_detail_by_status_rev) && $hide_tracking_events != 1 ){
340
  echo $this->layout1_tracking_details( $trackind_detail_by_status_rev, $tracking_details_by_date, $trackind_destination_detail_by_status_rev, $tracking_destination_details_by_date, $tracker , $order_id, $tracking_provider, $tracking_number );
341
  }
342
 
343
- $remove_trackship_branding = get_option('wc_ast_remove_trackship_branding');
344
 
345
  if($remove_trackship_branding != 1){ ?>
346
  <div class="trackship_branding">
@@ -360,12 +370,10 @@ class WC_Advanced_Shipment_Tracking_Front {
360
  if($tracker->ep_status == 'pending_trackship' || $tracker->ep_status == 'INVALID_TRACKING_NUM' || $tracker->ep_status == 'carrier_unsupported' || $tracker->ep_status == 'invalid_user_key' || $tracker->ep_status == 'wrong_shipping_provider' || $tracker->ep_status == 'deleted' || $tracker->ep_status == 'pending'){
361
  } elseif(isset($tracker->ep_status)){ echo $this->layout2_progress_bar($tracker); }
362
 
363
- if( !empty($trackind_detail_by_status_rev) && $hide_tracking_events != 1 ){
364
  echo $this->layout1_tracking_details( $trackind_detail_by_status_rev, $tracking_details_by_date, $trackind_destination_detail_by_status_rev, $tracking_destination_details_by_date, $tracker, $order_id, $tracking_provider, $tracking_number );
365
  }
366
 
367
- $remove_trackship_branding = get_option('wc_ast_remove_trackship_branding');
368
-
369
  if($remove_trackship_branding != 1){ ?>
370
  <div class="trackship_branding">
371
  <p>Shipment Tracking info by <a href="https://trackship.info/trackings/?number=<?php echo $tracking_number; ?>" title="TrackShip" target="blank"><img src="<?php echo wc_advanced_shipment_tracking()->plugin_dir_url()?>assets/images/trackship-logo.png"></a></p>
@@ -392,16 +400,16 @@ class WC_Advanced_Shipment_Tracking_Front {
392
  $unixTimestamp = strtotime($tracker->est_delivery_date);
393
  $day = date("l", $unixTimestamp);
394
  }
395
-
396
- $wc_ast_link_to_shipping_provider = get_option('wc_ast_link_to_shipping_provider');
 
397
 
398
  $tracking_number_url = '';
399
 
400
  if($wc_ast_link_to_shipping_provider == 1){
401
  $tracking_number_url = $this->get_tracking_number_url( $order_id, $tracking_provider, $tracking_number, $item );
402
- }
403
 
404
- $hide_tracking_provider_image = get_option('wc_ast_hide_tracking_provider_image');
405
  $upload_dir = wp_upload_dir();
406
  $ast_directory = $upload_dir['baseurl'] . '/ast-shipping-providers/';
407
  $ast_base_directory = $upload_dir['basedir'] . '/ast-shipping-providers/';
@@ -465,6 +473,8 @@ class WC_Advanced_Shipment_Tracking_Front {
465
  <?php }
466
 
467
  public function layout1_tracking_details( $trackind_detail_by_status_rev, $tracking_details_by_date, $trackind_destination_detail_by_status_rev, $tracking_destination_details_by_date, $tracker, $order_id, $tracking_provider, $tracking_number ){
 
 
468
  include 'views/front/layout1_tracking_details.php';
469
  }
470
 
@@ -572,13 +582,15 @@ class WC_Advanced_Shipment_Tracking_Front {
572
 
573
  get_header();
574
 
575
- $primary_color = get_option('wc_ast_select_primary_color');
576
- $border_color = get_option('wc_ast_select_border_color');
577
- $wc_ast_link_to_shipping_provider = get_option('wc_ast_link_to_shipping_provider');
578
- $hide_tracking_provider_image = get_option('wc_ast_hide_tracking_provider_image');
579
- $hide_tracking_events = get_option('wc_ast_hide_tracking_events');
580
- $tracking_page_layout = get_option('wc_ast_select_tracking_page_layout','t_layout_1');
581
- $remove_trackship_branding = get_option('wc_ast_remove_trackship_branding');
 
 
582
 
583
  $upload_dir = wp_upload_dir();
584
  $ast_directory = $upload_dir['baseurl'] . '/ast-shipping-providers/';
213
  wp_enqueue_script( 'front-js' );
214
 
215
  global $wpdb;
216
+
217
+ $ts_tracking_page_customizer = new ts_tracking_page_customizer();
218
+
219
+ $border_color = get_option('wc_ast_select_border_color', $ts_tracking_page_customizer->defaults['wc_ast_select_border_color'] );
220
+ $background_color = get_option('wc_ast_select_bg_color', $ts_tracking_page_customizer->defaults['wc_ast_select_bg_color'] );
221
+ $hide_tracking_events = get_option('wc_ast_hide_tracking_events', $ts_tracking_page_customizer->defaults['wc_ast_hide_tracking_events'] );
222
+ $tracking_page_layout = get_option('wc_ast_select_tracking_page_layout', $ts_tracking_page_customizer->defaults['wc_ast_select_tracking_page_layout'] );
223
+ $remove_trackship_branding = get_option('wc_ast_remove_trackship_branding', $ts_tracking_page_customizer->defaults['wc_ast_remove_trackship_branding'] );
224
+ ?>
225
 
226
  <style>
227
  <?php if($border_color){ ?>
235
  border-top: 1px solid <?php echo $border_color; ?>;
236
  }
237
  <?php } ?>
238
+ <?php if($background_color){ ?>
239
+ body .col.tracking-detail{
240
+ background: <?php echo $background_color; ?>;
241
+ }
242
+ <?php } ?>
243
  </style>
244
  <?php
245
 
346
  echo $this->layout1_progress_bar($tracker);
347
  }
348
 
349
+ if( !empty($trackind_detail_by_status_rev) ){
350
  echo $this->layout1_tracking_details( $trackind_detail_by_status_rev, $tracking_details_by_date, $trackind_destination_detail_by_status_rev, $tracking_destination_details_by_date, $tracker , $order_id, $tracking_provider, $tracking_number );
351
  }
352
 
353
+
354
 
355
  if($remove_trackship_branding != 1){ ?>
356
  <div class="trackship_branding">
370
  if($tracker->ep_status == 'pending_trackship' || $tracker->ep_status == 'INVALID_TRACKING_NUM' || $tracker->ep_status == 'carrier_unsupported' || $tracker->ep_status == 'invalid_user_key' || $tracker->ep_status == 'wrong_shipping_provider' || $tracker->ep_status == 'deleted' || $tracker->ep_status == 'pending'){
371
  } elseif(isset($tracker->ep_status)){ echo $this->layout2_progress_bar($tracker); }
372
 
373
+ if( !empty($trackind_detail_by_status_rev) ){
374
  echo $this->layout1_tracking_details( $trackind_detail_by_status_rev, $tracking_details_by_date, $trackind_destination_detail_by_status_rev, $tracking_destination_details_by_date, $tracker, $order_id, $tracking_provider, $tracking_number );
375
  }
376
 
 
 
377
  if($remove_trackship_branding != 1){ ?>
378
  <div class="trackship_branding">
379
  <p>Shipment Tracking info by <a href="https://trackship.info/trackings/?number=<?php echo $tracking_number; ?>" title="TrackShip" target="blank"><img src="<?php echo wc_advanced_shipment_tracking()->plugin_dir_url()?>assets/images/trackship-logo.png"></a></p>
400
  $unixTimestamp = strtotime($tracker->est_delivery_date);
401
  $day = date("l", $unixTimestamp);
402
  }
403
+ $ts_tracking_page_customizer = new ts_tracking_page_customizer();
404
+ $wc_ast_link_to_shipping_provider = get_option('wc_ast_link_to_shipping_provider', $ts_tracking_page_customizer->defaults['wc_ast_link_to_shipping_provider'] );
405
+ $hide_tracking_provider_image = get_option('wc_ast_hide_tracking_provider_image', $ts_tracking_page_customizer->defaults['wc_ast_hide_tracking_provider_image'] );
406
 
407
  $tracking_number_url = '';
408
 
409
  if($wc_ast_link_to_shipping_provider == 1){
410
  $tracking_number_url = $this->get_tracking_number_url( $order_id, $tracking_provider, $tracking_number, $item );
411
+ }
412
 
 
413
  $upload_dir = wp_upload_dir();
414
  $ast_directory = $upload_dir['baseurl'] . '/ast-shipping-providers/';
415
  $ast_base_directory = $upload_dir['basedir'] . '/ast-shipping-providers/';
473
  <?php }
474
 
475
  public function layout1_tracking_details( $trackind_detail_by_status_rev, $tracking_details_by_date, $trackind_destination_detail_by_status_rev, $tracking_destination_details_by_date, $tracker, $order_id, $tracking_provider, $tracking_number ){
476
+ $ts_tracking_page_customizer = new ts_tracking_page_customizer();
477
+ $hide_tracking_events = get_option( 'wc_ast_hide_tracking_events', $ts_tracking_page_customizer->defaults['wc_ast_hide_tracking_events'] );
478
  include 'views/front/layout1_tracking_details.php';
479
  }
480
 
582
 
583
  get_header();
584
 
585
+ $ts_tracking_page_customizer = new ts_tracking_page_customizer();
586
+
587
+ $border_color = get_option('wc_ast_select_border_color', $ts_tracking_page_customizer->defaults['wc_ast_select_border_color'] );
588
+ $background_color = get_option('wc_ast_select_bg_color', $ts_tracking_page_customizer->defaults['wc_ast_select_bg_color'] );
589
+ $wc_ast_link_to_shipping_provider = get_option('wc_ast_link_to_shipping_provider', $ts_tracking_page_customizer->defaults['wc_ast_link_to_shipping_provider'] );
590
+ $hide_tracking_provider_image = get_option('wc_ast_hide_tracking_provider_image', $ts_tracking_page_customizer->defaults['wc_ast_hide_tracking_provider_image'] );
591
+ $hide_tracking_events = get_option('wc_ast_hide_tracking_events', $ts_tracking_page_customizer->defaults['wc_ast_hide_tracking_events'] );
592
+ $tracking_page_layout = get_option('wc_ast_select_tracking_page_layout', $ts_tracking_page_customizer->defaults['wc_ast_select_tracking_page_layout'] );
593
+ $remove_trackship_branding = get_option('wc_ast_remove_trackship_branding', $ts_tracking_page_customizer->defaults['wc_ast_remove_trackship_branding'] );
594
 
595
  $upload_dir = wp_upload_dir();
596
  $ast_directory = $upload_dir['baseurl'] . '/ast-shipping-providers/';
includes/class-wc-advanced-shipment-tracking-trackship.php CHANGED
@@ -1288,7 +1288,7 @@ class WC_Advanced_Shipment_Tracking_Trackship {
1288
  */
1289
  public function ast_add_dashboard_widgets() {
1290
  wp_enqueue_style( 'trackship_styles', wc_advanced_shipment_tracking()->plugin_dir_url() . 'assets/css/trackship.css', array(), wc_advanced_shipment_tracking()->version );
1291
- wp_add_dashboard_widget( 'trackship_dashboard_widget', 'Tracking Analytics <small>(last 30 days)</small>', array( $this, 'dashboard_widget_function') );
1292
  }
1293
 
1294
  /**
@@ -1321,6 +1321,7 @@ class WC_Advanced_Shipment_Tracking_Trackship {
1321
  </div>
1322
  <div class="ts-widget-footer">
1323
  <a class="" href="https://trackship.info/my-account/analytics/" target="blank"><?php _e( 'View Tracking Analytics','woo-advanced-shipment-tracking' ); ?></a>
 
1324
  </div>
1325
  </div>
1326
  <?php
1288
  */
1289
  public function ast_add_dashboard_widgets() {
1290
  wp_enqueue_style( 'trackship_styles', wc_advanced_shipment_tracking()->plugin_dir_url() . 'assets/css/trackship.css', array(), wc_advanced_shipment_tracking()->version );
1291
+ wp_add_dashboard_widget( 'trackship_dashboard_widget', 'TrackShip Analytics <small>(last 30 days)</small>', array( $this, 'dashboard_widget_function') );
1292
  }
1293
 
1294
  /**
1321
  </div>
1322
  <div class="ts-widget-footer">
1323
  <a class="" href="https://trackship.info/my-account/analytics/" target="blank"><?php _e( 'View Tracking Analytics','woo-advanced-shipment-tracking' ); ?></a>
1324
+ <a class="ts_link" href="https://trackship.info" title="TrackShip" target="blank"><img src="<?php echo wc_advanced_shipment_tracking()->plugin_dir_url()?>assets/images/trackship-logo.png"></a>
1325
  </div>
1326
  </div>
1327
  <?php
includes/customizer/class-wc-tracking-page-customizer.php CHANGED
@@ -121,12 +121,12 @@ class ts_tracking_page_customizer {
121
  public function wcast_generate_defaults() {
122
  $customizer_defaults = array(
123
  'wc_ast_select_tracking_page_layout' => 't_layout_1',
124
- 'wc_ast_select_border_color' => '#e0e0e0',
125
- 'wc_ast_select_bg_color' => '#fff',
126
  'wc_ast_hide_tracking_provider_image' => 0,
127
- 'wc_ast_link_to_shipping_provider' => 0,
128
  'wc_ast_remove_trackship_branding' => 0,
129
- 'wc_ast_hide_tracking_events' => 0,
130
  );
131
 
132
  return apply_filters( 'ast_customizer_defaults', $customizer_defaults );
@@ -220,6 +220,7 @@ class ts_tracking_page_customizer {
220
  'choices' => array(
221
  0 => __( 'Show all Events', 'woo-advanced-shipment-tracking' ),
222
  1 => __( 'Hide tracking events', 'woo-advanced-shipment-tracking' ),
 
223
  ),
224
  )
225
  ) );
121
  public function wcast_generate_defaults() {
122
  $customizer_defaults = array(
123
  'wc_ast_select_tracking_page_layout' => 't_layout_1',
124
+ 'wc_ast_select_border_color' => '#cccccc',
125
+ 'wc_ast_select_bg_color' => '#fafafa',
126
  'wc_ast_hide_tracking_provider_image' => 0,
127
+ 'wc_ast_link_to_shipping_provider' => 1,
128
  'wc_ast_remove_trackship_branding' => 0,
129
+ 'wc_ast_hide_tracking_events' => 2,
130
  );
131
 
132
  return apply_filters( 'ast_customizer_defaults', $customizer_defaults );
220
  'choices' => array(
221
  0 => __( 'Show all Events', 'woo-advanced-shipment-tracking' ),
222
  1 => __( 'Hide tracking events', 'woo-advanced-shipment-tracking' ),
223
+ 2 => __( 'Show last event & expand', 'woo-advanced-shipment-tracking' ),
224
  ),
225
  )
226
  ) );
includes/customizer/class-wcast-customizer.php CHANGED
@@ -60,7 +60,7 @@ class WC_Advanced_Shipment_Tracking_Customizer {
60
  * add css and js for customizer
61
  */
62
  public function enqueue_customizer_scripts(){
63
- $wcast_enable_delivered_email = get_option('woocommerce_customer_delivered_order_settings');
64
  if(isset( $_REQUEST['wcast-customizer'] ) && '1' === $_REQUEST['wcast-customizer']){
65
  wp_enqueue_style( 'wp-color-picker' );
66
  wp_enqueue_style('wcast-customizer-styles', wc_advanced_shipment_tracking()->plugin_dir_url() . 'assets/css/customizer-styles.css', array(), wc_advanced_shipment_tracking()->version );
@@ -94,8 +94,7 @@ class WC_Advanced_Shipment_Tracking_Customizer {
94
  'customer_returntosender_preview_url' => $this->get_customer_returntosender_preview_url(),
95
  'customer_availableforpickup_preview_url' => $this->get_customer_availableforpickup_preview_url(),
96
  'admin_late_shipments_preview_url' => $this->get_admin_late_shipments_preview_url(),
97
- 'trigger_click' => '#accordion-section-'.$_REQUEST['email'].' h3',
98
- 'wcast_enable_delivered_email' => $wcast_enable_delivered_email['enabled'],
99
  ));
100
 
101
  wp_localize_script('wp-color-picker', 'wpColorPickerL10n', array(
60
  * add css and js for customizer
61
  */
62
  public function enqueue_customizer_scripts(){
63
+
64
  if(isset( $_REQUEST['wcast-customizer'] ) && '1' === $_REQUEST['wcast-customizer']){
65
  wp_enqueue_style( 'wp-color-picker' );
66
  wp_enqueue_style('wcast-customizer-styles', wc_advanced_shipment_tracking()->plugin_dir_url() . 'assets/css/customizer-styles.css', array(), wc_advanced_shipment_tracking()->version );
94
  'customer_returntosender_preview_url' => $this->get_customer_returntosender_preview_url(),
95
  'customer_availableforpickup_preview_url' => $this->get_customer_availableforpickup_preview_url(),
96
  'admin_late_shipments_preview_url' => $this->get_admin_late_shipments_preview_url(),
97
+ 'trigger_click' => '#accordion-section-'.$_REQUEST['email'].' h3',
 
98
  ));
99
 
100
  wp_localize_script('wp-color-picker', 'wpColorPickerL10n', array(
includes/views/admin_options_bulk_upload.php CHANGED
@@ -53,7 +53,7 @@
53
  <tr valign="top" class="">
54
  <td scope="row" class="button-column" colspan="2">
55
  <div class="submit">
56
- <button name="save" class="button-primary btn_ast2 btn_large" type="submit" value="Save"><?php _e('Continue', 'woo-advanced-shipment-tracking'); ?></button>
57
  <div class="spinner" style="float:none"></div>
58
  <div class="success_msg" style="display:none;"><?php _e('Settings Saved.', 'woo-advanced-shipment-tracking'); ?></div>
59
  <div class="error_msg" style="display:none;"></div>
@@ -104,8 +104,8 @@
104
  </tr>
105
  <tr valign="top" class="bulk_upload_status_action" style="display:none;">
106
  <td>
107
- <a class="button-primary btn_ast2 btn_large" href="<?php echo admin_url( 'edit.php?post_type=shop_order' ); ?>"><?php _e('View Orders', 'woo-advanced-shipment-tracking'); ?></a>
108
- <a href="javascript:void(0)" class="csv_upload_again button-primary btn_ast2 btn_large"><?php _e('Upload again', 'woo-advanced-shipment-tracking'); ?></a>
109
  </td>
110
  </tr>
111
  </tbody>
53
  <tr valign="top" class="">
54
  <td scope="row" class="button-column" colspan="2">
55
  <div class="submit">
56
+ <button name="save" class="button-primary btn_ast2" type="submit" value="Save"><?php _e('Continue', 'woo-advanced-shipment-tracking'); ?></button>
57
  <div class="spinner" style="float:none"></div>
58
  <div class="success_msg" style="display:none;"><?php _e('Settings Saved.', 'woo-advanced-shipment-tracking'); ?></div>
59
  <div class="error_msg" style="display:none;"></div>
104
  </tr>
105
  <tr valign="top" class="bulk_upload_status_action" style="display:none;">
106
  <td>
107
+ <a class="button-primary btn_ast2" href="<?php echo admin_url( 'edit.php?post_type=shop_order' ); ?>"><?php _e('View Orders', 'woo-advanced-shipment-tracking'); ?></a>
108
+ <a href="javascript:void(0)" class="csv_upload_again button-primary btn_ast2"><?php _e('Upload again', 'woo-advanced-shipment-tracking'); ?></a>
109
  </td>
110
  </tr>
111
  </tbody>
includes/views/admin_options_settings.php CHANGED
@@ -16,7 +16,7 @@
16
  </td>
17
  <td>
18
  <div class="settings_ul_submit">
19
- <button name="save" class="button-primary woocommerce-save-button btn_ast2 btn_large" type="submit" value="Save changes"><?php _e( 'Save Changes', 'woo-advanced-shipment-tracking' ); ?></button>
20
  <div class="spinner"></div>
21
  <?php wp_nonce_field( 'wc_ast_settings_form', 'wc_ast_settings_form_nonce' );?>
22
  <input type="hidden" name="action" value="wc_ast_settings_form_update">
@@ -44,7 +44,7 @@
44
  <ul class="settings_ul">
45
  <li>
46
  <label class="launch_customizer_label"><?php _e( 'Customize how the Tracking information display on the order emails and my-account', 'woo-advanced-shipment-tracking' ); ?></label>
47
- <a href="<?php echo wcast_initialise_customizer_settings::get_customizer_url('ast_tracking_general_section','settings') ?>" class="button-primary btn_ast_transparent btn_large launch_customizer_btn"><?php _e( 'Launch Customizer', 'woo-advanced-shipment-tracking' ); ?></a>
48
  </li>
49
  </ul>
50
  </div>
16
  </td>
17
  <td>
18
  <div class="settings_ul_submit">
19
+ <button name="save" class="button-primary woocommerce-save-button btn_ast2" type="submit" value="Save changes"><?php _e( 'Save Changes', 'woo-advanced-shipment-tracking' ); ?></button>
20
  <div class="spinner"></div>
21
  <?php wp_nonce_field( 'wc_ast_settings_form', 'wc_ast_settings_form_nonce' );?>
22
  <input type="hidden" name="action" value="wc_ast_settings_form_update">
44
  <ul class="settings_ul">
45
  <li>
46
  <label class="launch_customizer_label"><?php _e( 'Customize how the Tracking information display on the order emails and my-account', 'woo-advanced-shipment-tracking' ); ?></label>
47
+ <a href="<?php echo wcast_initialise_customizer_settings::get_customizer_url('ast_tracking_general_section','settings') ?>" class="button-primary btn_ast_transparent launch_customizer_btn"><?php _e( 'Customize', 'woo-advanced-shipment-tracking' ); ?></a>
48
  </li>
49
  </ul>
50
  </div>
includes/views/admin_options_shipping_provider.php CHANGED
@@ -77,7 +77,7 @@ if(isset($_GET['open']) && $_GET['open'] == 'synch_providers'){ ?>
77
  <p><?php _e( 'You can use the variables %number%, %postal_code% and %country_code% in the URL, for more info, check our ', 'woo-advanced-shipment-tracking' ); ?><?php echo sprintf(__('<a href="%s" target="blank">documentation</a>', 'woo-advanced-shipment-tracking'), 'http://www.zorem.com/docs/woocommerce-advanced-shipment-tracking/setting-shipping-providers/#adding-custom-shipping-provider'); ?></p>
78
  </div>
79
  <input type="hidden" name="action" value="add_custom_shipment_provider">
80
- <input type="submit" name="Submit" value="<?php _e( 'Add Custom Provider', 'woo-advanced-shipment-tracking' ); ?>" class="button-primary btn_ast2 btn_large">
81
  </form>
82
  </div>
83
  </div>
@@ -133,7 +133,7 @@ if(isset($_GET['open']) && $_GET['open'] == 'synch_providers'){ ?>
133
  <input type="hidden" name="action" value="update_custom_shipment_provider">
134
  <input type="hidden" name="provider_type" id="provider_type" value="">
135
  <input type="hidden" name="provider_id" id="provider_id" value="">
136
- <input type="submit" name="Submit" value="<?php _e( 'Update' , 'woo-advanced-shipment-tracking'); ?>" class="button-primary btn_ast2 btn_large">
137
  <a href="javascript:void(0);" class="reset_default_provider"><?php _e( 'Reset' , 'woo-advanced-shipment-tracking'); ?></a>
138
  </form>
139
  </div>
@@ -158,8 +158,8 @@ if(isset($_GET['open']) && $_GET['open'] == 'synch_providers'){ ?>
158
  <fieldset class="reset_db_fieldset">
159
  <label><input type="checkbox" id="reset_tracking_providers" name="reset_tracking_providers" value="1"><?php _e( 'Reset providers database, it will reset all your shipping provider database', 'woo-advanced-shipment-tracking'); ?></label>
160
  </fieldset>
161
- <button class="sync_providers_btn button-primary btn_ast2 btn_large"><?php _e( 'Sync Shipping Providers', 'woo-advanced-shipment-tracking'); ?></button>
162
- <button class="close_synch_popup button-primary btn_ast2 btn_large"><?php _e( 'Close', 'woocommerce'); ?></button>
163
  <div class="spinner" style=""></div>
164
  </div>
165
  </div>
77
  <p><?php _e( 'You can use the variables %number%, %postal_code% and %country_code% in the URL, for more info, check our ', 'woo-advanced-shipment-tracking' ); ?><?php echo sprintf(__('<a href="%s" target="blank">documentation</a>', 'woo-advanced-shipment-tracking'), 'http://www.zorem.com/docs/woocommerce-advanced-shipment-tracking/setting-shipping-providers/#adding-custom-shipping-provider'); ?></p>
78
  </div>
79
  <input type="hidden" name="action" value="add_custom_shipment_provider">
80
+ <input type="submit" name="Submit" value="<?php _e( 'Add Custom Provider', 'woo-advanced-shipment-tracking' ); ?>" class="button-primary btn_ast2">
81
  </form>
82
  </div>
83
  </div>
133
  <input type="hidden" name="action" value="update_custom_shipment_provider">
134
  <input type="hidden" name="provider_type" id="provider_type" value="">
135
  <input type="hidden" name="provider_id" id="provider_id" value="">
136
+ <input type="submit" name="Submit" value="<?php _e( 'Update' , 'woo-advanced-shipment-tracking'); ?>" class="button-primary btn_ast2">
137
  <a href="javascript:void(0);" class="reset_default_provider"><?php _e( 'Reset' , 'woo-advanced-shipment-tracking'); ?></a>
138
  </form>
139
  </div>
158
  <fieldset class="reset_db_fieldset">
159
  <label><input type="checkbox" id="reset_tracking_providers" name="reset_tracking_providers" value="1"><?php _e( 'Reset providers database, it will reset all your shipping provider database', 'woo-advanced-shipment-tracking'); ?></label>
160
  </fieldset>
161
+ <button class="sync_providers_btn button-primary btn_ast2"><?php _e( 'Sync Shipping Providers', 'woo-advanced-shipment-tracking'); ?></button>
162
+ <button class="close_synch_popup button-primary btn_ast2"><?php _e( 'Close', 'woocommerce'); ?></button>
163
  <div class="spinner" style=""></div>
164
  </div>
165
  </div>
includes/views/admin_status_notifications.php CHANGED
@@ -2,9 +2,7 @@
2
  <div class="tab_inner_container">
3
  <div class="outer_form_table ts_notifications_outer_table">
4
  <?php
5
- $ast = new WC_Advanced_Shipment_Tracking_Actions;
6
-
7
- $wcast_enable_delivered_email = get_option('woocommerce_customer_delivered_order_settings');
8
 
9
  $wcast_enable_intransit_email = $ast->get_option_value_from_array('wcast_intransit_email_settings','wcast_enable_intransit_email','');
10
 
2
  <div class="tab_inner_container">
3
  <div class="outer_form_table ts_notifications_outer_table">
4
  <?php
5
+ $ast = new WC_Advanced_Shipment_Tracking_Actions;
 
 
6
 
7
  $wcast_enable_intransit_email = $ast->get_option_value_from_array('wcast_intransit_email_settings','wcast_enable_intransit_email','');
8
 
includes/views/front/layout1_tracking_details.php CHANGED
@@ -1,40 +1,129 @@
 
 
 
1
  <div class="tracking-details" style="">
2
- <?php if(!empty($tracking_details_by_date)){ ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
3
  <div class="shipment_progress_heading_div">
4
  <h4 class="h4-heading text-uppercase"><?php _e( 'Tracking Details', 'woo-advanced-shipment-tracking' ); ?></h4>
5
  </div>
6
- <?php if(!empty($tracking_destination_details_by_date)){ ?>
 
 
7
  <div class="tracking_destination_details_by_date">
 
8
  <h4 style=""><?php _e( 'Destination Details', 'woo-advanced-shipment-tracking' ); ?></h4>
9
  <ul class="timeline">
10
- <?php
11
- foreach($tracking_destination_details_by_date as $date => $date_details){
12
- foreach($date_details as $key => $value){
13
- ?>
14
  <li>
15
  <strong><?php echo date_i18n( get_option( 'date_format' ), strtotime($date) ); ?> <?php echo date_i18n( get_option( 'time_format' ), strtotime($value->datetime) )?></strong>
16
  <p><?php echo apply_filters( 'trackship_tracking_event_description', $value->message ); if($value->tracking_location->city != NULL)echo ' - '; ?><span><?php echo apply_filters( 'trackship_tracking_event_location', $value->tracking_location->city ); ?></span></p>
17
  </li>
18
- <?php } } ?>
 
19
  </ul>
20
  </div>
 
21
  <?php } ?>
22
 
23
  <div class="tracking_details_by_date">
24
- <?php if(!empty($tracking_destination_details_by_date)){ ?>
 
25
  <h4 class="" style=""><?php _e( 'Origin Details', 'woo-advanced-shipment-tracking' ); ?></h4>
26
  <?php } ?>
 
27
  <ul class="timeline">
28
- <?php
29
- foreach($tracking_details_by_date as $date => $date_details){
30
- foreach($date_details as $key => $value){
31
- ?>
32
- <li>
33
- <strong><?php echo date_i18n( get_option( 'date_format' ), strtotime($date) ); ?> <?php echo date_i18n( get_option( 'time_format' ), strtotime($value->datetime) )?></strong>
34
- <p><?php echo apply_filters( 'trackship_tracking_event_description', $value->message ); if($value->tracking_location->city != NULL)echo ' - '; ?><span><?php echo apply_filters( 'trackship_tracking_event_location', $value->tracking_location->city ); ?></span></p>
35
- </li>
36
- <?php } } ?>
37
  </ul>
38
  </div>
39
- <?php } ?>
 
40
  </div>
1
+ <?php
2
+ if($hide_tracking_events == 1)return;
3
+ ?>
4
  <div class="tracking-details" style="">
5
+ <?php
6
+ if($hide_tracking_events == 2){
7
+ if(!empty($tracking_details_by_date)){ ?>
8
+
9
+ <div class="shipment_progress_heading_div">
10
+ <h4 class="h4-heading text-uppercase"><?php _e( 'Tracking Details', 'woo-advanced-shipment-tracking' ); ?></h4>
11
+ </div>
12
+
13
+ <?php if(!empty($trackind_destination_detail_by_status_rev)){ ?>
14
+
15
+ <div class="tracking_destination_details_by_date">
16
+
17
+ <h4 style=""><?php _e( 'Destination Details', 'woo-advanced-shipment-tracking' ); ?></h4>
18
+ <ul class="timeline new-details">
19
+ <?php $a = 1;
20
+ foreach( $trackind_destination_detail_by_status_rev as $key => $value ){
21
+ if( $a > 2)break;
22
+ $date = date('Y-m-d', strtotime($value->datetime)); ?>
23
+ <li>
24
+ <strong><?php echo date_i18n( get_option( 'date_format' ), strtotime($date) ); ?> <?php echo date_i18n( get_option( 'time_format' ), strtotime($value->datetime) )?></strong>
25
+ <p><?php echo apply_filters( 'trackship_tracking_event_description', $value->message ); if($value->tracking_location->city != NULL)echo ' - '; ?><span><?php echo apply_filters( 'trackship_tracking_event_location', $value->tracking_location->city ); ?></span></p>
26
+ </li>
27
+ <?php $a++; } ?>
28
+ </ul>
29
+
30
+ <ul class="timeline old-details" style="display:none;">
31
+ <?php
32
+ $a = 1;
33
+ foreach($trackind_destination_detail_by_status_rev as $key => $value){
34
+ if( $a <= 2 ){ $a++; continue; }
35
+ $date = date('Y-m-d', strtotime($value->datetime)); ?>
36
+ <li>
37
+ <strong><?php echo date_i18n( get_option( 'date_format' ), strtotime($date) ); ?> <?php echo date_i18n( get_option( 'time_format' ), strtotime($value->datetime) )?></strong>
38
+ <p><?php echo apply_filters( 'trackship_tracking_event_description', $value->message ); if($value->tracking_location->city != NULL)echo ' - '; ?><span><?php echo apply_filters( 'trackship_tracking_event_location', $value->tracking_location->city ); ?></span></p>
39
+ </li>
40
+ <?php $a++; } ?>
41
+ </ul>
42
+ </div>
43
+
44
+ <?php } ?>
45
+
46
+ <div class="tracking_details_by_date">
47
+
48
+ <?php if(!empty($trackind_destination_detail_by_status_rev)){ ?>
49
+ <h4 class="" style=""><?php _e( 'Origin Details', 'woo-advanced-shipment-tracking' ); ?></h4>
50
+ <?php } ?>
51
+
52
+ <ul class="timeline new-details">
53
+ <?php $a = 1;
54
+ foreach( $trackind_detail_by_status_rev as $key => $value ){
55
+ if( $a > 2)break;
56
+ $date = date('Y-m-d', strtotime($value->datetime)); ?>
57
+ <li>
58
+ <strong><?php echo date_i18n( get_option( 'date_format' ), strtotime($date) ); ?> <?php echo date_i18n( get_option( 'time_format' ), strtotime($value->datetime) )?></strong>
59
+ <p><?php echo apply_filters( 'trackship_tracking_event_description', $value->message ); if($value->tracking_location->city != NULL)echo ' - '; ?><span><?php echo apply_filters( 'trackship_tracking_event_location', $value->tracking_location->city ); ?></span></p>
60
+ </li>
61
+ <?php $a++; } ?>
62
+ </ul>
63
+
64
+ <ul class="timeline old-details" style="display:none;">
65
+ <?php
66
+ $a = 1;
67
+ foreach($trackind_detail_by_status_rev as $key => $value){
68
+ if( $a <= 2 ){ $a++; continue; }
69
+ $date = date('Y-m-d', strtotime($value->datetime)); ?>
70
+ <li>
71
+ <strong><?php echo date_i18n( get_option( 'date_format' ), strtotime($date) ); ?> <?php echo date_i18n( get_option( 'time_format' ), strtotime($value->datetime) )?></strong>
72
+ <p><?php echo apply_filters( 'trackship_tracking_event_description', $value->message ); if($value->tracking_location->city != NULL)echo ' - '; ?><span><?php echo apply_filters( 'trackship_tracking_event_location', $value->tracking_location->city ); ?></span></p>
73
+ </li>
74
+ <?php $a++; } ?>
75
+ </ul>
76
+
77
+ </div>
78
+
79
+ <a class="view_old_details" href="javaScript:void(0);" style="display: inline;"><?php _e( 'view more', 'woo-advanced-shipment-tracking' ); ?></a>
80
+ <a class="hide_old_details" href="javaScript:void(0);" style="display: none;"><?php _e( 'view less', 'woo-advanced-shipment-tracking' ); ?></a>
81
+
82
+ <?php } } else{
83
+
84
+ if(!empty($tracking_details_by_date)){ ?>
85
+
86
  <div class="shipment_progress_heading_div">
87
  <h4 class="h4-heading text-uppercase"><?php _e( 'Tracking Details', 'woo-advanced-shipment-tracking' ); ?></h4>
88
  </div>
89
+
90
+ <?php if(!empty($trackind_destination_detail_by_status_rev)){ ?>
91
+
92
  <div class="tracking_destination_details_by_date">
93
+
94
  <h4 style=""><?php _e( 'Destination Details', 'woo-advanced-shipment-tracking' ); ?></h4>
95
  <ul class="timeline">
96
+
97
+ <?php foreach($trackind_destination_detail_by_status_rev as $key => $value){
98
+ $date = date('Y-m-d', strtotime($value->datetime)); ?>
 
99
  <li>
100
  <strong><?php echo date_i18n( get_option( 'date_format' ), strtotime($date) ); ?> <?php echo date_i18n( get_option( 'time_format' ), strtotime($value->datetime) )?></strong>
101
  <p><?php echo apply_filters( 'trackship_tracking_event_description', $value->message ); if($value->tracking_location->city != NULL)echo ' - '; ?><span><?php echo apply_filters( 'trackship_tracking_event_location', $value->tracking_location->city ); ?></span></p>
102
  </li>
103
+ <?php } ?>
104
+
105
  </ul>
106
  </div>
107
+
108
  <?php } ?>
109
 
110
  <div class="tracking_details_by_date">
111
+
112
+ <?php if(!empty($trackind_destination_detail_by_status_rev)){ ?>
113
  <h4 class="" style=""><?php _e( 'Origin Details', 'woo-advanced-shipment-tracking' ); ?></h4>
114
  <?php } ?>
115
+
116
  <ul class="timeline">
117
+ <?php foreach($trackind_detail_by_status_rev as $key => $value){
118
+ $date = date('Y-m-d', strtotime($value->datetime)); ?>
119
+
120
+ <li>
121
+ <strong><?php echo date_i18n( get_option( 'date_format' ), strtotime($date) ); ?> <?php echo date_i18n( get_option( 'time_format' ), strtotime($value->datetime) )?></strong>
122
+ <p><?php echo apply_filters( 'trackship_tracking_event_description', $value->message ); if($value->tracking_location->city != NULL)echo ' - '; ?><span><?php echo apply_filters( 'trackship_tracking_event_location', $value->tracking_location->city ); ?></span></p>
123
+ </li>
124
+ <?php } ?>
 
125
  </ul>
126
  </div>
127
+ <?php }
128
+ } ?>
129
  </div>
includes/views/front/preview_tracking_page.php CHANGED
@@ -4,8 +4,9 @@
4
  margin-top:0px !important;
5
  }
6
  .col.tracking-detail{
7
- margin: 0 auto;
8
  }
 
9
  <?php
10
  if($border_color){ ?>
11
  .col.tracking-detail{
@@ -18,73 +19,116 @@
18
  border-top: 1px solid <?php echo $border_color; ?>;
19
  }
20
  <?php } ?>
 
 
 
 
 
21
  </style>
22
 
23
  <div class="tracking-detail col">
 
24
  <div class="shipment-header">
25
  <p class="shipment_heading"><?php _e( 'Shipment', 'woo-advanced-shipment-tracking' ); ?></p>
26
  <span><?php _e( 'Order', 'woocommerce' ); ?> <strong>#14696 </strong></span>
27
  </div>
28
- <div class="tracking-header">
29
- <div class="provider_image_div" style="<?php if($hide_tracking_provider_image == 1) { echo 'display:none'; }; ?>">
30
- <img class="provider_image" src="<?php echo wc_advanced_shipment_tracking()->plugin_dir_url()?>assets/images/usps.png?v=3.1.1">
31
- </div>
32
- <div class="tracking_number_div">
33
- <ul>
34
- <li>
35
- USPS:
36
- <?php
37
- if($wc_ast_link_to_shipping_provider == 1) { ?>
38
- <a href="https://tools.usps.com/go/TrackConfirmAction_input?qtc_tLabels1=9410803699300126968507" target="blank"><strong>9410803699300126968507</strong></a>
39
- <?php } else{ ?>
40
- <strong>9410803699300126968507</strong>
41
- <?php } ?>
42
- </li>
43
- </ul>
44
- </div>
45
- <h1 class="shipment_status_heading out_for_delivery">
46
- Out For Delivery
47
- </h1>
48
- <span class="tracking-number">
49
- Est. Delivery Date: <strong>
50
- Thursday, Oct 01</strong>
51
- </span>
52
- </div>
53
- <div class="tracker-progress-bar <?php if($tracking_page_layout == 't_layout_1'){ echo 'tracking_layout_1'; } ?>">
54
- <div class="progress">
55
- <div class="progress-bar out_for_delivery" style="width: 67%;"></div>
56
- </div>
57
- </div>
58
- <div class="tracking-details" style="<?php if($hide_tracking_events == 1){ echo 'display:none'; } ?>">
59
- <div class="shipment_progress_heading_div">
60
- <h4 class="h4-heading text-uppercase">Tracking Details</h4>
61
- </div>
62
- <div class="tracking_details_by_date">
63
- <ul class="timeline">
64
- <li>
65
- <strong>October 1, 2020 07:59</strong>
66
- <p>Out for Delivery, Expected Delivery by 8:00pm - EAST HARTFORD, CT - <span>EAST HARTFORD</span></p>
67
- </li>
68
- <li>
69
- <strong>October 1, 2020 07:48</strong>
70
- <p>Arrived at Post Office - HARTFORD, CT - <span>HARTFORD</span></p>
71
- </li>
72
- <li>
73
- <strong>October 1, 2020 00:10</strong>
74
- <p>Arrived at USPS Regional Destination Facility - SPRINGFIELD MA NETWORK DISTRIBUTION CENTER, - <span>SPRINGFIELD MA NETWORK DISTRIBUTION CENTER</span></p>
75
- </li>
76
- <li>
77
- <strong>September 30, 2020 00:00</strong>
78
- <p>In Transit to Next Facility<span></span></p>
79
- </li>
80
- <li>
81
- <strong>September 29, 2020 13:12</strong>
82
- <p>USPS in possession of item - SHELDON, WI - <span>SHELDON</span></p>
83
- </li>
84
- </ul>
85
- </div>
86
- </div>
87
- <div class="trackship_branding" style="<?php if($remove_trackship_branding == 1){ echo 'display:none'; }?>">
88
- <p>Shipment Tracking info by <a href="https://trackship.info" title="TrackShip" target="blank"><img src="<?php echo wc_advanced_shipment_tracking()->plugin_dir_url()?>assets/images/trackship-logo.png"></a></p>
89
- </div>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
90
  </div>
4
  margin-top:0px !important;
5
  }
6
  .col.tracking-detail{
7
+ margin: 50px auto 100px;
8
  }
9
+ .customize-partial-edit-shortcut-button {display: none;}
10
  <?php
11
  if($border_color){ ?>
12
  .col.tracking-detail{
19
  border-top: 1px solid <?php echo $border_color; ?>;
20
  }
21
  <?php } ?>
22
+ <?php if($background_color){ ?>
23
+ body .col.tracking-detail{
24
+ background: <?php echo $background_color; ?>;
25
+ }
26
+ <?php } ?>
27
  </style>
28
 
29
  <div class="tracking-detail col">
30
+
31
  <div class="shipment-header">
32
  <p class="shipment_heading"><?php _e( 'Shipment', 'woo-advanced-shipment-tracking' ); ?></p>
33
  <span><?php _e( 'Order', 'woocommerce' ); ?> <strong>#14696 </strong></span>
34
  </div>
35
+
36
+ <div class="tracking-header">
37
+ <?php if($hide_tracking_provider_image != 1) { ?>
38
+ <div class="provider_image_div" style="">
39
+ <img class="provider_image" src="<?php echo wc_advanced_shipment_tracking()->plugin_dir_url()?>assets/images/usps.png?v=3.1.1">
40
+ </div>
41
+ <?php } ?>
42
+
43
+ <div class="tracking_number_div">
44
+ <ul>
45
+ <li>
46
+ USPS:
47
+ <?php
48
+ if($wc_ast_link_to_shipping_provider == 1) { ?>
49
+ <a href="https://tools.usps.com/go/TrackConfirmAction_input?qtc_tLabels1=9410803699300126968507" target="blank"><strong>9410803699300126968507</strong></a>
50
+ <?php } else{ ?>
51
+ <strong>9410803699300126968507</strong>
52
+ <?php } ?>
53
+ </li>
54
+ </ul>
55
+ </div>
56
+
57
+ <h1 class="shipment_status_heading out_for_delivery">Out For Delivery</h1>
58
+
59
+ <span class="tracking-number">Est. Delivery Date: <strong>Thursday, Oct 01</strong></span>
60
+ </div>
61
+
62
+
63
+ <div class="tracker-progress-bar <?php if($tracking_page_layout == 't_layout_1'){ echo 'tracking_layout_1'; } ?>">
64
+ <div class="progress">
65
+ <div class="progress-bar out_for_delivery" style="width: 67%;"></div>
66
+ </div>
67
+ </div>
68
+
69
+ <div class="tracking-details" style="<?php if($hide_tracking_events == 1){ echo 'display:none'; } ?>">
70
+
71
+ <div class="shipment_progress_heading_div">
72
+ <h4 class="h4-heading text-uppercase">Tracking Details</h4>
73
+ </div>
74
+ <?php if($hide_tracking_events == 0){ ?>
75
+ <div class="tracking_details_by_date">
76
+ <ul class="timeline">
77
+ <li>
78
+ <strong>October 1, 2020 07:59</strong>
79
+ <p>Out for Delivery, Expected Delivery by 8:00pm - EAST HARTFORD, CT - <span>EAST HARTFORD</span></p>
80
+ </li>
81
+ <li>
82
+ <strong>October 1, 2020 07:48</strong>
83
+ <p>Arrived at Post Office - HARTFORD, CT - <span>HARTFORD</span></p>
84
+ </li>
85
+ <li>
86
+ <strong>October 1, 2020 00:10</strong>
87
+ <p>Arrived at USPS Regional Destination Facility - SPRINGFIELD MA NETWORK DISTRIBUTION CENTER, - <span>SPRINGFIELD MA NETWORK DISTRIBUTION CENTER</span></p>
88
+ </li>
89
+ <li>
90
+ <strong>September 30, 2020 00:00</strong>
91
+ <p>In Transit to Next Facility<span></span></p>
92
+ </li>
93
+ <li>
94
+ <strong>September 29, 2020 13:12</strong>
95
+ <p>USPS in possession of item - SHELDON, WI - <span>SHELDON</span></p>
96
+ </li>
97
+ </ul>
98
+ </div>
99
+ <?php } elseif( $hide_tracking_events == 2 ){ ?>
100
+ <div class="tracking_details_by_date">
101
+ <ul class="timeline new-details">
102
+ <li>
103
+ <strong>October 1, 2020 07:59</strong>
104
+ <p>Out for Delivery, Expected Delivery by 8:00pm - EAST HARTFORD, CT - <span>EAST HARTFORD</span></p>
105
+ </li>
106
+ <li>
107
+ <strong>October 1, 2020 07:48</strong>
108
+ <p>Arrived at Post Office - HARTFORD, CT - <span>HARTFORD</span></p>
109
+ </li>
110
+ </ul>
111
+ <ul class="timeline old-details" style="display:none;">
112
+ <li>
113
+ <strong>October 1, 2020 00:10</strong>
114
+ <p>Arrived at USPS Regional Destination Facility - SPRINGFIELD MA NETWORK DISTRIBUTION CENTER, - <span>SPRINGFIELD MA NETWORK DISTRIBUTION CENTER</span></p>
115
+ </li>
116
+ <li>
117
+ <strong>September 30, 2020 00:00</strong>
118
+ <p>In Transit to Next Facility<span></span></p>
119
+ </li>
120
+ <li>
121
+ <strong>September 29, 2020 13:12</strong>
122
+ <p>USPS in possession of item - SHELDON, WI - <span>SHELDON</span></p>
123
+ </li>
124
+ </ul>
125
+ </div>
126
+ <a class="view_old_details" href="javaScript:void(0);" style="display: inline;"><?php _e( 'view more', 'woo-advanced-shipment-tracking' ); ?></a>
127
+ <a class="hide_old_details" href="javaScript:void(0);" style="display: none;"><?php _e( 'view less', 'woo-advanced-shipment-tracking' ); ?></a>
128
+ <?php } ?>
129
+
130
+ </div>
131
+ <div class="trackship_branding" style="<?php if($remove_trackship_branding == 1){ echo 'display:none'; }?>">
132
+ <p>Shipment Tracking info by <a href="https://trackship.info" title="TrackShip" target="blank"><img src="<?php echo wc_advanced_shipment_tracking()->plugin_dir_url()?>assets/images/trackship-logo.png"></a></p>
133
+ </div>
134
  </div>
includes/views/trackship_settings.php CHANGED
@@ -15,7 +15,7 @@
15
  <tr valign="top">
16
  <td scope="row" class="titledesc"><label><strong><?php _e( 'Connection Status', 'woo-advanced-shipment-tracking' ); ?></strong></label></td>
17
  <td class="forminp">
18
- <a href="https://trackship.info/my-account/?utm_source=wpadmin&utm_medium=sidebar&utm_campaign=upgrade" target="_blank" class="button-primary btn_green2 btn_large api_connected"><span class="dashicons dashicons-yes"></span><?php _e( 'Connected', 'woo-advanced-shipment-tracking' ); ?></a>
19
  </td>
20
  </tr>
21
  </tbody>
15
  <tr valign="top">
16
  <td scope="row" class="titledesc"><label><strong><?php _e( 'Connection Status', 'woo-advanced-shipment-tracking' ); ?></strong></label></td>
17
  <td class="forminp">
18
+ <a href="https://trackship.info/my-account/?utm_source=wpadmin&utm_medium=sidebar&utm_campaign=upgrade" target="_blank" class="button-primary btn_green2 btn_icon api_connected"><span class="dashicons dashicons-yes"></span><?php _e( 'Connected', 'woo-advanced-shipment-tracking' ); ?></a>
19
  </td>
20
  </tr>
21
  </tbody>
readme.txt CHANGED
@@ -142,6 +142,11 @@ Yes, if you use external shipping services that work with the WooCommerce REST A
142
 
143
  == Changelog ==
144
 
 
 
 
 
 
145
  = 3.2.1.1 =
146
  * Fix - Fixed Invalid user key in Shipment tracking section if TrackShip is not connected
147
 
142
 
143
  == Changelog ==
144
 
145
+ = 3.2.1.2 =
146
+ * Enhancement - Improved the TrackShip tracking page customizer
147
+ * Enhancement - Updated design of Tracking tracking page
148
+ * Enhancement - Updated design of TrackShip analytics widget on WordPress dashboard
149
+
150
  = 3.2.1.1 =
151
  * Fix - Fixed Invalid user key in Shipment tracking section if TrackShip is not connected
152
 
woocommerce-advanced-shipment-tracking.php CHANGED
@@ -4,7 +4,7 @@
4
  * Plugin Name: Advanced Shipment Tracking for WooCommerce
5
  * Plugin URI: https://www.zorem.com/products/woocommerce-advanced-shipment-tracking/
6
  * Description: Add shipment tracking information to your WooCommerce orders and provide customers with an easy way to track their orders. Shipment tracking Info will appear in customers accounts (in the order panel) and in WooCommerce order complete email.
7
- * Version: 3.2.1.1
8
  * Author: zorem
9
  * Author URI: https://www.zorem.com
10
  * License: GPL-2.0+
@@ -21,7 +21,7 @@ class zorem_woocommerce_advanced_shipment_tracking {
21
  *
22
  * @var string
23
  */
24
- public $version = '3.2.1.1';
25
 
26
  /**
27
  * Initialize the main plugin function
4
  * Plugin Name: Advanced Shipment Tracking for WooCommerce
5
  * Plugin URI: https://www.zorem.com/products/woocommerce-advanced-shipment-tracking/
6
  * Description: Add shipment tracking information to your WooCommerce orders and provide customers with an easy way to track their orders. Shipment tracking Info will appear in customers accounts (in the order panel) and in WooCommerce order complete email.
7
+ * Version: 3.2.1.2
8
  * Author: zorem
9
  * Author URI: https://www.zorem.com
10
  * License: GPL-2.0+
21
  *
22
  * @var string
23
  */
24
+ public $version = '3.2.1.2';
25
 
26
  /**
27
  * Initialize the main plugin function