Changeset 2083

Timestamp:

11/16/2015 01:16:20 PM (11 years ago)

Author:

kovshenin

Message:

WordCamp.org: Add some basic logging to our payment requests plugin.

Location:

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

Files:

• classes/payment-request.php (modified) (5 diffs)
• classes/wordcamp-payments.php (modified) (3 diffs)
• css/wordcamp-payments.css (modified) (1 diff)
• views/payment-request/metabox-log.php (added)

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/classes/payment-request.php

@@ -20 +20 @@
                 add_action( 'save_post',              array( $this, 'save_payment' ), 10, 2 );
                 add_filter( 'map_meta_cap',           array( $this, 'modify_capabilities' ), 10, 4 );
+                add_action( 'transition_post_status', array( $this, 'transition_post_status' ), 10, 3 );
 
                 // Columns
@@ -165 +166 @@
                         'high'
                 );
+
+                add_meta_box( 'wcp_log', __( 'Log', 'wordcamporg' ), array( $this, 'render_log_metabox' ),
+                        self::POST_TYPE, 'normal', 'high' );
         }
 
@@ -248 +252 @@
 
                 require_once( dirname( __DIR__ ) . '/views/payment-request/metabox-files.php' );
+        }
+
+        /**
+         * Render the Log metabox
+         *
+         * @param WP_Post $post
+         */
+        public function render_log_metabox( $post ) {
+                $log = get_post_meta( $post->ID, '_wcp_log', true );
+                if ( empty( $log ) )
+                        $log = '[]';
+
+                $log = json_decode( $log, true );
+
+                // I wish I had a spaceship.
+                uasort( $log, function( $a, $b ) {
+                        if ( $b['timestamp'] == $a )
+                                return 0;
+
+                        return ( $a['timestamp'] < $b['timestamp'] ) ? -1 : 1;
+                });
+
+                require_once( dirname( __DIR__ ) . '/views/payment-request/metabox-log.php' );
         }
 
@@ -658 +685 @@
                                 $post_data['post_status'] = 'incomplete';
                                 $this->notify_requester_request_incomplete( $post_data_raw['ID'], $post_data, $post_data_raw );
+
+                                update_post_meta( $post_data_raw['ID'], '_wcp_incomplete_notes', sanitize_text_field( $post_data_raw['wcp_mark_incomplete_notes'] ) );
                         } else {
                                 $previous_status          = $post_data['post_status'];
@@ -901 +930 @@
         }
 
+        public function transition_post_status( $new, $old, $post ) {
+                if ( $post->post_type != self::POST_TYPE )
+                        return;
+
+                $user = get_user_by( 'id', get_current_user_id() );
+                if ( $new == 'auto-draft' )
+                        return;
+
+                if ( $new == 'incomplete' && $old != 'incomplete' ) {
+                        $incomplete_text = get_post_meta( $post->ID, '_wcp_incomplete_notes', true );
+                        $incomplete_text = preg_replace( '#\.$#', '', $incomplete_text ); // trailing-undot-it.
+                        WordCamp_Payments::log( $post->ID, sprintf( 'Marked as incomplete by %s: %s.', $user->display_name, $incomplete_text ), array(
+                                'user_id' => $user->ID,
+                                'action' => 'marked-incomplete',
+                                'reason' => 'maybe notes',
+                        ) );
+                } elseif ( $new == 'paid' && $old != 'paid' ) {
+                        WordCamp_Payments::log( $post->ID, sprintf( 'Marked as paid by %s.', $user->display_name ), array(
+                                'user_id' => $user->ID,
+                                'action' => 'marked-paid',
+                        ) );
+                } elseif ( $old == 'auto-draft' && $new != 'auto-draft' ) {
+                        WordCamp_Payments::log( $post->ID, sprintf( 'Request created by %s.', $user->display_name ), array(
+                                'user_id' => $user->ID,
+                                'action' => 'updated',
+                        ) );
+                } else {
+                        WordCamp_Payments::log( $post->ID, sprintf( 'Request updated by %s.', $user->display_name ), array(
+                                'user_id' => $user->ID,
+                                'action' => 'updated',
+                        ) );
+                }
+        }
+
         /**
          * Attach unattached files to the payment request post

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

@@ -11 +11 @@
          */
         public function __construct() {
-                add_action( 'admin_enqueue_scripts',  array( $this, 'enqueue_assets' ) );
+                add_action( 'admin_enqueue_scripts',  array( $this, 'enqueue_assets' ), 11 );
         }
 
@@ -39 +39 @@
                 );
 
+                // Let's still include our .css file even if these are unavailable.
+                $soft_deps = array( 'jquery-ui', 'wp-datepicker-skins' );
+                foreach ( $soft_deps as $key => $handle )
+                        if ( ! wp_style_is( $handle, 'registered' ) )
+                                unset( $soft_deps[ $key ] );
+
                 wp_register_style(
                         'wordcamp-payments',
                         plugins_url( 'css/wordcamp-payments.css', __DIR__ ),
-                        array( 'jquery-ui', 'wp-datepicker-skins' ),
+                        $soft_deps,
                         self::VERSION
                 );
@@ -68 +74 @@
                 }
         }
+
+        /**
+         * Log something with a payment request.
+         *
+         * @param int $post_id The payment requset ID.
+         * @param string $message A log message.
+         * @param array $data Optional data.
+         */
+        public static function log( $post_id, $message, $data = array() ) {
+                global $wpdb;
+
+                $entry = array(
+                        'timestamp' => time(),
+                        'message' => $message,
+                        'data' => $data,
+                );
+
+                $log = get_post_meta( $post_id, '_wcp_log', true );
+                if ( empty( $log ) )
+                        $log = '[]';
+
+                $log = json_decode( $log, true );
+                $log[] = $entry;
+                $log = json_encode( $log );
+
+                update_post_meta( $post_id, '_wcp_log', wp_slash( $log ) );
+        }
 }

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

@@ -27 +27 @@
         margin-bottom: 1em;
 }
+
+#wcp_log .inside {
+        margin: 0;
+        padding: 0;
+}
+
+#wcp_log .wcp-request-log {
+        border-collapse: collapse;
+        width: 100%;
+}
+
+#wcp_log .wcp-request-log td {
+        padding: 8px;
+}
+
+#wcp_log td.timestamp {
+        width: 130px;
+}