WC Vendors - Version 2.1.20

Version Description

Download this release

Release Info

Developer digitalchild
Plugin Icon 128x128 WC Vendors
Version 2.1.20
Comparing to
See all releases

Code changes from version 2.1.19 to 2.1.20

Files changed (16) hide show
  1. changelog.txt +12 -1
  2. class-wc-vendors.php +4 -4
  3. classes/admin/class-admin-menus.php +33 -2
  4. classes/admin/class-admin-reports.php +16 -16
  5. classes/admin/class-wcv-admin-setup.php +2 -2
  6. classes/admin/class-wcv-commissions-csv-exporter.php +32 -32
  7. classes/admin/class-wcv-commissions-page.php +145 -123
  8. classes/admin/views/setup/header.php +0 -1
  9. classes/class-commission.php +4 -10
  10. classes/class-queries.php +7 -7
  11. classes/front/class-vendor-shop.php +4 -1
  12. classes/includes/class-wcv-shortcodes.php +8 -8
  13. languages/wc-vendors.pot +109 -476
  14. readme.txt +14 -4
  15. templates/dashboard/date-picker.php +2 -2
  16. templates/orders/shipping/shipping-form.php +15 -15
changelog.txt CHANGED
@@ -1,9 +1,20 @@
1
  Changelog for WC Vendors Marketplace
 
 
 
 
 
 
 
 
 
 
 
2
  Version 2.1.19 - 11th March 2020
3
 
4
  * Confirm WordPress 5.4 and WooCommerce 4.0
5
 
6
- Version 2.1.18 - 5th February 2020
7
 
8
  * Added: New action hook to image field. (#620)
9
  * Updated: Vendor_list shortcode argument to has_products #595
1
  Changelog for WC Vendors Marketplace
2
+
3
+ Version 2.1.20 - 8th of May 2020
4
+
5
+ * Added: Add date range filters for commissions table #649 (#651)
6
+ * Updated: Tested to WooCommerce 4.1 (#654)
7
+ * Updated: Update filter names in WCV_Shortcodes class #644 (#647)
8
+ * Fixed: Front-end issues of Store Info option ( Enabled/Disabled ) not working #599 (#653)
9
+ * Fixed: Timezone display for commissions #625 (#648)
10
+ * Fixed: Order date query bug. (#646)
11
+ * Fixed: get current page error on setup wizard #640 (#641)
12
+
13
  Version 2.1.19 - 11th March 2020
14
 
15
  * Confirm WordPress 5.4 and WooCommerce 4.0
16
 
17
+ Version 2.1.18 - 5th February 2020
18
 
19
  * Added: New action hook to image field. (#620)
20
  * Updated: Vendor_list shortcode argument to has_products #595
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.1.19
11
  * Requires at least: 5.0.0
12
- * Tested up to: 5.4
13
  * WC requires at least: 3.8.0
14
- * WC tested up to: 4.0
15
  *
16
  * Text Domain: wc-vendors
17
  * Domain Path: /languages/
@@ -97,7 +97,7 @@ if ( wcv_is_woocommerce_activated() ) {
97
  */
98
  class WC_Vendors {
99
 
100
- public $version = '2.1.18';
101
 
102
  /**
103
  * @var
7
  * Author URI: https://www.wcvendors.com
8
  * GitHub Plugin URI: https://github.com/wcvendors/wcvendors
9
  *
10
+ * Version: 2.1.20
11
  * Requires at least: 5.0.0
12
+ * Tested up to: 5.4.1
13
  * WC requires at least: 3.8.0
14
+ * WC tested up to: 4.1
15
  *
16
  * Text Domain: wc-vendors
17
  * Domain Path: /languages/
97
  */
98
  class WC_Vendors {
99
 
100
+ public $version = '2.1.20';
101
 
102
  /**
103
  * @var
classes/admin/class-admin-menus.php CHANGED
@@ -26,6 +26,7 @@ class WCVendors_Admin_Menus {
26
  add_action( 'admin_menu', array( $this, 'settings_menu' ), 70 );
27
  add_action( 'admin_menu', array( $this, 'extensions_menu' ), 80 );
28
  add_action( 'admin_head', array( $this, 'commission_table_header_styles' ) );
 
29
 
30
  add_filter( 'set-screen-option', array( __CLASS__, 'set_commissions_screen' ), 10, 3 );
31
 
@@ -216,9 +217,39 @@ class WCVendors_Admin_Menus {
216
  echo '.wp-list-table .column-time { width: 10%;}';
217
  echo '</style>';
218
 
219
- } //table_header_styles()
220
-
221
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
222
  }
223
 
224
  new WCVendors_Admin_Menus();
26
  add_action( 'admin_menu', array( $this, 'settings_menu' ), 70 );
27
  add_action( 'admin_menu', array( $this, 'extensions_menu' ), 80 );
28
  add_action( 'admin_head', array( $this, 'commission_table_header_styles' ) );
29
+ add_action( 'admin_footer', array( $this, 'commission_table_script' ) );
30
 
31
  add_filter( 'set-screen-option', array( __CLASS__, 'set_commissions_screen' ), 10, 3 );
32
 
217
  echo '.wp-list-table .column-time { width: 10%;}';
218
  echo '</style>';
219
 
220
+ } //table_header_styles
 
221
 
222
+ /**
223
+ * Print script required by commission.
224
+ *
225
+ * @return void
226
+ * @version 2.1.20
227
+ * @since 2.1.20
228
+ */
229
+ public function commission_table_script() {
230
+ wp_enqueue_script( 'jquery-ui-datepicker' );
231
+ ?>
232
+ <script>
233
+ jQuery(document).ready(
234
+ function() {
235
+ jQuery('#from_date, #to_date').datepicker({
236
+ dateFormat: 'yy-mm-dd'
237
+ });
238
+
239
+ jQuery("#vendor_id").select2();
240
+
241
+ jQuery('#reset').click( function(e){
242
+ e.preventDefault();
243
+ jQuery('#from_date, #to_date').val('');
244
+ jQuery('#com_status_dropdown, #vendor_id').val('').select2();
245
+
246
+ jQuery('#posts-filter').submit();
247
+ });
248
+ }
249
+ );
250
+ </script>
251
+ <?php
252
+ }
253
  }
254
 
255
  new WCVendors_Admin_Menus();
classes/admin/class-admin-reports.php CHANGED
@@ -79,8 +79,8 @@ class WCV_Admin_Reports {
79
 
80
  $commission_status_labels = WCV_Commission::commission_status();
81
 
82
- $start_date = ! empty( $_POST['start_date'] ) ? $_POST['start_date'] : strtotime( date( 'Ymd', strtotime( date( 'Ym', current_time( 'timestamp' ) ) . '01' ) ) );
83
- $end_date = ! empty( $_POST['end_date'] ) ? $_POST['end_date'] : strtotime( date( 'Ymd', current_time( 'timestamp' ) ) );
84
 
85
  if ( ! empty( $_POST['start_date'] ) ) {
86
  $start_date = strtotime( $_POST['start_date'] );
@@ -90,8 +90,8 @@ class WCV_Admin_Reports {
90
  $end_date = strtotime( $_POST['end_date'] );
91
  }
92
 
93
- $after = date( 'Y-m-d', $start_date );
94
- $before = date( 'Y-m-d', strtotime( '+1 day', $end_date ) );
95
 
96
  $commission_due = $wpdb->get_var(
97
  "
@@ -122,11 +122,11 @@ class WCV_Admin_Reports {
122
  <form method="post" action="">
123
  <p><label for="from"><?php _e( 'From:', 'wc-vendors' ); ?></label>
124
  <input type="text" size="9" placeholder="yyyy-mm-dd"
125
- value="<?php echo esc_attr( date( 'Y-m-d', $start_date ) ); ?>" name="start_date"
126
  class="range_datepicker from" id="from"/>
127
  <label for="to"><?php _e( 'To:', 'wc-vendors' ); ?></label>
128
  <input type="text" size="9" placeholder="yyyy-mm-dd"
129
- value="<?php echo esc_attr( date( 'Y-m-d', $end_date ) ); ?>" name="end_date"
130
  class="range_datepicker to" id="to"/>
131
  <input type="submit" class="button" value="<?php _e( 'Show', 'wc-vendors' ); ?>"/></p>
132
  </form>
@@ -271,8 +271,8 @@ class WCV_Admin_Reports {
271
  $latest_woo = version_compare( $woocommerce->version, '2.3', '>' );
272
 
273
  $first_year = $wpdb->get_var( "SELECT time FROM {$wpdb->prefix}pv_commission ORDER BY time ASC LIMIT 1;" );
274
- $first_year = $first_year ? date( 'Y', strtotime( $first_year ) ) : date( 'Y' );
275
- $current_year = isset( $_POST['show_year'] ) ? $_POST['show_year'] : date( 'Y', current_time( 'timestamp' ) );
276
  $start_date = strtotime( $current_year . '0101' );
277
 
278
  $vendors = get_users( array( 'role' => 'vendor' ) );
@@ -286,7 +286,7 @@ class WCV_Admin_Reports {
286
  <label for="show_year"><?php _e( 'Show:', 'wc-vendors' ); ?></label>
287
  <select name="show_year" id="show_year">
288
  <?php
289
- for ( $i = $first_year; $i <= date( 'Y' ); $i ++ ) {
290
  printf( '<option value="%s" %s>%s</option>', $i, selected( $current_year, $i, false ), $i );
291
  }
292
  ?>
@@ -374,12 +374,12 @@ class WCV_Admin_Reports {
374
  $date_sql = " AND date_format(`time`,'%%Y%%m') = %d";
375
 
376
  for ( $count = 0; $count < 12; $count ++ ) {
377
- $time = strtotime( date( 'Ym', strtotime( '+ ' . $count . ' MONTH', $start_date ) ) . '01' );
378
  if ( $time > current_time( 'timestamp' ) ) {
379
  continue;
380
  }
381
 
382
- $month = date( 'Ym', strtotime( date( 'Ym', strtotime( '+ ' . $count . ' MONTH', $start_date ) ) . '01' ) );
383
 
384
  $fetch_results = $wpdb->prepare( $sql . $filter . $date_sql, $month );
385
 
@@ -391,7 +391,7 @@ class WCV_Admin_Reports {
391
  $paid = $wpdb->get_var( $wpdb->prepare( $paid_sql . $date_sql, $month ) );
392
  $reversed = $wpdb->get_var( $wpdb->prepare( $reversed_sql . $date_sql, $month ) );
393
 
394
- $commissions[ date( 'M', strtotime( $month . '01' ) ) ] = array(
395
  'commission' => $commission,
396
  'tax' => $tax,
397
  'shipping' => $shipping,
@@ -479,8 +479,8 @@ class WCV_Admin_Reports {
479
 
480
  global $wpdb;
481
 
482
- $total_start_date = ! empty( $_POST['total_start_date'] ) ? $_POST['total_start_date'] : strtotime( date( 'Ymd', strtotime( date( 'Ym', current_time( 'timestamp' ) ) . '01' ) ) );
483
- $total_end_date = ! empty( $_POST['total_end_date'] ) ? $_POST['total_end_date'] : strtotime( date( 'Ymd', current_time( 'timestamp' ) ) );
484
  $commission_status = ! empty( $_POST['commission_status'] ) ? $_POST['commission_status'] : 'due';
485
  $date_sql = ( ! empty( $_POST['total_start_date'] ) && ! empty( $_POST['total_end_date'] ) ) ? " time BETWEEN '$total_start_date 00:00:00' AND '$total_end_date 23:59:59' AND" : '';
486
 
@@ -504,11 +504,11 @@ class WCV_Admin_Reports {
504
  <form method="post" action="">
505
  <p><label for="from"><?php _e( 'From:', 'wc-vendors' ); ?></label>
506
  <input type="text" size="9" placeholder="yyyy-mm-dd"
507
- value="<?php echo esc_attr( date( 'Y-m-d', $total_start_date ) ); ?>" name="total_start_date"
508
  class="range_datepicker from" id="from"/>
509
  <label for="to"><?php _e( 'To:', 'wc-vendors' ); ?></label>
510
  <input type="text" size="9" placeholder="yyyy-mm-dd"
511
- value="<?php echo esc_attr( date( 'Y-m-d', $total_end_date ) ); ?>" name="total_end_date"
512
  class="range_datepicker to" id="to"/>
513
 
514
  <select name="commission_status">
79
 
80
  $commission_status_labels = WCV_Commission::commission_status();
81
 
82
+ $start_date = ! empty( $_POST['start_date'] ) ? $_POST['start_date'] : strtotime( gmdate( 'Ymd', strtotime( gmdate( 'Ym', current_time( 'timestamp' ) ) . '01' ) ) );
83
+ $end_date = ! empty( $_POST['end_date'] ) ? $_POST['end_date'] : strtotime( gmdate( 'Ymd', current_time( 'timestamp' ) ) );
84
 
85
  if ( ! empty( $_POST['start_date'] ) ) {
86
  $start_date = strtotime( $_POST['start_date'] );
90
  $end_date = strtotime( $_POST['end_date'] );
91
  }
92
 
93
+ $after = gmdate( 'Y-m-d', $start_date );
94
+ $before = gmdate( 'Y-m-d', strtotime( '+1 day', $end_date ) );
95
 
96
  $commission_due = $wpdb->get_var(
97
  "
122
  <form method="post" action="">
123
  <p><label for="from"><?php _e( 'From:', 'wc-vendors' ); ?></label>
124
  <input type="text" size="9" placeholder="yyyy-mm-dd"
125
+ value="<?php echo esc_attr( gmdate( 'Y-m-d', $start_date ) ); ?>" name="start_date"
126
  class="range_datepicker from" id="from"/>
127
  <label for="to"><?php _e( 'To:', 'wc-vendors' ); ?></label>
128
  <input type="text" size="9" placeholder="yyyy-mm-dd"
129
+ value="<?php echo esc_attr( gmdate( 'Y-m-d', $end_date ) ); ?>" name="end_date"
130
  class="range_datepicker to" id="to"/>
131
  <input type="submit" class="button" value="<?php _e( 'Show', 'wc-vendors' ); ?>"/></p>
132
  </form>
271
  $latest_woo = version_compare( $woocommerce->version, '2.3', '>' );
272
 
273
  $first_year = $wpdb->get_var( "SELECT time FROM {$wpdb->prefix}pv_commission ORDER BY time ASC LIMIT 1;" );
274
+ $first_year = $first_year ? gmdate( 'Y', strtotime( $first_year ) ) : gmdate( 'Y' );
275
+ $current_year = isset( $_POST['show_year'] ) ? $_POST['show_year'] : gmdate( 'Y', current_time( 'mysql' ) );
276
  $start_date = strtotime( $current_year . '0101' );
277
 
278
  $vendors = get_users( array( 'role' => 'vendor' ) );
286
  <label for="show_year"><?php _e( 'Show:', 'wc-vendors' ); ?></label>
287
  <select name="show_year" id="show_year">
288
  <?php
289
+ for ( $i = $first_year; $i <= gmdate( 'Y' ); $i ++ ) {
290
  printf( '<option value="%s" %s>%s</option>', $i, selected( $current_year, $i, false ), $i );
291
  }
292
  ?>
374
  $date_sql = " AND date_format(`time`,'%%Y%%m') = %d";
375
 
376
  for ( $count = 0; $count < 12; $count ++ ) {
377
+ $time = strtotime( gmdate( 'Ym', strtotime( '+ ' . $count . ' MONTH', $start_date ) ) . '01' );
378
  if ( $time > current_time( 'timestamp' ) ) {
379
  continue;
380
  }
381
 
382
+ $month = gmdate( 'Ym', strtotime( gmdate( 'Ym', strtotime( '+ ' . $count . ' MONTH', $start_date ) ) . '01' ) );
383
 
384
  $fetch_results = $wpdb->prepare( $sql . $filter . $date_sql, $month );
385
 
391
  $paid = $wpdb->get_var( $wpdb->prepare( $paid_sql . $date_sql, $month ) );
392
  $reversed = $wpdb->get_var( $wpdb->prepare( $reversed_sql . $date_sql, $month ) );
393
 
394
+ $commissions[ gmdate( 'M', strtotime( $month . '01' ) ) ] = array(
395
  'commission' => $commission,
396
  'tax' => $tax,
397
  'shipping' => $shipping,
479
 
480
  global $wpdb;
481
 
482
+ $total_start_date = ! empty( $_POST['total_start_date'] ) ? $_POST['total_start_date'] : strtotime( gmdate( 'Ymd', strtotime( gmdate( 'Ym', current_time( 'mysql' ) ) . '01' ) ) );
483
+ $total_end_date = ! empty( $_POST['total_end_date'] ) ? $_POST['total_end_date'] : strtotime( gmdate( 'Ymd', current_time( 'mysql' ) ) );
484
  $commission_status = ! empty( $_POST['commission_status'] ) ? $_POST['commission_status'] : 'due';
485
  $date_sql = ( ! empty( $_POST['total_start_date'] ) && ! empty( $_POST['total_end_date'] ) ) ? " time BETWEEN '$total_start_date 00:00:00' AND '$total_end_date 23:59:59' AND" : '';
486
 
504
  <form method="post" action="">
505
  <p><label for="from"><?php _e( 'From:', 'wc-vendors' ); ?></label>
506
  <input type="text" size="9" placeholder="yyyy-mm-dd"
507
+ value="<?php echo esc_attr( gmdate( 'Y-m-d', $total_start_date ) ); ?>" name="total_start_date"
508
  class="range_datepicker from" id="from"/>
509
  <label for="to"><?php _e( 'To:', 'wc-vendors' ); ?></label>
510
  <input type="text" size="9" placeholder="yyyy-mm-dd"
511
+ value="<?php echo esc_attr( gmdate( 'Y-m-d', $total_end_date ) ); ?>" name="total_end_date"
512
  class="range_datepicker to" id="to"/>
513
 
514
  <select name="commission_status">
classes/admin/class-wcv-admin-setup.php CHANGED
@@ -220,7 +220,7 @@ class WCV_Admin_Setup {
220
 
221
  $exporter = new WCV_Commissions_CSV_Export();
222
 
223
- $date = date( 'Y-M-d' );
224
 
225
  if ( ! empty( $_GET['com_status'] ) ) { // WPCS: input var ok.
226
  $exporter->set_filename( 'wcv_commissions_' . wp_unslash( $_GET['com_status'] ) . '-' . $date . '.csv' ); // WPCS: input var ok, sanitization ok.
@@ -245,7 +245,7 @@ class WCV_Admin_Setup {
245
 
246
  $exporter = new WCV_Commissions_Sum_CSV_Export();
247
 
248
- $date = date( 'Y-M-d' );
249
 
250
  if ( ! empty( $_GET['com_status'] ) ) { // WPCS: input var ok.
251
  $exporter->set_filename( 'wcv_commissions_sum_' . wp_unslash( $_GET['com_status'] ) . '-' . $date . '.csv' ); // WPCS: input var ok, sanitization ok.
220
 
221
  $exporter = new WCV_Commissions_CSV_Export();
222
 
223
+ $date = gmdate( 'Y-M-d' );
224
 
225
  if ( ! empty( $_GET['com_status'] ) ) { // WPCS: input var ok.
226
  $exporter->set_filename( 'wcv_commissions_' . wp_unslash( $_GET['com_status'] ) . '-' . $date . '.csv' ); // WPCS: input var ok, sanitization ok.
245
 
246
  $exporter = new WCV_Commissions_Sum_CSV_Export();
247
 
248
+ $date = gmdate( 'Y-M-d' );
249
 
250
  if ( ! empty( $_GET['com_status'] ) ) { // WPCS: input var ok.
251
  $exporter->set_filename( 'wcv_commissions_sum_' . wp_unslash( $_GET['com_status'] ) . '-' . $date . '.csv' ); // WPCS: input var ok, sanitization ok.
classes/admin/class-wcv-commissions-csv-exporter.php CHANGED
@@ -2,7 +2,11 @@
2
  /**
3
  * Handles commission CSV export.
4
  *
5
- * @version 1.9.14
 
 
 
 
6
  */
7
 
8
  if ( ! defined( 'ABSPATH' ) ) {
@@ -39,17 +43,19 @@ class WCV_Commissions_CSV_Export extends WC_CSV_Exporter {
39
  public function get_default_column_names() {
40
 
41
  return apply_filters(
42
- 'wcv_commissions_export_columns', array(
43
- 'order_id' => __( 'Order ID', 'wc-vendors' ),
44
- 'vendor_id' => sprintf( __( '%s', 'wc-vendors' ), wcv_get_vendor_name() ),
45
- 'product_id' => __( 'Product', 'wc-vendors' ),
46
- 'qty' => __( 'QTY', 'wc-vendors' ),
47
- 'total_due' => __( 'Commission', 'wc-vendors' ),
48
- 'total_shipping' => __( 'Shipping', 'wc-vendors' ),
49
- 'tax' => __( 'Tax', 'wc-vendors' ),
50
- 'totals' => __( 'Total', 'wc-vendors' ),
51
- 'status' => __( 'Status', 'wc-vendors' ),
52
- 'time' => __( 'Date', 'wc-vendors' ),
 
 
53
  )
54
  );
55
  }
@@ -69,10 +75,10 @@ class WCV_Commissions_CSV_Export extends WC_CSV_Exporter {
69
  return;
70
  }
71
 
72
- $order = ( ! empty( $_REQUEST['order'] ) && $_REQUEST['order'] == 'asc' ) ? 'ASC' : 'DESC';
73
- $orderby = ! empty( $_REQUEST['orderby'] ) ? esc_attr( $_REQUEST['orderby'] ) : 'time';
74
- $com_status = ! empty( $_REQUEST['com_status'] ) ? esc_attr( $_REQUEST['com_status'] ) : '';
75
- $vendor_id = ! empty( $_REQUEST['vendor_id'] ) ? esc_attr( $_REQUEST['vendor_id'] ) : '';
76
  $status_sql = '';
77
  $time_sql = '';
78
 
@@ -81,22 +87,17 @@ class WCV_Commissions_CSV_Export extends WC_CSV_Exporter {
81
  */
82
  $sql = "SELECT COUNT(id) FROM {$wpdb->prefix}pv_commission";
83
 
84
- if ( ! empty( $_GET['m'] ) ) {
85
-
86
- $year = substr( $_GET['m'], 0, 4 );
87
- $month = substr( $_GET['m'], 4, 2 );
88
-
89
- $time_sql = "
90
- WHERE MONTH(`time`) = '$month'
91
- AND YEAR(`time`) = '$year'
92
- ";
93
 
94
  $sql .= $time_sql;
95
  }
96
 
97
  if ( ! empty( $_GET['com_status'] ) ) {
98
 
99
- if ( $time_sql == '' ) {
100
  $status_sql = "
101
  WHERE status = '$com_status'
102
  ";
@@ -111,7 +112,7 @@ class WCV_Commissions_CSV_Export extends WC_CSV_Exporter {
111
 
112
  if ( ! empty( $_GET['vendor_id'] ) ) {
113
 
114
- if ( $time_sql == '' && $status_sql == '' ) {
115
  $vendor_sql = "
116
  WHERE vendor_id = '$vendor_id'
117
  ";
@@ -124,14 +125,14 @@ class WCV_Commissions_CSV_Export extends WC_CSV_Exporter {
124
  $sql .= $vendor_sql;
125
  }
126
 
127
- $max = $wpdb->get_var( $sql );
128
 
129
  $sql
130
  = "
131
  SELECT * FROM {$wpdb->prefix}pv_commission
132
  ";
133
 
134
- if ( ! empty( $_GET['m'] ) ) {
135
  $sql .= $time_sql;
136
  }
137
 
@@ -143,12 +144,11 @@ class WCV_Commissions_CSV_Export extends WC_CSV_Exporter {
143
  $sql .= $vendor_sql;
144
  }
145
 
146
- // $offset = ( $current_page - 1 ) * $per_page;
147
  $sql .= "
148
  ORDER BY `{$orderby}` {$order}
149
  ";
150
 
151
- $commissions = $wpdb->get_results( $sql );
152
 
153
  $this->total_rows = count( $commissions );
154
  $this->row_data = array();
@@ -169,7 +169,7 @@ class WCV_Commissions_CSV_Export extends WC_CSV_Exporter {
169
  break;
170
  case 'order_id':
171
  $order = wc_get_order( $commission->order_id );
172
- $value = ( $order )? $order->get_order_number() : $commission->order_id;
173
  break;
174
  case 'product_id':
175
  $parent = get_post_ancestors( $commission->product_id );
2
  /**
3
  * Handles commission CSV export.
4
  *
5
+ * @version 2.1.20
6
+ * @since 2.0.0
7
+ *
8
+ * @package WC_Vendors
9
+ * @subpackage Classes/Admin
10
  */
11
 
12
  if ( ! defined( 'ABSPATH' ) ) {
43
  public function get_default_column_names() {
44
 
45
  return apply_filters(
46
+ 'wcv_commissions_export_columns',
47
+ array(
48
+ 'order_id' => __( 'Order ID', 'wc-vendors' ),
49
+ // translators: The name used to refer to a vendor.
50
+ 'vendor_id' => sprintf( __( '%s', 'wc-vendors' ), wcv_get_vendor_name() ), // phpcs:ignore WordPress.WP.I18n.NoEmptyStrings
51
+ 'product_id' => __( 'Product', 'wc-vendors' ),
52
+ 'qty' => __( 'QTY', 'wc-vendors' ),
53
+ 'total_due' => __( 'Commission', 'wc-vendors' ),
54
+ 'total_shipping' => __( 'Shipping', 'wc-vendors' ),
55
+ 'tax' => __( 'Tax', 'wc-vendors' ),
56
+ 'totals' => __( 'Total', 'wc-vendors' ),
57
+ 'status' => __( 'Status', 'wc-vendors' ),
58
+ 'time' => __( 'Date', 'wc-vendors' ),
59
  )
60
  );
61
  }
75
  return;
76
  }
77
 
78
+ $order = ( ! empty( $_REQUEST['order'] ) && 'asc' === $_REQUEST['order'] ) ? 'ASC' : 'DESC';
79
+ $orderby = ! empty( $_REQUEST['orderby'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['orderby'] ) ) : 'time';
80
+ $com_status = ! empty( $_REQUEST['com_status'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['com_status'] ) ) : '';
81
+ $vendor_id = ! empty( $_REQUEST['vendor_id'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['vendor_id'] ) ) : '';
82
  $status_sql = '';
83
  $time_sql = '';
84
 
87
  */
88
  $sql = "SELECT COUNT(id) FROM {$wpdb->prefix}pv_commission";
89
 
90
+ if ( ! empty( $_REQUEST['from_date'] ) && ! empty( $_REQUEST['to_date'] ) ) {
91
+ $from_date = sanitize_text_field( wp_unslash( $_REQUEST['from_date'] ) );
92
+ $to_date = sanitize_text_field( wp_unslash( $_REQUEST['to_date'] ) );
93
+ $time_sql = " WHERE time BETWEEN '$from_date' AND '$to_date'";
 
 
 
 
 
94
 
95
  $sql .= $time_sql;
96
  }
97
 
98
  if ( ! empty( $_GET['com_status'] ) ) {
99
 
100
+ if ( '' === $time_sql ) {
101
  $status_sql = "
102
  WHERE status = '$com_status'
103
  ";
112
 
113
  if ( ! empty( $_GET['vendor_id'] ) ) {
114
 
115
+ if ( '' === $time_sql && '' === $status_sql ) {
116
  $vendor_sql = "
117
  WHERE vendor_id = '$vendor_id'
118
  ";
125
  $sql .= $vendor_sql;
126
  }
127
 
128
+ $max = $wpdb->get_var( $sql ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
129
 
130
  $sql
131
  = "
132
  SELECT * FROM {$wpdb->prefix}pv_commission
133
  ";
134
 
135
+ if ( ! empty( $_GET['from_date'] ) ) {
136
  $sql .= $time_sql;
137
  }
138
 
144
  $sql .= $vendor_sql;
145
  }
146
 
 
147
  $sql .= "
148
  ORDER BY `{$orderby}` {$order}
149
  ";
150
 
151
+ $commissions = $wpdb->get_results( $sql ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
152
 
153
  $this->total_rows = count( $commissions );
154
  $this->row_data = array();
169
  break;
170
  case 'order_id':
171
  $order = wc_get_order( $commission->order_id );
172
+ $value = ( $order ) ? $order->get_order_number() : $commission->order_id;
173
  break;
174
  case 'product_id':
175
  $parent = get_post_ancestors( $commission->product_id );
classes/admin/class-wcv-commissions-page.php CHANGED
@@ -1,4 +1,12 @@
1
  <?php
 
 
 
 
 
 
 
 
2
 
3
  if ( ! class_exists( 'WP_List_Table' ) ) {
4
  require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
@@ -7,13 +15,19 @@ if ( ! class_exists( 'WP_List_Table' ) ) {
7
  /**
8
  * WCVendors_Commissions_Page class.
9
  *
10
- * @category Admin
11
- * @package WCVendors/Admin
12
- * @version 2.0.0
13
  * @extends WP_List_Table
14
  */
15
  class WCVendors_Commissions_Page extends WP_List_Table {
16
 
 
 
 
 
 
 
 
17
  public $index;
18
 
19
  /**
@@ -27,7 +41,7 @@ class WCVendors_Commissions_Page extends WP_List_Table {
27
 
28
  $this->index = 0;
29
 
30
- // Set parent defaults
31
  parent::__construct(
32
  array(
33
  'singular' => 'commission',
@@ -39,12 +53,12 @@ class WCVendors_Commissions_Page extends WP_List_Table {
39
 
40
 
41
  /**
42
- * column_default function.
43
  *
44
  * @access public
45
  *
46
- * @param unknown $item
47
- * @param mixed $column_name
48
  *
49
  * @return unknown
50
  */
@@ -96,11 +110,11 @@ class WCVendors_Commissions_Page extends WP_List_Table {
96
 
97
 
98
  /**
99
- * column_cb function.
100
  *
101
  * @access public
102
  *
103
- * @param mixed $item
104
  *
105
  * @return unknown
106
  */
@@ -117,7 +131,7 @@ class WCVendors_Commissions_Page extends WP_List_Table {
117
 
118
 
119
  /**
120
- * get_columns function.
121
  *
122
  * @access public
123
  * @return unknown
@@ -127,9 +141,10 @@ class WCVendors_Commissions_Page extends WP_List_Table {
127
  $columns = array(
128
  'cb' => '<input type="checkbox" />',
129
  'order_id' => __( 'Order ID', 'wc-vendors' ),
130
- 'vendor_id' => sprintf( __( '%s', 'wc-vendors' ), wcv_get_vendor_name() ),
 
131
  'product_id' => __( 'Product', 'wc-vendors' ),
132
- 'qty' => __( 'Quantity', 'wc-vendors' ),
133
  'total_due' => __( 'Commission', 'wc-vendors' ),
134
  'total_shipping' => __( 'Shipping', 'wc-vendors' ),
135
  'tax' => __( 'Tax', 'wc-vendors' ),
@@ -147,7 +162,7 @@ class WCVendors_Commissions_Page extends WP_List_Table {
147
 
148
 
149
  /**
150
- * get_sortable_columns function.
151
  *
152
  * @access public
153
  * @return unknown
@@ -157,7 +172,7 @@ class WCVendors_Commissions_Page extends WP_List_Table {
157
  $sortable_columns = array(
158
  'time' => array( 'time', true ),
159
  'product_id' => array( 'product_id', false ),
160
- 'qty' => array( 'qty', false ),
161
  'order_id' => array( 'order_id', false ),
162
  'total_due' => array( 'total_due', false ),
163
  'total_shipping' => array( 'total_shipping', false ),
@@ -197,18 +212,23 @@ class WCVendors_Commissions_Page extends WP_List_Table {
197
 
198
 
199
  /**
 
200
  *
 
 
 
 
201
  */
202
  public function extra_tablenav( $which ) {
203
 
204
- $m = isset( $_GET['m'] ) ? (int) $_GET['m'] : 0;
205
- $com_status = isset( $_GET['com_status'] ) ? $_GET['com_status'] : '';
206
- $vendor_id = isset( $_GET['vendor_id'] ) ? $_GET['vendor_id'] : '';
 
207
  $args_url = '';
208
 
209
- if ( $m ) {
210
- $args_url .= '&m=' . $m;
211
- }
212
  if ( $com_status ) {
213
  $args_url .= '&com_status=' . $com_status;
214
  }
@@ -216,87 +236,87 @@ class WCVendors_Commissions_Page extends WP_List_Table {
216
  $args_url .= '&vendor_id=' . $vendor_id;
217
  }
218
 
219
- if ( $which == 'top' ) {
220
  echo '<div class="alignleft actions" style="width: 70%;">';
221
 
222
- // Months drop down
223
- $this->months_dropdown( 'commission' );
224
 
225
- // commission status drop down
226
  $this->status_dropdown( 'commission' );
227
 
228
- // Vendor drop down
229
  $this->vendor_dropdown( 'commission' );
230
 
231
  submit_button(
232
- __( 'Filter', 'wc-vendors' ), false, false, false, array(
 
 
 
 
233
  'id' => 'post-query-submit',
234
  'name' => 'do-filter',
235
  )
236
  );
237
  submit_button( __( 'Clear', 'wc-vendors' ), 'secondary', 'reset', false, array( 'type' => 'reset' ) );
238
 
239
- echo '<a class="button export_commissions" style="width: 110px; float: left;" href="' . wp_nonce_url( admin_url( 'admin.php?page=wcv-commissions&action=export_commissions' . $args_url ), 'export_commissions', 'nonce' ) . '">' . __( 'Export to CSV', 'wc-vendors' ) . '</a>';
240
- echo '<a class="button export_commission_totals" style="width: 150px; float: left;" href="' . wp_nonce_url( admin_url( 'admin.php?page=wcv-commissions&action=export_commission_totals' . $args_url ), 'export_commission_totals', 'nonce' ) . '">' . __( 'Export Totals to CSV', 'wc-vendors' ) . '</a>';
241
- echo '<a class="button mark_all_commissions_paid" id="mark_all_paid" style="width: 100px; float: left;" href="' . wp_nonce_url( admin_url( 'admin.php?page=wcv-commissions&action=mark_all_paid' . $args_url ), 'mark_all_paid', 'nonce' ) . '">' . __( 'Mark all paid', 'wc-vendors' ) . '</a>';
242
  echo '</div>';
243
-
244
  }
245
  }
246
 
247
-
248
  /**
249
  * Display a monthly dropdown for filtering items
250
  *
251
- * @since 3.1.0
252
- * @access protected
253
  *
254
- * @param unknown $post_type
255
  */
256
- public function months_dropdown( $post_type ) {
257
 
258
  global $wpdb, $wp_locale;
259
 
260
  $table_name = $wpdb->prefix . 'pv_commission';
261
 
262
- $months = $wpdb->get_results(
263
- "
264
- SELECT DISTINCT YEAR( time ) AS year, MONTH( time ) AS month
265
- FROM $table_name
266
- ORDER BY time DESC
267
- "
268
- );
269
-
270
- $month_count = count( $months );
271
 
272
- if ( ! $month_count || ( 1 == $month_count && 0 == $months[0]->month ) ) {
273
- return;
274
- }
275
-
276
- $m = isset( $_GET['m'] ) ? (int) $_GET['m'] : 0;
277
  ?>
278
- <select name="m" id="filter-by-date" class="wc-enhanced-select-nostd" style="min-width:150px;">
279
- <option<?php selected( $m, 0 ); ?> value='0'><?php _e( 'Show all dates', 'wc-vendors' ); ?></option>
280
- <?php
281
- foreach ( $months as $arc_row ) {
282
- if ( 0 == $arc_row->year ) {
283
- continue;
284
- }
285
-
286
- $month = zeroise( $arc_row->month, 2 );
287
- $year = $arc_row->year;
288
-
289
- printf(
290
- "<option %s value='%s'>%s</option>\n",
291
- selected( $m, $year . $month, false ),
292
- esc_attr( $arc_row->year . $month ),
293
- /* translators: 1: month name, 2: 4-digit year */
294
- sprintf( __( '%1$s %2$d' ), $wp_locale->get_month( $month ), $year )
295
- );
296
- }
297
- ?>
298
- </select>
299
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
300
  <?php
301
  }
302
 
@@ -306,19 +326,18 @@ class WCVendors_Commissions_Page extends WP_List_Table {
306
  * @since 3.1.0
307
  * @access protected
308
  *
309
- * @param unknown $post_type
310
  */
311
  public function status_dropdown( $post_type ) {
312
 
313
- $com_status = isset( $_GET['com_status'] ) ? $_GET['com_status'] : '';
314
  ?>
315
- <select name="com_status" class="wc-enhanced-select">
316
- <option<?php selected( $com_status, '' ); ?>
317
- value=''><?php _e( 'Show all Statuses', 'wc-vendors' ); ?></option>
318
- <option<?php selected( $com_status, 'due' ); ?> value="due"><?php _e( 'Due', 'wc-vendors' ); ?></option>
319
- <option<?php selected( $com_status, 'paid' ); ?> value="paid"><?php _e( 'Paid', 'wc-vendors' ); ?></option>
320
- <option<?php selected( $com_status, 'reversed' ); ?>
321
- value="reversed"><?php _e( 'Reversed', 'wc-vendors' ); ?></option>
322
  </select>
323
  <?php
324
  }
@@ -329,26 +348,25 @@ class WCVendors_Commissions_Page extends WP_List_Table {
329
  * @since 1.9.2
330
  * @access public
331
  *
332
- * @param unknown $post_type
333
  */
334
  public function vendor_dropdown( $post_type ) {
335
 
336
  $user_args = array( 'fields' => array( 'ID', 'display_name' ) );
337
- $vendor_id = isset( $_GET['vendor_id'] ) ? $_GET['vendor_id'] : '';
338
  $new_args = $user_args;
339
  $new_args['role'] = 'vendor';
340
  $users = get_users( $new_args );
341
 
342
- // Generate the drop down
343
  $output = '<select style="width:250px;" name="vendor_id" id="vendor_id" class="wc-enhanced-select">';
344
  $output .= '<option></option>';
345
  $output .= wcv_vendor_drop_down_options( $users, $vendor_id );
346
  $output .= '</select>';
347
- $output .= '<script type="text/javascript">jQuery(function() { jQuery("#vendor_id").select2(); } );</script>';
348
 
349
- echo $output;
350
 
351
- } // vendor_dropdown()
352
 
353
 
354
  /**
@@ -370,7 +388,7 @@ class WCVendors_Commissions_Page extends WP_List_Table {
370
  $result = $this->mark_paid( $ids );
371
 
372
  if ( $result ) {
373
- echo '<div class="updated"><p>' . __( 'Commission marked paid.', 'wc-vendors' ) . '</p></div>';
374
  }
375
  break;
376
 
@@ -378,7 +396,7 @@ class WCVendors_Commissions_Page extends WP_List_Table {
378
  $result = $this->mark_due( $ids );
379
 
380
  if ( $result ) {
381
- echo '<div class="updated"><p>' . __( 'Commission marked due.', 'wc-vendors' ) . '</p></div>';
382
  }
383
  break;
384
 
@@ -386,7 +404,7 @@ class WCVendors_Commissions_Page extends WP_List_Table {
386
  $result = $this->mark_reversed( $ids );
387
 
388
  if ( $result ) {
389
- echo '<div class="updated"><p>' . __( 'Commission marked reversed.', 'wc-vendors' ) . '</p></div>';
390
  }
391
  break;
392
 
@@ -400,9 +418,9 @@ class WCVendors_Commissions_Page extends WP_List_Table {
400
 
401
 
402
  /**
 
403
  *
404
- *
405
- * @param unknown $ids (optional)
406
  *
407
  * @return unknown
408
  */
@@ -413,16 +431,16 @@ class WCVendors_Commissions_Page extends WP_List_Table {
413
  $table_name = $wpdb->prefix . 'pv_commission';
414
 
415
  $query = "UPDATE `{$table_name}` SET `status` = 'paid' WHERE id IN ($ids) AND `status` = 'due'";
416
- $result = $wpdb->query( $query );
417
 
418
  return $result;
419
  }
420
 
421
 
422
  /**
 
423
  *
424
- *
425
- * @param unknown $ids (optional)
426
  *
427
  * @return unknown
428
  */
@@ -432,7 +450,7 @@ class WCVendors_Commissions_Page extends WP_List_Table {
432
 
433
  $table_name = $wpdb->prefix . 'pv_commission';
434
  $query = "UPDATE `{$table_name}` SET `status` = 'reversed' WHERE id IN ($ids)";
435
- $result = $wpdb->query( $query );
436
 
437
  return $result;
438
 
@@ -440,11 +458,11 @@ class WCVendors_Commissions_Page extends WP_List_Table {
440
 
441
 
442
  /**
 
443
  *
 
444
  *
445
- * @param unknown $ids (optional)
446
- *
447
- * @return unknown
448
  */
449
  public function mark_due( $ids = array() ) {
450
 
@@ -453,30 +471,32 @@ class WCVendors_Commissions_Page extends WP_List_Table {
453
  $table_name = $wpdb->prefix . 'pv_commission';
454
 
455
  $query = "UPDATE `{$table_name}` SET `status` = 'due' WHERE id IN ($ids)";
456
- $result = $wpdb->query( $query );
457
 
458
  return $result;
459
  }
460
 
461
 
462
  /**
463
- * cubrid_prepare(conn_identifier, prepare_stmt)_items function.
464
  *
465
- * @access public
 
466
  */
467
  public function prepare_items() {
468
 
469
  global $wpdb;
470
 
471
- $_SERVER['REQUEST_URI'] = remove_query_arg( '_wp_http_referer', $_SERVER['REQUEST_URI'] );
 
472
 
473
  $per_page = $this->get_items_per_page( 'commissions_per_page', 10 );
474
  $current_page = $this->get_pagenum();
475
 
476
- $orderby = ! empty( $_REQUEST['orderby'] ) ? esc_attr( $_REQUEST['orderby'] ) : 'time';
477
- $order = ( ! empty( $_REQUEST['order'] ) && $_REQUEST['order'] == 'asc' ) ? 'ASC' : 'DESC';
478
- $com_status = ! empty( $_REQUEST['com_status'] ) ? esc_attr( $_REQUEST['com_status'] ) : '';
479
- $vendor_id = ! empty( $_REQUEST['vendor_id'] ) ? esc_attr( $_REQUEST['vendor_id'] ) : '';
480
  $status_sql = '';
481
  $time_sql = '';
482
 
@@ -495,23 +515,17 @@ class WCVendors_Commissions_Page extends WP_List_Table {
495
  */
496
  $sql = "SELECT COUNT(id) FROM {$wpdb->prefix}pv_commission";
497
 
498
- if ( ! empty( $_GET['m'] ) ) {
499
-
500
- $year = substr( $_GET['m'], 0, 4 );
501
- $month = substr( $_GET['m'], 4, 2 );
502
-
503
- $time_sql
504
- = "
505
- WHERE MONTH(`time`) = '$month'
506
- AND YEAR(`time`) = '$year'
507
- ";
508
 
509
  $sql .= $time_sql;
510
  }
511
 
512
  if ( ! empty( $_GET['com_status'] ) ) {
513
 
514
- if ( $time_sql == '' ) {
515
  $status_sql
516
  = "
517
  WHERE status = '$com_status'
@@ -528,7 +542,7 @@ class WCVendors_Commissions_Page extends WP_List_Table {
528
 
529
  if ( ! empty( $_GET['vendor_id'] ) ) {
530
 
531
- if ( $time_sql == '' && $status_sql == '' ) {
532
  $vendor_sql
533
  = "
534
  WHERE vendor_id = '$vendor_id'
@@ -543,14 +557,14 @@ class WCVendors_Commissions_Page extends WP_List_Table {
543
  $sql .= $vendor_sql;
544
  }
545
 
546
- $max = $wpdb->get_var( $sql );
547
 
548
  $sql
549
  = "
550
  SELECT * FROM {$wpdb->prefix}pv_commission
551
  ";
552
 
553
- if ( ! empty( $_GET['m'] ) ) {
554
  $sql .= $time_sql;
555
  }
556
 
@@ -570,8 +584,18 @@ class WCVendors_Commissions_Page extends WP_List_Table {
570
  LIMIT {$offset}, {$per_page}
571
  ";
572
 
573
- // $this->items = $wpdb->get_results( $wpdb->prepare( $sql, ( $current_page - 1 ) * $per_page, $per_page ) );
574
- $this->items = $wpdb->get_results( $sql );
 
 
 
 
 
 
 
 
 
 
575
 
576
  /**
577
  * Pagination
@@ -599,6 +623,4 @@ class WCVendors_Commissions_Page extends WP_List_Table {
599
 
600
  return $views;
601
  }
602
-
603
-
604
  }
1
  <?php
2
+ /**
3
+ * WCVendors_Commissions_Page class.
4
+ *
5
+ * @category Admin
6
+ * @package WCVendors/Admin
7
+ * @version 2.1.20
8
+ * @since 2.0.0
9
+ */
10
 
11
  if ( ! class_exists( 'WP_List_Table' ) ) {
12
  require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
15
  /**
16
  * WCVendors_Commissions_Page class.
17
  *
18
+ * @version 2.1.20
19
+ * @since 2.0.0
 
20
  * @extends WP_List_Table
21
  */
22
  class WCVendors_Commissions_Page extends WP_List_Table {
23
 
24
+ /**
25
+ * The current index.
26
+ *
27
+ * @var int
28
+ * @version
29
+ * @since
30
+ */
31
  public $index;
32
 
33
  /**
41
 
42
  $this->index = 0;
43
 
44
+ // Set parent defaults.
45
  parent::__construct(
46
  array(
47
  'singular' => 'commission',
53
 
54
 
55
  /**
56
+ * Column_default function.
57
  *
58
  * @access public
59
  *
60
+ * @param unknown $item Commission item.
61
+ * @param mixed $column_name The name of the column.
62
  *
63
  * @return unknown
64
  */
110
 
111
 
112
  /**
113
+ * The column_cb function.
114
  *
115
  * @access public
116
  *
117
+ * @param mixed $item The item.
118
  *
119
  * @return unknown
120
  */
131
 
132
 
133
  /**
134
+ * The get_columns function.
135
  *
136
  * @access public
137
  * @return unknown
141
  $columns = array(
142
  'cb' => '<input type="checkbox" />',
143
  'order_id' => __( 'Order ID', 'wc-vendors' ),
144
+ // translators: %s - The name used to refer to a vendor.
145
+ 'vendor_id' => sprintf( __( '%s', 'wc-vendors' ), wcv_get_vendor_name() ), // phpcs:ignore WordPress.WP.I18n.NoEmptyStrings
146
  'product_id' => __( 'Product', 'wc-vendors' ),
147
+ 'qty' => __( 'Quantity', 'wc-vendors' ),
148
  'total_due' => __( 'Commission', 'wc-vendors' ),
149
  'total_shipping' => __( 'Shipping', 'wc-vendors' ),
150
  'tax' => __( 'Tax', 'wc-vendors' ),
162
 
163
 
164
  /**
165
+ * The get_sortable_columns function.
166
  *
167
  * @access public
168
  * @return unknown
172
  $sortable_columns = array(
173
  'time' => array( 'time', true ),
174
  'product_id' => array( 'product_id', false ),
175
+ 'qty' => array( 'qty', false ),
176
  'order_id' => array( 'order_id', false ),
177
  'total_due' => array( 'total_due', false ),
178
  'total_shipping' => array( 'total_shipping', false ),
212
 
213
 
214
  /**
215
+ * Extra table navigation.
216
  *
217
+ * @version 2.1.20
218
+ * @since 2.0.0
219
+ *
220
+ * @param string $which Which table nav to extend.
221
  */
222
  public function extra_tablenav( $which ) {
223
 
224
+ $from_date = isset( $_GET['from_date'] ) ? sanitize_text_field( wp_unslash( $_GET['from_date'] ) ) : gmdate( 'Y-m-d', strtotime( '-2 months' ) );
225
+ $to_date = isset( $_GET['to_date'] ) ? sanitize_text_field( wp_unslash( $_GET['to_date'] ) ) : current_time( 'Y-m-d' );
226
+ $com_status = isset( $_GET['com_status'] ) ? sanitize_text_field( wp_unslash( $_GET['com_status'] ) ) : '';
227
+ $vendor_id = isset( $_GET['vendor_id'] ) ? sanitize_text_field( wp_unslash( $_GET['vendor_id'] ) ) : '';
228
  $args_url = '';
229
 
230
+ $args_url .= '&from_date=' . $from_date . '&to_date=' . $to_date;
231
+
 
232
  if ( $com_status ) {
233
  $args_url .= '&com_status=' . $com_status;
234
  }
236
  $args_url .= '&vendor_id=' . $vendor_id;
237
  }
238
 
239
+ if ( 'top' === $which ) {
240
  echo '<div class="alignleft actions" style="width: 70%;">';
241
 
242
+ // Date range fields.
243
+ $this->date_range_fields( 'commission' );
244
 
245
+ // commission status drop down.
246
  $this->status_dropdown( 'commission' );
247
 
248
+ // Vendor drop down.
249
  $this->vendor_dropdown( 'commission' );
250
 
251
  submit_button(
252
+ __( 'Filter', 'wc-vendors' ),
253
+ false,
254
+ false,
255
+ false,
256
+ array(
257
  'id' => 'post-query-submit',
258
  'name' => 'do-filter',
259
  )
260
  );
261
  submit_button( __( 'Clear', 'wc-vendors' ), 'secondary', 'reset', false, array( 'type' => 'reset' ) );
262
 
263
+ echo '<a class="button export_commissions" style="width: 110px; float: left;" href="' . esc_url_raw( wp_nonce_url( admin_url( 'admin.php?page=wcv-commissions&action=export_commissions' . $args_url ), 'export_commissions', 'nonce' ) ) . '">' . esc_attr__( 'Export to CSV', 'wc-vendors' ) . '</a>';
264
+ echo '<a class="button export_commission_totals" style="width: 150px; float: left;" href="' . esc_url_raw( wp_nonce_url( admin_url( 'admin.php?page=wcv-commissions&action=export_commission_totals' . $args_url ), 'export_commission_totals', 'nonce' ) ) . '">' . esc_attr__( 'Export Totals to CSV', 'wc-vendors' ) . '</a>';
265
+ echo '<a class="button mark_all_commissions_paid" id="mark_all_paid" style="width: 100px; float: left;" href="' . esc_url_raw( wp_nonce_url( admin_url( 'admin.php?page=wcv-commissions&action=mark_all_paid' . $args_url ), 'mark_all_paid', 'nonce' ) ) . '">' . esc_attr__( 'Mark all paid', 'wc-vendors' ) . '</a>';
266
  echo '</div>';
 
267
  }
268
  }
269
 
 
270
  /**
271
  * Display a monthly dropdown for filtering items
272
  *
273
+ * @version 2.1.20
274
+ * @since 2.0.0
275
  *
276
+ * @param unknown $post_type The post type.
277
  */
278
+ public function date_range_fields( $post_type ) {
279
 
280
  global $wpdb, $wp_locale;
281
 
282
  $table_name = $wpdb->prefix . 'pv_commission';
283
 
284
+ $from_date = isset( $_GET['from_date'] ) ? sanitize_text_field( wp_unslash( $_GET['from_date'] ) ) : '';
285
+ $to_date = isset( $_GET['to_date'] ) ? sanitize_text_field( wp_unslash( $_GET['to_date'] ) ) : '';
 
 
 
 
 
 
 
286
 
287
+ $from_date = '' !== $from_date ? gmdate( 'Y-m-d', strtotime( $from_date ) ) : '';
288
+ $to_date = '' !== $to_date ? gmdate( 'Y-m-d', strtotime( $to_date ) ) : '';
 
 
 
289
  ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
290
 
291
+ <label for="from_date">
292
+ <?php echo esc_attr_e( 'From:', 'wc-vendors' ); ?>
293
+ <input
294
+ type="text"
295
+ size="9"
296
+ min="<?php echo esc_attr( gmdate( 'Y-m-d', strtotime( '-2 years' ) ) ); ?>"
297
+ max="<?php echo esc_attr( gmdate( 'Y-m-d', time() ) ); ?>"
298
+ placeholder="yyyy-mm-dd"
299
+ value="<?php echo esc_attr( $from_date ); ?>"
300
+ name="from_date"
301
+ class="range_datepicker from"
302
+ id="from_date"
303
+ />
304
+ </label>
305
+
306
+ <label for="from_date">
307
+ <?php echo esc_attr_e( 'To:', 'wc-vendors' ); ?>
308
+ <input
309
+ type="text"
310
+ size="9"
311
+ min="<?php echo esc_attr( gmdate( 'Y-m-d', strtotime( '-2 years' ) ) ); ?>"
312
+ max="<?php echo esc_attr( gmdate( 'Y-m-d', time() ) ); ?>"
313
+ placeholder="yyyy-mm-dd"
314
+ value="<?php echo esc_attr( $to_date ); ?>"
315
+ name="to_date"
316
+ class="range_datepicker to"
317
+ id="to_date"
318
+ />
319
+ </label>
320
  <?php
321
  }
322
 
326
  * @since 3.1.0
327
  * @access protected
328
  *
329
+ * @param unknown $post_type The post type.
330
  */
331
  public function status_dropdown( $post_type ) {
332
 
333
+ $com_status = isset( $_GET['com_status'] ) ? sanitize_text_field( wp_unslash( $_GET['com_status'] ) ) : '';
334
  ?>
335
+ <select id="com_status_dropdown" name="com_status" class="wc-enhanced-select">
336
+ <option <?php selected( $com_status, '' ); ?> value=''><?php esc_attr_e( 'Show all Statuses', 'wc-vendors' ); ?></option>
337
+ <option <?php selected( $com_status, 'due' ); ?> value="due"><?php esc_attr_e( 'Due', 'wc-vendors' ); ?></option>
338
+ <option <?php selected( $com_status, 'paid' ); ?> value="paid"><?php esc_attr_e( 'Paid', 'wc-vendors' ); ?></option>
339
+ <option <?php selected( $com_status, 'reversed' ); ?>
340
+ value="reversed"><?php esc_attr_e( 'Reversed', 'wc-vendors' ); ?></option>
 
341
  </select>
342
  <?php
343
  }
348
  * @since 1.9.2
349
  * @access public
350
  *
351
+ * @param unknown $post_type The post type.
352
  */
353
  public function vendor_dropdown( $post_type ) {
354
 
355
  $user_args = array( 'fields' => array( 'ID', 'display_name' ) );
356
+ $vendor_id = isset( $_GET['vendor_id'] ) ? sanitize_text_field( wp_unslash( $_GET['vendor_id'] ) ) : '';
357
  $new_args = $user_args;
358
  $new_args['role'] = 'vendor';
359
  $users = get_users( $new_args );
360
 
361
+ // Generate the drop down.
362
  $output = '<select style="width:250px;" name="vendor_id" id="vendor_id" class="wc-enhanced-select">';
363
  $output .= '<option></option>';
364
  $output .= wcv_vendor_drop_down_options( $users, $vendor_id );
365
  $output .= '</select>';
 
366
 
367
+ echo $output; // phpcs:ignore
368
 
369
+ } // vendor_dropdown
370
 
371
 
372
  /**
388
  $result = $this->mark_paid( $ids );
389
 
390
  if ( $result ) {
391
+ echo '<div class="updated"><p>' . esc_attr__( 'Commission marked paid.', 'wc-vendors' ) . '</p></div>';
392
  }
393
  break;
394
 
396
  $result = $this->mark_due( $ids );
397
 
398
  if ( $result ) {
399
+ echo '<div class="updated"><p>' . esc_attr__( 'Commission marked due.', 'wc-vendors' ) . '</p></div>';
400
  }
401
  break;
402
 
404
  $result = $this->mark_reversed( $ids );
405
 
406
  if ( $result ) {
407
+ echo '<div class="updated"><p>' . esc_attr__( 'Commission marked reversed.', 'wc-vendors' ) . '</p></div>';
408
  }
409
  break;
410
 
418
 
419
 
420
  /**
421
+ * Mark commission paid.
422
  *
423
+ * @param unknown $ids (optional).
 
424
  *
425
  * @return unknown
426
  */
431
  $table_name = $wpdb->prefix . 'pv_commission';
432
 
433
  $query = "UPDATE `{$table_name}` SET `status` = 'paid' WHERE id IN ($ids) AND `status` = 'due'";
434
+ $result = $wpdb->query( $query ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
435
 
436
  return $result;
437
  }
438
 
439
 
440
  /**
441
+ * Mark commission as reversed
442
  *
443
+ * @param array $ids (optional) Commission IDs.
 
444
  *
445
  * @return unknown
446
  */
450
 
451
  $table_name = $wpdb->prefix . 'pv_commission';
452
  $query = "UPDATE `{$table_name}` SET `status` = 'reversed' WHERE id IN ($ids)";
453
+ $result = $wpdb->query( $query ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
454
 
455
  return $result;
456
 
458
 
459
 
460
  /**
461
+ * Mark commission as due.
462
  *
463
+ * @param array $ids (optional) Comission IDs.
464
  *
465
+ * @return int|WP_Error
 
 
466
  */
467
  public function mark_due( $ids = array() ) {
468
 
471
  $table_name = $wpdb->prefix . 'pv_commission';
472
 
473
  $query = "UPDATE `{$table_name}` SET `status` = 'due' WHERE id IN ($ids)";
474
+ $result = $wpdb->query( $query ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
475
 
476
  return $result;
477
  }
478
 
479
 
480
  /**
481
+ * The function to prepare_items.
482
  *
483
+ * @version 2.1.20
484
+ * @since 2.0.0
485
  */
486
  public function prepare_items() {
487
 
488
  global $wpdb;
489
 
490
+ $http_referer = isset( $_SERVER['REQUEST_URI'] ) ? sanitize_text_field( wp_unslash( $_SERVER['REQUEST_URI'] ) ) : '';
491
+ $_SERVER['REQUEST_URI'] = remove_query_arg( '_wp_http_referer', $http_referer );
492
 
493
  $per_page = $this->get_items_per_page( 'commissions_per_page', 10 );
494
  $current_page = $this->get_pagenum();
495
 
496
+ $orderby = ! empty( $_REQUEST['orderby'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['orderby'] ) ) : 'time';
497
+ $order = ( ! empty( $_REQUEST['order'] ) && 'asc' === $_REQUEST['order'] ) ? 'ASC' : 'DESC';
498
+ $com_status = ! empty( $_REQUEST['com_status'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['com_status'] ) ) : '';
499
+ $vendor_id = ! empty( $_REQUEST['vendor_id'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['vendor_id'] ) ) : '';
500
  $status_sql = '';
501
  $time_sql = '';
502
 
515
  */
516
  $sql = "SELECT COUNT(id) FROM {$wpdb->prefix}pv_commission";
517
 
518
+ if ( ! empty( $_REQUEST['from_date'] ) && ! empty( $_REQUEST['to_date'] ) ) {
519
+ $from_date = sanitize_text_field( wp_unslash( $_REQUEST['from_date'] ) );
520
+ $to_date = sanitize_text_field( wp_unslash( $_REQUEST['to_date'] ) );
521
+ $time_sql = " WHERE time BETWEEN '$from_date' AND '$to_date'";
 
 
 
 
 
 
522
 
523
  $sql .= $time_sql;
524
  }
525
 
526
  if ( ! empty( $_GET['com_status'] ) ) {
527
 
528
+ if ( '' === $time_sql ) {
529
  $status_sql
530
  = "
531
  WHERE status = '$com_status'
542
 
543
  if ( ! empty( $_GET['vendor_id'] ) ) {
544
 
545
+ if ( '' === $time_sql && '' === $status_sql ) {
546
  $vendor_sql
547
  = "
548
  WHERE vendor_id = '$vendor_id'
557
  $sql .= $vendor_sql;
558
  }
559
 
560
+ $max = $wpdb->get_var( $sql ); //phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
561
 
562
  $sql
563
  = "
564
  SELECT * FROM {$wpdb->prefix}pv_commission
565
  ";
566
 
567
+ if ( ! empty( $_GET['from_date'] ) ) {
568
  $sql .= $time_sql;
569
  }
570
 
584
  LIMIT {$offset}, {$per_page}
585
  ";
586
 
587
+ $sql_args = array(
588
+ 'orderby' => $orderby,
589
+ 'order' => $order,
590
+ 'offset' => $offset,
591
+ 'per_page' => $per_page,
592
+ 'current_page' => $current_page,
593
+ 'comm_status' => $com_status,
594
+ 'vendor_id' => $vendor_id,
595
+ );
596
+ $sql = apply_filters( 'wcv_get_commissions_sql', $sql, $sql_args );
597
+
598
+ $this->items = $wpdb->get_results( $sql ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
599
 
600
  /**
601
  * Pagination
623
 
624
  return $views;
625
  }
 
 
626
  }
classes/admin/views/setup/header.php CHANGED
@@ -16,7 +16,6 @@ if ( ! defined( 'ABSPATH' ) ) {
16
  <title><?php esc_html_e( 'WC Vendors &rsaquo; Setup Wizard', 'wc-vendors' ); ?></title>
17
  <?php wp_print_scripts( 'wcv-setup' ); ?>
18
  <?php do_action( 'admin_print_styles' ); ?>
19
- <?php do_action( 'admin_head' ); ?>
20
  </head>
21
  <body class="wcv-setup wp-core-ui">
22
  <h1 id="wcv-logo"><a href="https://www.wcvendors.com/"><img
16
  <title><?php esc_html_e( 'WC Vendors &rsaquo; Setup Wizard', 'wc-vendors' ); ?></title>
17
  <?php wp_print_scripts( 'wcv-setup' ); ?>
18
  <?php do_action( 'admin_print_styles' ); ?>
 
19
  </head>
20
  <body class="wcv-setup wp-core-ui">
21
  <h1 id="wcv-logo"><a href="https://www.wcvendors.com/"><img
classes/class-commission.php CHANGED
@@ -630,16 +630,10 @@ class WCV_Commission {
630
  $status_sql = '';
631
  $time_sql = '';
632
 
633
- if ( ! empty( $_GET['m'] ) ) {
634
-
635
- $year = substr( $_GET['m'], 0, 4 );
636
- $month = substr( $_GET['m'], 4, 2 );
637
-
638
- $time_sql
639
- = "
640
- WHERE MONTH(`time`) = '$month'
641
- AND YEAR(`time`) = '$year'
642
- ";
643
 
644
  $query .= $time_sql;
645
  }
630
  $status_sql = '';
631
  $time_sql = '';
632
 
633
+ if ( ! empty( $_REQUEST['from_date'] ) && ! empty( $_REQUEST['to_date'] ) ) {
634
+ $from_date = sanitize_text_field( wp_unslash( $_REQUEST['from_date'] ) );
635
+ $to_date = sanitize_text_field( wp_unslash( $_REQUEST['to_date'] ) );
636
+ $time_sql = " WHERE time BETWEEN '$from_date' AND '$to_date'";
 
 
 
 
 
 
637
 
638
  $query .= $time_sql;
639
  }
classes/class-queries.php CHANGED
@@ -260,19 +260,19 @@ class WCV_Queries {
260
  public static function orders_within_range() {
261
  global $start_date, $end_date;
262
 
263
- $start_date = WC()->session->get( 'wcv_order_start_date', strtotime( current_time( 'Y-M' ) . '-01' ) );
264
- $end_date = WC()->session->get( 'wcv_order_end_date', current_time( 'timestamp' ) );
265
-
266
  if ( ! empty( $_POST['start_date'] ) ) {
267
- WC()->session->set( 'wcv_order_start_date', strtotime( $_POST['start_date'] ) );
268
  }
269
 
270
  if ( ! empty( $_POST['end_date'] ) ) {
271
- WC()->session->set( 'wcv_order_end_date', strtotime( $_POST['end_date'] ) );
272
  }
273
 
274
- $after = date( 'Y-m-d', $start_date );
275
- $before = date( 'Y-m-d', strtotime( '+1 day', $end_date ) );
 
 
 
276
 
277
  return apply_filters(
278
  'wcvendors_orders_date_range',
260
  public static function orders_within_range() {
261
  global $start_date, $end_date;
262
 
 
 
 
263
  if ( ! empty( $_POST['start_date'] ) ) {
264
+ WC()->session->set( 'wcv_order_start_date', strtotime( sanitize_text_field( wp_unslash( $_POST['start_date'] ) ) ) );
265
  }
266
 
267
  if ( ! empty( $_POST['end_date'] ) ) {
268
+ WC()->session->set( 'wcv_order_end_date', strtotime( sanitize_text_field( wp_unslash( $_POST['end_date'] ) ) ) );
269
  }
270
 
271
+ $start_date = WC()->session->get( 'wcv_order_start_date', strtotime( current_time( 'Y-M' ) . '-01' ) );
272
+ $end_date = WC()->session->get( 'wcv_order_end_date', strtotime( current_time( 'mysql' ) ) );
273
+
274
+ $after = gmdate( 'Y-m-d', $start_date );
275
+ $before = gmdate( 'Y-m-d', strtotime( '+1 day', $end_date ) );
276
 
277
  return apply_filters(
278
  'wcvendors_orders_date_range',
classes/front/class-vendor-shop.php CHANGED
@@ -18,7 +18,6 @@ class WCV_Vendor_Shop {
18
  function __construct() {
19
 
20
  add_action( 'woocommerce_product_query', array( $this, 'vendor_shop_query' ), 10, 2 );
21
- // add_filter( 'init', array( $this, 'add_rewrite_rules' ), 0 );
22
  add_action( 'woocommerce_before_main_content', array( 'WCV_Vendor_Shop', 'shop_description' ), 30 );
23
  add_filter( 'woocommerce_product_tabs', array( 'WCV_Vendor_Shop', 'seller_info_tab' ) );
24
  add_filter( 'post_type_archive_link', array( 'WCV_Vendor_Shop', 'change_archive_link' ) );
@@ -107,6 +106,10 @@ class WCV_Vendor_Shop {
107
 
108
  global $post;
109
 
 
 
 
 
110
  if ( WCV_Vendors::is_vendor( $post->post_author ) ) {
111
 
112
  $seller_info = get_user_meta( $post->post_author, 'pv_seller_info', true );
18
  function __construct() {
19
 
20
  add_action( 'woocommerce_product_query', array( $this, 'vendor_shop_query' ), 10, 2 );
 
21
  add_action( 'woocommerce_before_main_content', array( 'WCV_Vendor_Shop', 'shop_description' ), 30 );
22
  add_filter( 'woocommerce_product_tabs', array( 'WCV_Vendor_Shop', 'seller_info_tab' ) );
23
  add_filter( 'post_type_archive_link', array( 'WCV_Vendor_Shop', 'change_archive_link' ) );
106
 
107
  global $post;
108
 
109
+ if ( ! wc_string_to_bool( get_option( 'wcvendors_label_store_info_enable', 'no' ) ) ){
110
+ return $tabs;
111
+ }
112
+
113
  if ( WCV_Vendors::is_vendor( $post->post_author ) ) {
114
 
115
  $seller_info = get_user_meta( $post->post_author, 'pv_seller_info', true );
classes/includes/class-wcv-shortcodes.php CHANGED
@@ -87,7 +87,7 @@ class WCV_Shortcodes {
87
 
88
  ob_start();
89
 
90
- $products = new WP_Query( apply_filters( 'woocommerce_shortcode_products_query', $args, $atts ) );
91
 
92
  $woocommerce_loop['columns'] = $columns;
93
 
@@ -173,7 +173,7 @@ class WCV_Shortcodes {
173
 
174
  ob_start();
175
 
176
- $products = new WP_Query( apply_filters( 'woocommerce_shortcode_products_query', $args, $atts ) );
177
 
178
  $woocommerce_loop['columns'] = $columns;
179
 
@@ -252,7 +252,7 @@ class WCV_Shortcodes {
252
 
253
  ob_start();
254
 
255
- $products = new WP_Query( apply_filters( 'woocommerce_shortcode_products_query', $args, $atts ) );
256
 
257
  $woocommerce_loop['columns'] = $columns;
258
 
@@ -329,7 +329,7 @@ class WCV_Shortcodes {
329
 
330
  ob_start();
331
 
332
- $products = new WP_Query( apply_filters( 'woocommerce_shortcode_products_query', $args, $atts ) );
333
 
334
  $woocommerce_loop['columns'] = $columns;
335
 
@@ -401,7 +401,7 @@ class WCV_Shortcodes {
401
 
402
  add_filter( 'posts_clauses', array( 'WC_Shortcodes', 'order_by_rating_post_clauses' ) );
403
 
404
- $products = new WP_Query( apply_filters( 'woocommerce_shortcode_products_query', $args, $atts ) );
405
 
406
  remove_filter( 'posts_clauses', array( 'WC_Shortcodes', 'order_by_rating_post_clauses' ) );
407
 
@@ -474,7 +474,7 @@ class WCV_Shortcodes {
474
 
475
  ob_start();
476
 
477
- $products = new WP_Query( apply_filters( 'woocommerce_shortcode_products_query', $args, $atts ) );
478
 
479
  $woocommerce_loop['columns'] = $columns;
480
 
@@ -568,7 +568,7 @@ class WCV_Shortcodes {
568
 
569
  ob_start();
570
 
571
- $products = new WP_Query( apply_filters( 'woocommerce_shortcode_products_query', $args, $atts ) );
572
 
573
  $woocommerce_loop['columns'] = $columns;
574
 
@@ -759,7 +759,7 @@ class WCV_Shortcodes {
759
  );
760
  extract( $atts );
761
 
762
- $sold_by = wcv_get_sold_by_link( $vendor_id, 'wcvendors_cart_sold_by_meta' );
763
 
764
  return apply_filters( 'wcvendors_cart_sold_by_meta', $sold_by_label, get_the_ID(), $vendor_id ) . '&nbsp;' . apply_filters( 'wcvendors_cart_sold_by_meta_separator', $sold_by_separator, get_the_ID(), $vendor_id ) . '&nbsp;' . $sold_by . '<br/>';
765
  }
87
 
88
  ob_start();
89
 
90
+ $products = new WP_Query( apply_filters( 'wcv_shortcode_products_query', $args, $atts ) );
91
 
92
  $woocommerce_loop['columns'] = $columns;
93
 
173
 
174
  ob_start();
175
 
176
+ $products = new WP_Query( apply_filters( 'wcv_shortcode_products_query', $args, $atts ) );
177
 
178
  $woocommerce_loop['columns'] = $columns;
179
 
252
 
253
  ob_start();
254
 
255
+ $products = new WP_Query( apply_filters( 'wcv_shortcode_products_query', $args, $atts ) );
256
 
257
  $woocommerce_loop['columns'] = $columns;
258
 
329
 
330
  ob_start();
331
 
332
+ $products = new WP_Query( apply_filters( 'wcv_shortcode_products_query', $args, $atts ) );
333
 
334
  $woocommerce_loop['columns'] = $columns;
335
 
401
 
402
  add_filter( 'posts_clauses', array( 'WC_Shortcodes', 'order_by_rating_post_clauses' ) );
403
 
404
+ $products = new WP_Query( apply_filters( 'wcv_shortcode_products_query', $args, $atts ) );
405
 
406
  remove_filter( 'posts_clauses', array( 'WC_Shortcodes', 'order_by_rating_post_clauses' ) );
407
 
474
 
475
  ob_start();
476
 
477
+ $products = new WP_Query( apply_filters( 'wcv_shortcode_products_query', $args, $atts ) );
478
 
479
  $woocommerce_loop['columns'] = $columns;
480
 
568
 
569
  ob_start();
570
 
571
+ $products = new WP_Query( apply_filters( 'wcv_shortcode_products_query', $args, $atts ) );
572
 
573
  $woocommerce_loop['columns'] = $columns;
574
 
759
  );
760
  extract( $atts );
761
 
762
+ $sold_by = wcv_get_sold_by_link( $vendor_id, 'wcvendors_cart_sold_by_meta' );
763
 
764
  return apply_filters( 'wcvendors_cart_sold_by_meta', $sold_by_label, get_the_ID(), $vendor_id ) . '&nbsp;' . apply_filters( 'wcvendors_cart_sold_by_meta_separator', $sold_by_separator, get_the_ID(), $vendor_id ) . '&nbsp;' . $sold_by . '<br/>';
765
  }
languages/wc-vendors.pot CHANGED
@@ -40,27 +40,25 @@ msgstr ""
40
  msgid "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."
41
  msgstr ""
42
 
43
- #: classes/class-commission.php:61, classes/admin/class-admin-reports.php:417, classes/admin/class-admin-reports.php:515, classes/admin/class-wcv-commissions-page.php:318, classes/admin/class-wcv-commissions-page.php:595
44
  msgid "Due"
45
  msgstr ""
46
 
47
- #: classes/class-commission.php:62, classes/admin/class-admin-reports.php:416, classes/admin/class-admin-reports.php:516, classes/admin/class-wcv-commissions-page.php:319, classes/admin/class-wcv-commissions-page.php:596
48
  msgid "Paid"
49
  msgstr ""
50
 
51
- #: classes/class-commission.php:63, classes/admin/class-admin-reports.php:415, classes/admin/class-admin-reports.php:517, classes/admin/class-wcv-commissions-page.php:321, classes/admin/class-wcv-commissions-page.php:597
52
  msgid "Reversed"
53
  msgstr ""
54
 
55
- #: classes/class-cron.php:87
56
- msgid "Payment total: %s"
57
- msgstr ""
58
-
59
  #: classes/class-install.php:161, classes/admin/class-wcv-admin-setup.php:153
60
  msgid "Pending %s"
61
  msgstr ""
62
 
63
- #: classes/class-install.php:175, classes/admin/class-admin-reports.php:207, classes/admin/class-admin-reports.php:530, classes/admin/class-product-meta.php:295, classes/admin/class-product-meta.php:346, classes/admin/class-setup-wizard.php:349, classes/admin/class-wcv-admin-setup.php:148, classes/admin/class-wcv-admin-setup.php:365, classes/admin/class-wcv-commissions-csv-exporter.php:44, classes/admin/class-wcv-commissions-page.php:130, classes/admin/class-wcv-commissions-sum-csv-exporter.php:43, classes/admin/settings/class-wcv-settings-display.php:113, classes/admin/settings/class-wcv-settings-display.php:121, classes/admin/settings/class-wcv-settings-display.php:229
 
 
64
  msgid "%s"
65
  msgstr ""
66
 
@@ -108,7 +106,7 @@ msgstr ""
108
  msgid "View WC Vendors settings"
109
  msgstr ""
110
 
111
- #: classes/class-install.php:493, classes/admin/class-admin-menus.php:113, templates/dashboard/settings/settings.php:17
112
  msgid "Settings"
113
  msgstr ""
114
 
@@ -344,15 +342,6 @@ msgstr ""
344
  msgid "%s Orders"
345
  msgstr ""
346
 
347
- #: classes/class-vendors.php:619
348
- msgid "%1$s Order &ndash; %2$s"
349
- msgstr ""
350
-
351
- #: classes/class-vendors.php:619
352
- msgctxt "Order date parsed by strftime"
353
- msgid "%1$b %2$d, %Y @ %I:%M %p"
354
- msgstr ""
355
-
356
  #. translators: %s is vendor string
357
  #: classes/admin/class-admin-media.php:28
358
  msgid "Assign %s"
@@ -362,23 +351,23 @@ msgstr ""
362
  msgid "None"
363
  msgstr ""
364
 
365
- #: classes/admin/class-admin-menus.php:46, classes/admin/class-admin-menus.php:47, classes/admin/class-admin-reports.php:40, classes/admin/class-wcv-admin-setup.php:330, classes/admin/views/html-vendor-meta.php:1
366
  msgid "WC Vendors"
367
  msgstr ""
368
 
369
- #: classes/admin/class-admin-menus.php:63
370
  msgid "WC Vendors Extensions"
371
  msgstr ""
372
 
373
- #: classes/admin/class-admin-menus.php:64
374
  msgid "Extensions"
375
  msgstr ""
376
 
377
- #: classes/admin/class-admin-menus.php:90, classes/admin/class-admin-menus.php:91
378
  msgid "Commissions"
379
  msgstr ""
380
 
381
- #: classes/admin/class-admin-menus.php:112
382
  msgid "WC Vendors Settings"
383
  msgstr ""
384
 
@@ -402,11 +391,11 @@ msgstr ""
402
  msgid "Commission totals for all vendors includes shipping and taxes. By default no date range is used and all due commissions are returned. Use the date range to filter."
403
  msgstr ""
404
 
405
- #: classes/admin/class-admin-reports.php:123, classes/admin/class-admin-reports.php:505, templates/dashboard/date-picker.php:19
406
  msgid "From:"
407
  msgstr ""
408
 
409
- #: classes/admin/class-admin-reports.php:127, classes/admin/class-admin-reports.php:509, templates/dashboard/date-picker.php:23
410
  msgid "To:"
411
  msgstr ""
412
 
@@ -418,10 +407,6 @@ msgstr ""
418
  msgid "Total paid in range"
419
  msgstr ""
420
 
421
- #: classes/admin/class-admin-reports.php:145, classes/admin/class-admin-reports.php:160, classes/admin/class-admin-reports.php:175
422
- msgid "n/a"
423
- msgstr ""
424
-
425
  #: classes/admin/class-admin-reports.php:152
426
  msgid "Total due in range"
427
  msgstr ""
@@ -438,11 +423,11 @@ msgstr ""
438
  msgid "Order"
439
  msgstr ""
440
 
441
- #: classes/admin/class-admin-reports.php:206, classes/admin/class-wcv-commissions-csv-exporter.php:45, classes/admin/class-wcv-commissions-page.php:131, templates/dashboard/reports.php:36, templates/emails/notify-vendor-shipped.php:30, templates/emails/vendor-new-order.php:35, templates/emails/vendor-order-details.php:37, classes/admin/emails/class-wcv-vendor-notify-cancelled-order.php:195, classes/admin/emails/class-wcv-vendor-notify-order.php:222
442
  msgid "Product"
443
  msgstr ""
444
 
445
- #: classes/admin/class-admin-reports.php:208, classes/admin/class-admin-reports.php:441, classes/admin/class-vendor-admin-dashboard.php:381, classes/admin/class-wcv-commissions-csv-exporter.php:50, classes/admin/class-wcv-commissions-page.php:136, classes/admin/class-wcv-commissions-sum-csv-exporter.php:44, templates/dashboard/orders.php:56
446
  msgid "Total"
447
  msgstr ""
448
 
@@ -450,43 +435,31 @@ msgstr ""
450
  msgid "Date &amp; Time"
451
  msgstr ""
452
 
453
- #: classes/admin/class-admin-reports.php:210, classes/admin/class-admin-reports.php:533, classes/admin/class-wcv-commissions-csv-exporter.php:51, classes/admin/class-wcv-commissions-page.php:137
454
  msgid "Status"
455
  msgstr ""
456
 
457
- #: classes/admin/class-admin-reports.php:234, templates/emails/vendor-order-addresses.php:32
458
- msgid "N/A"
459
- msgstr ""
460
-
461
  #: classes/admin/class-admin-reports.php:241
462
  msgid "D j M Y \a\t h:ia"
463
  msgstr ""
464
 
465
- #: classes/admin/class-admin-reports.php:251
466
- msgid "No commission yet"
467
- msgstr ""
468
-
469
  #: classes/admin/class-admin-reports.php:286
470
  msgid "Show:"
471
  msgstr ""
472
 
473
- #: classes/admin/class-admin-reports.php:300, classes/admin/class-admin-reports.php:304
474
  msgid "Type in a product name to start searching..."
475
  msgstr ""
476
 
477
- #: classes/admin/class-admin-reports.php:338
478
- msgid "Select a %s&hellip;"
479
- msgstr ""
480
-
481
  #: classes/admin/class-admin-reports.php:411
482
  msgid "Month"
483
  msgstr ""
484
 
485
- #: classes/admin/class-admin-reports.php:413, classes/admin/class-wcv-commissions-csv-exporter.php:49, classes/admin/class-wcv-commissions-page.php:135
486
  msgid "Tax"
487
  msgstr ""
488
 
489
- #: classes/admin/class-admin-reports.php:414, classes/admin/class-wcv-commissions-csv-exporter.php:48, classes/admin/class-wcv-commissions-page.php:134, templates/dashboard/orders.php:54, templates/orders/orders.php:148, classes/admin/settings/class-wcv-settings-capabilities.php:107
490
  msgid "Shipping"
491
  msgstr ""
492
 
@@ -502,10 +475,6 @@ msgstr ""
502
  msgid "Commission Total"
503
  msgstr ""
504
 
505
- #: classes/admin/class-admin-reports.php:555
506
- msgid "No commissions found."
507
- msgstr ""
508
-
509
  #: classes/admin/class-admin-users.php:82
510
  msgid "You are not allowed to submit products. <a href=\"%s\">Go Back</a>"
511
  msgstr ""
@@ -526,7 +495,7 @@ msgstr ""
526
  msgid "Assign media to %s"
527
  msgstr ""
528
 
529
- #: classes/admin/class-product-meta.php:229, classes/admin/class-product-meta.php:247, classes/admin/class-wcv-commissions-csv-exporter.php:47, classes/admin/class-wcv-commissions-page.php:133, templates/dashboard/reports.php:38, templates/emails/vendor-order-details.php:42, classes/admin/emails/class-wcv-vendor-notify-cancelled-order.php:194, classes/admin/emails/class-wcv-vendor-notify-order.php:221, classes/admin/settings/class-wcv-settings-commission.php:32, classes/admin/views/html-admin-commission-page.php:23, classes/admin/views/setup/general.php:81
530
  msgid "Commission"
531
  msgstr ""
532
 
@@ -546,7 +515,7 @@ msgstr ""
546
  msgid "Capabilities"
547
  msgstr ""
548
 
549
- #: classes/admin/class-setup-wizard.php:89, classes/admin/settings/class-wcv-settings-display.php:196, classes/admin/views/setup/pages.php:19
550
  msgid "Pages"
551
  msgstr ""
552
 
@@ -609,11 +578,11 @@ msgstr ""
609
  msgid "Don't forget to check our <a href=\"%1$s\" target=\"_blank\">documentation</a> to learn more about setting up WC Vendors and if you need help, be sure to visit our <a href=\"%2$s\" target=\"_blank\">free support forums</a>."
610
  msgstr ""
611
 
612
- #: classes/admin/class-vendor-admin-dashboard.php:25, classes/admin/class-vendor-admin-dashboard.php:26, classes/admin/settings/class-wcv-settings-display.php:211
613
  msgid "Shop Settings"
614
  msgstr ""
615
 
616
- #: classes/admin/class-vendor-admin-dashboard.php:35, classes/admin/class-vendor-admin-dashboard.php:36, classes/admin/class-vendor-admin-dashboard.php:235, templates/dashboard/orders.php:40, classes/admin/settings/class-wcv-settings-capabilities.php:47, classes/admin/settings/class-wcv-settings-capabilities.php:294, classes/admin/settings/class-wcv-settings-display.php:220, classes/admin/views/setup/capabilities.php:70
617
  msgid "Orders"
618
  msgstr ""
619
 
@@ -637,7 +606,7 @@ msgstr ""
637
  msgid "orders"
638
  msgstr ""
639
 
640
- #: classes/admin/class-vendor-admin-dashboard.php:378, classes/admin/class-wcv-commissions-csv-exporter.php:43, classes/admin/class-wcv-commissions-page.php:129
641
  msgid "Order ID"
642
  msgstr ""
643
 
@@ -645,11 +614,11 @@ msgstr ""
645
  msgid "Customer"
646
  msgstr ""
647
 
648
- #: classes/admin/class-vendor-admin-dashboard.php:380, classes/admin/settings/class-wcv-settings-capabilities.php:46, classes/admin/settings/class-wcv-settings-capabilities.php:258, classes/admin/views/setup/capabilities.php:19
649
  msgid "Products"
650
  msgstr ""
651
 
652
- #: classes/admin/class-vendor-admin-dashboard.php:383, classes/admin/class-wcv-commissions-csv-exporter.php:52, classes/admin/class-wcv-commissions-page.php:138, templates/dashboard/orders.php:57, classes/front/orders/class-orders.php:219
653
  msgid "Date"
654
  msgstr ""
655
 
@@ -665,14 +634,6 @@ msgstr ""
665
  msgid "Orders marked shipped."
666
  msgstr ""
667
 
668
- #: classes/admin/class-vendor-admin-dashboard.php:610
669
- msgid "Yes"
670
- msgstr ""
671
-
672
- #: classes/admin/class-vendor-admin-dashboard.php:610
673
- msgid "No"
674
- msgstr ""
675
-
676
  #: classes/admin/class-vendor-applicants.php:80
677
  msgid "%s has been <b>denied</b>."
678
  msgstr ""
@@ -925,67 +886,63 @@ msgstr ""
925
  msgid "Enable %s backorder stock notifications"
926
  msgstr ""
927
 
928
- #: classes/admin/class-wcv-commissions-csv-exporter.php:46
929
  msgid "QTY"
930
  msgstr ""
931
 
932
- #: classes/admin/class-wcv-commissions-page.php:132, templates/dashboard/reports.php:37, templates/emails/notify-vendor-shipped.php:31, templates/emails/vendor-new-order.php:36, templates/emails/vendor-order-details.php:39, classes/front/orders/class-export-csv.php:17
933
  msgid "Quantity"
934
  msgstr ""
935
 
936
- #: classes/admin/class-wcv-commissions-page.php:187
937
  msgid "Mark paid"
938
  msgstr ""
939
 
940
- #: classes/admin/class-wcv-commissions-page.php:188
941
  msgid "Mark due"
942
  msgstr ""
943
 
944
- #: classes/admin/class-wcv-commissions-page.php:189
945
  msgid "Mark reversed"
946
  msgstr ""
947
 
948
- #: classes/admin/class-wcv-commissions-page.php:232
949
  msgid "Filter"
950
  msgstr ""
951
 
952
- #: classes/admin/class-wcv-commissions-page.php:237
953
  msgid "Clear"
954
  msgstr ""
955
 
956
- #: classes/admin/class-wcv-commissions-page.php:239
957
  msgid "Export to CSV"
958
  msgstr ""
959
 
960
- #: classes/admin/class-wcv-commissions-page.php:240
961
  msgid "Export Totals to CSV"
962
  msgstr ""
963
 
964
- #: classes/admin/class-wcv-commissions-page.php:241
965
  msgid "Mark all paid"
966
  msgstr ""
967
 
968
- #: classes/admin/class-wcv-commissions-page.php:279
969
- msgid "Show all dates"
970
- msgstr ""
971
-
972
- #: classes/admin/class-wcv-commissions-page.php:317
973
  msgid "Show all Statuses"
974
  msgstr ""
975
 
976
- #: classes/admin/class-wcv-commissions-page.php:373
977
  msgid "Commission marked paid."
978
  msgstr ""
979
 
980
- #: classes/admin/class-wcv-commissions-page.php:381
981
  msgid "Commission marked due."
982
  msgstr ""
983
 
984
- #: classes/admin/class-wcv-commissions-page.php:389
985
  msgid "Commission marked reversed."
986
  msgstr ""
987
 
988
- #: classes/admin/class-wcv-commissions-page.php:594
989
  msgid "All"
990
  msgstr ""
991
 
@@ -1065,27 +1022,11 @@ msgstr ""
1065
  msgid "Your account has not yet been approved to become a %s. When it is, you will receive an email telling you that your account is approved!"
1066
  msgstr ""
1067
 
1068
- #: templates/dashboard/denied.php:25
1069
- msgid "Your account is not setup as a %s."
1070
- msgstr ""
1071
-
1072
- #: templates/dashboard/denied.php:35
1073
- msgid "Apply to become a %s? "
1074
- msgstr ""
1075
-
1076
- #: templates/dashboard/denied.php:57
1077
- msgid "I have read and accepted the <a href=\"%s\">terms and conditions</a>"
1078
- msgstr ""
1079
-
1080
- #: templates/dashboard/denied.php:79
1081
- msgid "Submit"
1082
- msgstr ""
1083
-
1084
  #: templates/dashboard/links.php:22, classes/front/dashboard/class-vendor-dashboard.php:347
1085
  msgid "View Your Store"
1086
  msgstr ""
1087
 
1088
- #: templates/dashboard/links.php:23, classes/admin/settings/class-wcv-settings-display.php:254, classes/front/dashboard/class-vendor-dashboard.php:351
1089
  msgid "Store Settings"
1090
  msgstr ""
1091
 
@@ -1113,10 +1054,6 @@ msgstr ""
1113
  msgid "Tracking"
1114
  msgstr ""
1115
 
1116
- #: templates/dashboard/orders.php:216
1117
- msgid "You have no orders during this period."
1118
- msgstr ""
1119
-
1120
  #: templates/dashboard/reports.php:18
1121
  msgid "Sales Report"
1122
  msgstr ""
@@ -1133,14 +1070,6 @@ msgstr ""
1133
  msgid "Totals"
1134
  msgstr ""
1135
 
1136
- #: templates/dashboard/reports.php:94
1137
- msgid "You have no sales during this period."
1138
- msgstr ""
1139
-
1140
- #: templates/dashboard/reports.php:104
1141
- msgid "You haven't made any sales yet."
1142
- msgstr ""
1143
-
1144
  #: templates/emails/admin-notify-application.php:18, templates/emails/application-status.php:9, templates/emails/plain/admin-notify-application.php:18, templates/emails/plain/vendor-notify-application.php:18
1145
  msgid "Hi there. This is a notification about a %1$s application on %2$s."
1146
  msgstr ""
@@ -1274,18 +1203,10 @@ msgstr ""
1274
  msgid "Quantity: %d"
1275
  msgstr ""
1276
 
1277
- #: classes/admin/emails/class-emails.php:74, classes/admin/emails/class-emails.php:251, classes/admin/emails/class-wc-approve-vendor.php:72
1278
  msgid "pending"
1279
  msgstr ""
1280
 
1281
- #: classes/admin/emails/class-emails.php:76, classes/admin/emails/class-emails.php:255
1282
- msgid "approved"
1283
- msgstr ""
1284
-
1285
- #: classes/admin/emails/class-emails.php:78
1286
- msgid "denied"
1287
- msgstr ""
1288
-
1289
  #: classes/admin/emails/class-emails.php:203
1290
  msgid "Resend %s new order notification"
1291
  msgstr ""
@@ -1815,130 +1736,6 @@ msgstr ""
1815
  msgid "Hide tax fields from %s"
1816
  msgstr ""
1817
 
1818
- #: classes/admin/settings/class-wcv-settings-capabilities.php:163
1819
- msgid "Configure what order information a %s can view from an order"
1820
- msgstr ""
1821
-
1822
- #: classes/admin/settings/class-wcv-settings-capabilities.php:168
1823
- msgid "View Order Notes"
1824
- msgstr ""
1825
-
1826
- #: classes/admin/settings/class-wcv-settings-capabilities.php:169, classes/admin/views/setup/capabilities.php:102
1827
- msgid "Allow %s to view order notes"
1828
- msgstr ""
1829
-
1830
- #: classes/admin/settings/class-wcv-settings-capabilities.php:176
1831
- msgid "Add Order notes"
1832
- msgstr ""
1833
-
1834
- #: classes/admin/settings/class-wcv-settings-capabilities.php:177, classes/admin/views/setup/capabilities.php:115
1835
- msgid "Allow %s to add order notes."
1836
- msgstr ""
1837
-
1838
- #: classes/admin/settings/class-wcv-settings-capabilities.php:184
1839
- msgid "Customer Name"
1840
- msgstr ""
1841
-
1842
- #: classes/admin/settings/class-wcv-settings-capabilities.php:185
1843
- msgid "Allow %s to view customer name fields"
1844
- msgstr ""
1845
-
1846
- #: classes/admin/settings/class-wcv-settings-capabilities.php:192
1847
- msgid "Customer Shipping Name"
1848
- msgstr ""
1849
-
1850
- #: classes/admin/settings/class-wcv-settings-capabilities.php:193
1851
- msgid "Allow %s to view customer shipping name fields"
1852
- msgstr ""
1853
-
1854
- #: classes/admin/settings/class-wcv-settings-capabilities.php:200
1855
- msgid "Customer Billing Address"
1856
- msgstr ""
1857
-
1858
- #: classes/admin/settings/class-wcv-settings-capabilities.php:201
1859
- msgid "Allow %s to view customer billing address fields"
1860
- msgstr ""
1861
-
1862
- #: classes/admin/settings/class-wcv-settings-capabilities.php:208
1863
- msgid "Customer Shipping Address"
1864
- msgstr ""
1865
-
1866
- #: classes/admin/settings/class-wcv-settings-capabilities.php:209
1867
- msgid "Allow %s to view the customer shipping fields"
1868
- msgstr ""
1869
-
1870
- #: classes/admin/settings/class-wcv-settings-capabilities.php:216
1871
- msgid "Customer Email"
1872
- msgstr ""
1873
-
1874
- #: classes/admin/settings/class-wcv-settings-capabilities.php:217
1875
- msgid "Allow %s to view the customer email address"
1876
- msgstr ""
1877
-
1878
- #: classes/admin/settings/class-wcv-settings-capabilities.php:224
1879
- msgid "Customer Phone"
1880
- msgstr ""
1881
-
1882
- #: classes/admin/settings/class-wcv-settings-capabilities.php:225
1883
- msgid "Allow %s to view the customer phone number"
1884
- msgstr ""
1885
-
1886
- #: classes/admin/settings/class-wcv-settings-capabilities.php:245
1887
- msgid "Permissions"
1888
- msgstr ""
1889
-
1890
- #: classes/admin/settings/class-wcv-settings-capabilities.php:247
1891
- msgid "Enable or disable functionality for your %s"
1892
- msgstr ""
1893
-
1894
- #: classes/admin/settings/class-wcv-settings-capabilities.php:264
1895
- msgid "Submit Products"
1896
- msgstr ""
1897
-
1898
- #: classes/admin/settings/class-wcv-settings-capabilities.php:265, classes/admin/views/setup/capabilities.php:25
1899
- msgid "Allow %s to add/edit products"
1900
- msgstr ""
1901
-
1902
- #: classes/admin/settings/class-wcv-settings-capabilities.php:272
1903
- msgid "Edit Live Products"
1904
- msgstr ""
1905
-
1906
- #: classes/admin/settings/class-wcv-settings-capabilities.php:273, classes/admin/views/setup/capabilities.php:38
1907
- msgid "Allow %s to edit published (live) products"
1908
- msgstr ""
1909
-
1910
- #: classes/admin/settings/class-wcv-settings-capabilities.php:280
1911
- msgid "Publish Approval"
1912
- msgstr ""
1913
-
1914
- #: classes/admin/settings/class-wcv-settings-capabilities.php:281
1915
- msgid "Allow %s to publish products directly to the marketplace without requiring approval."
1916
- msgstr ""
1917
-
1918
- #: classes/admin/settings/class-wcv-settings-capabilities.php:300
1919
- msgid "View Orders"
1920
- msgstr ""
1921
-
1922
- #: classes/admin/settings/class-wcv-settings-capabilities.php:301, classes/admin/views/setup/capabilities.php:76
1923
- msgid "Allow %s to view orders"
1924
- msgstr ""
1925
-
1926
- #: classes/admin/settings/class-wcv-settings-capabilities.php:308
1927
- msgid "Export Orders"
1928
- msgstr ""
1929
-
1930
- #: classes/admin/settings/class-wcv-settings-capabilities.php:309, classes/admin/views/setup/capabilities.php:89
1931
- msgid "Allow %s to export their orders to a CSV file"
1932
- msgstr ""
1933
-
1934
- #: classes/admin/settings/class-wcv-settings-capabilities.php:316
1935
- msgid "Front End Sales Reports"
1936
- msgstr ""
1937
-
1938
- #: classes/admin/settings/class-wcv-settings-capabilities.php:317
1939
- msgid "Allow %1$s to view sales table on the frontend on the %2$s dashboard page."
1940
- msgstr ""
1941
-
1942
  #: classes/admin/settings/class-wcv-settings-commission.php:67
1943
  msgid "These are the commission settings for your marketplace"
1944
  msgstr ""
@@ -1959,7 +1756,7 @@ msgstr ""
1959
  msgid "Labels"
1960
  msgstr ""
1961
 
1962
- #: classes/admin/settings/class-wcv-settings-display.php:66, classes/admin/settings/class-wcv-settings-display.php:102, classes/admin/settings/class-wcv-settings-payments.php:71, classes/admin/settings/class-wcv-settings-payments.php:78, classes/admin/settings/class-wcv-settings-payments.php:131
1963
  msgstr ""
1964
 
1965
  #: classes/admin/settings/class-wcv-settings-display.php:68
@@ -1974,7 +1771,7 @@ msgstr ""
1974
  msgid "You can add CSS in this textarea, which will be loaded on the product add/edit page for %s"
1975
  msgstr ""
1976
 
1977
- #: classes/admin/settings/class-wcv-settings-display.php:74, classes/admin/settings/class-wcv-settings-display.php:127
1978
  msgid "This enables the sold by labels used to show which %s shop the product belongs to"
1979
  msgstr ""
1980
 
@@ -1986,202 +1783,6 @@ msgstr ""
1986
  msgid "This will redirect the WordPress registration to WooCommerce my-account page for registration."
1987
  msgstr ""
1988
 
1989
- #: classes/admin/settings/class-wcv-settings-display.php:104
1990
- msgid "Labels are shown on the front end, in orders or emails."
1991
- msgstr ""
1992
-
1993
- #: classes/admin/settings/class-wcv-settings-display.php:109
1994
- msgid "%s singluar term"
1995
- msgstr ""
1996
-
1997
- #: classes/admin/settings/class-wcv-settings-display.php:110
1998
- msgid "Change all references to vendor to this term"
1999
- msgstr ""
2000
-
2001
- #: classes/admin/settings/class-wcv-settings-display.php:117
2002
- msgid "%s plural term"
2003
- msgstr ""
2004
-
2005
- #: classes/admin/settings/class-wcv-settings-display.php:118
2006
- msgid "Change all references to vendors to this term"
2007
- msgstr ""
2008
-
2009
- #: classes/admin/settings/class-wcv-settings-display.php:125
2010
- msgid "Sold by"
2011
- msgstr ""
2012
-
2013
- #: classes/admin/settings/class-wcv-settings-display.php:126
2014
- msgid "Enable sold by labels"
2015
- msgstr ""
2016
-
2017
- #: classes/admin/settings/class-wcv-settings-display.php:134
2018
- msgid "Sold by separator"
2019
- msgstr ""
2020
-
2021
- #: classes/admin/settings/class-wcv-settings-display.php:135
2022
- msgid "The sold by separator"
2023
- msgstr ""
2024
-
2025
- #: classes/admin/settings/class-wcv-settings-display.php:138
2026
- msgid ":"
2027
- msgstr ""
2028
-
2029
- #: classes/admin/settings/class-wcv-settings-display.php:142
2030
- msgid "Sold by label"
2031
- msgstr ""
2032
-
2033
- #: classes/admin/settings/class-wcv-settings-display.php:143
2034
- msgid "The sold by label"
2035
- msgstr ""
2036
-
2037
- #: classes/admin/settings/class-wcv-settings-display.php:146
2038
- msgid "Sold By"
2039
- msgstr ""
2040
-
2041
- #: classes/admin/settings/class-wcv-settings-display.php:150
2042
- msgid "Become a %s"
2043
- msgstr ""
2044
-
2045
- #: classes/admin/settings/class-wcv-settings-display.php:151
2046
- msgid "Show the \"Become a %s\" link on WooCommerce my-account page"
2047
- msgstr ""
2048
-
2049
- #: classes/admin/settings/class-wcv-settings-display.php:158
2050
- msgid "Become a %s label"
2051
- msgstr ""
2052
-
2053
- #: classes/admin/settings/class-wcv-settings-display.php:159
2054
- msgid "The become a %s label"
2055
- msgstr ""
2056
-
2057
- #: classes/admin/settings/class-wcv-settings-display.php:162
2058
- msgid "Become a"
2059
- msgstr ""
2060
-
2061
- #: classes/admin/settings/class-wcv-settings-display.php:166
2062
- msgid "%s Store Info"
2063
- msgstr ""
2064
-
2065
- #: classes/admin/settings/class-wcv-settings-display.php:167
2066
- msgid "Enable %s store info tab on the single product page"
2067
- msgstr ""
2068
-
2069
- #: classes/admin/settings/class-wcv-settings-display.php:174
2070
- msgid "%s store info label"
2071
- msgstr ""
2072
-
2073
- #: classes/admin/settings/class-wcv-settings-display.php:175
2074
- msgid "The %s store info label"
2075
- msgstr ""
2076
-
2077
- #: classes/admin/settings/class-wcv-settings-display.php:178
2078
- msgid "Store Info"
2079
- msgstr ""
2080
-
2081
- #: classes/admin/settings/class-wcv-settings-display.php:198
2082
- msgid "These pages used on the front end by %s."
2083
- msgstr ""
2084
-
2085
- #: classes/admin/settings/class-wcv-settings-display.php:202
2086
- msgid "Dashboard"
2087
- msgstr ""
2088
-
2089
- #: classes/admin/settings/class-wcv-settings-display.php:208
2090
- msgid "<br />This sets the page used to display the front end %s dashboard. This page should contain the following shortcode. <code>[wcv_vendor_dashboard]</code>"
2091
- msgstr ""
2092
-
2093
- #: classes/admin/settings/class-wcv-settings-display.php:217
2094
- msgid "<br />This sets the page used to display the %s shop settings page. This page should contain the following shortcode. <code>[wcv_shop_settings]</code>"
2095
- msgstr ""
2096
-
2097
- #: classes/admin/settings/class-wcv-settings-display.php:226
2098
- msgid "<br />This sets the page used to display the %s orders page. This page should contain the following shortcode. <code>[wcv_orders]</code>"
2099
- msgstr ""
2100
-
2101
- #: classes/admin/settings/class-wcv-settings-display.php:235
2102
- msgid "<br />This sets the page used to display a paginated list of all %1$s stores. Your %1$s stores will be available at <code>%2$s/page-slug/store-name/</code><br />This page should contain the following shortcode. <code>[wcv_vendorslist]</code>"
2103
- msgstr ""
2104
-
2105
- #: classes/admin/settings/class-wcv-settings-display.php:238
2106
- msgid "Terms and Conditions"
2107
- msgstr ""
2108
-
2109
- #: classes/admin/settings/class-wcv-settings-display.php:244
2110
- msgid "<br />This sets the page used to display the terms and conditions when a %s signs up."
2111
- msgstr ""
2112
-
2113
- #: classes/admin/settings/class-wcv-settings-display.php:256
2114
- msgid "These are the settings for the individual %s stores."
2115
- msgstr ""
2116
-
2117
- #: classes/admin/settings/class-wcv-settings-display.php:261
2118
- msgid "%s Store URL"
2119
- msgstr ""
2120
-
2121
- #: classes/admin/settings/class-wcv-settings-display.php:262
2122
- msgid "If you enter \"vendors\" your %1$s store will be %1$s/vendors/store-name/"
2123
- msgstr ""
2124
-
2125
- #: classes/admin/settings/class-wcv-settings-display.php:269
2126
- msgid "Shop Header"
2127
- msgstr ""
2128
-
2129
- #: classes/admin/settings/class-wcv-settings-display.php:270
2130
- msgid "Enable %s shop headers"
2131
- msgstr ""
2132
-
2133
- #: classes/admin/settings/class-wcv-settings-display.php:271
2134
- msgid "This enables the %s shop header template."
2135
- msgstr ""
2136
-
2137
- #: classes/admin/settings/class-wcv-settings-display.php:287, classes/admin/views/html-vendor-settings-page.php:161, templates/dashboard/settings/shop-description.php:18
2138
- msgid "Shop Description"
2139
- msgstr ""
2140
-
2141
- #: classes/admin/settings/class-wcv-settings-display.php:288
2142
- msgid "Enable %s shop description"
2143
- msgstr ""
2144
-
2145
- #: classes/admin/settings/class-wcv-settings-display.php:289
2146
- msgid "This enables the %1$s shop description on the %1$s store page."
2147
- msgstr ""
2148
-
2149
- #: classes/admin/settings/class-wcv-settings-display.php:296
2150
- msgid "Shop HTML"
2151
- msgstr ""
2152
-
2153
- #: classes/admin/settings/class-wcv-settings-display.php:297
2154
- msgid "Allow HTML in %s shop description"
2155
- msgstr ""
2156
-
2157
- #: classes/admin/settings/class-wcv-settings-display.php:298
2158
- msgid "This will enable the WYSIWYG editor and for the %1$s shop description. You can enable or disable this per %1$s by editing the %1$s user account."
2159
- msgstr ""
2160
-
2161
- #: classes/admin/settings/class-wcv-settings-display.php:305
2162
- msgid "Display Name"
2163
- msgstr ""
2164
-
2165
- #: classes/admin/settings/class-wcv-settings-display.php:307
2166
- msgid "Select what will be used to display the %s name throughout the marketplace."
2167
- msgstr ""
2168
-
2169
- #: classes/admin/settings/class-wcv-settings-display.php:312
2170
- msgid "Display name"
2171
- msgstr ""
2172
-
2173
- #: classes/admin/settings/class-wcv-settings-display.php:313, classes/admin/views/html-vendor-meta.php:27
2174
- msgid "Shop name"
2175
- msgstr ""
2176
-
2177
- #: classes/admin/settings/class-wcv-settings-display.php:314
2178
- msgid "%s Username"
2179
- msgstr ""
2180
-
2181
- #: classes/admin/settings/class-wcv-settings-display.php:315
2182
- msgid "%s Email"
2183
- msgstr ""
2184
-
2185
  #: classes/admin/settings/class-wcv-settings-general.php:67
2186
  msgid "Marketplace Options"
2187
  msgstr ""
@@ -2302,10 +1903,6 @@ msgstr ""
2302
  msgid "Send the marketplace admin an email each time a payment has been made via the payment schedule options above"
2303
  msgstr ""
2304
 
2305
- #: classes/admin/settings/class-wcv-settings-payments.php:133
2306
- msgid "<strong>Payments controls how your %s commission is paid out. These settings only function if you are using a supported gateway.</strong> "
2307
- msgstr ""
2308
-
2309
  #: classes/admin/views/html-admin-page-extensions.php:15
2310
  msgid "Upgrade your marketplace today!"
2311
  msgstr ""
@@ -2458,6 +2055,10 @@ msgstr ""
2458
  msgid "Enable HTML for the shop description"
2459
  msgstr ""
2460
 
 
 
 
 
2461
  #: classes/admin/views/html-vendor-meta.php:40
2462
  msgid "PayPal E-mail"
2463
  msgstr ""
@@ -2510,6 +2111,10 @@ msgstr ""
2510
  msgid "This is displayed on each of your products."
2511
  msgstr ""
2512
 
 
 
 
 
2513
  #: classes/admin/views/html-vendor-settings-page.php:180, templates/dashboard/settings/shop-description.php:19
2514
  msgid "This is displayed on your <a href=\"%s\">shop page</a>."
2515
  msgstr ""
@@ -2602,11 +2207,7 @@ msgstr ""
2602
  msgid "Application denied. You are an administrator."
2603
  msgstr ""
2604
 
2605
- #: classes/front/signup/class-vendor-signup.php:102
2606
- msgid "Your application has been submitted."
2607
- msgstr ""
2608
-
2609
- #: classes/front/signup/class-vendor-signup.php:149, classes/front/signup/class-vendor-signup.php:191, classes/front/signup/class-vendor-signup.php:203
2610
  msgid "You must accept the terms and conditions to become a vendor."
2611
  msgstr ""
2612
 
@@ -2710,14 +2311,6 @@ msgstr ""
2710
  msgid "Please Note: PayPal has deprecated Adaptive Payments. This will soon cease to function."
2711
  msgstr ""
2712
 
2713
- #: classes/gateways/PayPal_AdvPayments/paypal_ap.php:285
2714
- msgid "Gateway Disabled"
2715
- msgstr ""
2716
-
2717
- #: classes/gateways/PayPal_AdvPayments/paypal_ap.php:285
2718
- msgid "%s does not support your store currency."
2719
- msgstr ""
2720
-
2721
  #: classes/gateways/PayPal_AdvPayments/paypal_ap.php:394, classes/gateways/PayPal_AdvPayments/paypal_ap.php:510, classes/gateways/PayPal_Masspay/class-paypal-masspay.php:156
2722
  msgid "Error: %s"
2723
  msgstr ""
@@ -2738,10 +2331,6 @@ msgstr ""
2738
  msgid "All due commission has been paid for. "
2739
  msgstr ""
2740
 
2741
- #: classes/gateways/PayPal_Masspay/class-paypal-masspay.php:176
2742
- 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."
2743
- msgstr ""
2744
-
2745
  #: classes/gateways/PayPal_Masspay/class-paypal-masspay.php:210
2746
  msgid "WooCommerce: Mass payments for vendors update"
2747
  msgstr ""
@@ -2855,8 +2444,36 @@ msgstr ""
2855
  msgid "Customer note"
2856
  msgstr ""
2857
 
2858
- #: templates/orders/customer-note/customer-note.php:24
2859
- msgid "No customer note."
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2860
  msgstr ""
2861
 
2862
  #: templates/orders/shipping/shipping-form.php:102
@@ -2923,24 +2540,40 @@ msgstr ""
2923
  msgid "Enable and disable capabilites of the %s"
2924
  msgstr ""
2925
 
 
 
 
 
 
 
 
 
2926
  #: classes/admin/views/setup/capabilities.php:51
2927
  msgid "Allow %s to publish products without requiring approval."
2928
  msgstr ""
2929
 
2930
- #: classes/admin/views/setup/capabilities.php:132, classes/admin/views/setup/capabilities.php:133, classes/admin/views/setup/general.php:99, classes/admin/views/setup/general.php:100, classes/admin/views/setup/pages.php:88, classes/admin/views/setup/pages.php:89
2931
- msgid "Next"
2932
  msgstr ""
2933
 
2934
- #: classes/admin/views/setup/footer.php:14
2935
- msgid "Exit Wizard"
 
 
 
 
 
 
 
 
2936
  msgstr ""
2937
 
2938
- #: classes/admin/views/setup/footer.php:17
2939
- msgid "Return to your dashboard"
2940
  msgstr ""
2941
 
2942
- #: classes/admin/views/setup/footer.php:20
2943
- msgid "Skip this step"
2944
  msgstr ""
2945
 
2946
  #: classes/admin/views/setup/general.php:14
40
  msgid "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."
41
  msgstr ""
42
 
43
+ #: classes/class-commission.php:61, classes/admin/class-admin-reports.php:417, classes/admin/class-admin-reports.php:515, classes/admin/class-wcv-commissions-page.php:337, classes/admin/class-wcv-commissions-page.php:619
44
  msgid "Due"
45
  msgstr ""
46
 
47
+ #: classes/class-commission.php:62, classes/admin/class-admin-reports.php:416, classes/admin/class-admin-reports.php:516, classes/admin/class-wcv-commissions-page.php:338, classes/admin/class-wcv-commissions-page.php:620
48
  msgid "Paid"
49
  msgstr ""
50
 
51
+ #: classes/class-commission.php:63, classes/admin/class-admin-reports.php:415, classes/admin/class-admin-reports.php:517, classes/admin/class-wcv-commissions-page.php:340, classes/admin/class-wcv-commissions-page.php:621
52
  msgid "Reversed"
53
  msgstr ""
54
 
 
 
 
 
55
  #: classes/class-install.php:161, classes/admin/class-wcv-admin-setup.php:153
56
  msgid "Pending %s"
57
  msgstr ""
58
 
59
+ #. translators: The name used to refer to a vendor.
60
+ #. translators: %s - The name used to refer to a vendor.
61
+ #: classes/class-install.php:175, classes/admin/class-admin-reports.php:207, classes/admin/class-admin-reports.php:530, classes/admin/class-product-meta.php:295, classes/admin/class-product-meta.php:346, classes/admin/class-setup-wizard.php:349, classes/admin/class-wcv-admin-setup.php:148, classes/admin/class-wcv-admin-setup.php:365, classes/admin/class-wcv-commissions-csv-exporter.php:50, classes/admin/class-wcv-commissions-page.php:145, classes/admin/class-wcv-commissions-sum-csv-exporter.php:43
62
  msgid "%s"
63
  msgstr ""
64
 
106
  msgid "View WC Vendors settings"
107
  msgstr ""
108
 
109
+ #: classes/class-install.php:493, classes/admin/class-admin-menus.php:114, templates/dashboard/settings/settings.php:17
110
  msgid "Settings"
111
  msgstr ""
112
 
342
  msgid "%s Orders"
343
  msgstr ""
344
 
 
 
 
 
 
 
 
 
 
345
  #. translators: %s is vendor string
346
  #: classes/admin/class-admin-media.php:28
347
  msgid "Assign %s"
351
  msgid "None"
352
  msgstr ""
353
 
354
+ #: classes/admin/class-admin-menus.php:47, classes/admin/class-admin-menus.php:48, classes/admin/class-admin-reports.php:40, classes/admin/class-wcv-admin-setup.php:330, classes/admin/views/html-vendor-meta.php:1
355
  msgid "WC Vendors"
356
  msgstr ""
357
 
358
+ #: classes/admin/class-admin-menus.php:64
359
  msgid "WC Vendors Extensions"
360
  msgstr ""
361
 
362
+ #: classes/admin/class-admin-menus.php:65
363
  msgid "Extensions"
364
  msgstr ""
365
 
366
+ #: classes/admin/class-admin-menus.php:91, classes/admin/class-admin-menus.php:92
367
  msgid "Commissions"
368
  msgstr ""
369
 
370
+ #: classes/admin/class-admin-menus.php:113
371
  msgid "WC Vendors Settings"
372
  msgstr ""
373
 
391
  msgid "Commission totals for all vendors includes shipping and taxes. By default no date range is used and all due commissions are returned. Use the date range to filter."
392
  msgstr ""
393
 
394
+ #: classes/admin/class-admin-reports.php:123, classes/admin/class-admin-reports.php:505, classes/admin/class-wcv-commissions-page.php:292, templates/dashboard/date-picker.php:19
395
  msgid "From:"
396
  msgstr ""
397
 
398
+ #: classes/admin/class-admin-reports.php:127, classes/admin/class-admin-reports.php:509, classes/admin/class-wcv-commissions-page.php:307, templates/dashboard/date-picker.php:23
399
  msgid "To:"
400
  msgstr ""
401
 
407
  msgid "Total paid in range"
408
  msgstr ""
409
 
 
 
 
 
410
  #: classes/admin/class-admin-reports.php:152
411
  msgid "Total due in range"
412
  msgstr ""
423
  msgid "Order"
424
  msgstr ""
425
 
426
+ #: classes/admin/class-admin-reports.php:206, classes/admin/class-wcv-commissions-csv-exporter.php:51, classes/admin/class-wcv-commissions-page.php:146, templates/dashboard/reports.php:36, templates/emails/notify-vendor-shipped.php:30, templates/emails/vendor-new-order.php:35, templates/emails/vendor-order-details.php:37, classes/admin/emails/class-wcv-vendor-notify-cancelled-order.php:195, classes/admin/emails/class-wcv-vendor-notify-order.php:222
427
  msgid "Product"
428
  msgstr ""
429
 
430
+ #: classes/admin/class-admin-reports.php:208, classes/admin/class-admin-reports.php:441, classes/admin/class-vendor-admin-dashboard.php:381, classes/admin/class-wcv-commissions-csv-exporter.php:56, classes/admin/class-wcv-commissions-page.php:151, classes/admin/class-wcv-commissions-sum-csv-exporter.php:44, templates/dashboard/orders.php:56
431
  msgid "Total"
432
  msgstr ""
433
 
435
  msgid "Date &amp; Time"
436
  msgstr ""
437
 
438
+ #: classes/admin/class-admin-reports.php:210, classes/admin/class-admin-reports.php:533, classes/admin/class-wcv-commissions-csv-exporter.php:57, classes/admin/class-wcv-commissions-page.php:152
439
  msgid "Status"
440
  msgstr ""
441
 
 
 
 
 
442
  #: classes/admin/class-admin-reports.php:241
443
  msgid "D j M Y \a\t h:ia"
444
  msgstr ""
445
 
 
 
 
 
446
  #: classes/admin/class-admin-reports.php:286
447
  msgid "Show:"
448
  msgstr ""
449
 
450
+ #: classes/admin/class-admin-reports.php:300
451
  msgid "Type in a product name to start searching..."
452
  msgstr ""
453
 
 
 
 
 
454
  #: classes/admin/class-admin-reports.php:411
455
  msgid "Month"
456
  msgstr ""
457
 
458
+ #: classes/admin/class-admin-reports.php:413, classes/admin/class-wcv-commissions-csv-exporter.php:55, classes/admin/class-wcv-commissions-page.php:150
459
  msgid "Tax"
460
  msgstr ""
461
 
462
+ #: classes/admin/class-admin-reports.php:414, classes/admin/class-wcv-commissions-csv-exporter.php:54, classes/admin/class-wcv-commissions-page.php:149, templates/dashboard/orders.php:54, templates/orders/orders.php:148, classes/admin/settings/class-wcv-settings-capabilities.php:107
463
  msgid "Shipping"
464
  msgstr ""
465
 
475
  msgid "Commission Total"
476
  msgstr ""
477
 
 
 
 
 
478
  #: classes/admin/class-admin-users.php:82
479
  msgid "You are not allowed to submit products. <a href=\"%s\">Go Back</a>"
480
  msgstr ""
495
  msgid "Assign media to %s"
496
  msgstr ""
497
 
498
+ #: classes/admin/class-product-meta.php:229, classes/admin/class-product-meta.php:247, classes/admin/class-wcv-commissions-csv-exporter.php:53, classes/admin/class-wcv-commissions-page.php:148, templates/dashboard/reports.php:38, templates/emails/vendor-order-details.php:42, classes/admin/emails/class-wcv-vendor-notify-cancelled-order.php:194, classes/admin/emails/class-wcv-vendor-notify-order.php:221, classes/admin/settings/class-wcv-settings-commission.php:32, classes/admin/views/html-admin-commission-page.php:23, classes/admin/views/setup/general.php:81
499
  msgid "Commission"
500
  msgstr ""
501
 
515
  msgid "Capabilities"
516
  msgstr ""
517
 
518
+ #: classes/admin/class-setup-wizard.php:89, classes/admin/views/setup/pages.php:19
519
  msgid "Pages"
520
  msgstr ""
521
 
578
  msgid "Don't forget to check our <a href=\"%1$s\" target=\"_blank\">documentation</a> to learn more about setting up WC Vendors and if you need help, be sure to visit our <a href=\"%2$s\" target=\"_blank\">free support forums</a>."
579
  msgstr ""
580
 
581
+ #: classes/admin/class-vendor-admin-dashboard.php:25, classes/admin/class-vendor-admin-dashboard.php:26
582
  msgid "Shop Settings"
583
  msgstr ""
584
 
585
+ #: classes/admin/class-vendor-admin-dashboard.php:35, classes/admin/class-vendor-admin-dashboard.php:36, classes/admin/class-vendor-admin-dashboard.php:235, templates/dashboard/orders.php:40, classes/admin/settings/class-wcv-settings-capabilities.php:47, classes/admin/views/setup/capabilities.php:70
586
  msgid "Orders"
587
  msgstr ""
588
 
606
  msgid "orders"
607
  msgstr ""
608
 
609
+ #: classes/admin/class-vendor-admin-dashboard.php:378, classes/admin/class-wcv-commissions-csv-exporter.php:48, classes/admin/class-wcv-commissions-page.php:143
610
  msgid "Order ID"
611
  msgstr ""
612
 
614
  msgid "Customer"
615
  msgstr ""
616
 
617
+ #: classes/admin/class-vendor-admin-dashboard.php:380, classes/admin/settings/class-wcv-settings-capabilities.php:46, classes/admin/views/setup/capabilities.php:19
618
  msgid "Products"
619
  msgstr ""
620
 
621
+ #: classes/admin/class-vendor-admin-dashboard.php:383, classes/admin/class-wcv-commissions-csv-exporter.php:58, classes/admin/class-wcv-commissions-page.php:153, templates/dashboard/orders.php:57, classes/front/orders/class-orders.php:219
622
  msgid "Date"
623
  msgstr ""
624
 
634
  msgid "Orders marked shipped."
635
  msgstr ""
636
 
 
 
 
 
 
 
 
 
637
  #: classes/admin/class-vendor-applicants.php:80
638
  msgid "%s has been <b>denied</b>."
639
  msgstr ""
886
  msgid "Enable %s backorder stock notifications"
887
  msgstr ""
888
 
889
+ #: classes/admin/class-wcv-commissions-csv-exporter.php:52
890
  msgid "QTY"
891
  msgstr ""
892
 
893
+ #: classes/admin/class-wcv-commissions-page.php:147, templates/dashboard/reports.php:37, templates/emails/notify-vendor-shipped.php:31, templates/emails/vendor-new-order.php:36, templates/emails/vendor-order-details.php:39, classes/front/orders/class-export-csv.php:17
894
  msgid "Quantity"
895
  msgstr ""
896
 
897
+ #: classes/admin/class-wcv-commissions-page.php:202
898
  msgid "Mark paid"
899
  msgstr ""
900
 
901
+ #: classes/admin/class-wcv-commissions-page.php:203
902
  msgid "Mark due"
903
  msgstr ""
904
 
905
+ #: classes/admin/class-wcv-commissions-page.php:204
906
  msgid "Mark reversed"
907
  msgstr ""
908
 
909
+ #: classes/admin/class-wcv-commissions-page.php:252
910
  msgid "Filter"
911
  msgstr ""
912
 
913
+ #: classes/admin/class-wcv-commissions-page.php:261
914
  msgid "Clear"
915
  msgstr ""
916
 
917
+ #: classes/admin/class-wcv-commissions-page.php:263
918
  msgid "Export to CSV"
919
  msgstr ""
920
 
921
+ #: classes/admin/class-wcv-commissions-page.php:264
922
  msgid "Export Totals to CSV"
923
  msgstr ""
924
 
925
+ #: classes/admin/class-wcv-commissions-page.php:265
926
  msgid "Mark all paid"
927
  msgstr ""
928
 
929
+ #: classes/admin/class-wcv-commissions-page.php:336
 
 
 
 
930
  msgid "Show all Statuses"
931
  msgstr ""
932
 
933
+ #: classes/admin/class-wcv-commissions-page.php:391
934
  msgid "Commission marked paid."
935
  msgstr ""
936
 
937
+ #: classes/admin/class-wcv-commissions-page.php:399
938
  msgid "Commission marked due."
939
  msgstr ""
940
 
941
+ #: classes/admin/class-wcv-commissions-page.php:407
942
  msgid "Commission marked reversed."
943
  msgstr ""
944
 
945
+ #: classes/admin/class-wcv-commissions-page.php:618
946
  msgid "All"
947
  msgstr ""
948
 
1022
  msgid "Your account has not yet been approved to become a %s. When it is, you will receive an email telling you that your account is approved!"
1023
  msgstr ""
1024
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1025
  #: templates/dashboard/links.php:22, classes/front/dashboard/class-vendor-dashboard.php:347
1026
  msgid "View Your Store"
1027
  msgstr ""
1028
 
1029
+ #: templates/dashboard/links.php:23, classes/front/dashboard/class-vendor-dashboard.php:351
1030
  msgid "Store Settings"
1031
  msgstr ""
1032
 
1054
  msgid "Tracking"
1055
  msgstr ""
1056
 
 
 
 
 
1057
  #: templates/dashboard/reports.php:18
1058
  msgid "Sales Report"
1059
  msgstr ""
1070
  msgid "Totals"
1071
  msgstr ""
1072
 
 
 
 
 
 
 
 
 
1073
  #: templates/emails/admin-notify-application.php:18, templates/emails/application-status.php:9, templates/emails/plain/admin-notify-application.php:18, templates/emails/plain/vendor-notify-application.php:18
1074
  msgid "Hi there. This is a notification about a %1$s application on %2$s."
1075
  msgstr ""
1203
  msgid "Quantity: %d"
1204
  msgstr ""
1205
 
1206
+ #: classes/admin/emails/class-emails.php:74, classes/admin/emails/class-emails.php:251
1207
  msgid "pending"
1208
  msgstr ""
1209
 
 
 
 
 
 
 
 
 
1210
  #: classes/admin/emails/class-emails.php:203
1211
  msgid "Resend %s new order notification"
1212
  msgstr ""
1736
  msgid "Hide tax fields from %s"
1737
  msgstr ""
1738
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1739
  #: classes/admin/settings/class-wcv-settings-commission.php:67
1740
  msgid "These are the commission settings for your marketplace"
1741
  msgstr ""
1756
  msgid "Labels"
1757
  msgstr ""
1758
 
1759
+ #: classes/admin/settings/class-wcv-settings-display.php:66, classes/admin/settings/class-wcv-settings-payments.php:71, classes/admin/settings/class-wcv-settings-payments.php:78
1760
  msgstr ""
1761
 
1762
  #: classes/admin/settings/class-wcv-settings-display.php:68
1771
  msgid "You can add CSS in this textarea, which will be loaded on the product add/edit page for %s"
1772
  msgstr ""
1773
 
1774
+ #: classes/admin/settings/class-wcv-settings-display.php:74
1775
  msgid "This enables the sold by labels used to show which %s shop the product belongs to"
1776
  msgstr ""
1777
 
1783
  msgid "This will redirect the WordPress registration to WooCommerce my-account page for registration."
1784
  msgstr ""
1785
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1786
  #: classes/admin/settings/class-wcv-settings-general.php:67
1787
  msgid "Marketplace Options"
1788
  msgstr ""
1903
  msgid "Send the marketplace admin an email each time a payment has been made via the payment schedule options above"
1904
  msgstr ""
1905
 
 
 
 
 
1906
  #: classes/admin/views/html-admin-page-extensions.php:15
1907
  msgid "Upgrade your marketplace today!"
1908
  msgstr ""
2055
  msgid "Enable HTML for the shop description"
2056
  msgstr ""
2057
 
2058
+ #: classes/admin/views/html-vendor-meta.php:27
2059
+ msgid "Shop name"
2060
+ msgstr ""
2061
+
2062
  #: classes/admin/views/html-vendor-meta.php:40
2063
  msgid "PayPal E-mail"
2064
  msgstr ""
2111
  msgid "This is displayed on each of your products."
2112
  msgstr ""
2113
 
2114
+ #: classes/admin/views/html-vendor-settings-page.php:161, templates/dashboard/settings/shop-description.php:18
2115
+ msgid "Shop Description"
2116
+ msgstr ""
2117
+
2118
  #: classes/admin/views/html-vendor-settings-page.php:180, templates/dashboard/settings/shop-description.php:19
2119
  msgid "This is displayed on your <a href=\"%s\">shop page</a>."
2120
  msgstr ""
2207
  msgid "Application denied. You are an administrator."
2208
  msgstr ""
2209
 
2210
+ #: classes/front/signup/class-vendor-signup.php:149, classes/front/signup/class-vendor-signup.php:203
 
 
 
 
2211
  msgid "You must accept the terms and conditions to become a vendor."
2212
  msgstr ""
2213
 
2311
  msgid "Please Note: PayPal has deprecated Adaptive Payments. This will soon cease to function."
2312
  msgstr ""
2313
 
 
 
 
 
 
 
 
 
2314
  #: classes/gateways/PayPal_AdvPayments/paypal_ap.php:394, classes/gateways/PayPal_AdvPayments/paypal_ap.php:510, classes/gateways/PayPal_Masspay/class-paypal-masspay.php:156
2315
  msgid "Error: %s"
2316
  msgstr ""
2331
  msgid "All due commission has been paid for. "
2332
  msgstr ""
2333
 
 
 
 
 
2334
  #: classes/gateways/PayPal_Masspay/class-paypal-masspay.php:210
2335
  msgid "WooCommerce: Mass payments for vendors update"
2336
  msgstr ""
2444
  msgid "Customer note"
2445
  msgstr ""
2446
 
2447
+ #: templates/orders/shipping/shipping-form.php:23
2448
+ msgid "Provider:"
2449
+ msgstr ""
2450
+
2451
+ #: templates/orders/shipping/shipping-form.php:25
2452
+ msgid "Custom Provider"
2453
+ msgstr ""
2454
+
2455
+ #: templates/orders/shipping/shipping-form.php:51
2456
+ msgid "Provider Name:"
2457
+ msgstr ""
2458
+
2459
+ #: templates/orders/shipping/shipping-form.php:62
2460
+ msgid "Tracking number:"
2461
+ msgstr ""
2462
+
2463
+ #: templates/orders/shipping/shipping-form.php:72
2464
+ msgid "Tracking link:"
2465
+ msgstr ""
2466
+
2467
+ #: templates/orders/shipping/shipping-form.php:84
2468
+ msgid "Date shipped:"
2469
+ msgstr ""
2470
+
2471
+ #: templates/orders/shipping/shipping-form.php:93
2472
+ msgid "Preview:"
2473
+ msgstr ""
2474
+
2475
+ #: templates/orders/shipping/shipping-form.php:93
2476
+ msgid "Click here to track your shipment"
2477
  msgstr ""
2478
 
2479
  #: templates/orders/shipping/shipping-form.php:102
2540
  msgid "Enable and disable capabilites of the %s"
2541
  msgstr ""
2542
 
2543
+ #: classes/admin/views/setup/capabilities.php:25
2544
+ msgid "Allow %s to add/edit products"
2545
+ msgstr ""
2546
+
2547
+ #: classes/admin/views/setup/capabilities.php:38
2548
+ msgid "Allow %s to edit published (live) products"
2549
+ msgstr ""
2550
+
2551
  #: classes/admin/views/setup/capabilities.php:51
2552
  msgid "Allow %s to publish products without requiring approval."
2553
  msgstr ""
2554
 
2555
+ #: classes/admin/views/setup/capabilities.php:76
2556
+ msgid "Allow %s to view orders"
2557
  msgstr ""
2558
 
2559
+ #: classes/admin/views/setup/capabilities.php:89
2560
+ msgid "Allow %s to export their orders to a CSV file"
2561
+ msgstr ""
2562
+
2563
+ #: classes/admin/views/setup/capabilities.php:102
2564
+ msgid "Allow %s to view order notes"
2565
+ msgstr ""
2566
+
2567
+ #: classes/admin/views/setup/capabilities.php:115
2568
+ msgid "Allow %s to add order notes."
2569
  msgstr ""
2570
 
2571
+ #: classes/admin/views/setup/capabilities.php:132, classes/admin/views/setup/capabilities.php:133, classes/admin/views/setup/general.php:99, classes/admin/views/setup/general.php:100, classes/admin/views/setup/pages.php:88, classes/admin/views/setup/pages.php:89
2572
+ msgid "Next"
2573
  msgstr ""
2574
 
2575
+ #: classes/admin/views/setup/footer.php:14
2576
+ msgid "Exit Wizard"
2577
  msgstr ""
2578
 
2579
  #: classes/admin/views/setup/general.php:14
readme.txt CHANGED
@@ -6,10 +6,10 @@ Author URI: https://www.wcvendors.com/
6
  Plugin URI: https://www.wcvendors.com/
7
  Requires at least: 5.0.0
8
  Requires PHP: 5.6
9
- Tested up to: 5.4
10
  WC requires at least: 3.8.0
11
- WC tested up to: 4.0
12
- Stable tag: 2.1.19
13
  License: GPLv2 or later
14
 
15
  The number one most downloaded marketplace plugin for WooCommerce. Now you can allow anyone to open a store on your WooCommerce site!
@@ -254,11 +254,21 @@ WC Vendors Marketplace does not work with multisite WordPress. There are no plan
254
 
255
  == Changelog ==
256
 
 
 
 
 
 
 
 
 
 
 
257
  = Version 2.1.19 - 11th March 2020 =
258
 
259
  * Confirm WordPress 5.4 and WooCommerce 4.0
260
 
261
- = Version 2.1.18 - 5th February 2020 =
262
 
263
  * Added: New action hook to image field. (#620)
264
  * Updated: Vendor_list shortcode argument to has_products #595
6
  Plugin URI: https://www.wcvendors.com/
7
  Requires at least: 5.0.0
8
  Requires PHP: 5.6
9
+ Tested up to: 5.4.1
10
  WC requires at least: 3.8.0
11
+ WC tested up to: 4.1
12
+ Stable tag: 2.1.20
13
  License: GPLv2 or later
14
 
15
  The number one most downloaded marketplace plugin for WooCommerce. Now you can allow anyone to open a store on your WooCommerce site!
254
 
255
  == Changelog ==
256
 
257
+ = Version 2.1.20 - 8th of May 2020 =
258
+
259
+ * Added: Add date range filters for commissions table #649 (#651)
260
+ * Updated: Tested to WooCommerce 4.1 (#654)
261
+ * Updated: Update filter names in WCV_Shortcodes class #644 (#647)
262
+ * Fixed: Front-end issues of Store Info option ( Enabled/Disabled ) not working #599 (#653)
263
+ * Fixed: Timezone display for commissions #625 (#648)
264
+ * Fixed: Order date query bug. (#646)
265
+ * Fixed: get current page error on setup wizard #640 (#641)
266
+
267
  = Version 2.1.19 - 11th March 2020 =
268
 
269
  * Confirm WordPress 5.4 and WooCommerce 4.0
270
 
271
+ = Version 2.1.18 - 5th February 2020 =
272
 
273
  * Added: New action hook to image field. (#620)
274
  * Updated: Vendor_list shortcode argument to has_products #595
templates/dashboard/date-picker.php CHANGED
@@ -18,11 +18,11 @@ if ( ! defined( 'ABSPATH' ) ) {
18
  <p>
19
  <label style="display:inline;" for="from"><?php _e( 'From:', 'wc-vendors' ); ?></label>
20
  <input class="date-pick" type="date" name="start_date" id="from"
21
- value="<?php echo esc_attr( date( 'Y-m-d', $start_date ) ); ?>"/>
22
 
23
  <label style="display:inline;" for="to"><?php _e( 'To:', 'wc-vendors' ); ?></label>
24
  <input type="date" class="date-pick" name="end_date" id="to"
25
- value="<?php echo esc_attr( date( 'Y-m-d', $end_date ) ); ?>"/>
26
 
27
  <input type="submit" class="btn btn-inverse btn-small" style="float:none;"
28
  value="<?php _e( 'Show', 'wc-vendors' ); ?>"/>
18
  <p>
19
  <label style="display:inline;" for="from"><?php _e( 'From:', 'wc-vendors' ); ?></label>
20
  <input class="date-pick" type="date" name="start_date" id="from"
21
+ value="<?php echo esc_attr( gmdate( 'Y-m-d', $start_date ) ); ?>"/>
22
 
23
  <label style="display:inline;" for="to"><?php _e( 'To:', 'wc-vendors' ); ?></label>
24
  <input type="date" class="date-pick" name="end_date" id="to"
25
+ value="<?php echo esc_attr( gmdate( 'Y-m-d', $end_date ) ); ?>"/>
26
 
27
  <input type="submit" class="btn btn-inverse btn-small" style="float:none;"
28
  value="<?php _e( 'Show', 'wc-vendors' ); ?>"/>
templates/orders/shipping/shipping-form.php CHANGED
@@ -14,15 +14,15 @@ if ( ! defined( 'ABSPATH' ) ) {
14
  }
15
  ?>
16
 
17
- <form method="post" name="track_shipment" id="track-shipment_<?php echo $order_id; ?>">
18
 
19
  <?php
20
  wp_nonce_field( 'track-shipment' );
21
 
22
- // Providers
23
- echo '<p class="form-field tracking_provider_field"><label for="tracking_provider">' . __( 'Provider:', 'wc_shipment_tracking' ) . '</label><br/><select id="tracking_provider" name="tracking_provider" class="tracking_provider" style="width:100%;">';
24
 
25
- echo '<option value="">' . __( 'Custom Provider', 'wc_shipment_tracking' ) . '</option>';
26
 
27
  $selected_provider = get_post_meta( $order_id, '_tracking_provider', true );
28
 
@@ -48,7 +48,7 @@ if ( ! defined( 'ABSPATH' ) ) {
48
  woocommerce_wp_text_input(
49
  array(
50
  'id' => 'custom_tracking_provider_name',
51
- 'label' => __( 'Provider Name:', 'wc_shipment_tracking' ),
52
  'wrapper_class' => $class,
53
  'placeholder' => '',
54
  'description' => '',
@@ -59,7 +59,7 @@ if ( ! defined( 'ABSPATH' ) ) {
59
  woocommerce_wp_text_input(
60
  array(
61
  'id' => 'tracking_number',
62
- 'label' => __( 'Tracking number:', 'wc_shipment_tracking' ),
63
  'placeholder' => '',
64
  'description' => '',
65
  'value' => get_post_meta( $order_id, '_tracking_number', true ),
@@ -69,7 +69,7 @@ if ( ! defined( 'ABSPATH' ) ) {
69
  woocommerce_wp_text_input(
70
  array(
71
  'id' => 'custom_tracking_url',
72
- 'label' => __( 'Tracking link:', 'wc_shipment_tracking' ),
73
  'placeholder' => 'http://',
74
  'wrapper_class' => $class,
75
  'description' => '',
@@ -81,26 +81,26 @@ if ( ! defined( 'ABSPATH' ) ) {
81
  array(
82
  'type' => 'date',
83
  'id' => 'date_shipped',
84
- 'label' => __( 'Date shipped:', 'wc_shipment_tracking' ),
85
  'placeholder' => 'YYYY-MM-DD',
86
  'description' => '',
87
  'class' => 'date-picker-field',
88
- 'value' => ( $date = get_post_meta( $order_id, '_date_shipped', true ) ) ? date( 'Y-m-d', $date ) : '',
89
  )
90
  );
91
 
92
- // Live preview
93
- echo '<p class="preview_tracking_link" style="display:none;">' . __( 'Preview:', 'wc_shipment_tracking' ) . ' <a href="" target="_blank">' . __( 'Click here to track your shipment', 'wc_shipment_tracking' ) . '</a></p>';
94
 
95
  ?>
96
 
97
 
98
- <input type="hidden" name="product_id" value="<?php echo $product_id; ?>">
99
- <input type="hidden" name="order_id" value="<?php echo $order_id; ?>">
100
 
101
  <input class="button" type="submit" name="update_tracking"
102
- value="<?php _e( 'Update tracking number', 'wc-vendors' ); ?>">
103
  <input class="button" type="submit" name="mark_shipped"
104
- value="<?php _e( 'Mark as shipped', 'wc-vendors' ); ?>">
105
 
106
  </form>
14
  }
15
  ?>
16
 
17
+ <form method="post" name="track_shipment" id="track-shipment_<?php echo esc_attr( $order_id ); ?>">
18
 
19
  <?php
20
  wp_nonce_field( 'track-shipment' );
21
 
22
+ // Providers.
23
+ echo '<p class="form-field tracking_provider_field"><label for="tracking_provider">' . esc_attr__( 'Provider:', 'wc-vendors' ) . '</label><br/><select id="tracking_provider" name="tracking_provider" class="tracking_provider" style="width:100%;">';
24
 
25
+ echo '<option value="">' . esc_attr__( 'Custom Provider', 'wc-vendors' ) . '</option>';
26
 
27
  $selected_provider = get_post_meta( $order_id, '_tracking_provider', true );
28
 
48
  woocommerce_wp_text_input(
49
  array(
50
  'id' => 'custom_tracking_provider_name',
51
+ 'label' => __( 'Provider Name:', 'wc-vendors' ),
52
  'wrapper_class' => $class,
53
  'placeholder' => '',
54
  'description' => '',
59
  woocommerce_wp_text_input(
60
  array(
61
  'id' => 'tracking_number',
62
+ 'label' => __( 'Tracking number:', 'wc-vendors' ),
63
  'placeholder' => '',
64
  'description' => '',
65
  'value' => get_post_meta( $order_id, '_tracking_number', true ),
69
  woocommerce_wp_text_input(
70
  array(
71
  'id' => 'custom_tracking_url',
72
+ 'label' => __( 'Tracking link:', 'wc-vendors' ),
73
  'placeholder' => 'http://',
74
  'wrapper_class' => $class,
75
  'description' => '',
81
  array(
82
  'type' => 'date',
83
  'id' => 'date_shipped',
84
+ 'label' => __( 'Date shipped:', 'wc-vendors' ),
85
  'placeholder' => 'YYYY-MM-DD',
86
  'description' => '',
87
  'class' => 'date-picker-field',
88
+ 'value' => ( $date = get_post_meta( $order_id, '_date_shipped', true ) ) ? gmdate( 'Y-m-d', $date ) : '',
89
  )
90
  );
91
 
92
+ // Live preview.
93
+ echo '<p class="preview_tracking_link" style="display:none;">' . esc_attr__( 'Preview:', 'wc-vendors' ) . ' <a href="" target="_blank">' . __( 'Click here to track your shipment', 'wc-vendors' ) . '</a></p>';
94
 
95
  ?>
96
 
97
 
98
+ <input type="hidden" name="product_id" value="<?php echo esc_attr( $product_id ); ?>">
99
+ <input type="hidden" name="order_id" value="<?php echo esc_attr( $order_id ); ?>">
100
 
101
  <input class="button" type="submit" name="update_tracking"
102
+ value="<?php esc_attr_e( 'Update tracking number', 'wc-vendors' ); ?>">
103
  <input class="button" type="submit" name="mark_shipped"
104
+ value="<?php esc_attr_e( 'Mark as shipped', 'wc-vendors' ); ?>">
105
 
106
  </form>