Changeset 2526

Timestamp:

02/18/2016 10:22:32 PM (10 years ago)

Author:

iandunn

Message:

WordCamp Budgets Dashboard: Store the corresponding QBO ID for an invoice.

Location:

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network

Files:

• includes/sponsor-invoices-dashboard.php (modified) (7 diffs)
• javascript/sponsor-invoices.js (modified) (1 diff)

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/sponsor-invoices-dashboard.php

@@ -5 +5 @@
 defined( 'WPINC' ) or die();
 
-const LATEST_DATABASE_VERSION = 1;
+const LATEST_DATABASE_VERSION = 2;
 
 if ( defined( 'DOING_AJAX' ) ) {
@@ -165 +165 @@
                         blog_id       int( 11 )        unsigned NOT NULL default '0',
                         invoice_id    int( 11 )        unsigned NOT NULL default '0',
+                        qbo_invoice_id int( 11 )        unsigned NOT NULL default '0',
                         invoice_title varchar( 75 )             NOT NULL default '',
                         status        varchar( 30 )             NOT NULL default '',
@@ -214 +215 @@
         }
 
+        switch_to_blog( $site_id );
+
         $quickbooks_result = send_invoice_to_quickbooks( $site_id, $invoice_id );
 
-        if ( 'sent' === $quickbooks_result ) {
+        if ( is_int( $quickbooks_result ) ) {
+                update_post_meta( $invoice_id, '_wcbsi_qbo_invoice_id', absint( $quickbooks_result ) );
                 update_invoice_status(           $site_id, $invoice_id, 'approved' );
                 notify_organizer_status_changed( $site_id, $invoice_id, 'approved' );
-                wp_send_json_success( array( 'message' => 'The invoice has been approved.' ) );
+
+                $result = array( 'success' => 'The invoice has been approved and e-mailed to the sponsor.' );
         } else {
-                wp_send_json_error( array( 'error' => $quickbooks_result ) );
+                $result = array( 'error' => $quickbooks_result );
+        }
+
+        restore_current_blog();
+
+        if ( isset( $result['success'] ) ) {
+                wp_send_json_success( $result );
+        } else {
+                wp_send_json_error( $result );
         }
 }
@@ -231 +244 @@
  * @param int $invoice_id
  *
- * @return string
+ * @return int|string
  */
 function send_invoice_to_quickbooks( $site_id, $invoice_id ) {
@@ -262 +275 @@
 
         $sent = 'QuickBooks integration is not complete yet.';
-        // todo return 'sent' (string) on success, or an error message string on failure
+        // todo return QBO invoice ID on success, or an error message string on failure
 
         restore_current_blog();
@@ -420 +433 @@
                 'blog_id'       => get_current_blog_id(),
                 'invoice_id'    => $invoice_id,
+                'qbo_invoice_id' => get_post_meta( $invoice_id, '_wcbsi_qbo_invoice_id', true ),
                 'invoice_title' => $invoice->post_title,
                 'status'        => $invoice->post_status,
@@ -430 +444 @@
         );
 
-        $formats = array( '%d', '%d', '%s', '%s', '%s', '%s', '%s', '%s', '%d', '%f' );
+        $formats = array( '%d', '%d', '%d', '%s', '%s', '%s', '%s', '%s', '%s', '%d', '%f' );
 
         $wpdb->replace( get_index_table_name(), $index_row, $formats );

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/javascript/sponsor-invoices.js

@@ -50 +50 @@
                                                         if ( response.hasOwnProperty( 'success' ) && true === response.success ) {
                                                                 statusMessage.addClass( 'notice notice-success' );
-                                                                statusMessage.html( _.escape( response.data.message ) );
+                                                                statusMessage.html( _.escape( response.data.success ) );
                                                         } else {
                                                                 statusMessage.addClass( 'notice notice-error' );