Changeset 2797313

Timestamp:

10/11/2022 02:41:45 PM (3 years ago)

Author:

netweblogic

Message:

dev 6.1.2.6

Location:

events-manager/trunk

Files:

• classes/em-booking.php (modified) (2 diffs)
• classes/em-bookings.php (modified) (2 diffs)
• classes/em-event.php (modified) (1 diff)
• classes/em-location.php (modified) (1 diff)
• classes/em-person.php (modified) (1 diff)
• classes/event-locations/em-event-location.php (modified) (1 diff)
• events-manager.php (modified) (2 diffs)
• readme.txt (modified) (2 diffs)

events-manager/trunk/classes/em-booking.php

@@ -1074 +1074 @@
             $this->feedback_message = sprintf(__('Booking %s.','events-manager'), $action_string);
             $result = apply_filters('em_booking_set_status', $result, $this); // run the filter before emails go out, in case others need to hook in first
-            if( $result && $email && $this->previous_status != $this->booking_status ){ //email if status has changed
+            if( $result && $this->previous_status != $this->booking_status ){ //email if status has changed
                 do_action('em_booking_status_changed', $this, array('status' => $status, 'email' => $email, 'ignore_spaces' => $ignore_spaces)); // method params passed as array
-                if( $this->email() ){
-                    if( $this->mails_sent > 0 ){
-                        $this->feedback_message .= " ".__('Email Sent.','events-manager');
-                    }
-                }else{
-                    //extra errors may be logged by email() in EM_Object
-                    $this->feedback_message .= ' <span style="color:red">'.__('ERROR : Email Not Sent.','events-manager').'</span>';
-                    $this->add_error(__('ERROR : Email Not Sent.','events-manager'));
+                if( $email ){
+                    if( $this->email() ){
+                        if( $this->mails_sent > 0 ){
+                            $this->feedback_message .= " ".__('Email Sent.','events-manager');
+                        }
+                    }else{
+                        //extra errors may be logged by email() in EM_Object
+                        $this->feedback_message .= ' <span style="color:red">'.__('ERROR : Email Not Sent.','events-manager').'</span>';
+                        $this->add_error(__('ERROR : Email Not Sent.','events-manager'));
+                    }
                 }
             }
@@ -1491 +1493 @@
         return $booking;
     }
+    
+    function to_api( $args = array('event' => true), $version = 'v1' ){
+        $booking = array (
+            'id' => $this->booking_id,
+            'event_id' => $this->event_id,
+            'uuid' => $this->booking_uuid,
+            'person_id' => $this->person_id,
+            'status' => $this->booking_status,
+            'spaces' => $this->booking_spaces,
+            'price' => $this->get_price(),
+            'tax_rate' => $this->get_tax_rate(true), // returned as decimal/percen
+            'taxes' => $this->booking_taxes,
+            'comment' => $this->booking_comment,
+            'meta' => $this->booking_meta,
+            'tickets' => array(),
+        );
+        // add tickets
+        foreach ( $this->get_tickets_bookings() as $EM_Ticket_Bookings ){
+            $booking['tickets'][$EM_Ticket_Bookings->ticket_id] = array(
+                'name' => $EM_Ticket_Bookings->get_ticket()->ticket_name,
+                'description' => $EM_Ticket_Bookings->get_ticket()->ticket_name,
+                'spaces' => $EM_Ticket_Bookings->get_spaces(),
+                'price' => $EM_Ticket_Bookings->get_price(),
+                'attendees' => array(),
+            );
+            foreach ( $EM_Ticket_Bookings as $EM_Ticket_Booking ){
+                $booking['tickets'][$EM_Ticket_Bookings->ticket_id]['attendees'][] = array(
+                    'uuid' => $EM_Ticket_Booking->ticket_uuid,
+                    'price' => $EM_Ticket_Booking->ticket_booking_price,
+                    'meta' => $EM_Ticket_Booking->meta,
+                );
+            }
+        }
+        // if event data should be sent
+        if( !empty($args['event']) ) {
+            $booking['event'] = $this->get_event()->to_api();
+        }
+        return apply_filters('em_booking_to_api', $booking, array(), $this);
+    }
 }
 ?>

events-manager/trunk/classes/em-bookings.php

@@ -6 +6 @@
  * @property EM_Event $event
  */
-class EM_Bookings extends EM_Object implements Iterator{
+class EM_Bookings extends EM_Object implements Iterator, ArrayAccess {
     
     /**
@@ -866 +866 @@
         return $var;
     }
+    
+    // ArrayAccess Implementation
+    #[\ReturnTypeWillChange]
+    /**
+     * @param $offset
+     * @param $value
+     * @return void
+     */
+    public function offsetSet($offset, $value) {
+        if (is_null($offset)) {
+            $this->bookings[] = $value;
+        } else {
+            $this->bookings[$offset] = $value;
+        }
+    }
+    #[\ReturnTypeWillChange]
+    /**
+     * @param $offset
+     * @return bool
+     */
+    public function offsetExists($offset) {
+        return isset($this->bookings[$offset]);
+    }
+    #[\ReturnTypeWillChange]
+    /**
+     * @param $offset
+     * @return void
+     */
+    public function offsetUnset($offset) {
+        unset($this->bookings[$offset]);
+    }
+    #[\ReturnTypeWillChange]
+    /**
+     * @param $offset
+     * @return EM_Ticket_Bookings|null
+     */
+    public function offsetGet($offset) {
+        return isset($this->bookings[$offset]) ? $this->bookings[$offset] : null;
+    }
 }
 ?>

events-manager/trunk/classes/em-event.php

@@ -3597 +3597 @@
         return apply_filters('em_event_can_manage', parent::can_manage($owner_capability, $admin_capability, $user_to_check), $this, $owner_capability, $admin_capability, $user_to_check);
     }
+    
+    /**
+     * Outputs a JSON-encodable associative array of data to output to REST or other remote operations
+     * @return array
+     */
+    function to_api(){
+        $event = array (
+            'name' => $this->event_name,
+            'id' => $this->event_id,
+            'post_id' => $this->post_id,
+            'parent' => $this->event_parent,
+            'owner' => $this->event_owner, // overwritten further down
+            'blog_id' => $this->blog_id,
+            'group_id' => $this->group_id,
+            'slug' => $this->event_slug,
+            'status' => $this->event_private,
+            'content' => $this->post_content,
+            'bookings' => array (
+                'end_date' => '$this->event_rsvp_date',
+                'end_time' => '$this->event_rsvp_time',
+                'rsvp_spaces' => '$this->event_rsvp_spaces',
+                'spaces' => $this->event_spaces,
+            ),
+            'when' => array(
+                'all_day' => $this->event_all_day,
+                'start' => $this->event_start,
+                'start_date' => $this->event_start_date,
+                'start_time' => $this->event_start_time,
+                'end' => $this->event_end,
+                'end_date' => $this->event_end_date,
+                'end_time' => $this->event_end_time,
+                'timezone' => $this->event_timezone,
+            ),
+            'location' => false,
+            'recurrence' => false,
+            'language' => $this->event_language,
+            'translation' => $this->event_translation,
+        );
+        if( $this->event_owner ){
+            // anonymous
+            $event['owner'] = array(
+                'guest' => true,
+                'email' => $this->get_contact()->user_email,
+                'name' => $this->get_contact()->get_name(),
+            );
+        }else{
+            // user
+            $event['owner'] = array(
+                'guest' => false,
+                'email' => $this->get_contact()->user_email,
+                'name' => $this->get_contact()->get_name(),
+            );
+        }
+        if( $this->recurrence_id ){
+            $event['recurrence_id'] = $this->recurrence_id;
+        }
+        if( $this->recurrence ){
+            $event['recurrence'] = array (
+                'interval' => $this->recurrence_interval,
+                'freq' => $this->recurrence_freq,
+                'days' => $this->recurrence_days,
+                'byday' => $this->recurrence_byday,
+                'byweekno' => $this->recurrence_byweekno,
+                'rsvp_days' => $this->recurrence_rsvp_days,
+            );
+        }
+        if( $this->location_type ){
+            $event['location_type'] = $this->event_location_type;
+            if( $this->has_location() ) {
+                $EM_Location = $this->get_location();
+                $event['location'] = $EM_Location->to_api();
+            }elseif( $this->has_event_location() ){
+                $event['location'] = $this->get_event_location()->to_api();
+            }
+        }
+        return $event;
+    }
 }
 

events-manager/trunk/classes/em-location.php

@@ -1171 +1171 @@
         return apply_filters('em_location_get_google_maps_embed_url', $url, $this);
     }
+    
+    public function to_api(){
+        return array (
+            'name' => $this->location_name,
+            'id' => $this->location_id,
+            'parent' => $this->location_parent,
+            'post_id' => $this->post_id,
+            'blog_id' => $this->blog_id,
+            'owner' => $this->location_owner,
+            'status' => $this->location_status,
+            'slug' => $this->location_slug,
+            'content' => $this->post_content,
+            'geo' => array(
+                'latitude' => $this->location_latitude,
+                'longitude' => $this->location_longitude,
+            ),
+            'address' => array(
+                'address' => $this->location_address,
+                'town' => $this->location_town,
+                'region' => $this->location_region,
+                'state' => $this->location_state,
+                'postcode' => $this->location_postcode,
+                'country' => $this->location_country,
+            ),
+            'language' => $this->location_language,
+            'translation' => $this->location_translation,
+        );
+    }
 }

events-manager/trunk/classes/em-person.php

@@ -124 +124 @@
         return apply_filters('em_person_get_name', $name, $this);
     }
+    
+    function to_api(){
+        $person = array(
+            'id' => $this->ID, // maybe hide this depending on permissions
+            'name' => $this->get_name(),
+            'name_first' => $this->first_name,
+            'name_last' => $this->last_name,
+            'email' => $this->user_email,
+            'phone' => $this->phone,
+            'guest' => $this->ID > 0, // whether person is registered or not
+        );
+        $person = array_merge( $person, $this->custom_user_fields );
+        return apply_filters('em_person_to_api', $person);
+    }
 }
 ?>

events-manager/trunk/classes/event-locations/em-event-location.php

@@ -206 +206 @@
         return false;
     }
+    
+    public function to_api(){
+        return array_merge( $this->data, array(
+            'type' => static::$type,
+        ));
+    }
 }
 

events-manager/trunk/events-manager.php

@@ -2 +2 @@
 /*
 Plugin Name: Events Manager
-Version: 6.1.2.5
+Version: 6.1.2.6
 Plugin URI: http://wp-events-plugin.com
 Description: Event registration and booking management for WordPress. Recurring events, locations, webinars, google maps, rss, ical, booking registration and more!
@@ -29 +29 @@
 
 // Setting constants
-define('EM_VERSION', '6.1.2.5'); //self expanatory, although version currently may not correspond directly with published version number. until 6.0 we're stuck updating 5.999.x
+define('EM_VERSION', '6.1.2.6'); //self expanatory, although version currently may not correspond directly with published version number. until 6.0 we're stuck updating 5.999.x
 define('EM_PRO_MIN_VERSION', '3.0'); //self expanatory
 define('EM_PRO_MIN_VERSION_CRITICAL', '3.0'); //self expanatory

events-manager/trunk/readme.txt

@@ -136 +136 @@
 
 == Changelog ==
-= 6.1.2.5 (dev) =
+= 6.1.2.6 (dev) =
 * fixed datepicker range JS issues
 * added ability to override email formats (currently only upon installation for event approval email template)
@@ -158 +158 @@
 * added em_booking_output_show_condition filter to help determine whether to show a condition
 * fixed search results coming back with incorrect styling layout when in responsive/mobile mode
+* added output methods for APIs via array for JSON for main objects (events, locations, bookings)
 
 = 6.1.2.1 =