Fixed issue #4

ole1986 · Sep 29, 2019 · 1c4c3e9 · 1c4c3e9
1 parent 24adcdf
commit 1c4c3e9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/menu/account-invoice.php b/menu/account-invoice.php
@@ -34,9 +34,9 @@ public function wc_invoice_content(){
 
         $query = "SELECT i.*, u.user_login AS customer_name, u.user_email AS user_email, u.ID AS user_id, p.ID AS order_id, p.post_status, pm.meta_value AS ispconfig_period 
                     FROM {$wpdb->prefix}ispconfig_invoice AS i 
-                    LEFT JOIN wp_users AS u ON u.ID = i.customer_id
-                    LEFT JOIN wp_posts AS p ON p.ID = i.wc_order_id
-                    LEFT JOIN wp_postmeta AS pm ON (p.ID = pm.post_id AND pm.meta_key = '_ispconfig_period')
+                    LEFT JOIN {$wpdb->users} AS u ON u.ID = i.customer_id
+                    LEFT JOIN {$wpdb->posts} AS p ON p.ID = i.wc_order_id
+                    LEFT JOIN {$wpdb->postmeta} AS pm ON (p.ID = pm.post_id AND pm.meta_key = '_ispconfig_period')
                     WHERE i.customer_id = {$current_user->ID} AND i.deleted = 0
                     ORDER BY i.created DESC";
 

diff --git a/model/invoice-export.php b/model/invoice-export.php
@@ -13,8 +13,8 @@ public function __construct($invoiceIds) {
         if(!empty($invoiceIds)) {
             $query = "SELECT i.ID, i.customer_id, i.invoice_number, i.wc_order_id, i.created, i.due_date, i.paid_date, i.status, u.user_login AS customer_name, u.user_email AS user_email, u.ID AS user_id, p.ID AS order_id, p.post_status 
                         FROM {$wpdb->prefix}".Invoice::TABLE." AS i 
-                        LEFT JOIN wp_users AS u ON u.ID = i.customer_id
-                        LEFT JOIN wp_posts AS p ON p.ID = i.wc_order_id
+                        LEFT JOIN {$wpdb->users} AS u ON u.ID = i.customer_id
+                        LEFT JOIN {$wpdb->posts} AS p ON p.ID = i.wc_order_id
                       WHERE 
                         i.deleted = 0 AND (status < ".Invoice::CANCELED.")
                         AND i.ID IN (".implode(',', $invoiceIds).")";

diff --git a/model/invoice-list.php b/model/invoice-list.php
@@ -168,9 +168,9 @@ public function prepare_items() {
 
         $query = "SELECT i.id AS ID, i.customer_id, i.invoice_number, i.wc_order_id, i.created, i.due_date, i.paid_date, i.status, i.deleted, i.reminder_sent, u.user_login AS customer_name, u.user_email AS user_email, u.ID AS user_id, p.ID AS order_id, p.post_status, pm.meta_value AS ispconfig_period 
                     FROM {$wpdb->prefix}".Invoice::TABLE." AS i 
-                    LEFT JOIN wp_users AS u ON u.ID = i.customer_id
-                    LEFT JOIN wp_posts AS p ON p.ID = i.wc_order_id
-                    LEFT JOIN wp_postmeta AS pm ON (p.ID = pm.post_id AND pm.meta_key = '_ispconfig_period')
+                    LEFT JOIN {$wpdb->users} AS u ON u.ID = i.customer_id
+                    LEFT JOIN {$wpdb->posts} AS p ON p.ID = i.wc_order_id
+                    LEFT JOIN {$wpdb->postmeta} AS pm ON (p.ID = pm.post_id AND pm.meta_key = '_ispconfig_period')
                     WHERE";
 
         if (isset($_GET['post_status']) && $_GET['post_status'] == 'deleted') {

diff --git a/wc-invoice-pdf.php b/wc-invoice-pdf.php
@@ -2,7 +2,7 @@
 /*
  * Plugin Name: WC Recurring Invoice PDF
  * Description: WooCommerce invoice pdf plugin with recurring payments (scheduled)
- * Version: 1.4.3
+ * Version: 1.4.4
  * Author: ole1986 <ole.k@web.de>
  * Author URI: https://github.com/ole1986/wc-invoice-pdf
  * Plugin URI: https://github.com/ole1986/wc-invoice-pdf/releases