Finish with the export json for uptra

Outputs the json data same as current live site.

diff --git a/models/admin/ajax/membersListJson.php b/models/admin/ajax/membersListJson.php
index 291d123..85772ee 100644 (file)
--- a/models/admin/ajax/membersListJson.php
+++ b/models/admin/ajax/membersListJson.php
@@ -87,23 +87,37 @@ class GlmMembersAdmin_ajax_membersListJson extends GlmDataMemberInfo
         $memberIndex = 0;
         foreach ( $memberList as $key => $member ) {
 
+            // Get member type
+            $member_type = $this->wpdb->get_var(
+                $this->wpdb->prepare(
+                    "SELECT name
+                       FROM " . GLM_MEMBERS_PLUGIN_DB_PREFIX . "member_type
+                      WHERE id = (
+                            SELECT member_type
+                              FROM " . GLM_MEMBERS_PLUGIN_DB_PREFIX . "members
+                             WHERE id = %d
+                    )",
+                    $member['member_pointer']
+                )
+            );
+
             $members[$memberIndex] = array(
-                'Unique ID'     => $member['member_pointer'],
-                'Business Name' => $member['member_name'],
-                'Member Type'   => null,
-                'Street'        => $member['addr1'],
-                'City'          => $member['city'],
-                'State'         => $member['state']['name'],
-                'Zip'           => $member['zip'],
+                'Unique ID'     => ( isset( $member['member_pointer'] ) && $member['member_pointer'] ) ? $member['member_pointer'] : null,
+                'Business Name' => ( isset( $member['member_name'] ) && $member['member_name'] ) ? $member['member_name'] : null,
+                'Member Type'   => ( isset( $member_type ) && $member_type ) ? $member_type : null,
+                'Street'        => ( isset( $member['addr1'] ) && $member['addr1'] ) ? $member['addr1'] : null,
+                'City'          => ( isset( $member['city'] ) && $member['city'] ) ? $member['city'] : null,
+                'State'         => ( isset( $member['state']['name'] ) && $member['state']['name'] ) ? $member['state']['name'] : null,
+                'Zip'           => ( isset( $member['zip'] ) && $member['zip'] ) ? $member['zip'] : null,
                 'Last Update'   => ( isset( $member['modify_time']['timestamp'] ) ) ? date( 'm/d/Y', $member['modify_time']['timestamp'] ) : '',
-                'Description'   => $member['descr'],
-                'Phone'         => $member['phone'],
-                'Email'         => $member['email'],
-                'Website'       => $member['url'],
-                'Image Url'     => null,
-                'Latitude'      => $member['lat'],
-                'Longitude'     => $member['lon'],
-                'Fax'           => null,
+                'Description'   => ( isset( $member['descr'] ) && $member['descr'] ) ? $member['descr'] : null,
+                'Phone'         => ( isset( $member['phone'] ) && $member['phone'] ) ? $member['phone'] : null,
+                'Fax'           => ( isset( $member['fax'] ) && $member['fax'] ) ? $member['fax'] : null,
+                'Email'         => ( isset( $member['email'] ) && $member['email'] ) ? $member['email'] : null,
+                'Website'       => ( isset( $member['url'] ) && $member['url'] ) ? $member['url'] : null,
+                'Image Url'     => ( isset( $member['logo'] ) && $member['logo'] ) ? $member['logo'] : null,
+                'Latitude'      => ( isset( $member['lat'] ) && $member['lat'] ) ? $member['lon'] : null,
+                'Longitude'     => ( isset( $member['lon'] ) && $member['lon'] ) ? $member['lat'] : null,
             );
 
             // Get social urls