Advanced Shipment Tracking for WooCommerce

Version Description

Enhancement - Updated Settings page header design
Enhancement - Updated TrackShip Settings page header design
Enhancement - Updated Email order details template for shipment status emails
Fix - Fixed Trackship shipment status customizer issue
Fix - Fixed database warnings on plugin installation

Release Info

Developer	zorem
Plugin	Advanced Shipment Tracking for WooCommerce
Version	3.2.2.1
Comparing to
See all releases

Code changes from version 3.2.2 to 3.2.2.1

Files changed (24) hide show

assets/css/admin.css +168 -16
assets/css/customizer-styles.css +3 -0
assets/css/trackship.css +1 -1
assets/js/settings.js +13 -0
includes/class-wc-advanced-shipment-tracking-admin.php +84 -23
includes/class-wc-advanced-shipment-tracking-install.php +13 -13
includes/class-wc-advanced-shipment-tracking-trackship.php +53 -4
includes/class-wc-advanced-shipment-tracking.php +2 -2
includes/customizer/class-wc-availableforpickup-email-customizer.php +2 -2
includes/customizer/class-wc-delivered-email-customizer.php +1 -1
includes/customizer/class-wc-exception-email-customizer.php +2 -2
includes/customizer/class-wc-failure-email-customizer.php +2 -2
includes/customizer/class-wc-intransit-email-customizer.php +1 -1
includes/customizer/class-wc-onhold-email-customizer.php +2 -2
includes/customizer/class-wc-outfordelivery-email-customizer.php +2 -2
includes/customizer/class-wc-returntosender-email-customizer.php +2 -2
includes/customizer/class-wc-tracking-page-customizer.php +2 -1
includes/customizer/class-wcast-customizer.php +2 -2
includes/trackship-email-manager.php +4 -4
readme.txt +7 -0
templates/emails/wcast-email-order-details.php +4 -4
templates/emails/wcast-email-order-items.php +9 -4
templates/emails/wcast-shipping-email-addresses.php +1 -1
woocommerce-advanced-shipment-tracking.php +2 -2

assets/css/admin.css CHANGED Viewed

@@ -1,8 +1,5 @@
             /* fallback */
-            -
            body.shipment_tracking_admin_settings{
-            -
            	background: #fafafa;
-            -
            }
-            -
            .zorem-layout {
                 margin: 0;
                 padding: 0;
+            }
@@ -12,7 +9,6 @@ body.shipment_tracking_admin_settings{
                 justify-content: space-between;
                 flex-direction: row;
                 box-sizing: border-box;
-            -
                border-bottom: 1px solid #fff;
                 padding: 0;
                 width: 100%;
                 top: 32px;
@@ -20,12 +16,13 @@ body.shipment_tracking_admin_settings{
             	align-items: center;
+            }
             .zorem-layout__header .zorem-layout__header-breadcrumbs {
-            -
                font-size: 13px;
-            -
                font-weight: 400;
-            -
                padding: 15px 0 15px 30px;
-            -
            	margin: 0;
-            -
                flex: 1 auto;
-            -
                line-height: 30px;
+            }
             .zorem-layout__header .zorem-layout__header-breadcrumbs a{
             	color: #005b9a;
@@ -36,6 +33,162 @@ body.shipment_tracking_admin_settings{
                 color: #555d66;
                 margin: 0 2px;
+            }
             .zorem-layout__header .zorem-layout__docs-panel{
             	display: flex;
                 flex-direction: row;
@@ -150,7 +303,7 @@ input.tab_input,input.inner_tab_input {
+            }
             label.tab_label {
                 text-decoration: none;
-            -
                padding: 13px 15px 13px;
                 font-size: 14px;
                 color: #005b9a;
                 display: inline-block;
@@ -160,7 +313,7 @@ label.tab_label {
             	font-weight: 500;
+            }
             label.tab_label.first_label {
-            -
                margin-left: 15px;
+            }
             label.inner_tab_label {
                 text-decoration: none;
@@ -244,7 +397,6 @@ input.tab_input_1:checked + label{
             .ast_admin_content {
             	width: 100%;
             	vertical-align: top;
-            -
            	border-top: 1px solid #ddd;
+            }
             .zorem_admin_layout .settings_ul_submit .spinner{
             	display: none;
@@ -1448,7 +1600,7 @@ section.widget_tab_section {
             	position: relative;
+            }
             .tabs_inner_section {
-            -
                margin: 10px -15px 0;
                 border-top: 1px solid #e0e0e0;
             	display:none;
+            }
@@ -1458,7 +1610,7 @@ section.widget_tab_section {
             .tabs_submit {
                 position: absolute;
                 top: 10px;
-            -
                right: 15px;
+            }
             .tabs_submit .spinner{
             	float:none;


1	/* fallback */
2	+ .zorem-layout__header {



3	margin: 0;
4	padding: 0;
5	}

9	justify-content: space-between;
10	flex-direction: row;
11	box-sizing: border-box;

12	padding: 0;
13	width: 100%;
14	top: 32px;

16	align-items: center;
17	}
18	.zorem-layout__header .zorem-layout__header-breadcrumbs {
19	+ font-size: 14px;
20	+ font-weight: 600;
21	+ padding: 0 0 0 30px;
22	+ margin: 0;
23	+ flex: 1 auto;
24	+ line-height: 60px;
25	+ height: 60px;
26	}
27	.zorem-layout__header .zorem-layout__header-breadcrumbs a{
28	color: #005b9a;

33	color: #555d66;
34	margin: 0 2px;
35	}
36	+ .zorem-layout__header * {
37	+ box-sizing: border-box;
38	+ }
39	+ .woocommerce-layout__activity-panel-tabs {
40	+ width: 100%;
41	+ display: flex;
42	+ height: 60px;
43	+ justify-content: flex-end;
44	+ }
45	+ .woocommerce-layout__activity-panel-tabs .dashicons{
46	+ width: 24px;
47	+ height: 24px;
48	+ font-size: 24px;
49	+ }
50	+ .woocommerce-layout__activity-panel-tabs .woocommerce-layout__activity-panel-tab {
51	+ display: flex;
52	+ flex-direction: column;
53	+ justify-content: center;
54	+ align-items: center;
55	+ position: relative;
56	+ border: none;
57	+ outline: none;
58	+ cursor: pointer;
59	+ background-color: #fff;
60	+ max-width: -webkit-min-content;
61	+ max-width: min-content;
62	+ min-width: 80px;
63	+ width: 100%;
64	+ height: 60px;
65	+ color: #757575;
66	+ white-space: nowrap;
67	+ }
68	+ .woocommerce-layout__activity-panel-tabs .woocommerce-layout__activity-panel-tab:before {
69	+ background-color: #005b9a;
70	+ bottom: 0;
71	+ content: "";
72	+ height: 0;
73	+ opacity: 0;
74	+ transition-property: height,opacity;
75	+ transition-duration: .3s;
76	+ transition-timing-function: ease-in-out;
77	+ left: 0;
78	+ position: absolute;
79	+ right: 0;
80	+ }
81	+ .woocommerce-layout__activity-panel-tabs .woocommerce-layout__activity-panel-tab:hover {
82	+ background-color: #f0f0f0;
83	+ box-shadow: none;
84	+ }
85	+ .woocommerce-layout__activity-panel-tabs .woocommerce-layout__activity-panel-tab.is-active{
86	+ color: #1e1e1e;
87	+ box-shadow: none;
88	+ }
89	+ .woocommerce-layout__activity-panel-tabs .woocommerce-layout__activity-panel-tab.is-active:before{
90	+ height: 3px;
91	+ opacity: 1;
92	+ }
93	+ .woocommerce-layout__activity-panel-wrapper {
94	+ height: calc(100vh - 166px);
95	+ background: #f0f0f0;
96	+ width: 510px;
97	+ transform: translateX(100%);
98	+ transition-property: transform box-shadow;
99	+ transition-duration: .3s;
100	+ transition-timing-function: ease-in-out;
101	+ position: fixed;
102	+ right: 0;
103	+ top: 166px;
104	+ z-index: 1000;
105	+ overflow-x: hidden;
106	+ overflow-y: auto;
107	+ }
108	+
109	+ .woocommerce-layout__activity-panel-wrapper.is-open {
110	+ transform: none;
111	+ box-shadow: 0 12px 12px 0 rgb(85 93 102 / 30%);
112	+ }
113	+ .woocommerce-layout__activity-panel-wrapper.is-switching {
114	+ animation: tabSwitch;
115	+ animation-duration: .3s;
116	+ }
117	+ .woocommerce-layout__activity-panel-header {
118	+ height: 50px;
119	+ background: #e0e0e0;
120	+ padding: 16px;
121	+ display: flex;
122	+ justify-content: space-between;
123	+ align-items: center;
124	+ }
125	+ .woocommerce-layout__inbox-title {
126	+ color: #1e1e1e;
127	+ display: flex;
128	+ align-items: center;
129	+ }
130	+ .css-activity-panel-Text {
131	+ box-sizing: border-box;
132	+ margin: 0px;
133	+ font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
134	+ font-weight: 400;
135	+ font-size: 20px;
136	+ line-height: 28px;
137	+ }
138	+ .woocommerce-list {
139	+ margin: 0;
140	+ padding: 0;
141	+ }
142	+ .woocommerce-list__item {
143	+ display: flex;
144	+ align-items: center;
145	+ margin-bottom: 0;
146	+ background-color: #fff;
147	+ }
148	+ .woocommerce-list__item:not(:first-child) {
149	+ border-top: 1px solid #f0f0f0;
150	+ }
151	+ .woocommerce-list__item.has-action {
152	+ cursor: pointer;
153	+ }
154	+ .woocommerce-list__item > .woocommerce-list__item-inner {
155	+ text-decoration: none;
156	+ width: 100%;
157	+ display: flex;
158	+ align-items: center;
159	+ padding: 16px 24px;
160	+ }
161	+ .woocommerce-list__item .woocommerce-list__item-before {
162	+ margin-right: 20px;
163	+ display: flex;
164	+ align-items: center;
165	+ }
166	+ .woocommerce-list__item .woocommerce-list__item-title {
167	+ color: #005b9a;
168	+ }
169	+ .woocommerce-list-Text {
170	+ box-sizing: border-box;
171	+ margin: 0px;
172	+ font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
173	+ font-weight: 600;
174	+ font-size: 14px;
175	+ line-height: 20px;
176	+ }
177	+ .woocommerce-list__item .woocommerce-list__item-after {
178	+ margin-left: 16px;
179	+ display: flex;
180	+ align-items: center;
181	+ margin-left: auto;
182	+ }
183	+ @media (min-width: 783px) {
184	+ .woocommerce-layout__activity-panel-wrapper {
185	+ height: calc(100vh - 92px);
186	+ top: 92px;
187	+ }
188	+ .woocommerce-layout__activity-panel-header {
189	+ padding: 16px 24px;
190	+ }
191	+ }
192	.zorem-layout__header .zorem-layout__docs-panel{
193	display: flex;
194	flex-direction: row;

303	}
304	label.tab_label {
305	text-decoration: none;
306	+ padding: 13px 10px 13px;
307	font-size: 14px;
308	color: #005b9a;
309	display: inline-block;

313	font-weight: 500;
314	}
315	label.tab_label.first_label {
316	+ margin-left: 20px;
317	}
318	label.inner_tab_label {
319	text-decoration: none;

397	.ast_admin_content {
398	width: 100%;
399	vertical-align: top;

400	}
401	.zorem_admin_layout .settings_ul_submit .spinner{
402	display: none;

1600	position: relative;
1601	}
1602	.tabs_inner_section {
1603	+ margin: 12px -15px 0;
1604	border-top: 1px solid #e0e0e0;
1605	display:none;
1606	}

1610	.tabs_submit {
1611	position: absolute;
1612	top: 10px;
1613	+ right: 20px;
1614	}
1615	.tabs_submit .spinner{
1616	float:none;

assets/css/customizer-styles.css CHANGED Viewed

	@@ -115,4 +115,7 @@
115	margin-top: 0;
116	padding-top: 0;
117	border-top: 0;



118	}


115	margin-top: 0;
116	padding-top: 0;
117	border-top: 0;
118	+ }
119	+ li#accordion-panel-widgets {
120	+ display: none !important;
121	}

assets/css/trackship.css CHANGED Viewed

	@@ -178,7 +178,7 @@ ul.trackship_dashboard_ul li strong{
178	}
179	.menu_trackship_link{
180	text-decoration: none;
181	- padding: 13px ~~15px~~ 13px;
182	font-size: 14px;
183	color: #005b9a;
184	display: inline-block;


178	}
179	.menu_trackship_link{
180	text-decoration: none;
181	+ padding: 13px 10px 13px;
182	font-size: 14px;
183	color: #005b9a;
184	display: inline-block;

assets/js/settings.js CHANGED Viewed

@@ -98,4 +98,17 @@ jQuery(document).on("change", "#wc_ast_status_partial_shipped_label_font_color",
             jQuery(document).on("change", "#wc_ast_status_updated_tracking_label_font_color", function(){
             	var font_color = jQuery(this).val();
             	jQuery('.order-status-table .order-label.wc-updated-tracking').css('color',font_color);
             });


98	jQuery(document).on("change", "#wc_ast_status_updated_tracking_label_font_color", function(){
99	var font_color = jQuery(this).val();
100	jQuery('.order-status-table .order-label.wc-updated-tracking').css('color',font_color);
101	+ });
102	+
103	+ jQuery( document ).on( "click", "#activity-panel-tab-help", function() {
104	+ jQuery(this).addClass( 'is-active' );
105	+ jQuery( '.woocommerce-layout__activity-panel-wrapper' ).addClass( 'is-open is-switching' );
106	+ });
107	+
108	+ jQuery(document).click(function(){
109	+ var $trigger = jQuery(".woocommerce-layout__activity-panel");
110	+ if($trigger !== event.target && !$trigger.has(event.target).length){
111	+ jQuery('#activity-panel-tab-help').removeClass( 'is-active' );
112	+ jQuery( '.woocommerce-layout__activity-panel-wrapper' ).removeClass( 'is-open is-switching' );
113	+ }
114	});

includes/class-wc-advanced-shipment-tracking-admin.php CHANGED Viewed

@@ -276,24 +276,85 @@ class WC_Advanced_Shipment_Tracking_Admin {
             		<div class="zorem-layout">
             			<div class="zorem-layout__header">
-            -
            				<h1 class="zorem-layout__header-breadcrumbs"><span class="header-breadcrumbs-last"><?php _e('Shipment Tracking', 'woo-advanced-shipment-tracking'); ?></span></h1>
-            -
            				<?php
-            -
            					/*if ( !class_exists( 'ast_pro' ) ) {
-            -
            					?>
-            -
            					<div class="zorem-layout__docs-panel">
-            -
            						<a class="button-primary btn_ast2 ast-pro-btn" target="blank" href="https://www.zorem.com/product/ast-pro/"><?php _e('UPGRADE TO PRO', 'woo-advanced-shipment-tracking'); ?><span class="dashicons dashicons-arrow-right-alt2"></span></a>
-            -
            					</div>
-            -
            				<?php }*/ ?>
             			</div>
             			<?php do_action( 'ast_settings_admin_notice' ); ?>
             			<div class="woocommerce zorem_admin_layout">
             				<div class="ast_admin_content" >
             					<div class="ast_nav_div">
-            -
            						<?php $this->get_html_menu_tab( $this->get_ast_tab_settings_data() ); ?>
-            -
            						<div class="nav_doc_section">
-            -
            							<a target="blank" class="doc_link" href="https://www.zorem.com/docs/woocommerce-advanced-shipment-tracking/"><?php _e( 'Documentation', 'woo-advanced-shipment-tracking' ); ?><span class="dashicons dashicons-media-default"></span></a>
-            -
            						</div>
-            -
            						<?php
             						require_once( 'views/admin_options_shipping_provider.php' );
             						require_once( 'views/admin_options_settings.php' );
             						require_once( 'views/admin_options_bulk_upload.php' );
@@ -331,7 +392,7 @@ class WC_Advanced_Shipment_Tracking_Admin {
             	public function get_ast_tab_settings_data() {
             		$ast_customizer_settings = new wcast_initialise_customizer_settings();
-            -
            		$go_pro_label = class_exists( 'ast_pro' ) ? __( 'License', 'woo-advanced-shipment-tracking' ) : __( 'Go PRO', 'woo-advanced-shipment-tracking' ) ;
             		$setting_data = array(
             			'tab2' => array(
             				'title'		=> __( 'Settings', 'woo-advanced-shipment-tracking' ),
@@ -341,6 +402,15 @@ class WC_Advanced_Shipment_Tracking_Admin {
             				'data-label' => __( 'Settings', 'woo-advanced-shipment-tracking' ),
             				'name'  => 'tabs',
             				'position'  => 1,
             			),
             			'customize' => array(
             				'title'		=> __( 'Customize', 'woo-advanced-shipment-tracking' ),
@@ -352,15 +422,6 @@ class WC_Advanced_Shipment_Tracking_Admin {
             				'data-label' => __( 'Customize', 'woo-advanced-shipment-tracking' ),
             				'name'  => 'tabs',
             				'position'  => 3,
-            -
            			),
-            -
            			'tab1' => array(
-            -
            				'title'		=> __( 'Shipping Providers', 'woo-advanced-shipment-tracking' ),
-            -
            				'show'      => true,
-            -
            				'class'     => 'tab_label',
-            -
            				'data-tab'  => 'shipping-providers',
-            -
            				'data-label' => __( 'Shipping Providers', 'woo-advanced-shipment-tracking' ),
-            -
            				'name'  => 'tabs',
-            -
            				'position'  => 2,
             			),
             			'tab4' => array(
             				'title'		=> __( 'CSV Import', 'woo-advanced-shipment-tracking' ),


276
277	<div class="zorem-layout">
278	<div class="zorem-layout__header">
279	+ <h1 class="zorem-layout__header-breadcrumbs">Advanced Shipment Tracking</h1>
280	+
281	+ <div class="woocommerce-layout__activity-panel">
282	+ <div class="woocommerce-layout__activity-panel-tabs">
283	+ <button type="button" id="activity-panel-tab-help" class="components-button woocommerce-layout__activity-panel-tab">
284	+ <span class="dashicons dashicons-editor-help"></span>
285	+ Help
286	+ </button>
287	+ </div>
288	+ <div class="woocommerce-layout__activity-panel-wrapper">
289	+ <div class="woocommerce-layout__activity-panel-content" id="activity-panel-true">
290	+ <div class="woocommerce-layout__activity-panel-header">
291	+ <div class="woocommerce-layout__inbox-title">
292	+ <p class="css-activity-panel-Text">Documentation</p>
293	+ </div>
294	+ </div>
295	+ <div>
296	+ <ul class="woocommerce-list woocommerce-quick-links__list">
297	+ <li class="woocommerce-list__item has-action">
298	+ <?php
299	+ $support_link = class_exists( 'ast_pro' ) ? 'https://www.zorem.com/?support=1' : 'https://wordpress.org/support/plugin/woo-advanced-shipment-tracking/#new-topic-0' ;
300	+ ?>
301	+ <a href="<?php echo esc_url( $support_link ); ?>" class="woocommerce-list__item-inner" target="_blank" >
302	+ <div class="woocommerce-list__item-before">
303	+ <span class="dashicons dashicons-media-document"></span>
304	+ </div>
305	+ <div class="woocommerce-list__item-text">
306	+ <span class="woocommerce-list__item-title">
307	+ <div class="woocommerce-list-Text">Get Support</div>
308	+ </span>
309	+ </div>
310	+ <div class="woocommerce-list__item-after">
311	+ <span class="dashicons dashicons-arrow-right-alt2"></span>
312	+ </div>
313	+ </a>
314	+ </li>
315	+ <li class="woocommerce-list__item has-action">
316	+ <a href="https://www.zorem.com/docs/woocommerce-advanced-shipment-tracking/" class="woocommerce-list__item-inner" target="_blank">
317	+ <div class="woocommerce-list__item-before">
318	+ <span class="dashicons dashicons-media-document"></span>
319	+ </div>
320	+ <div class="woocommerce-list__item-text">
321	+ <span class="woocommerce-list__item-title">
322	+ <div class="woocommerce-list-Text">Documentation</div>
323	+ </span>
324	+ </div>
325	+ <div class="woocommerce-list__item-after">
326	+ <span class="dashicons dashicons-arrow-right-alt2"></span>
327	+ </div>
328	+ </a>
329	+ </li>
330	+ <?php if ( !class_exists( 'ast_pro' ) ) { ?>
331	+ <li class="woocommerce-list__item has-action">
332	+ <a href="https://www.zorem.com/product/ast-pro/" class="woocommerce-list__item-inner" target="_blank">
333	+ <div class="woocommerce-list__item-before">
334	+ <span class="dashicons dashicons-media-document"></span>
335	+ </div>
336	+ <div class="woocommerce-list__item-text">
337	+ <span class="woocommerce-list__item-title">
338	+ <div class="woocommerce-list-Text">Upgrade To Pro</div>
339	+ </span>
340	+ </div>
341	+ <div class="woocommerce-list__item-after">
342	+ <span class="dashicons dashicons-arrow-right-alt2"></span>
343	+ </div>
344	+ </a>
345	+ </li>
346	+ <?php } ?>
347	+ </ul>
348	+ </div>
349	+ </div>
350	+ </div>
351	+ </div>
352	</div>
353	<?php do_action( 'ast_settings_admin_notice' ); ?>
354	<div class="woocommerce zorem_admin_layout">
355	<div class="ast_admin_content" >
356	<div class="ast_nav_div">
357	+ <?php $this->get_html_menu_tab( $this->get_ast_tab_settings_data() );




358	require_once( 'views/admin_options_shipping_provider.php' );
359	require_once( 'views/admin_options_settings.php' );
360	require_once( 'views/admin_options_bulk_upload.php' );

392	public function get_ast_tab_settings_data() {
393
394	$ast_customizer_settings = new wcast_initialise_customizer_settings();
395	+ $go_pro_label = class_exists( 'ast_pro' ) ? __( 'License', 'woo-advanced-shipment-tracking' ) : __( 'Go Pro', 'woo-advanced-shipment-tracking' ) ;
396	$setting_data = array(
397	'tab2' => array(
398	'title' => __( 'Settings', 'woo-advanced-shipment-tracking' ),

402	'data-label' => __( 'Settings', 'woo-advanced-shipment-tracking' ),
403	'name' => 'tabs',
404	'position' => 1,
405	+ ),
406	+ 'tab1' => array(
407	+ 'title' => __( 'Shipping Providers', 'woo-advanced-shipment-tracking' ),
408	+ 'show' => true,
409	+ 'class' => 'tab_label',
410	+ 'data-tab' => 'shipping-providers',
411	+ 'data-label' => __( 'Shipping Providers', 'woo-advanced-shipment-tracking' ),
412	+ 'name' => 'tabs',
413	+ 'position' => 2,
414	),
415	'customize' => array(
416	'title' => __( 'Customize', 'woo-advanced-shipment-tracking' ),

422	'data-label' => __( 'Customize', 'woo-advanced-shipment-tracking' ),
423	'name' => 'tabs',
424	'position' => 3,









425	),
426	'tab4' => array(
427	'title' => __( 'CSV Import', 'woo-advanced-shipment-tracking' ),

includes/class-wc-advanced-shipment-tracking-install.php CHANGED Viewed

	@@ -135,60 +135,60 @@ class WC_Advanced_Shipment_Tracking_Install {
135	public function check_all_column_exist() {
136
137	global $wpdb;
138	- $results = $wpdb->get_row( "SELECT * FROM $this->table LIMIT 1" );
139	$db_update_need = false;
140
141	- if ( !~~isset~~( $results~~->provider_name~~ ) ) {
142	$wpdb->query( "ALTER TABLE $this->table ADD provider_name varchar(500) DEFAULT '' NOT NULL AFTER id" );
143	$db_update_need = true;
144	}
145
146	- if ( !~~isset~~( $results~~->api_provider_name~~ ) ) {
147	$wpdb->query( "ALTER TABLE $this->table ADD api_provider_name text NULL DEFAULT NULL AFTER provider_name" );
148	$db_update_need = true;
149	}
150
151	- if ( !~~isset~~( $results~~->custom_provider_name~~ ) ) {
152	$wpdb->query( "ALTER TABLE $this->table ADD custom_provider_name text NULL DEFAULT NULL AFTER api_provider_name" );
153	$db_update_need = true;
154	}
155
156	- if ( !~~isset~~( $results~~->ts_slug~~ ) ) {
157	$wpdb->query( "ALTER TABLE $this->table ADD ts_slug text NULL DEFAULT NULL AFTER custom_provider_name" );
158	$db_update_need = true;
159	}
160
161	- if ( !~~isset~~( $results~~->provider_url~~ ) ) {
162	$wpdb->query( "ALTER TABLE $this->table ADD provider_url varchar(500) DEFAULT '' NULL AFTER ts_slug" );
163	$db_update_need = true;
164	}
165	-
166	- if ( !~~isset~~( $results~~->shipping_country~~ ) ) {
167	$wpdb->query( "ALTER TABLE $this->table ADD shipping_country varchar(45) DEFAULT '' NULL AFTER provider_url" );
168	$db_update_need = true;
169	}
170
171	- if ( !~~isset~~( $results~~->shipping_default~~ ) ) {
172	$wpdb->query( "ALTER TABLE $this->table ADD shipping_default tinyint(4) NULL DEFAULT '0' AFTER shipping_country" );
173	$db_update_need = true;
174	}
175
176	- if ( !~~isset~~( $results~~->custom_thumb_id~~ ) ) {
177	$wpdb->query( "ALTER TABLE $this->table ADD custom_thumb_id int(11) NOT NULL DEFAULT '0' AFTER shipping_default" );
178	$db_update_need = true;
179	}
180
181	- if ( !~~isset~~( $results~~->display_in_order~~ ) ) {
182	$wpdb->query( "ALTER TABLE $this->table ADD display_in_order tinyint(4) NOT NULL DEFAULT '1' AFTER custom_thumb_id" );
183	$db_update_need = true;
184	}
185
186	- if ( !~~isset~~( $results~~->trackship_supported~~ ) ) {
187	$wpdb->query( "ALTER TABLE $this->table ADD trackship_supported int(11) NOT NULL DEFAULT '0' AFTER display_in_order" );
188	$db_update_need = true;
189	}
190
191	- if ( !~~isset~~( $results~~->sort_order~~ ) ) {
192	$wpdb->query( "ALTER TABLE $this->table ADD sort_order int(11) NOT NULL DEFAULT '0' AFTER trackship_supported" );
193	$db_update_need = true;
194	}


135	public function check_all_column_exist() {
136
137	global $wpdb;
138	+ $results = $wpdb->get_row( "SELECT * FROM $this->table LIMIT 1", ARRAY_A );
139	$db_update_need = false;
140
141	+ if ( !array_key_exists( 'provider_name', $results ) ) {
142	$wpdb->query( "ALTER TABLE $this->table ADD provider_name varchar(500) DEFAULT '' NOT NULL AFTER id" );
143	$db_update_need = true;
144	}
145
146	+ if ( !array_key_exists( 'api_provider_name', $results ) ) {
147	$wpdb->query( "ALTER TABLE $this->table ADD api_provider_name text NULL DEFAULT NULL AFTER provider_name" );
148	$db_update_need = true;
149	}
150
151	+ if ( !array_key_exists( 'custom_provider_name', $results ) ) {
152	$wpdb->query( "ALTER TABLE $this->table ADD custom_provider_name text NULL DEFAULT NULL AFTER api_provider_name" );
153	$db_update_need = true;
154	}
155
156	+ if ( !array_key_exists( 'ts_slug', $results ) ) {
157	$wpdb->query( "ALTER TABLE $this->table ADD ts_slug text NULL DEFAULT NULL AFTER custom_provider_name" );
158	$db_update_need = true;
159	}
160
161	+ if ( !array_key_exists( 'provider_url', $results ) ) {
162	$wpdb->query( "ALTER TABLE $this->table ADD provider_url varchar(500) DEFAULT '' NULL AFTER ts_slug" );
163	$db_update_need = true;
164	}
165	+
166	+ if ( !array_key_exists( 'shipping_country', $results ) ) {
167	$wpdb->query( "ALTER TABLE $this->table ADD shipping_country varchar(45) DEFAULT '' NULL AFTER provider_url" );
168	$db_update_need = true;
169	}
170
171	+ if ( !array_key_exists( 'shipping_default', $results ) ) {
172	$wpdb->query( "ALTER TABLE $this->table ADD shipping_default tinyint(4) NULL DEFAULT '0' AFTER shipping_country" );
173	$db_update_need = true;
174	}
175
176	+ if ( !array_key_exists( 'custom_thumb_id', $results ) ) {
177	$wpdb->query( "ALTER TABLE $this->table ADD custom_thumb_id int(11) NOT NULL DEFAULT '0' AFTER shipping_default" );
178	$db_update_need = true;
179	}
180
181	+ if ( !array_key_exists( 'display_in_order', $results ) ) {
182	$wpdb->query( "ALTER TABLE $this->table ADD display_in_order tinyint(4) NOT NULL DEFAULT '1' AFTER custom_thumb_id" );
183	$db_update_need = true;
184	}
185
186	+ if ( !array_key_exists( 'trackship_supported', $results ) ) {
187	$wpdb->query( "ALTER TABLE $this->table ADD trackship_supported int(11) NOT NULL DEFAULT '0' AFTER display_in_order" );
188	$db_update_need = true;
189	}
190
191	+ if ( !array_key_exists( 'sort_order', $results ) ) {
192	$wpdb->query( "ALTER TABLE $this->table ADD sort_order int(11) NOT NULL DEFAULT '0' AFTER trackship_supported" );
193	$db_update_need = true;
194	}

includes/class-wc-advanced-shipment-tracking-trackship.php CHANGED Viewed

@@ -278,10 +278,59 @@ class WC_Advanced_Shipment_Tracking_Trackship {
             		?>
             		<div class="zorem-layout">
             			<div class="zorem-layout__header">
-            -
            				<h1 class="zorem-layout__header-breadcrumbs">
-            -
            					<span><a href="<?php echo esc_url( admin_url( '/admin.php?page=wc-admin' ) ); ?>"><?php esc_html_e('WooCommerce', 'woocommerce'); ?></a></span>
-            -
            					<span class="header-breadcrumbs-last">TrackShip</span>
-            -
            				</h1>
             			</div>
             			<?php
             			if ( $wc_ast_api_key ) {


278	?>
279	<div class="zorem-layout">
280	<div class="zorem-layout__header">
281	+ <h1 class="zorem-layout__header-breadcrumbs">TrackShip</h1>
282	+
283	+ <div class="woocommerce-layout__activity-panel">
284	+ <div class="woocommerce-layout__activity-panel-tabs">
285	+ <button type="button" id="activity-panel-tab-help" class="components-button woocommerce-layout__activity-panel-tab">
286	+ <span class="dashicons dashicons-editor-help"></span>
287	+ Help
288	+ </button>
289	+ </div>
290	+ <div class="woocommerce-layout__activity-panel-wrapper">
291	+ <div class="woocommerce-layout__activity-panel-content" id="activity-panel-true">
292	+ <div class="woocommerce-layout__activity-panel-header">
293	+ <div class="woocommerce-layout__inbox-title">
294	+ <p class="css-activity-panel-Text">Documentation</p>
295	+ </div>
296	+ </div>
297	+ <div>
298	+ <ul class="woocommerce-list woocommerce-quick-links__list">
299	+ <li class="woocommerce-list__item has-action">
300	+ <a href="<?php echo esc_url( 'https://trackship.info/support/' ); ?>" class="woocommerce-list__item-inner" target="_blank" >
301	+ <div class="woocommerce-list__item-before">
302	+ <span class="dashicons dashicons-media-document"></span>
303	+ </div>
304	+ <div class="woocommerce-list__item-text">
305	+ <span class="woocommerce-list__item-title">
306	+ <div class="woocommerce-list-Text">Get Support</div>
307	+ </span>
308	+ </div>
309	+ <div class="woocommerce-list__item-after">
310	+ <span class="dashicons dashicons-arrow-right-alt2"></span>
311	+ </div>
312	+ </a>
313	+ </li>
314	+ <li class="woocommerce-list__item has-action">
315	+ <a href="https://trackship.info/documentation/" class="woocommerce-list__item-inner" target="_blank">
316	+ <div class="woocommerce-list__item-before">
317	+ <span class="dashicons dashicons-media-document"></span>
318	+ </div>
319	+ <div class="woocommerce-list__item-text">
320	+ <span class="woocommerce-list__item-title">
321	+ <div class="woocommerce-list-Text">Documentation</div>
322	+ </span>
323	+ </div>
324	+ <div class="woocommerce-list__item-after">
325	+ <span class="dashicons dashicons-arrow-right-alt2"></span>
326	+ </div>
327	+ </a>
328	+ </li>
329	+ </ul>
330	+ </div>
331	+ </div>
332	+ </div>
333	+ </div>
334	</div>
335	<?php
336	if ( $wc_ast_api_key ) {

includes/class-wc-advanced-shipment-tracking.php CHANGED Viewed

	@@ -795,10 +795,10 @@ class WC_Advanced_Shipment_Tracking_Actions {
795	</script>
796	<?php
797	}
798	-
799	$actions['ast_track'] = array(
800	// adjust URL as needed
801	- 'url' => $tracking_items[~~0][~~ 'ast_tracking_link' ],
802	'name' => __( 'Track', 'woo-advanced-shipment-tracking' ),
803	);
804	return $actions;


795	</script>
796	<?php
797	}
798	+ $tracking_items = reset($tracking_items);
799	$actions['ast_track'] = array(
800	// adjust URL as needed
801	+ 'url' => $tracking_items[ 'ast_tracking_link' ],
802	'name' => __( 'Track', 'woo-advanced-shipment-tracking' ),
803	);
804	return $actions;

includes/customizer/class-wc-availableforpickup-email-customizer.php CHANGED Viewed

	@@ -372,9 +372,9 @@ class wcast_availableforpickup_customizer_email {
372	if( $wcast_show_order_details )$message .= $ast->order_details_template( $order, $hide_shipping_item_price );
373	if( $wcast_show_shipping_address )$message .= $ast->order_shipping_details_template( $order );
374
375	- // create a new email
376	- $email = new WC_Email();
377	$mailer = WC()->mailer();


378
379	// wrap the content with the email template and then add styles
380	echo apply_filters( 'woocommerce_mail_content', $email->style_inline( $mailer->wrap_message( $email_heading, $message ) ) );


372	if( $wcast_show_order_details )$message .= $ast->order_details_template( $order, $hide_shipping_item_price );
373	if( $wcast_show_shipping_address )$message .= $ast->order_shipping_details_template( $order );
374


375	$mailer = WC()->mailer();
376	+ // create a new email
377	+ $email = new WC_Email();
378
379	// wrap the content with the email template and then add styles
380	echo apply_filters( 'woocommerce_mail_content', $email->style_inline( $mailer->wrap_message( $email_heading, $message ) ) );

includes/customizer/class-wc-delivered-email-customizer.php CHANGED Viewed

	@@ -393,9 +393,9 @@ class wcast_delivered_customizer_email {
393	if( $wcast_show_order_details )$message .= $ast->order_details_template( $order, $hide_shipping_item_price );
394	if( $wcast_show_shipping_address )$message .= $ast->order_shipping_details_template( $order );
395

396	// create a new email
397	$email = new WC_Email();
398	- $mailer = WC()->mailer();
399
400	// wrap the content with the email template and then add styles
401	echo apply_filters( 'woocommerce_mail_content', $email->style_inline( $mailer->wrap_message( $email_heading, $message ) ) );


393	if( $wcast_show_order_details )$message .= $ast->order_details_template( $order, $hide_shipping_item_price );
394	if( $wcast_show_shipping_address )$message .= $ast->order_shipping_details_template( $order );
395
396	+ $mailer = WC()->mailer();
397	// create a new email
398	$email = new WC_Email();

399
400	// wrap the content with the email template and then add styles
401	echo apply_filters( 'woocommerce_mail_content', $email->style_inline( $mailer->wrap_message( $email_heading, $message ) ) );

includes/customizer/class-wc-exception-email-customizer.php CHANGED Viewed

	@@ -372,9 +372,9 @@ class wcast_exception_customizer_email {
372	if( $wcast_show_order_details )$message .= $ast->order_details_template( $order, $hide_shipping_item_price );
373	if( $wcast_show_shipping_address )$message .= $ast->order_shipping_details_template( $order );
374
375	- // create a new email
376	- $email = new WC_Email();
377	$mailer = WC()->mailer();


378
379	// wrap the content with the email template and then add styles
380	echo apply_filters( 'woocommerce_mail_content', $email->style_inline( $mailer->wrap_message( $email_heading, $message ) ) );


372	if( $wcast_show_order_details )$message .= $ast->order_details_template( $order, $hide_shipping_item_price );
373	if( $wcast_show_shipping_address )$message .= $ast->order_shipping_details_template( $order );
374


375	$mailer = WC()->mailer();
376	+ // create a new email
377	+ $email = new WC_Email();
378
379	// wrap the content with the email template and then add styles
380	echo apply_filters( 'woocommerce_mail_content', $email->style_inline( $mailer->wrap_message( $email_heading, $message ) ) );

includes/customizer/class-wc-failure-email-customizer.php CHANGED Viewed

	@@ -373,9 +373,9 @@ class wcast_failure_customizer_email {
373	if( $wcast_show_order_details )$message .= $ast->order_details_template( $order, $hide_shipping_item_price );
374	if( $wcast_show_shipping_address )$message .= $ast->order_shipping_details_template( $order );
375
376	- // create a new email
377	- $email = new WC_Email();
378	$mailer = WC()->mailer();


379
380	// wrap the content with the email template and then add styles
381	echo apply_filters( 'woocommerce_mail_content', $email->style_inline( $mailer->wrap_message( $email_heading, $message ) ) );


373	if( $wcast_show_order_details )$message .= $ast->order_details_template( $order, $hide_shipping_item_price );
374	if( $wcast_show_shipping_address )$message .= $ast->order_shipping_details_template( $order );
375


376	$mailer = WC()->mailer();
377	+ // create a new email
378	+ $email = new WC_Email();
379
380	// wrap the content with the email template and then add styles
381	echo apply_filters( 'woocommerce_mail_content', $email->style_inline( $mailer->wrap_message( $email_heading, $message ) ) );

includes/customizer/class-wc-intransit-email-customizer.php CHANGED Viewed

	@@ -447,9 +447,9 @@ class wcast_intransit_customizer_email {
447	if( $wcast_show_order_details )$message .= $ast->order_details_template( $order, $hide_shipping_item_price );
448	if( $wcast_show_shipping_address )$message .= $ast->order_shipping_details_template( $order );
449

450	// create a new email
451	$email = new WC_Email();
452	- $mailer = WC()->mailer();
453
454	// wrap the content with the email template and then add styles
455	echo apply_filters( 'woocommerce_mail_content', $email->style_inline( $mailer->wrap_message( $email_heading, $message ) ) );


447	if( $wcast_show_order_details )$message .= $ast->order_details_template( $order, $hide_shipping_item_price );
448	if( $wcast_show_shipping_address )$message .= $ast->order_shipping_details_template( $order );
449
450	+ $mailer = WC()->mailer();
451	// create a new email
452	$email = new WC_Email();

453
454	// wrap the content with the email template and then add styles
455	echo apply_filters( 'woocommerce_mail_content', $email->style_inline( $mailer->wrap_message( $email_heading, $message ) ) );

includes/customizer/class-wc-onhold-email-customizer.php CHANGED Viewed

	@@ -369,9 +369,9 @@ class wcast_onhold_customizer_email {
369	if( $wcast_show_order_details )$message .= $ast->order_details_template( $order, $hide_shipping_item_price );
370	if( $wcast_show_shipping_address )$message .= $ast->order_shipping_details_template( $order );
371

372	// create a new email
373	- $email = new WC_Email();
374	- $mailer = WC()->mailer();
375
376	// wrap the content with the email template and then add styles
377	echo apply_filters( 'woocommerce_mail_content', $email->style_inline( $mailer->wrap_message( $email_heading, $message ) ) );


369	if( $wcast_show_order_details )$message .= $ast->order_details_template( $order, $hide_shipping_item_price );
370	if( $wcast_show_shipping_address )$message .= $ast->order_shipping_details_template( $order );
371
372	+ $mailer = WC()->mailer();
373	// create a new email
374	+ $email = new WC_Email();

375
376	// wrap the content with the email template and then add styles
377	echo apply_filters( 'woocommerce_mail_content', $email->style_inline( $mailer->wrap_message( $email_heading, $message ) ) );

includes/customizer/class-wc-outfordelivery-email-customizer.php CHANGED Viewed

	@@ -369,9 +369,9 @@ class wcast_outfordelivery_customizer_email {
369	if( $wcast_show_order_details )$message .= $ast->order_details_template( $order, $hide_shipping_item_price );
370	if( $wcast_show_shipping_address )$message .= $ast->order_shipping_details_template( $order );
371
372	- // create a new email
373	- $email = new WC_Email();
374	$mailer = WC()->mailer();


375
376	// wrap the content with the email template and then add styles
377	echo apply_filters( 'woocommerce_mail_content', $email->style_inline( $mailer->wrap_message( $email_heading, $message ) ) );


369	if( $wcast_show_order_details )$message .= $ast->order_details_template( $order, $hide_shipping_item_price );
370	if( $wcast_show_shipping_address )$message .= $ast->order_shipping_details_template( $order );
371


372	$mailer = WC()->mailer();
373	+ // create a new email
374	+ $email = new WC_Email();
375
376	// wrap the content with the email template and then add styles
377	echo apply_filters( 'woocommerce_mail_content', $email->style_inline( $mailer->wrap_message( $email_heading, $message ) ) );

includes/customizer/class-wc-returntosender-email-customizer.php CHANGED Viewed

	@@ -368,9 +368,9 @@ class wcast_returntosender_customizer_email {
368	if( $wcast_show_order_details )$message .= $ast->order_details_template( $order, $hide_shipping_item_price );
369	if( $wcast_show_shipping_address )$message .= $ast->order_shipping_details_template( $order );
370
371	- // create a new email
372	- $email = new WC_Email();
373	$mailer = WC()->mailer();


374
375	// wrap the content with the email template and then add styles
376	echo apply_filters( 'woocommerce_mail_content', $email->style_inline( $mailer->wrap_message( $email_heading, $message ) ) );


368	if( $wcast_show_order_details )$message .= $ast->order_details_template( $order, $hide_shipping_item_price );
369	if( $wcast_show_shipping_address )$message .= $ast->order_shipping_details_template( $order );
370


371	$mailer = WC()->mailer();
372	+ // create a new email
373	+ $email = new WC_Email();
374
375	// wrap the content with the email template and then add styles
376	echo apply_filters( 'woocommerce_mail_content', $email->style_inline( $mailer->wrap_message( $email_heading, $message ) ) );

includes/customizer/class-wc-tracking-page-customizer.php CHANGED Viewed

	@@ -130,7 +130,8 @@ class ts_tracking_page_customizer {
130	/**
131	* Register our sample default controls
132	*/
133	- public function wcast_register_sample_default_controls( $wp_customize ) {

134	/**
135	* Load all our Customizer Custom Controls
136	*/


130	/**
131	* Register our sample default controls
132	*/
133	+ public function wcast_register_sample_default_controls( $wp_customize ) {
134	+
135	/**
136	* Load all our Customizer Custom Controls
137	*/

includes/customizer/class-wcast-customizer.php CHANGED Viewed

	@@ -52,7 +52,7 @@ class WC_Advanced_Shipment_Tracking_Customizer {
52	'title' => __( 'Shipping and Delivery Emails', 'woo-advanced-shipment-tracking' ),
53	'description' => esc_html__( '', 'woo-advanced-shipment-tracking' ),
54	)
55	- );
56	}
57
58	/**
	@@ -281,7 +281,7 @@ class WC_Advanced_Shipment_Tracking_Customizer {
281	* @param object $wp_customize
282	* @return array
283	*/
284	- public function remove_unrelated_components($components, $wp_customize) {
285	// Iterate over components
286	foreach ($components as $component_key => $component) {
287	// Check if current component is own component


52	'title' => __( 'Shipping and Delivery Emails', 'woo-advanced-shipment-tracking' ),
53	'description' => esc_html__( '', 'woo-advanced-shipment-tracking' ),
54	)
55	+ );
56	}
57
58	/**

281	* @param object $wp_customize
282	* @return array
283	*/
284	+ public function remove_unrelated_components($components, $wp_customize) {
285	// Iterate over components
286	foreach ($components as $component_key => $component) {
287	// Check if current component is own component

includes/trackship-email-manager.php CHANGED Viewed

	@@ -56,9 +56,9 @@ class WC_TrackShip_Email_Manager {
56	$message .= $ast->order_shipping_details_template( $order );
57	}
58
59	- // create a new email
60	- $email = new WC_Email();
61	$mailer = WC()->mailer();


62
63	// wrap the content with the email template and then add styles
64	$message = apply_filters( 'woocommerce_mail_content', $email->style_inline( $mailer->wrap_message( $email_heading, $message ) ) );
	@@ -122,9 +122,9 @@ class WC_TrackShip_Email_Manager {
122	$message .= $ast->order_shipping_details_template( $order );
123	}
124
125	- // create a new email
126	- $email = new WC_Email();
127	$mailer = WC()->mailer();


128
129	// wrap the content with the email template and then add styles
130	$message = apply_filters( 'woocommerce_mail_content', $email->style_inline( $mailer->wrap_message( $email_heading, $message ) ) );


56	$message .= $ast->order_shipping_details_template( $order );
57	}
58


59	$mailer = WC()->mailer();
60	+ // create a new email
61	+ $email = new WC_Email();
62
63	// wrap the content with the email template and then add styles
64	$message = apply_filters( 'woocommerce_mail_content', $email->style_inline( $mailer->wrap_message( $email_heading, $message ) ) );

122	$message .= $ast->order_shipping_details_template( $order );
123	}
124


125	$mailer = WC()->mailer();
126	+ // create a new email
127	+ $email = new WC_Email();
128
129	// wrap the content with the email template and then add styles
130	$message = apply_filters( 'woocommerce_mail_content', $email->style_inline( $mailer->wrap_message( $email_heading, $message ) ) );

readme.txt CHANGED Viewed

	@@ -142,6 +142,13 @@ Yes, if you use external shipping services that work with the WooCommerce REST A
142
143	== Changelog ==
144







145	= 3.2.2 =
146	* Enhancement - Updated Settings page design
147	* Enhancement - Moved TrackShip menu to a new page under WooCommerce and updated its design


142
143	== Changelog ==
144
145	+ = 3.2.2.1 =
146	+ * Enhancement - Updated Settings page header design
147	+ * Enhancement - Updated TrackShip Settings page header design
148	+ * Enhancement - Updated Email order details template for shipment status emails
149	+ * Fix - Fixed Trackship shipment status customizer issue
150	+ * Fix - Fixed database warnings on plugin installation
151	+
152	= 3.2.2 =
153	* Enhancement - Updated Settings page design
154	* Enhancement - Moved TrackShip menu to a new page under WooCommerce and updated its design

templates/emails/wcast-email-order-details.php CHANGED Viewed

	@@ -39,7 +39,7 @@ if( !empty($kt_woomail) && isset( $kt_woomail['font_size'] ) )$table_font_size =
39	</h2>
40	<table class="order-info-split-table" cellspacing="0" cellpadding="0" width="100%" border="0">
41	<tr>
42	- <td align="left" valign="middle">
43	<h3 style="text-align: left;">
44	<?php
45	if ( $sent_to_admin ) {
	@@ -54,7 +54,7 @@ if( !empty($kt_woomail) && isset( $kt_woomail['font_size'] ) )$table_font_size =
54	?>
55	</h3>
56	</td>
57	- <td align="right" valign="middle">
58	<h3 style="text-align: right;">
59	<?php
60	echo wp_kses_post( sprintf( __( 'Order Date', 'woocommerce' ) . ': <time datetime="%s">%s</time>', $order->get_date_created()->format( 'c' ), wc_format_datetime( $order->get_date_created() ) ) );
	@@ -80,8 +80,8 @@ if ( true == $responsive_check ) { ?>
80	<?php
81	$args = array(
82	'show_sku' => $sent_to_admin,
83	- 'show_image' => ~~false~~,
84	- 'image_size' => array( 32, 32 ),
85	'plain_text' => $plain_text,
86	'sent_to_admin' => $sent_to_admin,
87	);


39	</h2>
40	<table class="order-info-split-table" cellspacing="0" cellpadding="0" width="100%" border="0">
41	<tr>
42	+ <td align="left" valign="middle" style="padding: 12px 0;">
43	<h3 style="text-align: left;">
44	<?php
45	if ( $sent_to_admin ) {

54	?>
55	</h3>
56	</td>
57	+ <td align="right" valign="middle" style="padding: 12px 0;">
58	<h3 style="text-align: right;">
59	<?php
60	echo wp_kses_post( sprintf( __( 'Order Date', 'woocommerce' ) . ': <time datetime="%s">%s</time>', $order->get_date_created()->format( 'c' ), wc_format_datetime( $order->get_date_created() ) ) );

80	<?php
81	$args = array(
82	'show_sku' => $sent_to_admin,
83	+ 'show_image' => true,
84	+ 'image_size' => array( 64, 64 ),
85	'plain_text' => $plain_text,
86	'sent_to_admin' => $sent_to_admin,
87	);

templates/emails/wcast-email-order-items.php CHANGED Viewed

	@@ -35,8 +35,13 @@ foreach ( $items as $item_id => $item ) :
35	$purchase_note = $product->get_purchase_note();
36	$image = $product->get_image( $image_size );
37	}
38	-
39	?>






40	<tr class="<?php echo esc_attr( apply_filters( 'woocommerce_order_item_class', 'order_item', $item, $order ) ); ?>">
41	<td class="td" style="text-align:<?php echo esc_attr( $text_align ); ?>; vertical-align: middle; font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif; word-wrap:break-word;">
42	<?php
	@@ -45,7 +50,7 @@ foreach ( $items as $item_id => $item ) :
45	if ( $show_image ) {
46	echo wp_kses_post( apply_filters( 'woocommerce_order_item_thumbnail', $image, $item ) );
47	}
48	-
49	// Product name.
50	echo wp_kses_post( apply_filters( 'woocommerce_order_item_name', $item->get_name(), $item, false ) );
51
	@@ -60,13 +65,13 @@ foreach ( $items as $item_id => $item ) :
60	wc_display_item_meta(
61	$item,
62	array(
63	- 'label_before' => '<strong class="wc-item-meta-label" style="~~float: ' . esc_attr( $text_align ) . ';~~ margin-' . esc_attr( $margin_side ) . ': .25em; clear: both">',
64	)
65	);
66
67	// allow other plugins to add additional product information here.
68	do_action( 'woocommerce_order_item_meta_end', $item_id, $item, $order, $plain_text );
69	-
70	?>
71	</td>
72	<td class="td" style="text-align:<?php echo esc_attr( $text_align ); ?>; vertical-align:middle; font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif;">


35	$purchase_note = $product->get_purchase_note();
36	$image = $product->get_image( $image_size );
37	}

38	?>
39	+ <style>
40	+ img.attachment-64x64{
41	+ display: inline-block;
42	+ float: none;
43	+ }
44	+ </style>
45	<tr class="<?php echo esc_attr( apply_filters( 'woocommerce_order_item_class', 'order_item', $item, $order ) ); ?>">
46	<td class="td" style="text-align:<?php echo esc_attr( $text_align ); ?>; vertical-align: middle; font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif; word-wrap:break-word;">
47	<?php

50	if ( $show_image ) {
51	echo wp_kses_post( apply_filters( 'woocommerce_order_item_thumbnail', $image, $item ) );
52	}
53	+ echo '<div>';
54	// Product name.
55	echo wp_kses_post( apply_filters( 'woocommerce_order_item_name', $item->get_name(), $item, false ) );
56

65	wc_display_item_meta(
66	$item,
67	array(
68	+ 'label_before' => '<strong class="wc-item-meta-label" style="margin-' . esc_attr( $margin_side ) . ': .25em; clear: both">',
69	)
70	);
71
72	// allow other plugins to add additional product information here.
73	do_action( 'woocommerce_order_item_meta_end', $item_id, $item, $order, $plain_text );
74	+ echo '</div>';
75	?>
76	</td>
77	<td class="td" style="text-align:<?php echo esc_attr( $text_align ); ?>; vertical-align:middle; font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif;">

templates/emails/wcast-shipping-email-addresses.php CHANGED Viewed

	@@ -23,7 +23,7 @@ $text_align = is_rtl() ? 'right' : 'left';
23	$address = $order->get_formatted_billing_address();
24	$shipping = $order->get_formatted_shipping_address();
25	if( !empty($shipping) ){ ?>
26	- <table id="addresses" cellspacing="0" cellpadding="0" style="width: 48%;display:inline-block;vertical-align: top; margin-bottom: 20px; padding:0;border: 1px solid #e0e0e0;" border="0">
27	<tr>
28	<td style="text-align:<?php echo esc_attr( $text_align ); ?>; font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif; padding:15px;" valign="top" width="50%">
29	<strong style="color: #4e4e4e;padding-bottom: 5px;font-size: 14px;"><?php esc_html_e( 'Shipping address', 'woocommerce' ); ?></strong>


23	$address = $order->get_formatted_billing_address();
24	$shipping = $order->get_formatted_shipping_address();
25	if( !empty($shipping) ){ ?>
26	+ <table id="addresses" cellspacing="0" cellpadding="0" style="width: 48%;display:inline-block;vertical-align: top; margin-bottom: 20px; padding:0;border: 1px solid #e0e0e0;margin-right: 15px;" border="0">
27	<tr>
28	<td style="text-align:<?php echo esc_attr( $text_align ); ?>; font-family: 'Helvetica Neue', Helvetica, Roboto, Arial, sans-serif; padding:15px;" valign="top" width="50%">
29	<strong style="color: #4e4e4e;padding-bottom: 5px;font-size: 14px;"><?php esc_html_e( 'Shipping address', 'woocommerce' ); ?></strong>

woocommerce-advanced-shipment-tracking.php CHANGED Viewed

	@@ -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.2
8	* Author: zorem
9	* Author URI: https://www.zorem.com
10	* License: GPL-2.0+
	@@ -20,7 +20,7 @@ class zorem_woocommerce_advanced_shipment_tracking {
20	*
21	* @var string
22	*/
23	- public $version = '3.2.2';
24
25	/**
26	* 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.2.1
8	* Author: zorem
9	* Author URI: https://www.zorem.com
10	* License: GPL-2.0+

20	*
21	* @var string
22	*/
23	+ public $version = '3.2.2.1';
24
25	/**
26	* Initialize the main plugin function

Advanced Shipment Tracking for WooCommerce - Version 3.2.2.1

Version Description

Release Info

Code changes from version 3.2.2 to 3.2.2.1