Skip to content

Commit

Permalink
Merge pull request #121 from xylusthemes/recurring_event_and_history_…
Browse files Browse the repository at this point in the history 
…message

set recurring events' end dates and enhanced the import history message.
  • Loading branch information
@Rajat1192
Rajat1192 authored Apr 30, 2024
2 parents 8d4e646 + f41c682 commit c7be163
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 58 deletions.
8 changes: 8 additions & 0 deletions includes/class-import-meetup-events-api.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,10 @@ private function getEventQuery(){
type
url
}
series{
endDate
description
}
isOnline
imageUrl
hosts{
Expand Down Expand Up @@ -149,6 +153,10 @@ private function getGroupEventsQuery(){
type
url
}
series{
endDate
description
}
isOnline
imageUrl
hosts{
Expand Down
41 changes: 18 additions & 23 deletions includes/class-import-meetup-events-common.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,9 +313,6 @@ public function setup_featured_image_to_event( $event_id, $image_url = '' ) {
*/
public function display_import_success_message( $import_data = array(),$import_args = array(), $schedule_post = '' ) {
global $ime_success_msg, $ime_errors;
if( empty( $import_data ) || !empty( $ime_errors ) ){
return;
}

$import_status = $import_ids = array();
foreach ($import_data as $key => $value) {
Expand Down Expand Up @@ -361,26 +358,24 @@ public function display_import_success_message( $import_data = array(),$import_a
$temp_title = 'Manual Import';
}

if( $created > 0 || $updated > 0 || $skipped > 0 || $skip_trash > 0 ){
$insert_args = array(
'post_type' => 'ime_import_history',
'post_status' => 'publish',
'post_title' => $temp_title . " - ".ucfirst( $import_args["import_origin"]),
);

$insert = wp_insert_post( $insert_args, true );
if ( !is_wp_error( $insert ) ) {
update_post_meta( $insert, 'import_origin', $import_args["import_origin"] );
update_post_meta( $insert, 'created', $created );
update_post_meta( $insert, 'updated', $updated );
update_post_meta( $insert, 'skipped', $skipped );
update_post_meta( $insert, 'skip_trash', $skip_trash );
update_post_meta( $insert, 'import_data', $import_args );
if( $schedule_post != '' && $schedule_post > 0 ){
update_post_meta( $insert, 'schedule_import_id', $schedule_post );
}
}
}
$insert_args = array(
'post_type' => 'ime_import_history',
'post_status' => 'publish',
'post_title' => $temp_title . " - ".ucfirst( $import_args["import_origin"]),
);

$insert = wp_insert_post( $insert_args, true );
if ( !is_wp_error( $insert ) ) {
update_post_meta( $insert, 'import_origin', $import_args["import_origin"] );
update_post_meta( $insert, 'created', $created );
update_post_meta( $insert, 'updated', $updated );
update_post_meta( $insert, 'skipped', $skipped );
update_post_meta( $insert, 'skip_trash', $skip_trash );
update_post_meta( $insert, 'import_data', $import_args );
if( $schedule_post != '' && $schedule_post > 0 ){
update_post_meta( $insert, 'schedule_import_id', $schedule_post );
}
}
}

/**
Expand Down
5 changes: 5 additions & 0 deletions includes/class-import-meetup-events-list-table.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,11 @@ function column_stats( $item ) {
if( $skip_trash > 0 ){
$success_message .= sprintf( __( '%d Skipped in Trash', 'import-meetup-events' ), $skip_trash ) ."<br>";
}

if( $created == 0 && $updated == 0 && $skipped == 0 && $skip_trash == 0 ){
$success_message .= "There are no events imported/Updated";
}

$success_message .= "</strong></span>";

// Return the title contents.
Expand Down
16 changes: 13 additions & 3 deletions includes/class-import-meetup-events-meetup.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,24 @@ public function import_events( $event_data = array() ){
$itemsnum = 50;
$endcursor = null;
$have_next_page = true;

while( true === $have_next_page ){
$stopLoop = false;
while( true === $have_next_page && !$stopLoop ){
$meetup_event_data = $api->getGroupEvents( $meetup_group_id, $itemsnum, $endcursor );
$get_upcoming_events = $meetup_event_data['data']['groupByUrlname']['upcomingEvents'];
$meetup_events = $get_upcoming_events['edges'];

if( !empty( $meetup_events ) ){
foreach ($meetup_events as $meetup_event) {
foreach ($meetup_events as $meetup_event ) {

if( isset( $meetup_event['node']['series'] ) && !empty( $meetup_event['node']['series'] ) ){
$end = $meetup_event['node']['endTime'];
$unixTimestamp = strtotime( $end );
$nextfiveyear = strtotime('+2 years', time() );
if( $unixTimestamp > $nextfiveyear ){
$stopLoop = true;
break 2;
}
}
$imported_events[] = $this->save_meetup_event( $meetup_event['node'], $event_data );
}
}
Expand Down
64 changes: 32 additions & 32 deletions languages/import-meetup-events.pot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"POT-Creation-Date: 2024-04-30T10:15:23+00:00\n"
"POT-Creation-Date: 2024-04-30T10:21:41+00:00\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"X-Generator: WP-CLI 2.10.0\n"
"X-Domain: import-meetup-events\n"
Expand Down Expand Up @@ -164,7 +164,7 @@ msgid "Upgrade to Pro"
msgstr ""

#: includes/class-import-meetup-events-admin.php:130
#: includes/class-import-meetup-events-list-table.php:401
#: includes/class-import-meetup-events-list-table.php:406
msgid "Import"
msgstr ""

Expand Down Expand Up @@ -390,77 +390,77 @@ msgstr ""
msgid "Invalid image URL"
msgstr ""

#: includes/class-import-meetup-events-common.php:343
#: includes/class-import-meetup-events-common.php:340
msgid "Event(s) are imported successfully."
msgstr ""

#: includes/class-import-meetup-events-common.php:345
#: includes/class-import-meetup-events-common.php:342
#: includes/class-import-meetup-events-list-table.php:368
msgid "%d Created"
msgstr ""

#: includes/class-import-meetup-events-common.php:348
#: includes/class-import-meetup-events-common.php:345
#: includes/class-import-meetup-events-list-table.php:371
msgid "%d Updated"
msgstr ""

#: includes/class-import-meetup-events-common.php:351
#: includes/class-import-meetup-events-common.php:348
msgid "%d Skipped (Already exists)"
msgstr ""

#: includes/class-import-meetup-events-common.php:354
#: includes/class-import-meetup-events-common.php:351
msgid "%d Skipped (Already exists in Trash )"
msgstr ""

#: includes/class-import-meetup-events-common.php:441
#: includes/class-import-meetup-events-common.php:436
msgid "Once Hourly"
msgstr ""

#: includes/class-import-meetup-events-common.php:444
#: includes/class-import-meetup-events-common.php:439
msgid "Twice Daily"
msgstr ""

#: includes/class-import-meetup-events-common.php:447
#: includes/class-import-meetup-events-common.php:442
msgid "Once Daily"
msgstr ""

#: includes/class-import-meetup-events-common.php:450
#: includes/class-import-meetup-events-common.php:445
msgid "Once Weekly"
msgstr ""

#: includes/class-import-meetup-events-common.php:453
#: includes/class-import-meetup-events-common.php:448
msgid "Once a Month"
msgstr ""

#: includes/class-import-meetup-events-common.php:468
#: includes/class-import-meetup-events-common.php:463
msgid "One-time Import"
msgstr ""

#: includes/class-import-meetup-events-common.php:469
#: includes/class-import-meetup-events-common.php:464
msgid "Scheduled Import"
msgstr ""

#: includes/class-import-meetup-events-common.php:523
#: includes/class-import-meetup-events-common.php:518
msgid "Status"
msgstr ""

#: includes/class-import-meetup-events-common.php:528
#: includes/class-import-meetup-events-common.php:523
msgid "Published"
msgstr ""

#: includes/class-import-meetup-events-common.php:531
#: includes/class-import-meetup-events-common.php:526
msgid "Pending"
msgstr ""

#: includes/class-import-meetup-events-common.php:534
#: includes/class-import-meetup-events-common.php:529
msgid "Draft"
msgstr ""

#: includes/class-import-meetup-events-common.php:643
#: includes/class-import-meetup-events-common.php:638
msgid "Available in Pro version."
msgstr ""

#: includes/class-import-meetup-events-common.php:643
#: includes/class-import-meetup-events-common.php:638
msgid "Upgrade to PRO"
msgstr ""

Expand Down Expand Up @@ -756,7 +756,7 @@ msgstr ""
#: includes/class-import-meetup-events-list-table.php:66
#: includes/class-import-meetup-events-list-table.php:139
#: includes/class-import-meetup-events-list-table.php:341
#: includes/class-import-meetup-events-list-table.php:412
#: includes/class-import-meetup-events-list-table.php:417
msgid "Delete"
msgstr ""

Expand All @@ -782,7 +782,7 @@ msgid "Import Event Status"
msgstr ""

#: includes/class-import-meetup-events-list-table.php:129
#: includes/class-import-meetup-events-list-table.php:402
#: includes/class-import-meetup-events-list-table.php:407
msgid "Import Category"
msgstr ""

Expand All @@ -791,7 +791,7 @@ msgid "Import Frequency"
msgstr ""

#: includes/class-import-meetup-events-list-table.php:131
#: includes/class-import-meetup-events-list-table.php:606
#: includes/class-import-meetup-events-list-table.php:611
msgid "Action"
msgstr ""

Expand All @@ -807,31 +807,31 @@ msgstr ""
msgid "%d Skipped in Trash"
msgstr ""

#: includes/class-import-meetup-events-list-table.php:403
#: includes/class-import-meetup-events-list-table.php:408
msgid "Import Date"
msgstr ""

#: includes/class-import-meetup-events-list-table.php:404
#: includes/class-import-meetup-events-list-table.php:409
msgid "Import Stats"
msgstr ""

#: includes/class-import-meetup-events-list-table.php:466
#: includes/class-import-meetup-events-list-table.php:471
msgid "Warning!! Are you sure you want to delete all these import histories? Import history will be permanently deleted."
msgstr ""

#: includes/class-import-meetup-events-list-table.php:469
#: includes/class-import-meetup-events-list-table.php:474
msgid "Clear Import History"
msgstr ""

#: includes/class-import-meetup-events-list-table.php:603
#: includes/class-import-meetup-events-list-table.php:608
msgid "ID"
msgstr ""

#: includes/class-import-meetup-events-list-table.php:604
#: includes/class-import-meetup-events-list-table.php:609
msgid "Title"
msgstr ""

#: includes/class-import-meetup-events-list-table.php:605
#: includes/class-import-meetup-events-list-table.php:610
msgid "Shortcode"
msgstr ""

Expand Down Expand Up @@ -878,11 +878,11 @@ msgid "Import histories are deleted successfully."
msgstr ""

#: includes/class-import-meetup-events-meetup.php:52
#: includes/class-import-meetup-events-meetup.php:243
#: includes/class-import-meetup-events-meetup.php:253
msgid "Please insert \"Meetup API key\" Or OAuth key and secret in settings."
msgstr ""

#: includes/class-import-meetup-events-meetup.php:90
#: includes/class-import-meetup-events-meetup.php:100
msgid "Please insert valid Meetup Event ID."
msgstr ""

Expand Down

0 comments on commit c7be163

Please sign in to comment.