Version Description
- Fix - fixed issue so trackship_supported column adding in shipping providers table and based on that use carrier website as tracking link if TrackShip not sot supported
Download this release
Release Info
Developer | zorem |
Plugin | Advanced Shipment Tracking for WooCommerce |
Version | 2.9.8 |
Comparing to | |
See all releases |
Code changes from version 2.9.6 to 2.9.8
- assets/css/admin.css +27 -12
- assets/{shipment-provider-img/dai-post (Hitesh Patel's conflicted copy 2020-04-27).png → css/icons/failure-o (Hitesh Patel's conflicted copy 2020-04-29).png} +0 -0
- assets/js/admin.js +2 -2
- assets/shipment-provider-img/{mrw (Hitesh Patel's conflicted copy 2020-04-27).png → postnord-sverige-ab (Hitesh Patel's conflicted copy 2020-04-29).png} +0 -0
- assets/shipment-provider-img/{nacex (Hitesh Patel's conflicted copy 2020-04-27).png → sda (Hitesh Patel's conflicted copy 2020-04-29).png} +0 -0
- assets/shipment-provider-img/{shree-maruti-courier (Hitesh Patel's conflicted copy 2020-04-27).png → turkey-post (Hitesh Patel's conflicted copy 2020-04-29).png} +0 -0
- includes/class-wc-advanced-shipment-tracking-admin.php +133 -7
- includes/class-wc-advanced-shipment-tracking-front.php +20 -1
- includes/class-wc-advanced-shipment-tracking-install.php +32 -2
- includes/class-wc-advanced-shipment-tracking-settings.php +13 -4
- includes/class-wc-advanced-shipment-tracking.php +22 -9
- includes/views/admin_trackship_dashboard.php +14 -27
- includes/views/zorem_admin_sidebar.php +23 -26
- lang/woo-advanced-shipment-tracking-tr_TR (Hitesh Patel's conflicted copy 2020-04-29).mo +0 -0
- readme.txt +12 -0
- woocommerce-advanced-shipment-tracking.php +2 -2
assets/css/admin.css
CHANGED
@@ -194,8 +194,7 @@ input.tab_input_1:checked + label{
|
|
194 |
padding: 0 0 10px;
|
195 |
}
|
196 |
.zorem_admin_layout .zorem_admin_sidebar h3.top-border{
|
197 |
-
padding: 10px 0 10px;
|
198 |
-
border-top: 1px solid #eee;
|
199 |
}
|
200 |
.zorem_admin_layout .zorem_admin_sidebar p,.zorem_admin_layout .zorem_admin_sidebar a{
|
201 |
margin: 0px 10px 0 0;
|
@@ -274,6 +273,17 @@ input.tab_input_1:checked + label{
|
|
274 |
.ast_admin_content .form-table th.titledesc {
|
275 |
width: 40%;
|
276 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
277 |
.woocommerce .ast_admin_content table.form-table th label .woocommerce-help-tip{
|
278 |
margin: -4px 0 0 5px;
|
279 |
position: relative;
|
@@ -440,6 +450,12 @@ thead .mdl-list__item-secondary-action {
|
|
440 |
}
|
441 |
#wc_ast_settings_form .form-table tr:first-child,#wc_ast_trackship_form .form-table tr:first-child,#wc_ast_upload_csv_form .form-table tr:first-child,#wc_ast_addons_form .form-table tr:first-child{
|
442 |
border-top: 1px solid #eee;
|
|
|
|
|
|
|
|
|
|
|
|
|
443 |
}
|
444 |
#wc_ast_settings_form .form-table tr.multiple_checkbox_title_tr{
|
445 |
border-bottom: 0;
|
@@ -450,17 +466,13 @@ thead .mdl-list__item-secondary-action {
|
|
450 |
input#wc_ast_api_key {
|
451 |
width: 260px;
|
452 |
}
|
453 |
-
|
454 |
-
|
455 |
-
|
456 |
-
background: #83bd31;
|
457 |
-
padding: 12px 26px;
|
458 |
-
font-size: 15px;
|
459 |
-
border-radius: 5px;
|
460 |
}
|
461 |
-
|
462 |
-
|
463 |
-
|
464 |
}
|
465 |
.ac-container {
|
466 |
margin: 0 auto 30px auto;
|
@@ -1444,6 +1456,9 @@ p.delivered_message {
|
|
1444 |
.woocommerce.zorem_admin_layout table.form-table th{
|
1445 |
padding: 20px 24px 20px 15px;
|
1446 |
}
|
|
|
|
|
|
|
1447 |
.woocommerce.zorem_admin_layout table.form-table td{
|
1448 |
padding: 15px 15px;
|
1449 |
}
|
194 |
padding: 0 0 10px;
|
195 |
}
|
196 |
.zorem_admin_layout .zorem_admin_sidebar h3.top-border{
|
197 |
+
padding: 10px 0 10px;
|
|
|
198 |
}
|
199 |
.zorem_admin_layout .zorem_admin_sidebar p,.zorem_admin_layout .zorem_admin_sidebar a{
|
200 |
margin: 0px 10px 0 0;
|
273 |
.ast_admin_content .form-table th.titledesc {
|
274 |
width: 40%;
|
275 |
}
|
276 |
+
.ast_admin_content .form-table.table-layout-2 th.titledesc {
|
277 |
+
width: 2.5%;
|
278 |
+
border-right:1px solid #eee;
|
279 |
+
}
|
280 |
+
.ast_admin_content .trackship_status_section .form-table th.titledesc{
|
281 |
+
width: 20%;
|
282 |
+
padding: 10px 24px 10px 15px;
|
283 |
+
}
|
284 |
+
.woocommerce.zorem_admin_layout .trackship_status_section table.form-table td {
|
285 |
+
padding: 10px 15px;
|
286 |
+
}
|
287 |
.woocommerce .ast_admin_content table.form-table th label .woocommerce-help-tip{
|
288 |
margin: -4px 0 0 5px;
|
289 |
position: relative;
|
450 |
}
|
451 |
#wc_ast_settings_form .form-table tr:first-child,#wc_ast_trackship_form .form-table tr:first-child,#wc_ast_upload_csv_form .form-table tr:first-child,#wc_ast_addons_form .form-table tr:first-child{
|
452 |
border-top: 1px solid #eee;
|
453 |
+
}
|
454 |
+
#wc_ast_trackship_form .trackship_status_section .form-table tr{
|
455 |
+
border-bottom: 0;
|
456 |
+
}
|
457 |
+
#wc_ast_trackship_form .trackship_status_section .form-table tr:nth-last-child(2) {
|
458 |
+
border-bottom: 1px solid #eee;
|
459 |
}
|
460 |
#wc_ast_settings_form .form-table tr.multiple_checkbox_title_tr{
|
461 |
border-bottom: 0;
|
466 |
input#wc_ast_api_key {
|
467 |
width: 260px;
|
468 |
}
|
469 |
+
.api_connected {
|
470 |
+
color: #83bd31;
|
471 |
+
text-decoration:none;
|
|
|
|
|
|
|
|
|
472 |
}
|
473 |
+
.api_connected .dashicons{
|
474 |
+
height: 18px;
|
475 |
+
width: 18px;
|
476 |
}
|
477 |
.ac-container {
|
478 |
margin: 0 auto 30px auto;
|
1456 |
.woocommerce.zorem_admin_layout table.form-table th{
|
1457 |
padding: 20px 24px 20px 15px;
|
1458 |
}
|
1459 |
+
.woocommerce.zorem_admin_layout table.form-table.table-layout-2 th.titledesc{
|
1460 |
+
padding: 20px 15px 20px 15px;
|
1461 |
+
}
|
1462 |
.woocommerce.zorem_admin_layout table.form-table td{
|
1463 |
padding: 15px 15px;
|
1464 |
}
|
assets/{shipment-provider-img/dai-post (Hitesh Patel's conflicted copy 2020-04-27).png → css/icons/failure-o (Hitesh Patel's conflicted copy 2020-04-29).png}
RENAMED
File without changes
|
assets/js/admin.js
CHANGED
@@ -19,7 +19,7 @@ jQuery( function( $ ) {
|
|
19 |
if( tracking_number.val() === '' ){
|
20 |
showerror( tracking_number );error = true;
|
21 |
} else{
|
22 |
-
var pattern = /^[0-9a-zA-Z-_ \b]+$/;
|
23 |
if(!pattern.test(tracking_number.val())){
|
24 |
showerror( tracking_number );
|
25 |
error = true;
|
@@ -347,7 +347,7 @@ jQuery(document).on("submit", "#add_tracking_number_form", function(){
|
|
347 |
showerror(tracking_number);
|
348 |
error = true;
|
349 |
} else{
|
350 |
-
var pattern = /^[0-9a-zA-Z-_ \b]+$/;
|
351 |
if(!pattern.test(tracking_number.val())){
|
352 |
showerror(tracking_number);
|
353 |
error = true;
|
19 |
if( tracking_number.val() === '' ){
|
20 |
showerror( tracking_number );error = true;
|
21 |
} else{
|
22 |
+
var pattern = /^[0-9a-zA-Z-_. \b]+$/;
|
23 |
if(!pattern.test(tracking_number.val())){
|
24 |
showerror( tracking_number );
|
25 |
error = true;
|
347 |
showerror(tracking_number);
|
348 |
error = true;
|
349 |
} else{
|
350 |
+
var pattern = /^[0-9a-zA-Z-_. \b]+$/;
|
351 |
if(!pattern.test(tracking_number.val())){
|
352 |
showerror(tracking_number);
|
353 |
error = true;
|
assets/shipment-provider-img/{mrw (Hitesh Patel's conflicted copy 2020-04-27).png → postnord-sverige-ab (Hitesh Patel's conflicted copy 2020-04-29).png}
RENAMED
File without changes
|
assets/shipment-provider-img/{nacex (Hitesh Patel's conflicted copy 2020-04-27).png → sda (Hitesh Patel's conflicted copy 2020-04-29).png}
RENAMED
File without changes
|
assets/shipment-provider-img/{shree-maruti-courier (Hitesh Patel's conflicted copy 2020-04-27).png → turkey-post (Hitesh Patel's conflicted copy 2020-04-29).png}
RENAMED
File without changes
|
includes/class-wc-advanced-shipment-tracking-admin.php
CHANGED
@@ -788,6 +788,129 @@ class WC_Advanced_Shipment_Tracking_Admin {
|
|
788 |
</table>
|
789 |
<?php
|
790 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
791 |
|
792 |
/*
|
793 |
* get trackship bulk actions tab array data
|
@@ -797,7 +920,7 @@ class WC_Advanced_Shipment_Tracking_Admin {
|
|
797 |
// Get orders completed.
|
798 |
$args = array(
|
799 |
'status' => 'wc-completed',
|
800 |
-
'limit' =>
|
801 |
'date_created' => '>' . ( time() - 2592000 ),
|
802 |
);
|
803 |
|
@@ -1545,7 +1668,7 @@ class WC_Advanced_Shipment_Tracking_Admin {
|
|
1545 |
if(empty($tracking_number)){
|
1546 |
echo '<li class="error">Failed - Empty Tracking Number for Order Id - '.$_POST['order_id'].'</li>';exit;
|
1547 |
}
|
1548 |
-
if(preg_match('/[^a-z0-9- \b]+/i', $tracking_number)){
|
1549 |
echo '<li class="error">Failed - Special character not allowd in tracking number for Order Id - '.$_POST['order_id'].'</li>';exit;
|
1550 |
}
|
1551 |
if(empty($date_shipped)){
|
@@ -2026,11 +2149,14 @@ class WC_Advanced_Shipment_Tracking_Admin {
|
|
2026 |
);
|
2027 |
}
|
2028 |
}
|
2029 |
-
|
2030 |
-
|
2031 |
-
'
|
2032 |
-
|
2033 |
-
|
|
|
|
|
|
|
2034 |
return $actions;
|
2035 |
}
|
2036 |
|
788 |
</table>
|
789 |
<?php
|
790 |
}
|
791 |
+
|
792 |
+
|
793 |
+
/*
|
794 |
+
* get html of fields
|
795 |
+
*/
|
796 |
+
public function get_html_2( $arrays ){
|
797 |
+
|
798 |
+
$checked = '';
|
799 |
+
?>
|
800 |
+
<table class="form-table table-layout-2">
|
801 |
+
<tbody>
|
802 |
+
<?php foreach( (array)$arrays as $id => $array ){
|
803 |
+
|
804 |
+
if($array['show']){ ?>
|
805 |
+
<tr valign="top" class="<?php echo $array['class']; ?>">
|
806 |
+
|
807 |
+
<th scope="row" class="titledesc" <?php if($array['type'] == 'desc'){ ?> colspan=2 <?php } ?>>
|
808 |
+
<?php if( $array['type'] == 'checkbox' ){
|
809 |
+
if($id === 'wcast_enable_delivered_email'){
|
810 |
+
$wcast_enable_delivered_email = get_option('woocommerce_customer_delivered_order_settings');
|
811 |
+
|
812 |
+
if($wcast_enable_delivered_email['enabled'] == 'yes' || $wcast_enable_delivered_email['enabled'] == 1){
|
813 |
+
$checked = 'checked';
|
814 |
+
} else{
|
815 |
+
$checked = '';
|
816 |
+
}
|
817 |
+
|
818 |
+
} elseif($id === 'wcast_enable_partial_shipped_email'){
|
819 |
+
$wcast_enable_partial_shipped_email = get_option('woocommerce_customer_partial_shipped_order_settings');
|
820 |
+
|
821 |
+
if($wcast_enable_partial_shipped_email['enabled'] == 'yes' || $wcast_enable_partial_shipped_email['enabled'] == 1){
|
822 |
+
$checked = 'checked';
|
823 |
+
} else{
|
824 |
+
$checked = '';
|
825 |
+
}
|
826 |
+
} else{
|
827 |
+
if(get_option($id)){
|
828 |
+
$checked = 'checked';
|
829 |
+
} else{
|
830 |
+
$checked = '';
|
831 |
+
}
|
832 |
+
}
|
833 |
+
|
834 |
+
if(isset($array['disabled']) && $array['disabled'] == true){
|
835 |
+
$disabled = 'disabled';
|
836 |
+
$checked = '';
|
837 |
+
} else{
|
838 |
+
$disabled = '';
|
839 |
+
}
|
840 |
+
?>
|
841 |
+
<span class="mdl-list__item-secondary-action">
|
842 |
+
<label class="mdl-switch mdl-js-switch mdl-js-ripple-effect" for="<?php echo $id?>">
|
843 |
+
<input type="hidden" name="<?php echo $id?>" value="0"/>
|
844 |
+
<input type="checkbox" id="<?php echo $id?>" name="<?php echo $id?>" class="mdl-switch__input" <?php echo $checked ?> value="1" <?php echo $disabled; ?>/>
|
845 |
+
</label>
|
846 |
+
</span>
|
847 |
+
<?php } elseif( isset( $array['type'] ) && $array['type'] == 'dropdown' ){?>
|
848 |
+
<?php
|
849 |
+
if( isset($array['multiple']) ){
|
850 |
+
$multiple = 'multiple';
|
851 |
+
$field_id = $array['multiple'];
|
852 |
+
} else {
|
853 |
+
$multiple = '';
|
854 |
+
$field_id = $id;
|
855 |
+
}
|
856 |
+
?>
|
857 |
+
<fieldset>
|
858 |
+
<select class="select select2" id="<?php echo $field_id?>" name="<?php echo $id?>" <?php echo $multiple;?>> <?php foreach((array)$array['options'] as $key => $val ){?>
|
859 |
+
<?php
|
860 |
+
$selected = '';
|
861 |
+
if( isset($array['multiple']) ){
|
862 |
+
if (in_array($key, (array)$this->data->$field_id ))$selected = 'selected';
|
863 |
+
} else {
|
864 |
+
if( get_option($id) == (string)$key )$selected = 'selected';
|
865 |
+
}
|
866 |
+
|
867 |
+
?>
|
868 |
+
<option value="<?php echo $key?>" <?php echo $selected?> ><?php echo $val?></option>
|
869 |
+
<?php } ?>
|
870 |
+
</select>
|
871 |
+
</fieldset>
|
872 |
+
<?php }
|
873 |
+
elseif( $array['type'] == 'label' ){ ?>
|
874 |
+
<fieldset>
|
875 |
+
<label><?php echo $array['value']; ?></label>
|
876 |
+
</fieldset>
|
877 |
+
<?php }
|
878 |
+
elseif( $array['type'] == 'tooltip_button' ){ ?>
|
879 |
+
<fieldset>
|
880 |
+
<a href="<?php echo $array['link']; ?>" class="button-primary" target="<?php echo $array['target'];?>"><?php echo $array['link_label'];?></a>
|
881 |
+
</fieldset>
|
882 |
+
<?php }
|
883 |
+
elseif( $array['type'] == 'button' ){ ?>
|
884 |
+
<fieldset>
|
885 |
+
<button class="button-primary btn_green2 <?php echo $array['button_class'];?>" <?php if($array['disable'] == 1){ echo 'disabled'; }?>><?php echo $array['label'];?></button>
|
886 |
+
</fieldset>
|
887 |
+
<?php }
|
888 |
+
else { ?>
|
889 |
+
|
890 |
+
<fieldset>
|
891 |
+
<input class="input-text regular-input " type="text" name="<?php echo $id?>" id="<?php echo $id?>" style="" value="<?php echo get_option($id)?>" placeholder="<?php if(!empty($array['placeholder'])){echo $array['placeholder'];} ?>">
|
892 |
+
</fieldset>
|
893 |
+
<?php } ?>
|
894 |
+
|
895 |
+
</th>
|
896 |
+
<?php if($array['type'] != 'desc'){ ?>
|
897 |
+
<th class="forminp">
|
898 |
+
<label for=""><?php echo $array['title']?><?php if(isset($array['title_link'])){ echo $array['title_link']; } ?>
|
899 |
+
<?php if( isset($array['tooltip']) ){?>
|
900 |
+
<span class="woocommerce-help-tip tipTip" title="<?php echo $array['tooltip']?>"></span>
|
901 |
+
<?php } ?>
|
902 |
+
</label>
|
903 |
+
</th>
|
904 |
+
<?php } ?>
|
905 |
+
</tr>
|
906 |
+
<?php if(isset($array['desc']) && $array['desc'] != ''){ ?>
|
907 |
+
<tr class="<?php echo $array['class']; ?>"><td colspan="2" style=""><p class="description"><?php echo (isset($array['desc']))? $array['desc']: ''?></p></td></tr>
|
908 |
+
<?php } ?>
|
909 |
+
<?php } } ?>
|
910 |
+
</tbody>
|
911 |
+
</table>
|
912 |
+
<?php
|
913 |
+
}
|
914 |
|
915 |
/*
|
916 |
* get trackship bulk actions tab array data
|
920 |
// Get orders completed.
|
921 |
$args = array(
|
922 |
'status' => 'wc-completed',
|
923 |
+
'limit' => 100,
|
924 |
'date_created' => '>' . ( time() - 2592000 ),
|
925 |
);
|
926 |
|
1668 |
if(empty($tracking_number)){
|
1669 |
echo '<li class="error">Failed - Empty Tracking Number for Order Id - '.$_POST['order_id'].'</li>';exit;
|
1670 |
}
|
1671 |
+
if(preg_match('/[^a-z0-9-_. \b]+/i', $tracking_number)){
|
1672 |
echo '<li class="error">Failed - Special character not allowd in tracking number for Order Id - '.$_POST['order_id'].'</li>';exit;
|
1673 |
}
|
1674 |
if(empty($date_shipped)){
|
2149 |
);
|
2150 |
}
|
2151 |
}
|
2152 |
+
|
2153 |
+
if ( !$order->has_status( array( 'pickup','ready-pickup','on-hold','delivered','cancelled','failed' ) ) ) {
|
2154 |
+
$actions['add_tracking'] = array(
|
2155 |
+
'url' => "#".$order->get_id(),
|
2156 |
+
'name' => __( 'Add Tracking', 'woo-advanced-shipment-tracking' ),
|
2157 |
+
'action' => "add_inline_tracking", // keep "view" class for a clean button CSS
|
2158 |
+
);
|
2159 |
+
}
|
2160 |
return $actions;
|
2161 |
}
|
2162 |
|
includes/class-wc-advanced-shipment-tracking-front.php
CHANGED
@@ -346,6 +346,9 @@ class WC_Advanced_Shipment_Tracking_Front {
|
|
346 |
$order_id = $_POST['order_id'];
|
347 |
$email = $_POST['order_email'];
|
348 |
|
|
|
|
|
|
|
349 |
$order = wc_get_order( $order_id );
|
350 |
if(empty($order)){
|
351 |
ob_start();
|
@@ -400,7 +403,23 @@ class WC_Advanced_Shipment_Tracking_Front {
|
|
400 |
}
|
401 |
$shipment_status = get_post_meta( $order_id, "shipment_status", true);
|
402 |
if(!$tracking_items){
|
403 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
404 |
exit;
|
405 |
}
|
406 |
|
346 |
$order_id = $_POST['order_id'];
|
347 |
$email = $_POST['order_email'];
|
348 |
|
349 |
+
$wast = WC_Advanced_Shipment_Tracking_Actions::get_instance();
|
350 |
+
$order_id = $wast->get_formated_order_id($order_id);
|
351 |
+
|
352 |
$order = wc_get_order( $order_id );
|
353 |
if(empty($order)){
|
354 |
ob_start();
|
403 |
}
|
404 |
$shipment_status = get_post_meta( $order_id, "shipment_status", true);
|
405 |
if(!$tracking_items){
|
406 |
+
ob_start();
|
407 |
+
?>
|
408 |
+
<div class="track-order-section">
|
409 |
+
<form method="post" class="order_track_form">
|
410 |
+
<p><?php echo apply_filters( 'ast_tracking_page_front_text', __( 'To track your order please enter your Order ID in the box below and press the "Track" button. This was given to you on your receipt and in the confirmation email you should have received.', 'woo-advanced-shipment-tracking' ) ); ?></p>
|
411 |
+
<p class="form-row form-row-first"><label for="order_id"><?php echo apply_filters( 'ast_tracking_page_front_order_label', __( 'Order ID', 'woocommerce' ) ); ?></label> <input class="input-text" type="text" name="order_id" id="order_id" value="" placeholder="<?php _e( 'Found in your order confirmation email.', 'woo-advanced-shipment-tracking' ); ?>"></p>
|
412 |
+
<p class="form-row form-row-last"><label for="order_email"><?php echo apply_filters( 'ast_tracking_page_front_order_email_label', __( 'Order Email', 'woo-advanced-shipment-tracking' ) ); ?></label> <input class="input-text" type="text" name="order_email" id="order_email" value="" placeholder="<?php _e( 'Found in your order confirmation email.', 'woo-advanced-shipment-tracking' ); ?>"></p>
|
413 |
+
<div class="clear"></div>
|
414 |
+
<input type="hidden" name="action" value="get_tracking_info">
|
415 |
+
<p class="form-row"><button type="submit" class="button" name="track" value="Track"><?php echo apply_filters( 'ast_tracking_page_front_track_label', __( 'Track', 'woo-advanced-shipment-tracking' ) ); ?></button></p>
|
416 |
+
<div class="track_fail_msg" style="display:block;color: red;"><?php _e( 'Tracking details not found.', 'woo-advanced-shipment-tracking' ); ?></div>
|
417 |
+
</form>
|
418 |
+
</div>
|
419 |
+
<?php
|
420 |
+
|
421 |
+
$form = ob_get_clean();
|
422 |
+
echo $form;exit;
|
423 |
exit;
|
424 |
}
|
425 |
|
includes/class-wc-advanced-shipment-tracking-install.php
CHANGED
@@ -1721,6 +1721,31 @@ class WC_Advanced_Shipment_Tracking_Install {
|
|
1721 |
update_option( 'late_shipments_email_settings', $late_shipments_email_opt );
|
1722 |
|
1723 |
update_option( 'wc_advanced_shipment_tracking', '3.8');
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1724 |
}
|
1725 |
}
|
1726 |
}
|
@@ -1755,16 +1780,20 @@ class WC_Advanced_Shipment_Tracking_Install {
|
|
1755 |
$provider_url = $provider['provider_url'];
|
1756 |
$shipping_country = $provider['shipping_country'];
|
1757 |
$ts_slug = $provider['shipping_provider_slug'];
|
|
|
1758 |
|
1759 |
if(isset($shippment_providers[$provider_name])){
|
1760 |
$db_provider_url = $shippment_providers[$provider_name]->provider_url;
|
1761 |
$db_shipping_country = $shippment_providers[$provider_name]->shipping_country;
|
1762 |
$db_ts_slug = $shippment_providers[$provider_name]->ts_slug;
|
1763 |
-
|
|
|
|
|
1764 |
$data_array = array(
|
1765 |
'ts_slug' => $ts_slug,
|
1766 |
'provider_url' => $provider_url,
|
1767 |
-
'shipping_country' => $shipping_country,
|
|
|
1768 |
);
|
1769 |
$where_array = array(
|
1770 |
'provider_name' => $provider_name,
|
@@ -1795,6 +1824,7 @@ class WC_Advanced_Shipment_Tracking_Install {
|
|
1795 |
'provider_url' => sanitize_text_field($provider_url),
|
1796 |
'display_in_order' => 0,
|
1797 |
'shipping_default' => 1,
|
|
|
1798 |
);
|
1799 |
$result = $wpdb->insert( $this->table, $data_array );
|
1800 |
}
|
1721 |
update_option( 'late_shipments_email_settings', $late_shipments_email_opt );
|
1722 |
|
1723 |
update_option( 'wc_advanced_shipment_tracking', '3.8');
|
1724 |
+
}
|
1725 |
+
|
1726 |
+
if(version_compare(get_option( 'wc_advanced_shipment_tracking' ),'3.10', '<') ){
|
1727 |
+
global $wpdb;
|
1728 |
+
$results = $wpdb->get_row( "SELECT * FROM {$this->table} LIMIT 1");
|
1729 |
+
|
1730 |
+
if(!isset($results->trackship_supported)) {
|
1731 |
+
$res = $wpdb->query( sprintf( "ALTER TABLE %s ADD trackship_supported int(11) NOT NULL DEFAULT '0'", $this->table) );
|
1732 |
+
}
|
1733 |
+
|
1734 |
+
$url = 'https://trackship.info/wp-json/WCAST/v1/Provider';
|
1735 |
+
$resp = wp_remote_get( $url );
|
1736 |
+
if ( is_array( $resp ) && ! is_wp_error( $resp ) ) {
|
1737 |
+
$providers = json_decode($resp['body'],true);
|
1738 |
+
}
|
1739 |
+
foreach($providers as $provider){
|
1740 |
+
$data_array = array(
|
1741 |
+
'trackship_supported' => $provider['trackship_supported'],
|
1742 |
+
);
|
1743 |
+
$where_array = array(
|
1744 |
+
'provider_name' => $provider['shipping_provider'],
|
1745 |
+
);
|
1746 |
+
$wpdb->update( $this->table, $data_array, $where_array);
|
1747 |
+
}
|
1748 |
+
update_option( 'wc_advanced_shipment_tracking', '3.10');
|
1749 |
}
|
1750 |
}
|
1751 |
}
|
1780 |
$provider_url = $provider['provider_url'];
|
1781 |
$shipping_country = $provider['shipping_country'];
|
1782 |
$ts_slug = $provider['shipping_provider_slug'];
|
1783 |
+
$trackship_supported = $provider['trackship_supported'];
|
1784 |
|
1785 |
if(isset($shippment_providers[$provider_name])){
|
1786 |
$db_provider_url = $shippment_providers[$provider_name]->provider_url;
|
1787 |
$db_shipping_country = $shippment_providers[$provider_name]->shipping_country;
|
1788 |
$db_ts_slug = $shippment_providers[$provider_name]->ts_slug;
|
1789 |
+
$db_trackship_supported = $shippment_providers[$provider_name]->trackship_supported;
|
1790 |
+
|
1791 |
+
if(($db_provider_url != $provider_url) || ($db_shipping_country != $shipping_country) || ($db_ts_slug != $ts_slug) || ($db_trackship_supported != $trackship_supported)){
|
1792 |
$data_array = array(
|
1793 |
'ts_slug' => $ts_slug,
|
1794 |
'provider_url' => $provider_url,
|
1795 |
+
'shipping_country' => $shipping_country,
|
1796 |
+
'trackship_supported' => $trackship_supported,
|
1797 |
);
|
1798 |
$where_array = array(
|
1799 |
'provider_name' => $provider_name,
|
1824 |
'provider_url' => sanitize_text_field($provider_url),
|
1825 |
'display_in_order' => 0,
|
1826 |
'shipping_default' => 1,
|
1827 |
+
'trackship_supported' => $provider['trackship_supported'],
|
1828 |
);
|
1829 |
$result = $wpdb->insert( $this->table, $data_array );
|
1830 |
}
|
includes/class-wc-advanced-shipment-tracking-settings.php
CHANGED
@@ -410,6 +410,14 @@ class WC_Advanced_Shipment_Tracking_Settings {
|
|
410 |
|
411 |
public function ast_open_inline_tracking_form_fun(){
|
412 |
$order_id = wc_clean($_POST['order_id']);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
413 |
global $wpdb;
|
414 |
$WC_Countries = new WC_Countries();
|
415 |
$countries = $WC_Countries->get_countries();
|
@@ -429,6 +437,7 @@ class WC_Advanced_Shipment_Tracking_Settings {
|
|
429 |
} else{
|
430 |
$woo_shippment_table_name = $wpdb->prefix."woo_shippment_provider";
|
431 |
}
|
|
|
432 |
$shippment_countries = $wpdb->get_results( "SELECT shipping_country FROM $woo_shippment_table_name WHERE display_in_order = 1 GROUP BY shipping_country" );
|
433 |
|
434 |
$shippment_providers = $wpdb->get_results( "SELECT * FROM $woo_shippment_table_name" );
|
@@ -450,7 +459,7 @@ class WC_Advanced_Shipment_Tracking_Settings {
|
|
450 |
?>
|
451 |
<div id="" class="trackingpopup_wrapper add_tracking_popup" style="display:none;">
|
452 |
<div class="trackingpopup_row">
|
453 |
-
<h3 class="popup_title"><?php _e( 'Add Tracking Number', 'woo-advanced-shipment-tracking'); ?></h2>
|
454 |
<form id="add_tracking_number_form" method="POST" class="add_tracking_number_form">
|
455 |
<p class="form-field">
|
456 |
<label for="tracking_number"><?php _e( 'Shipping Provider:', 'woo-advanced-shipment-tracking'); ?></label>
|
@@ -476,11 +485,11 @@ class WC_Advanced_Shipment_Tracking_Settings {
|
|
476 |
</p>
|
477 |
<p class="form-field tracking_number_field">
|
478 |
<label for="tracking_number"><?php _e( 'Tracking number:', 'woo-advanced-shipment-tracking'); ?></label>
|
479 |
-
<input type="text" class="short" style="" name="tracking_number" id="tracking_number" value=""
|
480 |
</p>
|
481 |
<p class="form-field tracking_product_code_field">
|
482 |
<label for="tracking_product_code"><?php _e( 'Product Code:', 'woo-advanced-shipment-tracking'); ?></label>
|
483 |
-
<input type="text" class="short" style="" name="tracking_product_code" id="tracking_product_code" value=""
|
484 |
</p>
|
485 |
<p class="form-field date_shipped_field">
|
486 |
<label for="date_shipped"><?php _e( 'Date shipped:', 'woo-advanced-shipment-tracking'); ?></label>
|
@@ -507,7 +516,7 @@ class WC_Advanced_Shipment_Tracking_Settings {
|
|
507 |
<p class="" style="text-align:left;">
|
508 |
<input type="hidden" name="action" value="add_inline_tracking_number">
|
509 |
<input type="hidden" name="order_id" id="order_id" value="<?php echo $order_id; ?>">
|
510 |
-
<input type="submit" name="Submit" value="Save Tracking" class="button-primary btn_green">
|
511 |
</p>
|
512 |
</form>
|
513 |
</div>
|
410 |
|
411 |
public function ast_open_inline_tracking_form_fun(){
|
412 |
$order_id = wc_clean($_POST['order_id']);
|
413 |
+
|
414 |
+
$wast = WC_Advanced_Shipment_Tracking_Actions::get_instance();
|
415 |
+
$custom_order_number = $wast->get_custom_order_number($order_id);
|
416 |
+
|
417 |
+
if(empty($custom_order_number)){
|
418 |
+
$custom_order_number = $order_id;
|
419 |
+
}
|
420 |
+
|
421 |
global $wpdb;
|
422 |
$WC_Countries = new WC_Countries();
|
423 |
$countries = $WC_Countries->get_countries();
|
437 |
} else{
|
438 |
$woo_shippment_table_name = $wpdb->prefix."woo_shippment_provider";
|
439 |
}
|
440 |
+
|
441 |
$shippment_countries = $wpdb->get_results( "SELECT shipping_country FROM $woo_shippment_table_name WHERE display_in_order = 1 GROUP BY shipping_country" );
|
442 |
|
443 |
$shippment_providers = $wpdb->get_results( "SELECT * FROM $woo_shippment_table_name" );
|
459 |
?>
|
460 |
<div id="" class="trackingpopup_wrapper add_tracking_popup" style="display:none;">
|
461 |
<div class="trackingpopup_row">
|
462 |
+
<h3 class="popup_title"><?php _e( 'Add Tracking Number', 'woo-advanced-shipment-tracking'); ?> - #<?php echo $custom_order_number; ?></h2>
|
463 |
<form id="add_tracking_number_form" method="POST" class="add_tracking_number_form">
|
464 |
<p class="form-field">
|
465 |
<label for="tracking_number"><?php _e( 'Shipping Provider:', 'woo-advanced-shipment-tracking'); ?></label>
|
485 |
</p>
|
486 |
<p class="form-field tracking_number_field">
|
487 |
<label for="tracking_number"><?php _e( 'Tracking number:', 'woo-advanced-shipment-tracking'); ?></label>
|
488 |
+
<input type="text" class="short" style="" name="tracking_number" id="tracking_number" value="">
|
489 |
</p>
|
490 |
<p class="form-field tracking_product_code_field">
|
491 |
<label for="tracking_product_code"><?php _e( 'Product Code:', 'woo-advanced-shipment-tracking'); ?></label>
|
492 |
+
<input type="text" class="short" style="" name="tracking_product_code" id="tracking_product_code" value="" autofocus>
|
493 |
</p>
|
494 |
<p class="form-field date_shipped_field">
|
495 |
<label for="date_shipped"><?php _e( 'Date shipped:', 'woo-advanced-shipment-tracking'); ?></label>
|
516 |
<p class="" style="text-align:left;">
|
517 |
<input type="hidden" name="action" value="add_inline_tracking_number">
|
518 |
<input type="hidden" name="order_id" id="order_id" value="<?php echo $order_id; ?>">
|
519 |
+
<input type="submit" name="Submit" value="<?php _e( 'Save Tracking', 'woo-advanced-shipment-tracking'); ?>" class="button-primary btn_green">
|
520 |
</p>
|
521 |
</form>
|
522 |
</div>
|
includes/class-wc-advanced-shipment-tracking.php
CHANGED
@@ -62,7 +62,8 @@ class WC_Advanced_Shipment_Tracking_Actions {
|
|
62 |
foreach ( $results as $row ) {
|
63 |
$shippment_providers[ $row->ts_slug ] = array(
|
64 |
'provider_name'=> $row->provider_name,
|
65 |
-
'provider_url' => $row->provider_url,
|
|
|
66 |
);
|
67 |
}
|
68 |
|
@@ -729,12 +730,22 @@ class WC_Advanced_Shipment_Tracking_Actions {
|
|
729 |
$tracking_item = $this->add_tracking_item( $order_id, $args );
|
730 |
|
731 |
if($_POST['change_order_to_shipped'] == 'change_order_to_shipped' || $_POST['change_order_to_shipped'] == 'yes'){
|
|
|
732 |
$order = new WC_Order($order_id);
|
733 |
-
if(
|
734 |
-
$
|
735 |
-
|
736 |
-
|
737 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
738 |
} elseif($_POST['change_order_to_shipped'] == 'change_order_to_partial_shipped'){
|
739 |
$order = new WC_Order($order_id);
|
740 |
|
@@ -1028,6 +1039,7 @@ class WC_Advanced_Shipment_Tracking_Actions {
|
|
1028 |
foreach ( $this->get_providers() as $provider => $format ) {
|
1029 |
if ( $provider === $tracking_item['tracking_provider'] ) {
|
1030 |
$link_format = $format['provider_url'];
|
|
|
1031 |
$formatted['formatted_tracking_provider'] = $format['provider_name'];
|
1032 |
break;
|
1033 |
}
|
@@ -1036,12 +1048,12 @@ class WC_Advanced_Shipment_Tracking_Actions {
|
|
1036 |
break;
|
1037 |
}
|
1038 |
}
|
1039 |
-
|
1040 |
$tracking_page = get_option('wc_ast_trackship_page_id');
|
1041 |
$wc_ast_api_key = get_option('wc_ast_api_key');
|
1042 |
$use_tracking_page = get_option('wc_ast_use_tracking_page');
|
1043 |
|
1044 |
-
if( $wc_ast_api_key && $use_tracking_page && $status != 'carrier_unsupported'){
|
1045 |
$order_key = $order->get_order_key();
|
1046 |
$formatted['formatted_tracking_link'] = get_permalink( $tracking_page ).'?order_id='.$order_id.'&order_key='.$order_key;
|
1047 |
} else {
|
@@ -1508,6 +1520,7 @@ class WC_Advanced_Shipment_Tracking_Actions {
|
|
1508 |
$alg_wc_custom_order_numbers_enabled = get_option('alg_wc_custom_order_numbers_enabled');
|
1509 |
$alg_wc_custom_order_numbers_prefix = get_option('alg_wc_custom_order_numbers_prefix');
|
1510 |
$new_order_id = str_replace($alg_wc_custom_order_numbers_prefix,'',$order_id);
|
|
|
1511 |
if($alg_wc_custom_order_numbers_enabled == 'yes'){
|
1512 |
$args = array(
|
1513 |
'post_type' => 'shop_order',
|
@@ -1519,7 +1532,7 @@ class WC_Advanced_Shipment_Tracking_Actions {
|
|
1519 |
'value' => $new_order_id,
|
1520 |
),
|
1521 |
),
|
1522 |
-
'post_status' =>
|
1523 |
);
|
1524 |
$posts = get_posts( $args );
|
1525 |
$my_query = new WP_Query( $args );
|
62 |
foreach ( $results as $row ) {
|
63 |
$shippment_providers[ $row->ts_slug ] = array(
|
64 |
'provider_name'=> $row->provider_name,
|
65 |
+
'provider_url' => $row->provider_url,
|
66 |
+
'trackship_supported' => $row->trackship_supported,
|
67 |
);
|
68 |
}
|
69 |
|
730 |
$tracking_item = $this->add_tracking_item( $order_id, $args );
|
731 |
|
732 |
if($_POST['change_order_to_shipped'] == 'change_order_to_shipped' || $_POST['change_order_to_shipped'] == 'yes'){
|
733 |
+
$wc_ast_completed_to_shipped = get_option('wc_ast_completed_to_shipped','wc_ast_rename_to_shipped');
|
734 |
$order = new WC_Order($order_id);
|
735 |
+
if($wc_ast_completed_to_shipped == 'wc_ast_rename_to_shipped'){
|
736 |
+
if('completed' == $order->get_status()){
|
737 |
+
$ast_admin->trigger_woocommerce_order_status_completed( $order_id );
|
738 |
+
} else{
|
739 |
+
$order->update_status('completed');
|
740 |
+
}
|
741 |
+
} else if($wc_ast_completed_to_shipped == 'wc_ast_create_shipped' && get_option('wc_ast_status_shipped_active')){
|
742 |
+
if('shipped' == $order->get_status()){
|
743 |
+
$ast_admin->trigger_woocommerce_order_status_completed( $order_id );
|
744 |
+
} else{
|
745 |
+
$order->update_status('shipped');
|
746 |
+
}
|
747 |
+
}
|
748 |
+
|
749 |
} elseif($_POST['change_order_to_shipped'] == 'change_order_to_partial_shipped'){
|
750 |
$order = new WC_Order($order_id);
|
751 |
|
1039 |
foreach ( $this->get_providers() as $provider => $format ) {
|
1040 |
if ( $provider === $tracking_item['tracking_provider'] ) {
|
1041 |
$link_format = $format['provider_url'];
|
1042 |
+
$trackship_supported = $format['trackship_supported'];
|
1043 |
$formatted['formatted_tracking_provider'] = $format['provider_name'];
|
1044 |
break;
|
1045 |
}
|
1048 |
break;
|
1049 |
}
|
1050 |
}
|
1051 |
+
|
1052 |
$tracking_page = get_option('wc_ast_trackship_page_id');
|
1053 |
$wc_ast_api_key = get_option('wc_ast_api_key');
|
1054 |
$use_tracking_page = get_option('wc_ast_use_tracking_page');
|
1055 |
|
1056 |
+
if( $wc_ast_api_key && $use_tracking_page && $trackship_supported == 1 && $status != 'carrier_unsupported'){
|
1057 |
$order_key = $order->get_order_key();
|
1058 |
$formatted['formatted_tracking_link'] = get_permalink( $tracking_page ).'?order_id='.$order_id.'&order_key='.$order_key;
|
1059 |
} else {
|
1520 |
$alg_wc_custom_order_numbers_enabled = get_option('alg_wc_custom_order_numbers_enabled');
|
1521 |
$alg_wc_custom_order_numbers_prefix = get_option('alg_wc_custom_order_numbers_prefix');
|
1522 |
$new_order_id = str_replace($alg_wc_custom_order_numbers_prefix,'',$order_id);
|
1523 |
+
|
1524 |
if($alg_wc_custom_order_numbers_enabled == 'yes'){
|
1525 |
$args = array(
|
1526 |
'post_type' => 'shop_order',
|
1532 |
'value' => $new_order_id,
|
1533 |
),
|
1534 |
),
|
1535 |
+
'post_status' => array_keys( wc_get_order_statuses() ) ,
|
1536 |
);
|
1537 |
$posts = get_posts( $args );
|
1538 |
$my_query = new WP_Query( $args );
|
includes/views/admin_trackship_dashboard.php
CHANGED
@@ -1,52 +1,39 @@
|
|
1 |
<section id="content_trackship_dashboard" class="inner_tab_section">
|
2 |
<div class="tab_inner_container">
|
3 |
-
<div class="outer_form_table">
|
4 |
<table class="form-table heading-table">
|
5 |
<tbody>
|
6 |
<tr valign="top">
|
7 |
-
<td><h3 style=""><?php _e( '
|
8 |
</tr>
|
9 |
</tbody>
|
10 |
</table>
|
11 |
<table class="form-table">
|
12 |
<tbody>
|
13 |
<tr valign="top">
|
14 |
-
<
|
15 |
-
<td class="forminp">
|
16 |
-
<fieldset>
|
17 |
-
<a href="https://my.trackship.info/?utm_source=wpadmin&utm_medium=sidebar&utm_campaign=upgrade" target="_blank">
|
18 |
-
<span class="api_connected"><label><?php _e( 'Connected', 'woo-advanced-shipment-tracking' ); ?></label><span class="dashicons dashicons-yes"></span></span>
|
19 |
-
</a>
|
20 |
-
</fieldset>
|
21 |
-
</td>
|
22 |
-
</tr>
|
23 |
-
<tr valign="top">
|
24 |
-
<td><label><?php _e( 'Trackers Balance', 'woo-advanced-shipment-tracking' ); ?></label></td>
|
25 |
<td class="forminp">
|
26 |
<fieldset>
|
27 |
-
<
|
28 |
</fieldset>
|
29 |
</td>
|
30 |
</tr>
|
31 |
<tr valign="top">
|
32 |
-
<
|
33 |
<td class="forminp">
|
34 |
-
<fieldset
|
35 |
-
<strong>
|
36 |
-
<?php
|
37 |
if(isset($plan_data->subscription_plan)){
|
38 |
echo $plan_data->subscription_plan;
|
39 |
}
|
40 |
-
|
41 |
-
</strong>
|
42 |
-
</fieldset>
|
43 |
-
</td>
|
44 |
-
</tr>
|
45 |
-
<tr valign="top">
|
46 |
-
<td colspan="2">
|
47 |
-
<?php _e( 'You are now connected with TrackShip! TrackShip makes it effortless to automate your post shipping operations and get tracking and delivery status updates directly in the WooCommerce admin.', 'woo-advanced-shipment-tracking' ); ?>
|
48 |
</td>
|
49 |
</tr>
|
|
|
|
|
|
|
|
|
|
|
|
|
50 |
<tr valign="top">
|
51 |
<td colspan="2">
|
52 |
<a href="https://trackship.info/documentation/?utm_source=wpadmin&utm_medium=ts_settings&utm_campaign=docs" class="" style="margin-right: 10px;" target="blank"><?php _e( 'Documentation', 'woo-advanced-shipment-tracking' ); ?></a>
|
@@ -67,7 +54,7 @@
|
|
67 |
</tr>
|
68 |
</tbody>
|
69 |
</table>
|
70 |
-
<?php $this->
|
71 |
<table class="form-table">
|
72 |
<tbody>
|
73 |
<tr valign="top">
|
1 |
<section id="content_trackship_dashboard" class="inner_tab_section">
|
2 |
<div class="tab_inner_container">
|
3 |
+
<div class="outer_form_table trackship_status_section">
|
4 |
<table class="form-table heading-table">
|
5 |
<tbody>
|
6 |
<tr valign="top">
|
7 |
+
<td><h3 style=""><?php _e( 'TrackShip status', 'woo-advanced-shipment-tracking' ); ?></h3></td>
|
8 |
</tr>
|
9 |
</tbody>
|
10 |
</table>
|
11 |
<table class="form-table">
|
12 |
<tbody>
|
13 |
<tr valign="top">
|
14 |
+
<th scope="row" class="titledesc"><label><?php _e( 'Connection Status', 'woo-advanced-shipment-tracking' ); ?></label></th>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
15 |
<td class="forminp">
|
16 |
<fieldset>
|
17 |
+
<a href="https://my.trackship.info/?utm_source=wpadmin&utm_medium=sidebar&utm_campaign=upgrade" target="_blank" class="api_connected"><?php _e( 'Connected', 'woo-advanced-shipment-tracking' ); ?><span class="dashicons dashicons-yes"></span></a>
|
18 |
</fieldset>
|
19 |
</td>
|
20 |
</tr>
|
21 |
<tr valign="top">
|
22 |
+
<th scope="row" class="titledesc"><label><?php _e( 'Current Plan', 'woo-advanced-shipment-tracking' ); ?></label></th>
|
23 |
<td class="forminp">
|
24 |
+
<fieldset><?php
|
|
|
|
|
25 |
if(isset($plan_data->subscription_plan)){
|
26 |
echo $plan_data->subscription_plan;
|
27 |
}
|
28 |
+
?></fieldset>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
29 |
</td>
|
30 |
</tr>
|
31 |
+
<tr valign="top">
|
32 |
+
<th scope="row" class="titledesc"><label><?php _e( 'Trackers Balance', 'woo-advanced-shipment-tracking' ); ?></label></th>
|
33 |
+
<td class="forminp">
|
34 |
+
<fieldset><?php echo get_option('trackers_balance'); ?></strong></fieldset>
|
35 |
+
</td>
|
36 |
+
</tr>
|
37 |
<tr valign="top">
|
38 |
<td colspan="2">
|
39 |
<a href="https://trackship.info/documentation/?utm_source=wpadmin&utm_medium=ts_settings&utm_campaign=docs" class="" style="margin-right: 10px;" target="blank"><?php _e( 'Documentation', 'woo-advanced-shipment-tracking' ); ?></a>
|
54 |
</tr>
|
55 |
</tbody>
|
56 |
</table>
|
57 |
+
<?php $this->get_html_2( $this->get_trackship_general_data() ); ?>
|
58 |
<table class="form-table">
|
59 |
<tbody>
|
60 |
<tr valign="top">
|
includes/views/zorem_admin_sidebar.php
CHANGED
@@ -5,34 +5,31 @@
|
|
5 |
?>
|
6 |
<div class="zorem_admin_sidebar">
|
7 |
<div class="zorem_admin_sidebar_inner">
|
8 |
-
|
9 |
-
|
10 |
-
|
11 |
-
|
12 |
-
|
13 |
-
<
|
14 |
-
|
15 |
-
|
16 |
-
|
17 |
-
|
18 |
-
<a href="https://www.zorem.com/my-account/api-keys/?utm_source=wpadmin&utm_medium=sidebar&utm_campaign=upgrade" class="button button-primary btn_green2 addon_widget_button" target="blank"><?php _e('Active','woo-advanced-shipment-tracking');?> <span class="dashicons dashicons-yes"></span></a>
|
19 |
-
<?php } else{ ?>
|
20 |
<a href="https://www.zorem.com/shop/tracking-per-item-ast-add-on/?utm_source=wpadmin&utm_medium=sidebar&utm_campaign=upgrade" target="blank" class="button button-primary btn_ast2 addon_widget_button"><?php _e( 'Get This Add-on >', 'woo-advanced-shipment-tracking' ); ?></a>
|
21 |
-
|
22 |
-
|
23 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
24 |
</div>
|
25 |
-
|
26 |
-
|
27 |
-
<div class="addon_button_div">
|
28 |
-
<?php if(!$wc_ast_api_key){ ?>
|
29 |
-
<a href="https://trackship.info/?utm_source=wpadmin&utm_medium=sidebar&utm_campaign=upgrade" class="button button-primary btn_ast2 addon_widget_button" target="_blank"><span><?php _e( 'Upgrade to PRO', 'woo-advanced-shipment-tracking' ); ?></span><i class="icon-angle-right"></i></a>
|
30 |
-
<?php } else{ ?>
|
31 |
-
<a href="https://my.trackship.info/?utm_source=wpadmin&utm_medium=sidebar&utm_campaign=upgrade" class="button button-primary btn_green2 addon_widget_button" target="_blank"><span><?php _e( 'Connected', 'woo-advanced-shipment-tracking' ); ?></span><i class="icon-angle-right"></i></a>
|
32 |
-
<?php } ?>
|
33 |
-
</div>
|
34 |
-
</div>
|
35 |
-
</div>
|
36 |
<div class="zorem-sidebar__section">
|
37 |
<h3 class="top-border">Your opinion matters to us!</h3>
|
38 |
<p>If you enjoy using The Advanced Shipment Tracking plugin, please take a minute and <a href="https://wordpress.org/support/plugin/woo-advanced-shipment-tracking/reviews/#new-post" target="_blank">share your review</a>
|
5 |
?>
|
6 |
<div class="zorem_admin_sidebar">
|
7 |
<div class="zorem_admin_sidebar_inner">
|
8 |
+
|
9 |
+
<?php $wc_ast_api_key = get_option('wc_ast_api_key');
|
10 |
+
|
11 |
+
if ( !is_plugin_active( 'ast-tracking-per-order-items/ast-tracking-per-order-items.php' ) || !$wc_ast_api_key) { ?>
|
12 |
+
<div class="zorem-sidebar__section">
|
13 |
+
<h3>AST Add-ons</h3>
|
14 |
+
<?php if ( !is_plugin_active( 'ast-tracking-per-order-items/ast-tracking-per-order-items.php' ) ) { ?>
|
15 |
+
<div class="sidebar_addon_inner">
|
16 |
+
<img src="<?php echo wc_advanced_shipment_tracking()->plugin_dir_url()?>assets/images/AST-banner.png" class="sidebar_addon_logo">
|
17 |
+
<div class="addon_button_div">
|
|
|
|
|
18 |
<a href="https://www.zorem.com/shop/tracking-per-item-ast-add-on/?utm_source=wpadmin&utm_medium=sidebar&utm_campaign=upgrade" target="blank" class="button button-primary btn_ast2 addon_widget_button"><?php _e( 'Get This Add-on >', 'woo-advanced-shipment-tracking' ); ?></a>
|
19 |
+
</div>
|
20 |
+
</div>
|
21 |
+
<?php } ?>
|
22 |
+
<?php if(!$wc_ast_api_key){ ?>
|
23 |
+
<div class="sidebar_addon_inner">
|
24 |
+
<img src="<?php echo wc_advanced_shipment_tracking()->plugin_dir_url()?>assets/images/trackship-banner.png" class="sidebar_addon_logo">
|
25 |
+
<div class="addon_button_div">
|
26 |
+
<a href="https://trackship.info/?utm_source=wpadmin&utm_medium=sidebar&utm_campaign=upgrade" class="button button-primary btn_ast2 addon_widget_button" target="_blank"><span><?php _e( 'Upgrade to PRO', 'woo-advanced-shipment-tracking' ); ?></span><i class="icon-angle-right"></i></a>
|
27 |
+
</div>
|
28 |
+
</div>
|
29 |
+
<?php } ?>
|
30 |
</div>
|
31 |
+
<?php }?>
|
32 |
+
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
33 |
<div class="zorem-sidebar__section">
|
34 |
<h3 class="top-border">Your opinion matters to us!</h3>
|
35 |
<p>If you enjoy using The Advanced Shipment Tracking plugin, please take a minute and <a href="https://wordpress.org/support/plugin/woo-advanced-shipment-tracking/reviews/#new-post" target="_blank">share your review</a>
|
lang/woo-advanced-shipment-tracking-tr_TR (Hitesh Patel's conflicted copy 2020-04-29).mo
ADDED
File without changes
|
readme.txt
CHANGED
@@ -156,6 +156,18 @@ http://a32694-tmp.s415.upress.link/wp-json/wc/v1/orders/<order-id>/shipment-trac
|
|
156 |
|
157 |
== Changelog ==
|
158 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
159 |
= 2.9.6 =
|
160 |
* Dev - Pass custom order number generate by custom order plugin in TrackShip
|
161 |
* Dev - Remove underscore validation in tracking number
|
156 |
|
157 |
== Changelog ==
|
158 |
|
159 |
+
= 2.9.8 =
|
160 |
+
* Fix - fixed issue so trackship_supported column adding in shipping providers table and based on that use carrier website as tracking link if TrackShip not sot supported
|
161 |
+
|
162 |
+
= 2.9.7 =
|
163 |
+
* Dev - Added trackship_supported column in shipping providers table and based on that use carrier website as tracking link if TrackShip not sot supported
|
164 |
+
* Dev - Added custom order number compatibility in TrackShip tracking form
|
165 |
+
* Dev - Remove dot validation in tracking number
|
166 |
+
* Dev - Remove dot and underscore validation from Bulk Upload trackig information
|
167 |
+
* Enhancement - Added Order Id in Inline Tracking Form
|
168 |
+
* Enhancement - Remove Add Tracking button form orders action if order status is On Hold, Failed , Cancelled, Ready for Pickup and Picked up
|
169 |
+
* Enhancement - Updated design of TrackShip dashboard
|
170 |
+
|
171 |
= 2.9.6 =
|
172 |
* Dev - Pass custom order number generate by custom order plugin in TrackShip
|
173 |
* Dev - Remove underscore validation in tracking number
|
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: 2.9.
|
8 |
* Author: zorem
|
9 |
* Author URI: https://www.zorem.com
|
10 |
* License: GPL-2.0+
|
@@ -22,7 +22,7 @@ class zorem_woocommerce_advanced_shipment_tracking {
|
|
22 |
*
|
23 |
* @var string
|
24 |
*/
|
25 |
-
public $version = '2.9.
|
26 |
|
27 |
/**
|
28 |
* 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: 2.9.8
|
8 |
* Author: zorem
|
9 |
* Author URI: https://www.zorem.com
|
10 |
* License: GPL-2.0+
|
22 |
*
|
23 |
* @var string
|
24 |
*/
|
25 |
+
public $version = '2.9.8';
|
26 |
|
27 |
/**
|
28 |
* Initialize the main plugin function
|