Version Description
Download this release
Release Info
Developer | digitalchild |
Plugin | WC Vendors |
Version | 2.0.6 |
Comparing to | |
See all releases |
Code changes from version 2.0.5 to 2.0.6
- changelog.txt +15 -0
- class-wc-vendors.php +4 -5
- classes/admin/class-setup-wizard.php +6 -6
- classes/admin/class-wcv-admin-notices.php +3 -3
- classes/admin/class-wcv-commissions-sum-csv-exporter.php +42 -9
- classes/admin/settings/class-wcv-settings-commission.php +1 -1
- classes/admin/views/notices/html-notice-template-check.php +1 -1
- classes/class-cron.php +17 -16
- classes/class-install.php +4 -5
- classes/front/class-vendor-shop.php +1 -1
- classes/front/signup/class-vendor-signup.php +1 -1
- classes/gateways/PayPal_AdvPayments/PayPal_AP/classes/adaptivepayments-sdk/lib/PPUtils.php +2 -2
- classes/gateways/PayPal_Masspay/api/lib/PPHttpConnection.php +1 -1
- classes/gateways/PayPal_Masspay/api/lib/PPUtils.php +4 -3
- classes/gateways/PayPal_Masspay/class-paypal-masspay.php +1 -2
- classes/includes/class-wcv-background-updater.php +124 -0
- classes/includes/wcv-update-functions.php +1 -1
- languages/wc-vendors.pot +63 -59
- readme.txt +18 -2
changelog.txt
CHANGED
@@ -1,5 +1,20 @@
|
|
1 |
Changelog for WC Vendors
|
2 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
3 |
Version 2.0.5
|
4 |
|
5 |
* Updated: Legacy WooCommerce calls
|
1 |
Changelog for WC Vendors
|
2 |
|
3 |
+
Version 2.0.6
|
4 |
+
|
5 |
+
* Added: Payment details to totals CSV export #414
|
6 |
+
* Added: New background updater
|
7 |
+
* Added: New reference to the GDPR for users in the readme
|
8 |
+
* Updated: Invalid text domain in woocommerce registration errors
|
9 |
+
* Updated: Only show major update warning for WC Vendors below 2.0.0
|
10 |
+
* Fixed: Payment message output
|
11 |
+
* Fixed: PayPal cron schedules not working #416
|
12 |
+
* Fixed: Incorrect page name
|
13 |
+
* Fixed: Incorrect default settings in setup wizard
|
14 |
+
* Fixed: Call correct background updater
|
15 |
+
* Fixed: Reference to documentation
|
16 |
+
* Fixed: Increased input width for commission input in settings
|
17 |
+
|
18 |
Version 2.0.5
|
19 |
|
20 |
* Updated: Legacy WooCommerce calls
|
class-wc-vendors.php
CHANGED
@@ -7,11 +7,11 @@
|
|
7 |
* Author URI: https://www.wcvendors.com
|
8 |
* GitHub Plugin URI: https://github.com/wcvendors/wcvendors
|
9 |
*
|
10 |
-
* Version: 2.0.
|
11 |
* Requires at least: 4.4.0
|
12 |
* Tested up to: 4.9.5
|
13 |
* WC requires at least: 3.0.0
|
14 |
-
* WC tested up to: 3.
|
15 |
*
|
16 |
* Text Domain: wc-vendors
|
17 |
* Domain Path: /languages/
|
@@ -80,7 +80,7 @@ if ( wcv_is_woocommerce_activated() ) {
|
|
80 |
class WC_Vendors
|
81 |
{
|
82 |
|
83 |
-
public $version = '2.0.
|
84 |
|
85 |
/**
|
86 |
* @var
|
@@ -396,7 +396,7 @@ if ( wcv_is_woocommerce_activated() ) {
|
|
396 |
$new_version = $response->new_version;
|
397 |
$upgrade_notice = sprintf( __( 'WC Vendors 2.0 is a major update. This is not compatible with any of our existing extensions. You should test this update on a staging server before updating. Backup your site and update your theme and extensions, and <a href="%s">review update details here</a> before upgrading.', 'wc-vendors' ), 'https://docs.wcvendors.com/knowledge-base/upgrading-to-wc-vendors-2-0/');
|
398 |
|
399 |
-
if ( version_compare( WCV_VERSION,
|
400 |
echo '<h3>Important Upgrade Notice:</h3>';
|
401 |
echo '<p style="background-color: #d54e21; padding: 10px; color: #f9f9f9; margin-top: 10px">';
|
402 |
echo $upgrade_notice;
|
@@ -410,7 +410,6 @@ if ( wcv_is_woocommerce_activated() ) {
|
|
410 |
$pro_upgrade = sprintf( __( 'WC Vendors Pro 1.5.0 is required to run WC Vendors 2.0.0. Your current version %s will be deactivated. Please upgrade to the latest version.', 'wc-vendors' ), WCV_PRO_VERSION );
|
411 |
|
412 |
echo $pro_upgrade;
|
413 |
-
// echo '</p>';
|
414 |
}
|
415 |
|
416 |
}
|
7 |
* Author URI: https://www.wcvendors.com
|
8 |
* GitHub Plugin URI: https://github.com/wcvendors/wcvendors
|
9 |
*
|
10 |
+
* Version: 2.0.6
|
11 |
* Requires at least: 4.4.0
|
12 |
* Tested up to: 4.9.5
|
13 |
* WC requires at least: 3.0.0
|
14 |
+
* WC tested up to: 3.4.0
|
15 |
*
|
16 |
* Text Domain: wc-vendors
|
17 |
* Domain Path: /languages/
|
80 |
class WC_Vendors
|
81 |
{
|
82 |
|
83 |
+
public $version = '2.0.6';
|
84 |
|
85 |
/**
|
86 |
* @var
|
396 |
$new_version = $response->new_version;
|
397 |
$upgrade_notice = sprintf( __( 'WC Vendors 2.0 is a major update. This is not compatible with any of our existing extensions. You should test this update on a staging server before updating. Backup your site and update your theme and extensions, and <a href="%s">review update details here</a> before upgrading.', 'wc-vendors' ), 'https://docs.wcvendors.com/knowledge-base/upgrading-to-wc-vendors-2-0/');
|
398 |
|
399 |
+
if ( version_compare( WCV_VERSION, '2.0.0', '<' ) && version_compare( $new_version, '2.0.0', '>=') ){
|
400 |
echo '<h3>Important Upgrade Notice:</h3>';
|
401 |
echo '<p style="background-color: #d54e21; padding: 10px; color: #f9f9f9; margin-top: 10px">';
|
402 |
echo $upgrade_notice;
|
410 |
$pro_upgrade = sprintf( __( 'WC Vendors Pro 1.5.0 is required to run WC Vendors 2.0.0. Your current version %s will be deactivated. Please upgrade to the latest version.', 'wc-vendors' ), WCV_PRO_VERSION );
|
411 |
|
412 |
echo $pro_upgrade;
|
|
|
413 |
}
|
414 |
|
415 |
}
|
classes/admin/class-setup-wizard.php
CHANGED
@@ -75,7 +75,7 @@ class WCVendors_Admin_Setup_Wizard {
|
|
75 |
'view' => array( $this, 'wcv_setup_capabilities' ),
|
76 |
'handler' => array( $this, 'wcv_setup_capabilities_save' ),
|
77 |
),
|
78 |
-
'
|
79 |
'name' => __( 'Pages', 'wc-vendors' ),
|
80 |
'view' => array( $this, 'wcv_setup_pages' ),
|
81 |
'handler' => array( $this, 'wcv_setup_pages_save' ),
|
@@ -206,11 +206,11 @@ class WCVendors_Admin_Setup_Wizard {
|
|
206 |
*/
|
207 |
public function wcv_setup_general() {
|
208 |
|
209 |
-
$allow_registration =
|
210 |
-
$manual_approval =
|
211 |
-
$vendor_taxes =
|
212 |
-
$vendor_shipping =
|
213 |
-
$commission_rate =
|
214 |
|
215 |
include( WCV_ABSPATH_ADMIN . 'views/setup/general.php' );
|
216 |
}
|
75 |
'view' => array( $this, 'wcv_setup_capabilities' ),
|
76 |
'handler' => array( $this, 'wcv_setup_capabilities_save' ),
|
77 |
),
|
78 |
+
'pages' => array(
|
79 |
'name' => __( 'Pages', 'wc-vendors' ),
|
80 |
'view' => array( $this, 'wcv_setup_pages' ),
|
81 |
'handler' => array( $this, 'wcv_setup_pages_save' ),
|
206 |
*/
|
207 |
public function wcv_setup_general() {
|
208 |
|
209 |
+
$allow_registration = get_option( 'wcvendors_vendor_allow_registration', 'yes' );
|
210 |
+
$manual_approval = get_option( 'wcvendors_vendor_approve_registration', 'no' );
|
211 |
+
$vendor_taxes = get_option( 'wcvendors_vendor_give_taxes', 'no' );
|
212 |
+
$vendor_shipping = get_option( 'wcvendors_vendor_give_shipping', 'no' );
|
213 |
+
$commission_rate = get_option( 'wcvendors_vendor_commission_rate', '' );
|
214 |
|
215 |
include( WCV_ABSPATH_ADMIN . 'views/setup/general.php' );
|
216 |
}
|
classes/admin/class-wcv-admin-notices.php
CHANGED
@@ -111,11 +111,11 @@ class WCVendors_Admin_Notices {
|
|
111 |
public static function hide_notices() {
|
112 |
if ( isset( $_GET['wcv-hide-notice'] ) && isset( $_GET['_wcv_notice_nonce'] ) ) {
|
113 |
if ( ! wp_verify_nonce( $_GET['_wcv_notice_nonce'], 'wcvendors_hide_notices_nonce' ) ) {
|
114 |
-
wp_die( __( 'Action failed. Please refresh the page and retry.', '
|
115 |
}
|
116 |
|
117 |
if ( ! current_user_can( 'manage_woocommerce' ) ) {
|
118 |
-
wp_die( __( 'Cheatin’ huh?', '
|
119 |
}
|
120 |
|
121 |
$hide_notice = sanitize_text_field( $_GET['wcv-hide-notice'] );
|
@@ -177,7 +177,7 @@ class WCVendors_Admin_Notices {
|
|
177 |
*/
|
178 |
public static function update_notice() {
|
179 |
if ( version_compare( get_option( 'wcvendors_db_version' ), WCV_VERSION, '<' ) ) {
|
180 |
-
$updater = new
|
181 |
if ( $updater->is_updating() || ! empty( $_GET['do_update_wcvendors'] ) ) {
|
182 |
include( 'views/notices/html-notice-updating.php' );
|
183 |
} else {
|
111 |
public static function hide_notices() {
|
112 |
if ( isset( $_GET['wcv-hide-notice'] ) && isset( $_GET['_wcv_notice_nonce'] ) ) {
|
113 |
if ( ! wp_verify_nonce( $_GET['_wcv_notice_nonce'], 'wcvendors_hide_notices_nonce' ) ) {
|
114 |
+
wp_die( __( 'Action failed. Please refresh the page and retry.', 'wc-vendors' ) );
|
115 |
}
|
116 |
|
117 |
if ( ! current_user_can( 'manage_woocommerce' ) ) {
|
118 |
+
wp_die( __( 'Cheatin’ huh?', 'wc-vendors' ) );
|
119 |
}
|
120 |
|
121 |
$hide_notice = sanitize_text_field( $_GET['wcv-hide-notice'] );
|
177 |
*/
|
178 |
public static function update_notice() {
|
179 |
if ( version_compare( get_option( 'wcvendors_db_version' ), WCV_VERSION, '<' ) ) {
|
180 |
+
$updater = new WCVendors_Background_Updater();
|
181 |
if ( $updater->is_updating() || ! empty( $_GET['do_update_wcvendors'] ) ) {
|
182 |
include( 'views/notices/html-notice-updating.php' );
|
183 |
} else {
|
classes/admin/class-wcv-commissions-sum-csv-exporter.php
CHANGED
@@ -38,9 +38,16 @@ class WCV_Commissions_Sum_CSV_Export extends WC_CSV_Exporter {
|
|
38 |
public function get_default_column_names() {
|
39 |
|
40 |
return apply_filters( 'wcv_commissions_sum_export_columns', array(
|
41 |
-
'vendor_id'
|
42 |
-
'total_due'
|
43 |
-
'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
44 |
) );
|
45 |
}
|
46 |
|
@@ -66,12 +73,38 @@ class WCV_Commissions_Sum_CSV_Export extends WC_CSV_Exporter {
|
|
66 |
foreach ( $totals as $vendor_id => $total ) {
|
67 |
|
68 |
foreach ( $columns as $column_id => $column_name ) {
|
69 |
-
|
70 |
-
|
71 |
-
|
72 |
-
|
73 |
-
|
74 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
75 |
}
|
76 |
|
77 |
$row[ $column_id ] = $value;
|
38 |
public function get_default_column_names() {
|
39 |
|
40 |
return apply_filters( 'wcv_commissions_sum_export_columns', array(
|
41 |
+
'vendor_id' => __( 'Vendor', 'wc-vendors' ),
|
42 |
+
'total_due' => __( 'Total', 'wc-vendors' ),
|
43 |
+
'paypal_email' => __( 'PayPal Email', 'wc-vendors' ),
|
44 |
+
'bank_account_name' => __( 'Bank Account Name', 'wc-vendors' ),
|
45 |
+
'bank_account_number' => __( 'Bank Account Number', 'wc-vendors' ),
|
46 |
+
'bank_name' => __( 'Bank Name', 'wc-vendors' ),
|
47 |
+
'bank_routing' => __( 'Routing Number', 'wc-vendors' ),
|
48 |
+
'bank_iban' => __( 'IBAN', 'wc-vendors' ),
|
49 |
+
'bank_swift' => __( 'BIC/SWIFT', 'wc-vendors' ),
|
50 |
+
'status' => __( 'Commission Status', 'wc-vendors' ),
|
51 |
) );
|
52 |
}
|
53 |
|
73 |
foreach ( $totals as $vendor_id => $total ) {
|
74 |
|
75 |
foreach ( $columns as $column_id => $column_name ) {
|
76 |
+
|
77 |
+
switch ( $column_id ) {
|
78 |
+
case 'vendor_id':
|
79 |
+
$value = WCV_Vendors::get_vendor_shop_name( $vendor_id );
|
80 |
+
break;
|
81 |
+
case 'paypal_email':
|
82 |
+
$value = get_user_meta( $vendor_id, 'pv_paypal', 'true' );
|
83 |
+
break;
|
84 |
+
case 'bank_account_name':
|
85 |
+
$value = get_user_meta( $vendor_id, 'wcv_bank_account_name', 'true' );
|
86 |
+
break;
|
87 |
+
case 'bank_account_number':
|
88 |
+
$value = get_user_meta( $vendor_id, 'wcv_bank_account_number', 'true' );
|
89 |
+
break;
|
90 |
+
case 'bank_name':
|
91 |
+
$value = get_user_meta( $vendor_id, 'wcv_bank_name', 'true' );
|
92 |
+
break;
|
93 |
+
case 'bank_routing':
|
94 |
+
$value = get_user_meta( $vendor_id, 'wcv_bank_routing_number', 'true' );
|
95 |
+
break;
|
96 |
+
case 'bank_iban':
|
97 |
+
$value = get_user_meta( $vendor_id, 'wcv_bank_iban', 'true' );
|
98 |
+
break;
|
99 |
+
case 'bank_swift':
|
100 |
+
$value = get_user_meta( $vendor_id, 'wcv_bank_bic_swift', 'true' );
|
101 |
+
break;
|
102 |
+
case 'total_due':
|
103 |
+
$value = wc_format_localized_price( $total );
|
104 |
+
break;
|
105 |
+
default:
|
106 |
+
$value = $status;
|
107 |
+
break;
|
108 |
}
|
109 |
|
110 |
$row[ $column_id ] = $value;
|
classes/admin/settings/class-wcv-settings-commission.php
CHANGED
@@ -69,7 +69,7 @@ class WCVendors_Settings_Commission extends WCVendors_Settings_Page {
|
|
69 |
'title' => sprintf( __( '%s Commission %%', 'wc-vendors' ), wcv_get_vendor_name() ),
|
70 |
'desc' => sprintf( __( 'The global commission rate for your %s', 'wc-vendors' ), wcv_get_vendor_name( false, false ) ),
|
71 |
'id' => 'wcvendors_vendor_commission_rate',
|
72 |
-
'css' => 'width:
|
73 |
'default' => '50',
|
74 |
'type' => 'number',
|
75 |
),
|
69 |
'title' => sprintf( __( '%s Commission %%', 'wc-vendors' ), wcv_get_vendor_name() ),
|
70 |
'desc' => sprintf( __( 'The global commission rate for your %s', 'wc-vendors' ), wcv_get_vendor_name( false, false ) ),
|
71 |
'id' => 'wcvendors_vendor_commission_rate',
|
72 |
+
'css' => 'width:55px;',
|
73 |
'default' => '50',
|
74 |
'type' => 'number',
|
75 |
),
|
classes/admin/views/notices/html-notice-template-check.php
CHANGED
@@ -13,5 +13,5 @@ $theme = wp_get_theme();
|
|
13 |
<a class="wcvendors-message-close notice-dismiss" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wcv-hide-notice', 'template_files' ), 'wcvendors_hide_notices_nonce', '_wcv_notice_nonce' ) ); ?>"><?php _e( 'Dismiss', 'wc-vendors' ); ?></a>
|
14 |
|
15 |
<p><?php printf( __( '<strong>Your theme (%1$s) contains outdated copies of some WC Vendors template files.</strong> These files may need updating to ensure they are compatible with the current version of WC Vendors. You can see which files are affected from the <a href="%2$s">system status page</a>. If in doubt, check with the author of the theme.', 'wc-vendors' ), esc_html( $theme[ 'Name' ] ), esc_url( admin_url( 'admin.php?page=wc-status' ) ) ); ?></p>
|
16 |
-
<p class="submit"><a class="button-primary" href="https://docs.wcvendors.com/
|
17 |
</div>
|
13 |
<a class="wcvendors-message-close notice-dismiss" href="<?php echo esc_url( wp_nonce_url( add_query_arg( 'wcv-hide-notice', 'template_files' ), 'wcvendors_hide_notices_nonce', '_wcv_notice_nonce' ) ); ?>"><?php _e( 'Dismiss', 'wc-vendors' ); ?></a>
|
14 |
|
15 |
<p><?php printf( __( '<strong>Your theme (%1$s) contains outdated copies of some WC Vendors template files.</strong> These files may need updating to ensure they are compatible with the current version of WC Vendors. You can see which files are affected from the <a href="%2$s">system status page</a>. If in doubt, check with the author of the theme.', 'wc-vendors' ), esc_html( $theme[ 'Name' ] ), esc_url( admin_url( 'admin.php?page=wc-status' ) ) ); ?></p>
|
16 |
+
<p class="submit"><a class="button-primary" href="https://docs.wcvendors.com/knowledge-base/changing-the-vendor-templates/?utm_source=plugin" target="_blank"><?php _e( 'Learn more about templates', 'wc-vendors' ); ?></a></p>
|
17 |
</div>
|
classes/class-cron.php
CHANGED
@@ -6,8 +6,7 @@
|
|
6 |
*/
|
7 |
|
8 |
|
9 |
-
class WCV_Cron
|
10 |
-
{
|
11 |
|
12 |
|
13 |
/**
|
@@ -15,9 +14,12 @@ class WCV_Cron
|
|
15 |
*/
|
16 |
function __construct()
|
17 |
{
|
18 |
-
add_filter( 'cron_schedules',
|
19 |
-
add_action(
|
20 |
-
add_filter(
|
|
|
|
|
|
|
21 |
}
|
22 |
|
23 |
|
@@ -27,11 +29,11 @@ class WCV_Cron
|
|
27 |
* @param array
|
28 |
* @param unknown $options
|
29 |
*/
|
30 |
-
public static function check_schedule(
|
31 |
-
|
32 |
$old_interval = wp_get_schedule( 'pv_schedule_mass_payments' );
|
33 |
-
$new_interval =
|
34 |
-
$instapay =
|
35 |
|
36 |
/**
|
37 |
* 1. The user actually changed the schedule
|
@@ -39,12 +41,12 @@ class WCV_Cron
|
|
39 |
* 3. Manual was not selected
|
40 |
*/
|
41 |
if ( ( $old_interval != $new_interval ) && !$instapay && $new_interval != 'manual' ) {
|
42 |
-
WCV_Cron::remove_cron_schedule(
|
43 |
WCV_Cron::schedule_cron( $new_interval );
|
44 |
}
|
45 |
|
46 |
if ( $new_interval == 'manual' || $instapay ) {
|
47 |
-
WCV_Cron::remove_cron_schedule(
|
48 |
}
|
49 |
|
50 |
}
|
@@ -57,19 +59,18 @@ class WCV_Cron
|
|
57 |
*
|
58 |
* @return array
|
59 |
*/
|
60 |
-
public static function check_schedule_now( $
|
61 |
-
|
62 |
$old_schedule = get_option( 'wcvendors_payments_paypal_schedule' );
|
63 |
-
$new_schedule = $options[ 'schedule' ];
|
64 |
|
65 |
if ( $new_schedule == 'now' ) {
|
66 |
$return = WCV_Cron::pay_now();
|
67 |
$options[ 'schedule' ] = $old_schedule;
|
68 |
WCV_Cron::schedule_cron( $old_schedule );
|
69 |
-
|
70 |
}
|
71 |
|
72 |
-
return $
|
73 |
}
|
74 |
|
75 |
|
6 |
*/
|
7 |
|
8 |
|
9 |
+
class WCV_Cron {
|
|
|
10 |
|
11 |
|
12 |
/**
|
14 |
*/
|
15 |
function __construct()
|
16 |
{
|
17 |
+
add_filter( 'cron_schedules', array( 'WCV_Cron', 'custom_cron_intervals' ) );
|
18 |
+
add_action( 'wcvendors_settings_save_payments', array( 'WCV_Cron', 'check_schedule' ) );
|
19 |
+
add_filter( 'wcvendors_admin_settings_sanitize_option_wcvendors_payments_paypal_schedule', array( 'WCV_Cron', 'check_schedule_now') );
|
20 |
+
// add_filter( WC_Vendors::$id . '_options_on_update', array( 'WCV_Cron', 'check_schedule_now' ) );
|
21 |
+
|
22 |
+
|
23 |
}
|
24 |
|
25 |
|
29 |
* @param array
|
30 |
* @param unknown $options
|
31 |
*/
|
32 |
+
public static function check_schedule() {
|
33 |
+
|
34 |
$old_interval = wp_get_schedule( 'pv_schedule_mass_payments' );
|
35 |
+
$new_interval = wc_string_to_bool( get_option( 'wcvendors_payments_paypal_schedule', '') );
|
36 |
+
$instapay = wc_string_to_bool( get_option( 'wcvendors_payments_paypal_instantpay_enable', 'no' ) );
|
37 |
|
38 |
/**
|
39 |
* 1. The user actually changed the schedule
|
41 |
* 3. Manual was not selected
|
42 |
*/
|
43 |
if ( ( $old_interval != $new_interval ) && !$instapay && $new_interval != 'manual' ) {
|
44 |
+
WCV_Cron::remove_cron_schedule();
|
45 |
WCV_Cron::schedule_cron( $new_interval );
|
46 |
}
|
47 |
|
48 |
if ( $new_interval == 'manual' || $instapay ) {
|
49 |
+
WCV_Cron::remove_cron_schedule( );
|
50 |
}
|
51 |
|
52 |
}
|
59 |
*
|
60 |
* @return array
|
61 |
*/
|
62 |
+
public static function check_schedule_now( $new_schedule ) {
|
63 |
+
|
64 |
$old_schedule = get_option( 'wcvendors_payments_paypal_schedule' );
|
|
|
65 |
|
66 |
if ( $new_schedule == 'now' ) {
|
67 |
$return = WCV_Cron::pay_now();
|
68 |
$options[ 'schedule' ] = $old_schedule;
|
69 |
WCV_Cron::schedule_cron( $old_schedule );
|
70 |
+
WCVendors_Admin_Settings::add_message( wp_strip_all_tags( $return[ 'message' ] ) );
|
71 |
}
|
72 |
|
73 |
+
return $new_schedule;
|
74 |
}
|
75 |
|
76 |
|
classes/class-install.php
CHANGED
@@ -15,10 +15,7 @@ class WCVendors_Install {
|
|
15 |
'wcv_migrate_settings',
|
16 |
'wcv_enable_legacy_emails',
|
17 |
'wcv_update_200_db_version',
|
18 |
-
)
|
19 |
-
'2.0.5' => array(
|
20 |
-
'wcv_update_db_version',
|
21 |
-
),
|
22 |
);
|
23 |
|
24 |
|
@@ -281,6 +278,7 @@ class WCVendors_Install {
|
|
281 |
* @return boolean
|
282 |
*/
|
283 |
private static function needs_db_update() {
|
|
|
284 |
$current_db_version = get_option( 'wcvendors_db_version', null );
|
285 |
$version_one = get_option( 'wc_prd_vendor_options', null );
|
286 |
$updates = self::get_db_update_callbacks();
|
@@ -297,7 +295,8 @@ class WCVendors_Install {
|
|
297 |
* Init background updates
|
298 |
*/
|
299 |
public static function init_background_updater() {
|
300 |
-
|
|
|
301 |
}
|
302 |
|
303 |
|
15 |
'wcv_migrate_settings',
|
16 |
'wcv_enable_legacy_emails',
|
17 |
'wcv_update_200_db_version',
|
18 |
+
)
|
|
|
|
|
|
|
19 |
);
|
20 |
|
21 |
|
278 |
* @return boolean
|
279 |
*/
|
280 |
private static function needs_db_update() {
|
281 |
+
global $wc_vendors;
|
282 |
$current_db_version = get_option( 'wcvendors_db_version', null );
|
283 |
$version_one = get_option( 'wc_prd_vendor_options', null );
|
284 |
$updates = self::get_db_update_callbacks();
|
295 |
* Init background updates
|
296 |
*/
|
297 |
public static function init_background_updater() {
|
298 |
+
include_once dirname( __FILE__ ) . '/includes/class-wcv-background-updater.php';
|
299 |
+
self::$background_updater = new WCVendors_Background_Updater();
|
300 |
}
|
301 |
|
302 |
|
classes/front/class-vendor-shop.php
CHANGED
@@ -40,7 +40,7 @@ class WCV_Vendor_Shop
|
|
40 |
add_action( 'woocommerce_checkout_create_order_line_item', array( $this, 'add_vendor_to_order_item_meta' ), 10, 4 );
|
41 |
|
42 |
// Add a vendor header
|
43 |
-
if ( apply_filters( 'wcvendors_disable_shop_headers', get_option( 'wcvendors_display_shop_headers' ) ) ) {
|
44 |
add_action( 'woocommerce_before_main_content', array('WCV_Vendor_Shop', 'vendor_main_header'), 20 );
|
45 |
add_action( 'woocommerce_before_single_product', array('WCV_Vendor_Shop', 'vendor_mini_header'));
|
46 |
}
|
40 |
add_action( 'woocommerce_checkout_create_order_line_item', array( $this, 'add_vendor_to_order_item_meta' ), 10, 4 );
|
41 |
|
42 |
// Add a vendor header
|
43 |
+
if ( apply_filters( 'wcvendors_disable_shop_headers', wc_string_to_bool( get_option( 'wcvendors_display_shop_headers', 'no' ) ) ) ) {
|
44 |
add_action( 'woocommerce_before_main_content', array('WCV_Vendor_Shop', 'vendor_main_header'), 20 );
|
45 |
add_action( 'woocommerce_before_single_product', array('WCV_Vendor_Shop', 'vendor_mini_header'));
|
46 |
}
|
classes/front/signup/class-vendor-signup.php
CHANGED
@@ -79,7 +79,7 @@ class WCV_Vendor_Signup
|
|
79 |
public function vendor_registration_errors( $errors, $sanitized_user_login, $user_email ) {
|
80 |
|
81 |
if ( empty( $_POST[ 'agree_to_terms' ] ) || ! empty( $_POST[ 'agree_to_terms' ] ) && trim( $_POST[ 'agree_to_terms' ] ) == '' ) {
|
82 |
-
$errors->add( 'terms_errors', sprintf( '<strong>%s</strong>: %s', __( 'ERROR', 'wc-vendors' ), __( 'Please agree to the terms and conditions', '
|
83 |
}
|
84 |
|
85 |
return $errors;
|
79 |
public function vendor_registration_errors( $errors, $sanitized_user_login, $user_email ) {
|
80 |
|
81 |
if ( empty( $_POST[ 'agree_to_terms' ] ) || ! empty( $_POST[ 'agree_to_terms' ] ) && trim( $_POST[ 'agree_to_terms' ] ) == '' ) {
|
82 |
+
$errors->add( 'terms_errors', sprintf( '<strong>%s</strong>: %s', __( 'ERROR', 'wc-vendors' ), __( 'Please agree to the terms and conditions', 'wc-vendors' ) ) );
|
83 |
}
|
84 |
|
85 |
return $errors;
|
classes/gateways/PayPal_AdvPayments/PayPal_AP/classes/adaptivepayments-sdk/lib/PPUtils.php
CHANGED
@@ -122,7 +122,7 @@ class PPUtils
|
|
122 |
}*/
|
123 |
|
124 |
|
125 |
-
function convertXmlObjToArr( $obj, &$arr )
|
126 |
{
|
127 |
$children = $obj->children();
|
128 |
foreach ( $children as $elementName => $node ) {
|
@@ -271,4 +271,4 @@ class PPUtils
|
|
271 |
// }
|
272 |
|
273 |
//XmlToArray
|
274 |
-
?>
|
122 |
}*/
|
123 |
|
124 |
|
125 |
+
public static function convertXmlObjToArr( $obj, &$arr )
|
126 |
{
|
127 |
$children = $obj->children();
|
128 |
foreach ( $children as $elementName => $node ) {
|
271 |
// }
|
272 |
|
273 |
//XmlToArray
|
274 |
+
?>
|
classes/gateways/PayPal_Masspay/api/lib/PPHttpConnection.php
CHANGED
@@ -46,7 +46,7 @@ class PPHttpConnection
|
|
46 |
CURLOPT_USERAGENT => 'PayPal-PHP-SDK',
|
47 |
CURLOPT_POST => 1,
|
48 |
CURLOPT_HTTPHEADER => array(),
|
49 |
-
CURLOPT_SSL_VERIFYHOST =>
|
50 |
CURLOPT_SSL_VERIFYPEER => 2
|
51 |
);
|
52 |
|
46 |
CURLOPT_USERAGENT => 'PayPal-PHP-SDK',
|
47 |
CURLOPT_POST => 1,
|
48 |
CURLOPT_HTTPHEADER => array(),
|
49 |
+
CURLOPT_SSL_VERIFYHOST => 2,
|
50 |
CURLOPT_SSL_VERIFYPEER => 2
|
51 |
);
|
52 |
|
classes/gateways/PayPal_Masspay/api/lib/PPUtils.php
CHANGED
@@ -85,8 +85,9 @@ class PPUtils
|
|
85 |
|
86 |
$soap = $xml->children( $ns[ 'SOAP-ENV' ] );
|
87 |
$getChild = $soap->Body->children();
|
|
|
88 |
|
89 |
-
$ret = PPUtils::convertXmlObjToArr( $getChild, $
|
90 |
|
91 |
return $ret;
|
92 |
}
|
@@ -122,7 +123,7 @@ class PPUtils
|
|
122 |
}*/
|
123 |
|
124 |
|
125 |
-
function convertXmlObjToArr( $obj, &$arr )
|
126 |
{
|
127 |
$children = $obj->children();
|
128 |
foreach ( $children as $elementName => $node ) {
|
@@ -281,4 +282,4 @@ class XmlToArray
|
|
281 |
}
|
282 |
|
283 |
//XmlToArray
|
284 |
-
?>
|
85 |
|
86 |
$soap = $xml->children( $ns[ 'SOAP-ENV' ] );
|
87 |
$getChild = $soap->Body->children();
|
88 |
+
$temp_array = array();
|
89 |
|
90 |
+
$ret = PPUtils::convertXmlObjToArr( $getChild, $temp_array );
|
91 |
|
92 |
return $ret;
|
93 |
}
|
123 |
}*/
|
124 |
|
125 |
|
126 |
+
public static function convertXmlObjToArr( $obj, &$arr )
|
127 |
{
|
128 |
$children = $obj->children();
|
129 |
foreach ( $children as $elementName => $node ) {
|
282 |
}
|
283 |
|
284 |
//XmlToArray
|
285 |
+
?>
|
classes/gateways/PayPal_Masspay/class-paypal-masspay.php
CHANGED
@@ -164,7 +164,7 @@ class WCV_Mass_Pay
|
|
164 |
if ( $this->purge_user_meta( $vendor_ids ) ) {
|
165 |
$return = array(
|
166 |
'status' => 'updated',
|
167 |
-
'msg' => __( 'All due commission has been paid for.', 'wc-vendors' ),
|
168 |
'total' => $total_pay,
|
169 |
);
|
170 |
} else {
|
@@ -198,7 +198,6 @@ class WCV_Mass_Pay
|
|
198 |
*/
|
199 |
private function mail_results( $result )
|
200 |
{
|
201 |
-
global $woocommerce;
|
202 |
|
203 |
$send_results = get_option( 'wcvendors_payments_paypal_email_enable' );
|
204 |
|
164 |
if ( $this->purge_user_meta( $vendor_ids ) ) {
|
165 |
$return = array(
|
166 |
'status' => 'updated',
|
167 |
+
'msg' => __( 'All due commission has been paid for. ', 'wc-vendors' ),
|
168 |
'total' => $total_pay,
|
169 |
);
|
170 |
} else {
|
198 |
*/
|
199 |
private function mail_results( $result )
|
200 |
{
|
|
|
201 |
|
202 |
$send_results = get_option( 'wcvendors_payments_paypal_email_enable' );
|
203 |
|
classes/includes/class-wcv-background-updater.php
ADDED
@@ -0,0 +1,124 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* WC Vendors Background Updater
|
4 |
+
*
|
5 |
+
* @version 2.0.6
|
6 |
+
* @package WCVendors/Classes
|
7 |
+
*/
|
8 |
+
|
9 |
+
defined( 'ABSPATH' ) || exit;
|
10 |
+
|
11 |
+
/**
|
12 |
+
* WCVendors_Background_Updater Class.
|
13 |
+
*/
|
14 |
+
class WCVendors_Background_Updater extends WC_Background_Process {
|
15 |
+
|
16 |
+
/**
|
17 |
+
* Initiate new background process.
|
18 |
+
*/
|
19 |
+
public function __construct() {
|
20 |
+
// Uses unique prefix per blog so each blog has separate queue.
|
21 |
+
$this->prefix = 'wp_' . get_current_blog_id();
|
22 |
+
$this->action = 'wcvendors_updater';
|
23 |
+
|
24 |
+
parent::__construct();
|
25 |
+
}
|
26 |
+
|
27 |
+
/**
|
28 |
+
* Dispatch updater.
|
29 |
+
*
|
30 |
+
* Updater will still run via cron job if this fails for any reason.
|
31 |
+
*/
|
32 |
+
public function dispatch() {
|
33 |
+
$dispatched = parent::dispatch();
|
34 |
+
$logger = wc_get_logger();
|
35 |
+
|
36 |
+
if ( is_wp_error( $dispatched ) ) {
|
37 |
+
$logger->error(
|
38 |
+
sprintf( 'Unable to dispatch WC Vendors updater: %s', $dispatched->get_error_message() ),
|
39 |
+
array( 'source' => 'wcvendors_db_updates' )
|
40 |
+
);
|
41 |
+
}
|
42 |
+
}
|
43 |
+
|
44 |
+
/**
|
45 |
+
* Handle cron healthcheck
|
46 |
+
*
|
47 |
+
* Restart the background process if not already running
|
48 |
+
* and data exists in the queue.
|
49 |
+
*/
|
50 |
+
public function handle_cron_healthcheck() {
|
51 |
+
if ( $this->is_process_running() ) {
|
52 |
+
// Background process already running.
|
53 |
+
return;
|
54 |
+
}
|
55 |
+
|
56 |
+
if ( $this->is_queue_empty() ) {
|
57 |
+
// No data to process.
|
58 |
+
$this->clear_scheduled_event();
|
59 |
+
return;
|
60 |
+
}
|
61 |
+
|
62 |
+
$this->handle();
|
63 |
+
}
|
64 |
+
|
65 |
+
/**
|
66 |
+
* Schedule fallback event.
|
67 |
+
*/
|
68 |
+
protected function schedule_event() {
|
69 |
+
if ( ! wp_next_scheduled( $this->cron_hook_identifier ) ) {
|
70 |
+
wp_schedule_event( time() + 10, $this->cron_interval_identifier, $this->cron_hook_identifier );
|
71 |
+
}
|
72 |
+
}
|
73 |
+
|
74 |
+
/**
|
75 |
+
* Is the updater running?
|
76 |
+
*
|
77 |
+
* @return boolean
|
78 |
+
*/
|
79 |
+
public function is_updating() {
|
80 |
+
return false === $this->is_queue_empty();
|
81 |
+
}
|
82 |
+
|
83 |
+
/**
|
84 |
+
* Task
|
85 |
+
*
|
86 |
+
* Override this method to perform any actions required on each
|
87 |
+
* queue item. Return the modified item for further processing
|
88 |
+
* in the next pass through. Or, return false to remove the
|
89 |
+
* item from the queue.
|
90 |
+
*
|
91 |
+
* @param string $callback Update callback function.
|
92 |
+
* @return mixed
|
93 |
+
*/
|
94 |
+
protected function task( $callback ) {
|
95 |
+
wc_maybe_define_constant( 'WCV_UPDATING', true );
|
96 |
+
|
97 |
+
$logger = wc_get_logger();
|
98 |
+
|
99 |
+
include_once dirname( __FILE__ ) . '/wcv-update-functions.php';
|
100 |
+
|
101 |
+
if ( is_callable( $callback ) ) {
|
102 |
+
$logger->info( sprintf( 'Running %s callback', $callback ), array( 'source' => 'wcvendors_db_updates' ) );
|
103 |
+
call_user_func( $callback );
|
104 |
+
$logger->info( sprintf( 'Finished %s callback', $callback ), array( 'source' => 'wcvendors_db_updates' ) );
|
105 |
+
} else {
|
106 |
+
$logger->notice( sprintf( 'Could not find %s callback', $callback ), array( 'source' => 'wcvendors_db_updates' ) );
|
107 |
+
}
|
108 |
+
|
109 |
+
return false;
|
110 |
+
}
|
111 |
+
|
112 |
+
/**
|
113 |
+
* Complete
|
114 |
+
*
|
115 |
+
* Override if applicable, but ensure that the below actions are
|
116 |
+
* performed, or, call parent::complete().
|
117 |
+
*/
|
118 |
+
protected function complete() {
|
119 |
+
$logger = wc_get_logger();
|
120 |
+
$logger->info( 'Data update complete', array( 'source' => 'wcvendors_db_updates' ) );
|
121 |
+
WCVendors_Install::update_db_version();
|
122 |
+
parent::complete();
|
123 |
+
}
|
124 |
+
}
|
classes/includes/wcv-update-functions.php
CHANGED
@@ -115,7 +115,7 @@ function wcv_update_200_db_version(){
|
|
115 |
}
|
116 |
|
117 |
/**
|
118 |
-
* Manually push the database version to fix update dialog.
|
119 |
*/
|
120 |
function wcv_update_db_version(){
|
121 |
WCVendors_Install::update_db_version();
|
115 |
}
|
116 |
|
117 |
/**
|
118 |
+
* Manually push the database version to fix update dialog.
|
119 |
*/
|
120 |
function wcv_update_db_version(){
|
121 |
WCVendors_Install::update_db_version();
|
languages/wc-vendors.pot
CHANGED
@@ -48,87 +48,87 @@ msgstr ""
|
|
48 |
msgid "Reversed"
|
49 |
msgstr ""
|
50 |
|
51 |
-
#: classes/class-cron.php:
|
52 |
msgid "Payment total: %s"
|
53 |
msgstr ""
|
54 |
|
55 |
-
#: classes/class-install.php:
|
56 |
msgid "Pending Vendor"
|
57 |
msgstr ""
|
58 |
|
59 |
-
#: classes/class-install.php:
|
60 |
msgid "Vendor"
|
61 |
msgstr ""
|
62 |
|
63 |
-
#: classes/class-install.php:
|
64 |
msgctxt "Page slug"
|
65 |
msgid "vendor_dashboard"
|
66 |
msgstr ""
|
67 |
|
68 |
-
#: classes/class-install.php:
|
69 |
msgctxt "Page title"
|
70 |
msgid "%s Dashboard"
|
71 |
msgstr ""
|
72 |
|
73 |
-
#: classes/class-install.php:
|
74 |
msgctxt "Page slug"
|
75 |
msgid "vendors"
|
76 |
msgstr ""
|
77 |
|
78 |
-
#: classes/class-install.php:
|
79 |
msgctxt "Page title"
|
80 |
msgid "%s"
|
81 |
msgstr ""
|
82 |
|
83 |
-
#: classes/class-install.php:
|
84 |
msgctxt "Page slug"
|
85 |
msgid "shop_settings"
|
86 |
msgstr ""
|
87 |
|
88 |
-
#: classes/class-install.php:
|
89 |
msgctxt "Page title"
|
90 |
msgid "Shop Settings"
|
91 |
msgstr ""
|
92 |
|
93 |
-
#: classes/class-install.php:
|
94 |
msgctxt "Page slug"
|
95 |
msgid "product_orders"
|
96 |
msgstr ""
|
97 |
|
98 |
-
#: classes/class-install.php:
|
99 |
msgctxt "Page title"
|
100 |
msgid "Orders"
|
101 |
msgstr ""
|
102 |
|
103 |
-
#: classes/class-install.php:
|
104 |
msgid "View WC Vendors settings"
|
105 |
msgstr ""
|
106 |
|
107 |
-
#: classes/class-install.php:
|
108 |
msgid "Settings"
|
109 |
msgstr ""
|
110 |
|
111 |
-
#: classes/class-install.php:
|
112 |
msgid "View WC Vendors documentation"
|
113 |
msgstr ""
|
114 |
|
115 |
-
#: classes/class-install.php:
|
116 |
msgid "Docs"
|
117 |
msgstr ""
|
118 |
|
119 |
-
#: classes/class-install.php:
|
120 |
msgid "Visit community forums"
|
121 |
msgstr ""
|
122 |
|
123 |
-
#: classes/class-install.php:
|
124 |
msgid "Free support"
|
125 |
msgstr ""
|
126 |
|
127 |
-
#: classes/class-install.php:
|
128 |
msgid "Visit premium customer support"
|
129 |
msgstr ""
|
130 |
|
131 |
-
#: classes/class-install.php:
|
132 |
msgid "Premium support"
|
133 |
msgstr ""
|
134 |
|
@@ -497,10 +497,14 @@ msgstr ""
|
|
497 |
msgid "WC Vendors Github"
|
498 |
msgstr ""
|
499 |
|
500 |
-
#: classes/admin/class-wcv-admin-settings.php:68
|
501 |
msgid "Action failed. Please refresh the page and retry."
|
502 |
msgstr ""
|
503 |
|
|
|
|
|
|
|
|
|
504 |
#: classes/admin/class-wcv-admin-settings.php:76
|
505 |
msgid "Your settings have been saved."
|
506 |
msgstr ""
|
@@ -646,7 +650,35 @@ msgstr ""
|
|
646 |
msgid "All"
|
647 |
msgstr ""
|
648 |
|
649 |
-
#: classes/admin/class-wcv-commissions-sum-csv-exporter.php:43
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
650 |
msgid "Commission Status"
|
651 |
msgstr ""
|
652 |
|
@@ -1903,30 +1935,6 @@ msgstr ""
|
|
1903 |
msgid "PayPal E-mail"
|
1904 |
msgstr ""
|
1905 |
|
1906 |
-
#: classes/admin/views/html-vendor-meta.php:50, classes/admin/views/html-vendor-settings-page.php:26
|
1907 |
-
msgid "Bank Account Name"
|
1908 |
-
msgstr ""
|
1909 |
-
|
1910 |
-
#: classes/admin/views/html-vendor-meta.php:55, classes/admin/views/html-vendor-settings-page.php:31
|
1911 |
-
msgid "Bank Account Number"
|
1912 |
-
msgstr ""
|
1913 |
-
|
1914 |
-
#: classes/admin/views/html-vendor-meta.php:60, classes/admin/views/html-vendor-settings-page.php:36, templates/dashboard/settings/settings.php:44
|
1915 |
-
msgid "Bank Name"
|
1916 |
-
msgstr ""
|
1917 |
-
|
1918 |
-
#: classes/admin/views/html-vendor-meta.php:65, classes/admin/views/html-vendor-settings-page.php:41, templates/dashboard/settings/settings.php:47
|
1919 |
-
msgid "Routing Number"
|
1920 |
-
msgstr ""
|
1921 |
-
|
1922 |
-
#: classes/admin/views/html-vendor-meta.php:70, classes/admin/views/html-vendor-settings-page.php:46, templates/dashboard/settings/settings.php:48
|
1923 |
-
msgid "IBAN"
|
1924 |
-
msgstr ""
|
1925 |
-
|
1926 |
-
#: classes/admin/views/html-vendor-meta.php:75, classes/admin/views/html-vendor-settings-page.php:51
|
1927 |
-
msgid "BIC/SWIFT"
|
1928 |
-
msgstr ""
|
1929 |
-
|
1930 |
#: classes/admin/views/html-vendor-meta.php:88
|
1931 |
msgid "Commission rate"
|
1932 |
msgstr ""
|
@@ -2055,6 +2063,10 @@ msgstr ""
|
|
2055 |
msgid "ERROR"
|
2056 |
msgstr ""
|
2057 |
|
|
|
|
|
|
|
|
|
2058 |
#: classes/front/signup/class-vendor-signup.php:101
|
2059 |
msgid "Application denied. You are an administrator."
|
2060 |
msgstr ""
|
@@ -2111,10 +2123,6 @@ msgstr ""
|
|
2111 |
msgid "You must have an <a href=\"%s\">Application ID</a> to process live transactions. You do not need one for testing in Sandbox mode."
|
2112 |
msgstr ""
|
2113 |
|
2114 |
-
#: classes/gateways/PayPal_AdvPayments/paypal_ap.php:179, classes/gateways/PayPal_AdvPayments/paypal_ap.php:213
|
2115 |
-
msgid "PayPal Email"
|
2116 |
-
msgstr ""
|
2117 |
-
|
2118 |
#: classes/gateways/PayPal_AdvPayments/paypal_ap.php:180, classes/gateways/PayPal_AdvPayments/paypal_ap.php:214
|
2119 |
msgid "The email address main payments should go to."
|
2120 |
msgstr ""
|
@@ -2192,30 +2200,30 @@ msgid "No vendors found to pay. Maybe they haven't set a PayPal address?"
|
|
2192 |
msgstr ""
|
2193 |
|
2194 |
#: classes/gateways/PayPal_Masspay/class-paypal-masspay.php:167
|
2195 |
-
msgid "All due commission has been paid for."
|
2196 |
msgstr ""
|
2197 |
|
2198 |
#: classes/gateways/PayPal_Masspay/class-paypal-masspay.php:173
|
2199 |
msgid "All due commission has been paid for, but I could not clear it from their profiles due to an internal error. Commission will still be listed as due. Please manually mark the commission as paid from the Commissions page."
|
2200 |
msgstr ""
|
2201 |
|
2202 |
-
#: classes/gateways/PayPal_Masspay/class-paypal-masspay.php:
|
2203 |
msgid "WooCommerce: Mass payments for vendors update"
|
2204 |
msgstr ""
|
2205 |
|
2206 |
-
#: classes/gateways/PayPal_Masspay/class-paypal-masspay.php:
|
2207 |
msgid "Hello! A payment was just triggered to mass pay all vendors their due commission."
|
2208 |
msgstr ""
|
2209 |
|
2210 |
-
#: classes/gateways/PayPal_Masspay/class-paypal-masspay.php:
|
2211 |
msgid "Payment status: %s."
|
2212 |
msgstr ""
|
2213 |
|
2214 |
-
#: classes/gateways/PayPal_Masspay/class-paypal-masspay.php:
|
2215 |
msgid "Payment message: %s."
|
2216 |
msgstr ""
|
2217 |
|
2218 |
-
#: classes/gateways/PayPal_Masspay/class-paypal-masspay.php:
|
2219 |
msgid "Payment total: %s."
|
2220 |
msgstr ""
|
2221 |
|
@@ -2531,7 +2539,3 @@ msgstr ""
|
|
2531 |
#: classes/front/signup/views/html-vendor-signup.php:36
|
2532 |
msgid "I have read and accepted the <a target=\"top\" href=\"%s\">terms and conditions</a>."
|
2533 |
msgstr ""
|
2534 |
-
|
2535 |
-
#: classes/front/signup/views/html-vendor-signup.php:45
|
2536 |
-
msgid "Please agree to the terms and conditions"
|
2537 |
-
msgstr ""
|
48 |
msgid "Reversed"
|
49 |
msgstr ""
|
50 |
|
51 |
+
#: classes/class-cron.php:88
|
52 |
msgid "Payment total: %s"
|
53 |
msgstr ""
|
54 |
|
55 |
+
#: classes/class-install.php:140, classes/admin/class-wcv-admin-setup.php:143
|
56 |
msgid "Pending Vendor"
|
57 |
msgstr ""
|
58 |
|
59 |
+
#: classes/class-install.php:147, classes/admin/class-admin-reports.php:173, classes/admin/class-admin-reports.php:456, classes/admin/class-product-meta.php:223, classes/admin/class-wcv-admin-setup.php:140, classes/admin/class-wcv-admin-setup.php:299, classes/admin/class-wcv-commissions-csv-exporter.php:43, classes/admin/class-wcv-commissions-page.php:118, classes/admin/class-wcv-commissions-sum-csv-exporter.php:41, classes/includes/class-functions.php:35, classes/admin/settings/class-wcv-settings-display.php:100
|
60 |
msgid "Vendor"
|
61 |
msgstr ""
|
62 |
|
63 |
+
#: classes/class-install.php:195
|
64 |
msgctxt "Page slug"
|
65 |
msgid "vendor_dashboard"
|
66 |
msgstr ""
|
67 |
|
68 |
+
#: classes/class-install.php:197
|
69 |
msgctxt "Page title"
|
70 |
msgid "%s Dashboard"
|
71 |
msgstr ""
|
72 |
|
73 |
+
#: classes/class-install.php:203
|
74 |
msgctxt "Page slug"
|
75 |
msgid "vendors"
|
76 |
msgstr ""
|
77 |
|
78 |
+
#: classes/class-install.php:205
|
79 |
msgctxt "Page title"
|
80 |
msgid "%s"
|
81 |
msgstr ""
|
82 |
|
83 |
+
#: classes/class-install.php:213
|
84 |
msgctxt "Page slug"
|
85 |
msgid "shop_settings"
|
86 |
msgstr ""
|
87 |
|
88 |
+
#: classes/class-install.php:214
|
89 |
msgctxt "Page title"
|
90 |
msgid "Shop Settings"
|
91 |
msgstr ""
|
92 |
|
93 |
+
#: classes/class-install.php:219
|
94 |
msgctxt "Page slug"
|
95 |
msgid "product_orders"
|
96 |
msgstr ""
|
97 |
|
98 |
+
#: classes/class-install.php:220
|
99 |
msgctxt "Page title"
|
100 |
msgid "Orders"
|
101 |
msgstr ""
|
102 |
|
103 |
+
#: classes/class-install.php:408
|
104 |
msgid "View WC Vendors settings"
|
105 |
msgstr ""
|
106 |
|
107 |
+
#: classes/class-install.php:408, templates/dashboard/settings/settings.php:18
|
108 |
msgid "Settings"
|
109 |
msgstr ""
|
110 |
|
111 |
+
#: classes/class-install.php:425
|
112 |
msgid "View WC Vendors documentation"
|
113 |
msgstr ""
|
114 |
|
115 |
+
#: classes/class-install.php:425
|
116 |
msgid "Docs"
|
117 |
msgstr ""
|
118 |
|
119 |
+
#: classes/class-install.php:426
|
120 |
msgid "Visit community forums"
|
121 |
msgstr ""
|
122 |
|
123 |
+
#: classes/class-install.php:426
|
124 |
msgid "Free support"
|
125 |
msgstr ""
|
126 |
|
127 |
+
#: classes/class-install.php:427
|
128 |
msgid "Visit premium customer support"
|
129 |
msgstr ""
|
130 |
|
131 |
+
#: classes/class-install.php:427
|
132 |
msgid "Premium support"
|
133 |
msgstr ""
|
134 |
|
497 |
msgid "WC Vendors Github"
|
498 |
msgstr ""
|
499 |
|
500 |
+
#: classes/admin/class-wcv-admin-notices.php:114, classes/admin/class-wcv-admin-settings.php:68
|
501 |
msgid "Action failed. Please refresh the page and retry."
|
502 |
msgstr ""
|
503 |
|
504 |
+
#: classes/admin/class-wcv-admin-notices.php:118
|
505 |
+
msgid "Cheatin’ huh?"
|
506 |
+
msgstr ""
|
507 |
+
|
508 |
#: classes/admin/class-wcv-admin-settings.php:76
|
509 |
msgid "Your settings have been saved."
|
510 |
msgstr ""
|
650 |
msgid "All"
|
651 |
msgstr ""
|
652 |
|
653 |
+
#: classes/admin/class-wcv-commissions-sum-csv-exporter.php:43, classes/gateways/PayPal_AdvPayments/paypal_ap.php:179, classes/gateways/PayPal_AdvPayments/paypal_ap.php:213
|
654 |
+
msgid "PayPal Email"
|
655 |
+
msgstr ""
|
656 |
+
|
657 |
+
#: classes/admin/class-wcv-commissions-sum-csv-exporter.php:44, classes/admin/views/html-vendor-meta.php:50, classes/admin/views/html-vendor-settings-page.php:26
|
658 |
+
msgid "Bank Account Name"
|
659 |
+
msgstr ""
|
660 |
+
|
661 |
+
#: classes/admin/class-wcv-commissions-sum-csv-exporter.php:45, classes/admin/views/html-vendor-meta.php:55, classes/admin/views/html-vendor-settings-page.php:31
|
662 |
+
msgid "Bank Account Number"
|
663 |
+
msgstr ""
|
664 |
+
|
665 |
+
#: classes/admin/class-wcv-commissions-sum-csv-exporter.php:46, classes/admin/views/html-vendor-meta.php:60, classes/admin/views/html-vendor-settings-page.php:36, templates/dashboard/settings/settings.php:44
|
666 |
+
msgid "Bank Name"
|
667 |
+
msgstr ""
|
668 |
+
|
669 |
+
#: classes/admin/class-wcv-commissions-sum-csv-exporter.php:47, classes/admin/views/html-vendor-meta.php:65, classes/admin/views/html-vendor-settings-page.php:41, templates/dashboard/settings/settings.php:47
|
670 |
+
msgid "Routing Number"
|
671 |
+
msgstr ""
|
672 |
+
|
673 |
+
#: classes/admin/class-wcv-commissions-sum-csv-exporter.php:48, classes/admin/views/html-vendor-meta.php:70, classes/admin/views/html-vendor-settings-page.php:46, templates/dashboard/settings/settings.php:48
|
674 |
+
msgid "IBAN"
|
675 |
+
msgstr ""
|
676 |
+
|
677 |
+
#: classes/admin/class-wcv-commissions-sum-csv-exporter.php:49, classes/admin/views/html-vendor-meta.php:75, classes/admin/views/html-vendor-settings-page.php:51
|
678 |
+
msgid "BIC/SWIFT"
|
679 |
+
msgstr ""
|
680 |
+
|
681 |
+
#: classes/admin/class-wcv-commissions-sum-csv-exporter.php:50
|
682 |
msgid "Commission Status"
|
683 |
msgstr ""
|
684 |
|
1935 |
msgid "PayPal E-mail"
|
1936 |
msgstr ""
|
1937 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1938 |
#: classes/admin/views/html-vendor-meta.php:88
|
1939 |
msgid "Commission rate"
|
1940 |
msgstr ""
|
2063 |
msgid "ERROR"
|
2064 |
msgstr ""
|
2065 |
|
2066 |
+
#: classes/front/signup/class-vendor-signup.php:82, classes/front/signup/views/html-vendor-signup.php:45
|
2067 |
+
msgid "Please agree to the terms and conditions"
|
2068 |
+
msgstr ""
|
2069 |
+
|
2070 |
#: classes/front/signup/class-vendor-signup.php:101
|
2071 |
msgid "Application denied. You are an administrator."
|
2072 |
msgstr ""
|
2123 |
msgid "You must have an <a href=\"%s\">Application ID</a> to process live transactions. You do not need one for testing in Sandbox mode."
|
2124 |
msgstr ""
|
2125 |
|
|
|
|
|
|
|
|
|
2126 |
#: classes/gateways/PayPal_AdvPayments/paypal_ap.php:180, classes/gateways/PayPal_AdvPayments/paypal_ap.php:214
|
2127 |
msgid "The email address main payments should go to."
|
2128 |
msgstr ""
|
2200 |
msgstr ""
|
2201 |
|
2202 |
#: classes/gateways/PayPal_Masspay/class-paypal-masspay.php:167
|
2203 |
+
msgid "All due commission has been paid for. "
|
2204 |
msgstr ""
|
2205 |
|
2206 |
#: classes/gateways/PayPal_Masspay/class-paypal-masspay.php:173
|
2207 |
msgid "All due commission has been paid for, but I could not clear it from their profiles due to an internal error. Commission will still be listed as due. Please manually mark the commission as paid from the Commissions page."
|
2208 |
msgstr ""
|
2209 |
|
2210 |
+
#: classes/gateways/PayPal_Masspay/class-paypal-masspay.php:207
|
2211 |
msgid "WooCommerce: Mass payments for vendors update"
|
2212 |
msgstr ""
|
2213 |
|
2214 |
+
#: classes/gateways/PayPal_Masspay/class-paypal-masspay.php:209
|
2215 |
msgid "Hello! A payment was just triggered to mass pay all vendors their due commission."
|
2216 |
msgstr ""
|
2217 |
|
2218 |
+
#: classes/gateways/PayPal_Masspay/class-paypal-masspay.php:210
|
2219 |
msgid "Payment status: %s."
|
2220 |
msgstr ""
|
2221 |
|
2222 |
+
#: classes/gateways/PayPal_Masspay/class-paypal-masspay.php:211
|
2223 |
msgid "Payment message: %s."
|
2224 |
msgstr ""
|
2225 |
|
2226 |
+
#: classes/gateways/PayPal_Masspay/class-paypal-masspay.php:214
|
2227 |
msgid "Payment total: %s."
|
2228 |
msgstr ""
|
2229 |
|
2539 |
#: classes/front/signup/views/html-vendor-signup.php:36
|
2540 |
msgid "I have read and accepted the <a target=\"top\" href=\"%s\">terms and conditions</a>."
|
2541 |
msgstr ""
|
|
|
|
|
|
|
|
readme.txt
CHANGED
@@ -7,7 +7,7 @@ Plugin URI: https://www.wcvendors.com/
|
|
7 |
Requires at least: 4.4.0
|
8 |
Requires PHP: 5.6
|
9 |
Tested up to: 4.9.5
|
10 |
-
Stable tag: 2.0.
|
11 |
License: GPLv2 or later
|
12 |
|
13 |
The free marketplace plugin for WooCommerce. Now you can allow anyone to open a store on your WooCommerce site!
|
@@ -19,6 +19,7 @@ WC Vendors was released to the market in October of 2014 having gotten its roots
|
|
19 |
|
20 |
== Announcements ==
|
21 |
|
|
|
22 |
* Please read our recent blog post <a href="https://www.wcvendors.com/2018/05/payments-explained/?utm_campaign=announcements?utm_source=wporg">Payments Explained</a> for solutions to your vendor commission payments. Including Stripe, Paypal and others.
|
23 |
* WC Vendors 2.0 is a major update, this will affect some stores using other WC Vendors integrations.
|
24 |
* PayPal has depreciated Adaptive Payments as of September 1st 2017. This will soon cease to function. We provide an instant payment solution via our <a href="https://www.wcvendors.com/product/wc-vendors-pro/?utm_campaign=annoucements?utm_source=wporg">Stripe Gateway</a> however there are 3rd party extensions from MangoPay and Escrow that also provide vendor commission payouts.
|
@@ -142,7 +143,22 @@ WC Vendors does not work with multisite WordPress. There are no plans to support
|
|
142 |
|
143 |
== Changelog ==
|
144 |
|
145 |
-
= Version 2.0.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
146 |
|
147 |
* Updated: Legacy WooCommerce calls
|
148 |
* Updated: Changed how options are retrieved from the database
|
7 |
Requires at least: 4.4.0
|
8 |
Requires PHP: 5.6
|
9 |
Tested up to: 4.9.5
|
10 |
+
Stable tag: 2.0.6
|
11 |
License: GPLv2 or later
|
12 |
|
13 |
The free marketplace plugin for WooCommerce. Now you can allow anyone to open a store on your WooCommerce site!
|
19 |
|
20 |
== Announcements ==
|
21 |
|
22 |
+
* Questions about GDPR and WC Vendors? Please read our recent blog post <a href="https://www.wcvendors.com/2018/05/gdpr-and-wc-vendors/?utm_campaign=announcements?utm_source=wporg">GDPR and WC Vendors</a>.
|
23 |
* Please read our recent blog post <a href="https://www.wcvendors.com/2018/05/payments-explained/?utm_campaign=announcements?utm_source=wporg">Payments Explained</a> for solutions to your vendor commission payments. Including Stripe, Paypal and others.
|
24 |
* WC Vendors 2.0 is a major update, this will affect some stores using other WC Vendors integrations.
|
25 |
* PayPal has depreciated Adaptive Payments as of September 1st 2017. This will soon cease to function. We provide an instant payment solution via our <a href="https://www.wcvendors.com/product/wc-vendors-pro/?utm_campaign=annoucements?utm_source=wporg">Stripe Gateway</a> however there are 3rd party extensions from MangoPay and Escrow that also provide vendor commission payouts.
|
143 |
|
144 |
== Changelog ==
|
145 |
|
146 |
+
= Version 2.0.6 - 28th May 2018 =
|
147 |
+
|
148 |
+
* Added: Payment details to totals CSV export #414
|
149 |
+
* Added: New background updater
|
150 |
+
* Added: New reference to the GDPR for users in the readme
|
151 |
+
* Updated: Invalid text domain in woocommerce registration errors
|
152 |
+
* Updated: Only show major update warning for WC Vendors below 2.0.0
|
153 |
+
* Fixed: Payment message output
|
154 |
+
* Fixed: PayPal cron schedules not working #416
|
155 |
+
* Fixed: Incorrect page name
|
156 |
+
* Fixed: Incorrect default settings in setup wizard
|
157 |
+
* Fixed: Call correct background updater
|
158 |
+
* Fixed: Reference to documentation
|
159 |
+
* Fixed: Increased input width for commission input in settings
|
160 |
+
|
161 |
+
= Version 2.0.5 - 21st May 2018 =
|
162 |
|
163 |
* Updated: Legacy WooCommerce calls
|
164 |
* Updated: Changed how options are retrieved from the database
|