Version Description
No Upgrade required at this time.
Download this release
Release Info
Developer | digitalchild |
Plugin | WC Vendors |
Version | 1.7.8 |
Comparing to | |
See all releases |
Code changes from version 1.7.7 to 1.7.8
- changelog.txt +13 -0
- class-wc-vendors.php +8 -10
- classes/admin/emails/class-wc-notify-vendor.php +1 -0
- classes/class-install.php +1 -0
- classes/front/dashboard/class-vendor-dashboard.php +4 -2
- classes/front/orders/class-orders.php +1 -1
- classes/front/signup/class-vendor-signup.php +8 -4
- classes/gateways/PayPal_AdvPayments/PayPal_AP/classes/adaptivepayments-sdk/lib/PPLoggingManager.php +1 -1
- readme.txt +18 -5
- templates/dashboard/links.php +4 -4
- templates/dashboard/orders.php +41 -9
- templates/orders/table-body.php +2 -2
changelog.txt
CHANGED
@@ -1,5 +1,18 @@
|
|
1 |
Changelog for WC Vendors
|
2 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
3 |
Version 1.7.7
|
4 |
|
5 |
* Fixed: Terms and conditions processing #182
|
1 |
Changelog for WC Vendors
|
2 |
|
3 |
+
Version 1.7.8
|
4 |
+
|
5 |
+
* Fixed: Vendors can not register #193
|
6 |
+
* Fixed: Variation product image upload #194
|
7 |
+
* Added: Order actions thanks GoTeamScotch
|
8 |
+
* Updated: New item meta in WC 2.4+
|
9 |
+
* Updated: WooCommerce Shipment Tracking v1.2.7+
|
10 |
+
* Fixed: Paypal Logging thanks to GoTeamScotch
|
11 |
+
* Updated: Templates now fully translatable #195
|
12 |
+
* Fixed: Translations not loading bug
|
13 |
+
* Fixed: vendors not defined error
|
14 |
+
* Updated: Base translation files
|
15 |
+
|
16 |
Version 1.7.7
|
17 |
|
18 |
* Fixed: Terms and conditions processing #182
|
class-wc-vendors.php
CHANGED
@@ -7,9 +7,9 @@
|
|
7 |
* Author: WC Vendors
|
8 |
* Author URI: http://wcvendors.com
|
9 |
*
|
10 |
-
* Version: 1.7.
|
11 |
* Requires at least: 4.0.0
|
12 |
-
* Tested up to: 4.3.
|
13 |
*
|
14 |
* Text Domain: wcvendors
|
15 |
* Domain Path: /languages/
|
@@ -36,8 +36,7 @@ if ( is_woocommerce_activated() ) {
|
|
36 |
if ( !defined( 'wcv_plugin_dir' ) ) define( 'wcv_plugin_dir', trailingslashit( dirname( __FILE__ ) ) . '/' );
|
37 |
if ( !defined( 'wcv_assets_url' ) ) define( 'wcv_assets_url', trailingslashit( plugins_url( 'assets', __FILE__ ) ) );
|
38 |
if ( !defined( 'wcv_plugin_base' ) ) define( 'wcv_plugin_base', plugin_basename( __FILE__ ) );
|
39 |
-
if ( !defined( 'wcv_plugin_dir_path' ) ) define(
|
40 |
-
|
41 |
|
42 |
/**
|
43 |
* Main Product Vendor class
|
@@ -58,10 +57,11 @@ if ( is_woocommerce_activated() ) {
|
|
58 |
*/
|
59 |
public function __construct()
|
60 |
{
|
61 |
-
|
62 |
-
|
63 |
// Load text domain
|
64 |
-
add_action( '
|
|
|
|
|
65 |
|
66 |
// Install & upgrade
|
67 |
add_action( 'admin_init', array( $this, 'check_install' ) );
|
@@ -134,10 +134,8 @@ if ( is_woocommerce_activated() ) {
|
|
134 |
public function load_il8n() {
|
135 |
|
136 |
$domain = 'wcvendors';
|
137 |
-
|
138 |
-
// The "plugin_locale" filter is also used in load_plugin_textdomain()
|
139 |
|
140 |
-
$locale = apply_filters('plugin_locale', get_locale(), $domain);
|
141 |
|
142 |
//Place your custom translations into wp-content/languages/wc-vendors to be upgrade safe
|
143 |
load_textdomain($domain, WP_LANG_DIR.'/wc-vendors/'.$domain.'-'.$locale.'.mo');
|
7 |
* Author: WC Vendors
|
8 |
* Author URI: http://wcvendors.com
|
9 |
*
|
10 |
+
* Version: 1.7.8
|
11 |
* Requires at least: 4.0.0
|
12 |
+
* Tested up to: 4.3.1
|
13 |
*
|
14 |
* Text Domain: wcvendors
|
15 |
* Domain Path: /languages/
|
36 |
if ( !defined( 'wcv_plugin_dir' ) ) define( 'wcv_plugin_dir', trailingslashit( dirname( __FILE__ ) ) . '/' );
|
37 |
if ( !defined( 'wcv_assets_url' ) ) define( 'wcv_assets_url', trailingslashit( plugins_url( 'assets', __FILE__ ) ) );
|
38 |
if ( !defined( 'wcv_plugin_base' ) ) define( 'wcv_plugin_base', plugin_basename( __FILE__ ) );
|
39 |
+
if ( !defined( 'wcv_plugin_dir_path' ) ) define( 'wcv_plugin_dir_path', untrailingslashit( plugin_dir_path( __FILE__ ) ) );
|
|
|
40 |
|
41 |
/**
|
42 |
* Main Product Vendor class
|
57 |
*/
|
58 |
public function __construct()
|
59 |
{
|
60 |
+
|
|
|
61 |
// Load text domain
|
62 |
+
add_action( 'plugins_loaded', array( $this, 'load_il8n' ) );
|
63 |
+
|
64 |
+
$this->title = __( 'WC Vendors', 'wcvendors' );
|
65 |
|
66 |
// Install & upgrade
|
67 |
add_action( 'admin_init', array( $this, 'check_install' ) );
|
134 |
public function load_il8n() {
|
135 |
|
136 |
$domain = 'wcvendors';
|
|
|
|
|
137 |
|
138 |
+
$locale = apply_filters( 'plugin_locale', get_locale(), $domain );
|
139 |
|
140 |
//Place your custom translations into wp-content/languages/wc-vendors to be upgrade safe
|
141 |
load_textdomain($domain, WP_LANG_DIR.'/wc-vendors/'.$domain.'-'.$locale.'.mo');
|
classes/admin/emails/class-wc-notify-vendor.php
CHANGED
@@ -141,6 +141,7 @@ class WC_Email_Notify_Vendor extends WC_Email
|
|
141 |
public function get_vendors( $order )
|
142 |
{
|
143 |
$items = $order->get_items();
|
|
|
144 |
|
145 |
foreach ( $items as $key => $product ) {
|
146 |
|
141 |
public function get_vendors( $order )
|
142 |
{
|
143 |
$items = $order->get_items();
|
144 |
+
$vendors = array();
|
145 |
|
146 |
foreach ( $items as $key => $product ) {
|
147 |
|
classes/class-install.php
CHANGED
@@ -66,6 +66,7 @@ class WCV_Install
|
|
66 |
add_role( 'vendor', __('Vendor', 'wcvendors') , array(
|
67 |
'assign_product_terms' => true,
|
68 |
'edit_products' => true,
|
|
|
69 |
'edit_published_products' => false,
|
70 |
'manage_product' => true,
|
71 |
'publish_products' => false,
|
66 |
add_role( 'vendor', __('Vendor', 'wcvendors') , array(
|
67 |
'assign_product_terms' => true,
|
68 |
'edit_products' => true,
|
69 |
+
'edit_product' => true,
|
70 |
'edit_published_products' => false,
|
71 |
'manage_product' => true,
|
72 |
'publish_products' => false,
|
classes/front/dashboard/class-vendor-dashboard.php
CHANGED
@@ -47,7 +47,9 @@ class WCV_Vendor_Dashboard
|
|
47 |
do_action('wcvendors_vendor_ship', $order_id, $user_id);
|
48 |
wc_add_notice( __( 'Order marked shipped.', 'wcvendors' ), 'success' );
|
49 |
$order->add_order_note( apply_filters( 'wcvendors_vendor_shipped_note', __( $shop_name . ' has marked as shipped. ', 'wcvendors') ), $user_id ) ;
|
50 |
-
}
|
|
|
|
|
51 |
|
52 |
update_post_meta( $order_id, 'wc_pv_shipped', $shippers );
|
53 |
return;
|
@@ -196,7 +198,7 @@ class WCV_Vendor_Dashboard
|
|
196 |
// WC Shipment Tracking Providers
|
197 |
if ( class_exists( 'WC_Shipment_Tracking' ) ) {
|
198 |
$WC_Shipment_Tracking = new WC_Shipment_Tracking();
|
199 |
-
$providers = $WC_Shipment_Tracking->get_providers();
|
200 |
$provider_array = array();
|
201 |
foreach ( $providers as $all_providers ) {
|
202 |
foreach ( $all_providers as $provider => $format ) {
|
47 |
do_action('wcvendors_vendor_ship', $order_id, $user_id);
|
48 |
wc_add_notice( __( 'Order marked shipped.', 'wcvendors' ), 'success' );
|
49 |
$order->add_order_note( apply_filters( 'wcvendors_vendor_shipped_note', __( $shop_name . ' has marked as shipped. ', 'wcvendors') ), $user_id ) ;
|
50 |
+
} elseif ( false != ( $key = array_search( $user_id, $shippers) ) ) {
|
51 |
+
unset( $shippers[$key] ); // Remove user from the shippers array
|
52 |
+
}
|
53 |
|
54 |
update_post_meta( $order_id, 'wc_pv_shipped', $shippers );
|
55 |
return;
|
198 |
// WC Shipment Tracking Providers
|
199 |
if ( class_exists( 'WC_Shipment_Tracking' ) ) {
|
200 |
$WC_Shipment_Tracking = new WC_Shipment_Tracking();
|
201 |
+
$providers = (method_exists($WC_Shipment_Tracking, 'get_providers')) ? $WC_Shipment_Tracking->get_providers() : $WC_Shipment_Tracking->providers;
|
202 |
$provider_array = array();
|
203 |
foreach ( $providers as $all_providers ) {
|
204 |
foreach ( $all_providers as $provider => $format ) {
|
classes/front/orders/class-orders.php
CHANGED
@@ -134,7 +134,7 @@ class WCV_Orders
|
|
134 |
// WC Shipment Tracking Providers
|
135 |
if ( class_exists( 'WC_Shipment_Tracking' ) ) {
|
136 |
$WC_Shipment_Tracking = new WC_Shipment_Tracking();
|
137 |
-
$providers = $WC_Shipment_Tracking->get_providers();
|
138 |
$provider_array = array();
|
139 |
foreach ( $providers as $all_providers ) {
|
140 |
foreach ( $all_providers as $provider => $format ) {
|
134 |
// WC Shipment Tracking Providers
|
135 |
if ( class_exists( 'WC_Shipment_Tracking' ) ) {
|
136 |
$WC_Shipment_Tracking = new WC_Shipment_Tracking();
|
137 |
+
$providers = (method_exists($WC_Shipment_Tracking, 'get_providers')) ? $WC_Shipment_Tracking->get_providers() : $WC_Shipment_Tracking->providers;
|
138 |
$provider_array = array();
|
139 |
foreach ( $providers as $all_providers ) {
|
140 |
foreach ( $all_providers as $provider => $format ) {
|
classes/front/signup/class-vendor-signup.php
CHANGED
@@ -123,10 +123,14 @@ class WCV_Vendor_Signup
|
|
123 |
$page_id = get_queried_object_id();
|
124 |
|
125 |
if ( $page_id == $vendor_dashboard_page ) {
|
126 |
-
if ( $this->terms_page
|
127 |
-
|
|
|
|
|
|
|
|
|
128 |
} else {
|
129 |
-
|
130 |
}
|
131 |
}
|
132 |
}
|
@@ -134,7 +138,7 @@ class WCV_Vendor_Signup
|
|
134 |
public function validate_vendor_registration( $username, $email, $validation_errors ) {
|
135 |
|
136 |
if ( isset( $_POST[ 'apply_for_vendor' ] ) ) {
|
137 |
-
if ( !isset( $_POST[ 'agree_to_terms' ] ) ) {
|
138 |
$validation_errors->add( 'agree_to_terms_error', __( 'You must accept the terms and conditions to become a vendor.', 'wcvendors' ) );
|
139 |
}
|
140 |
}
|
123 |
$page_id = get_queried_object_id();
|
124 |
|
125 |
if ( $page_id == $vendor_dashboard_page ) {
|
126 |
+
if ( $this->terms_page ) {
|
127 |
+
if ( isset( $_POST[ 'agree_to_terms' ] ) ) {
|
128 |
+
self::save_pending( get_current_user_id() );
|
129 |
+
} else {
|
130 |
+
wc_add_notice( __( 'You must accept the terms and conditions to become a vendor.', 'wcvendors' ), 'error' );
|
131 |
+
}
|
132 |
} else {
|
133 |
+
self::save_pending( get_current_user_id() );
|
134 |
}
|
135 |
}
|
136 |
}
|
138 |
public function validate_vendor_registration( $username, $email, $validation_errors ) {
|
139 |
|
140 |
if ( isset( $_POST[ 'apply_for_vendor' ] ) ) {
|
141 |
+
if ( $this->terms_page && !isset( $_POST[ 'agree_to_terms' ] ) ) {
|
142 |
$validation_errors->add( 'agree_to_terms_error', __( 'You must accept the terms and conditions to become a vendor.', 'wcvendors' ) );
|
143 |
}
|
144 |
}
|
classes/gateways/PayPal_AdvPayments/PayPal_AP/classes/adaptivepayments-sdk/lib/PPLoggingManager.php
CHANGED
@@ -55,7 +55,7 @@ class PPLoggingManager
|
|
55 |
public function log( $message, $level = PPLoggingLevel::INFO )
|
56 |
{
|
57 |
if ( $this->isLoggingEnabled && ( $level <= $this->loggingLevel ) ) {
|
58 |
-
error_log( $this->loggerName . ": $message\n"
|
59 |
}
|
60 |
}
|
61 |
|
55 |
public function log( $message, $level = PPLoggingLevel::INFO )
|
56 |
{
|
57 |
if ( $this->isLoggingEnabled && ( $level <= $this->loggingLevel ) ) {
|
58 |
+
error_log( $this->loggerName . ": $message\n" );
|
59 |
}
|
60 |
}
|
61 |
|
readme.txt
CHANGED
@@ -1,12 +1,12 @@
|
|
1 |
=== WC Vendors ===
|
2 |
Contributors: wcvendors, digitalchild
|
3 |
-
Tags: commission rate, dc multi vendor, dc multi vendors, dc product vendor, dc product vendors, dc vendor, dc vendors, e-commerce, ecommerce, ebay, free, marketplace, multi seller, multi store, multi vendor, multistore, multivendor, multivendors, product vendor, product vendors, seller, shops, store, vendor, vendor shop, vendor system, vendors, wc multivendor, wc vendors, woo vendors, woocommerce, woocommerce marketplace, woocommerce multi vendor, WooCommerce multivendor, woocommerce product vendors, WooCommerce
|
4 |
Donate link: http://www.wcvendors.com/
|
5 |
Author URI: http://www.wcvendors.com/
|
6 |
Plugin URI: http://www.wcvendors.com/
|
7 |
Requires at least: 4.0
|
8 |
-
Tested up to: 4.3
|
9 |
-
Stable tag: 1.7.
|
10 |
License: GPLv2 or later
|
11 |
|
12 |
The free multi-vendor plugin for WooCommerce. Now you can allow anyone to open a store on your site!
|
@@ -37,7 +37,7 @@ This plugin has been around since 2011 and remains still the #1 multi vendor plu
|
|
37 |
* Front-End Vendor Registration and Back-End Vendor Registration
|
38 |
* Vendors have their own user accounts and a Vendor Role
|
39 |
* Tons of shortcodes
|
40 |
-
* Translated in over
|
41 |
* Shipping Management through Per Product Shipping and Multiple Packages (and more coming soon!)
|
42 |
* Tax Management to give or not give vendors tax for each order
|
43 |
* Test Checkout Gateway included for testing your store before it goes live
|
@@ -96,6 +96,19 @@ No Upgrade required at this time.
|
|
96 |
|
97 |
== Changelog ==
|
98 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
99 |
= Version 1.7.7 - 10th August 2015 =
|
100 |
|
101 |
* Fixed: Terms and conditions processing #182
|
@@ -333,4 +346,4 @@ No Upgrade required at this time.
|
|
333 |
== Upgrade Notice ==
|
334 |
|
335 |
= 1.6.0 =
|
336 |
-
Our template system has been upgraded. See (http://www.wcvendors.com/knowledgebase/v1-5-0-to-v1-6-0-upgrade-guide/) for the upgrade guide if you have used our templates to change how your site looks.
|
1 |
=== WC Vendors ===
|
2 |
Contributors: wcvendors, digitalchild
|
3 |
+
Tags: commission rate, dc multi vendor, dc multi vendors, dc product vendor, dc product vendors, dc vendor, dc vendors, e-commerce, ecommerce, ebay, free, marketplace, multi seller, multi store, multi vendor, multistore, multivendor, multivendors, product vendor, product vendors, seller, shops, store, vendor, vendor shop, vendor system, vendors, wc multivendor, wc vendors, woo vendors, woocommerce, woocommerce marketplace, woocommerce multi vendor, WooCommerce multivendor, woocommerce product vendors, WooCommerce vendors, yit, yith, yithemes
|
4 |
Donate link: http://www.wcvendors.com/
|
5 |
Author URI: http://www.wcvendors.com/
|
6 |
Plugin URI: http://www.wcvendors.com/
|
7 |
Requires at least: 4.0
|
8 |
+
Tested up to: 4.3.1
|
9 |
+
Stable tag: 1.7.8
|
10 |
License: GPLv2 or later
|
11 |
|
12 |
The free multi-vendor plugin for WooCommerce. Now you can allow anyone to open a store on your site!
|
37 |
* Front-End Vendor Registration and Back-End Vendor Registration
|
38 |
* Vendors have their own user accounts and a Vendor Role
|
39 |
* Tons of shortcodes
|
40 |
+
* Translated in over 9 languages and growing!
|
41 |
* Shipping Management through Per Product Shipping and Multiple Packages (and more coming soon!)
|
42 |
* Tax Management to give or not give vendors tax for each order
|
43 |
* Test Checkout Gateway included for testing your store before it goes live
|
96 |
|
97 |
== Changelog ==
|
98 |
|
99 |
+
= Version 1.7.8 - 18th September 2015 =
|
100 |
+
|
101 |
+
* Fixed: Vendors can not register #193
|
102 |
+
* Fixed: Variation product image upload #194
|
103 |
+
* Added: Order actions thanks GoTeamScotch
|
104 |
+
* Updated: New item meta in WC 2.4+
|
105 |
+
* Updated: WooCommerce Shipment Tracking v1.2.7+
|
106 |
+
* Fixed: Paypal Logging thanks to GoTeamScotch
|
107 |
+
* Updated: Templates now fully translatable #195
|
108 |
+
* Fixed: Translations not loading bug
|
109 |
+
* Fixed: vendors not defined error
|
110 |
+
* Updated: Base translation files
|
111 |
+
|
112 |
= Version 1.7.7 - 10th August 2015 =
|
113 |
|
114 |
* Fixed: Terms and conditions processing #182
|
346 |
== Upgrade Notice ==
|
347 |
|
348 |
= 1.6.0 =
|
349 |
+
Our template system has been upgraded. See (http://www.wcvendors.com/knowledgebase/v1-5-0-to-v1-6-0-upgrade-guide/) for the upgrade guide if you have used our templates to change how your site looks.
|
templates/dashboard/links.php
CHANGED
@@ -1,11 +1,11 @@
|
|
1 |
<center>
|
2 |
<p>
|
3 |
-
<a href="<?php echo $shop_page; ?>" class="button"
|
4 |
-
<a href="<?php echo $settings_page; ?>" class="button"
|
5 |
|
6 |
<?php if ( $can_submit ) { ?>
|
7 |
-
<a target="_TOP" href="<?php echo $submit_link; ?>" class="button"
|
8 |
-
<a target="_TOP" href="<?php echo $edit_link; ?>" class="button"
|
9 |
<?php } ?>
|
10 |
</center>
|
11 |
|
1 |
<center>
|
2 |
<p>
|
3 |
+
<a href="<?php echo $shop_page; ?>" class="button"><?php echo _e( 'View Your Store', 'wcvendors' ); ?></a>
|
4 |
+
<a href="<?php echo $settings_page; ?>" class="button"><?php echo _e( 'Store Settings', 'wcvendors' ); ?></a>
|
5 |
|
6 |
<?php if ( $can_submit ) { ?>
|
7 |
+
<a target="_TOP" href="<?php echo $submit_link; ?>" class="button"><?php echo _e( 'Add New Product', 'wcvendors' ); ?></a>
|
8 |
+
<a target="_TOP" href="<?php echo $edit_link; ?>" class="button"><?php echo _e( 'Edit Products', 'wcvendors' ); ?></a>
|
9 |
<?php } ?>
|
10 |
</center>
|
11 |
|
templates/dashboard/orders.php
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
jQuery(function () {
|
3 |
jQuery('a.view-items').on('click', function (e) {
|
4 |
e.preventDefault();
|
5 |
-
var id = jQuery(this).
|
6 |
|
7 |
if ( jQuery(this).text() == "<?php _e('Hide items', 'wcvendors'); ?>" ) {
|
8 |
jQuery(this).text("<?php _e('View items', 'wcvendors'); ?>");
|
@@ -15,7 +15,7 @@ jQuery(function () {
|
|
15 |
|
16 |
jQuery('a.view-order-tracking').on('click', function (e) {
|
17 |
e.preventDefault();
|
18 |
-
|
19 |
jQuery("#view-tracking-" + id).fadeToggle();
|
20 |
});
|
21 |
});
|
@@ -66,17 +66,49 @@ jQuery(function () {
|
|
66 |
|
67 |
?>
|
68 |
|
69 |
-
<tr>
|
70 |
<td><?php echo $order->get_order_number(); ?></td>
|
71 |
<td><?php echo apply_filters( 'wcvendors_dashboard_google_maps_link', '<a target="_blank" href="' . esc_url( 'http://maps.google.com/maps?&q=' . urlencode( esc_html( preg_replace( '#<br\s*/?>#i', ', ', $order->get_formatted_shipping_address() ) ) ) . '&z=16' ) . '">'. esc_html( preg_replace( '#<br\s*/?>#i', ', ', $order->get_formatted_shipping_address() ) ) .'</a>' ); ?></td>
|
72 |
<td><?php $sum = WCV_Queries::sum_for_orders( array( $order->id ), array('vendor_id'=>get_current_user_id()) ); $total = $sum[0]->line_total; $totals += $total; echo woocommerce_price( $total ); ?></td>
|
73 |
<td><?php echo $order->order_date; ?></td>
|
74 |
<td>
|
75 |
-
|
76 |
-
|
77 |
-
|
78 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
79 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
80 |
</td>
|
81 |
</tr>
|
82 |
|
@@ -86,7 +118,7 @@ jQuery(function () {
|
|
86 |
$product_id = '';
|
87 |
foreach ($valid as $key => $item):
|
88 |
$product_id = $item['product_id'];
|
89 |
-
$item_meta = new WC_Order_Item_Meta( $item
|
90 |
$item_meta = $item_meta->display( false, true ); ?>
|
91 |
<?php echo $item['qty'] . 'x ' . $item['name']; ?>
|
92 |
|
@@ -139,4 +171,4 @@ jQuery(function () {
|
|
139 |
<?php endif; ?>
|
140 |
|
141 |
</tbody>
|
142 |
-
</table>
|
2 |
jQuery(function () {
|
3 |
jQuery('a.view-items').on('click', function (e) {
|
4 |
e.preventDefault();
|
5 |
+
var id = jQuery(this).closest('tr').data('order-id');
|
6 |
|
7 |
if ( jQuery(this).text() == "<?php _e('Hide items', 'wcvendors'); ?>" ) {
|
8 |
jQuery(this).text("<?php _e('View items', 'wcvendors'); ?>");
|
15 |
|
16 |
jQuery('a.view-order-tracking').on('click', function (e) {
|
17 |
e.preventDefault();
|
18 |
+
var id = jQuery(this).closest('tr').data('order-id');
|
19 |
jQuery("#view-tracking-" + id).fadeToggle();
|
20 |
});
|
21 |
});
|
66 |
|
67 |
?>
|
68 |
|
69 |
+
<tr id="order-<?php echo $order->id; ?>" data-order-id="<?php echo $order->id; ?>">
|
70 |
<td><?php echo $order->get_order_number(); ?></td>
|
71 |
<td><?php echo apply_filters( 'wcvendors_dashboard_google_maps_link', '<a target="_blank" href="' . esc_url( 'http://maps.google.com/maps?&q=' . urlencode( esc_html( preg_replace( '#<br\s*/?>#i', ', ', $order->get_formatted_shipping_address() ) ) ) . '&z=16' ) . '">'. esc_html( preg_replace( '#<br\s*/?>#i', ', ', $order->get_formatted_shipping_address() ) ) .'</a>' ); ?></td>
|
72 |
<td><?php $sum = WCV_Queries::sum_for_orders( array( $order->id ), array('vendor_id'=>get_current_user_id()) ); $total = $sum[0]->line_total; $totals += $total; echo woocommerce_price( $total ); ?></td>
|
73 |
<td><?php echo $order->order_date; ?></td>
|
74 |
<td>
|
75 |
+
<?php
|
76 |
+
$order_actions = array(
|
77 |
+
'view' => array(
|
78 |
+
'class' => 'view-items',
|
79 |
+
'content' => __('View items', 'wcvendors'),
|
80 |
+
)
|
81 |
+
);
|
82 |
+
if ( $needs_shipping ) {
|
83 |
+
$order_actions['shipped'] = array(
|
84 |
+
'class' => 'mark-shipped',
|
85 |
+
'content' => __('Mark shipped', 'wcvendors'),
|
86 |
+
'url' => '?wc_pv_mark_shipped=' . $order->id
|
87 |
+
);
|
88 |
+
}
|
89 |
+
if ( $providers && $needs_shipping && class_exists( 'WC_Shipment_Tracking' ) ) {
|
90 |
+
$order_actions['tracking'] = array(
|
91 |
+
'class' => 'view-order-tracking',
|
92 |
+
'content' => __( 'Tracking', 'wcvendors' )
|
93 |
+
);
|
94 |
+
}
|
95 |
+
|
96 |
+
$order_actions = apply_filters( 'wcvendors_order_actions', $order_actions, $order );
|
97 |
|
98 |
+
if ($order_actions) {
|
99 |
+
$output = array();
|
100 |
+
foreach ($order_actions as $key => $data) {
|
101 |
+
$output[] = sprintf(
|
102 |
+
'<a href="%s" id="%s" class="%s">%s</a>',
|
103 |
+
(isset($data['url'])) ? $data['url'] : '#',
|
104 |
+
(isset($data['id'])) ? $data['id'] : $key . '-' . $order->id,
|
105 |
+
(isset($data['class'])) ? $data['class'] : '',
|
106 |
+
$data['content']
|
107 |
+
);
|
108 |
+
}
|
109 |
+
echo implode(' | ', $output);
|
110 |
+
}
|
111 |
+
?>
|
112 |
</td>
|
113 |
</tr>
|
114 |
|
118 |
$product_id = '';
|
119 |
foreach ($valid as $key => $item):
|
120 |
$product_id = $item['product_id'];
|
121 |
+
$item_meta = new WC_Order_Item_Meta( $item );
|
122 |
$item_meta = $item_meta->display( false, true ); ?>
|
123 |
<?php echo $item['qty'] . 'x ' . $item['name']; ?>
|
124 |
|
171 |
<?php endif; ?>
|
172 |
|
173 |
</tbody>
|
174 |
+
</table>
|
templates/orders/table-body.php
CHANGED
@@ -1,5 +1,5 @@
|
|
1 |
<?php
|
2 |
-
$item_meta = new WC_Order_Item_Meta( $item
|
3 |
$item_meta = $item_meta->display( false, true );
|
4 |
|
5 |
if ($count > 1) : ?>
|
@@ -29,4 +29,4 @@ if ($count > 1) : ?>
|
|
29 |
|
30 |
</tr>
|
31 |
|
32 |
-
<?php endif; ?>
|
1 |
<?php
|
2 |
+
$item_meta = new WC_Order_Item_Meta( $item );
|
3 |
$item_meta = $item_meta->display( false, true );
|
4 |
|
5 |
if ($count > 1) : ?>
|
29 |
|
30 |
</tr>
|
31 |
|
32 |
+
<?php endif; ?>
|