From 3349346caa9458990df57caf14c73662d9a127bd Mon Sep 17 00:00:00 2001 From: Stephen Page Date: Wed, 15 May 2024 15:49:21 -0400 Subject: [PATCH 1/4] Remove VE, EVA, and ETW+ from the app shopping and bundles pages. --- src/Tribe/App_Shop.php | 23 --------------- src/Tribe/Plugins_API.php | 60 --------------------------------------- 2 files changed, 83 deletions(-) diff --git a/src/Tribe/App_Shop.php b/src/Tribe/App_Shop.php index 5bba5fc37b..a1ef274558 100755 --- a/src/Tribe/App_Shop.php +++ b/src/Tribe/App_Shop.php @@ -150,18 +150,14 @@ private function get_all_products() { $products = [ 'the-events-calendar' => (object) $all_products['the-events-calendar'], 'events-calendar-pro' => (object) $all_products['events-calendar-pro'], - 'events-virtual' => (object) $all_products['events-virtual'], 'event-aggregator' => (object) $all_products['event-aggregator'], - 'event-automator' => (object) $all_products['event-automator'], 'event-tickets' => (object) $all_products['event-tickets'], 'event-tickets-plus' => (object) $all_products['event-tickets-plus'], - 'event-tickets-wallet-plus' => (object) $all_products['event-tickets-wallet-plus'], 'promoter' => (object) $all_products['promoter'], 'tribe-filterbar' => (object) $all_products['tribe-filterbar'], 'events-community' => (object) $all_products['events-community'], 'events-community-tickets' => (object) $all_products['events-community-tickets'], 'event-schedule-manager' => (object) $all_products['event-schedule-manager'], - 'tribe-eventbrite' => (object) $all_products['tribe-eventbrite'], 'image-widget-plus' => (object) $all_products['image-widget-plus'], ]; @@ -199,25 +195,6 @@ private function get_bundles() { 'event-aggregator' ], ], - (object) [ - 'title' => __( 'Virtual Events Marketing Bundle', 'tribe-common' ), - 'logo' => 'images/logo/bundle-virtual-events.svg', - 'link' => 'http://evnt.is/ve-bundle', - 'discount' => __( 'Save over 20%', 'tribe-common' ), - 'description' => __( 'Streamline your online events and increase revenue.', 'tribe-common' ), - 'includes' => [ - 'events-calendar-pro', - 'event-tickets-plus', - 'events-virtual', - 'promoter', - ], - 'features' => [ - __( 'Sell tickets and earn revenue for online events', 'tribe-common' ), - __( 'Zoom integration', 'tribe-common' ), - __( 'Automated emails optimized for virtual events', 'tribe-common' ), - __( 'Add recurring events', 'tribe-common' ), - ], - ], (object) [ 'title' => __( 'Community Manager Bundle', 'tribe-common' ), 'logo' => 'images/logo/bundle-community-manager.svg', diff --git a/src/Tribe/Plugins_API.php b/src/Tribe/Plugins_API.php index d2897a3166..63a13ae0f4 100644 --- a/src/Tribe/Plugins_API.php +++ b/src/Tribe/Plugins_API.php @@ -61,26 +61,6 @@ public function get_products() { 'free' => false, 'active_installs' => 20000, ], - 'event-automator' => [ - 'title' => __( 'Event Automator', 'tribe-common' ), - 'slug' => 'event-automator', - 'link' => 'https://evnt.is/1bc7', - 'plugin-dir' => 'event-automator', - 'main-file' => 'event-automator.php', - 'description' => __( 'Automate your event workflow with Zapier—no code required!', 'tribe-common' ), - 'description-help' => __( 'Connect The Events Calendar and Event Tickets with thousands of the most popular apps.', 'tribe-common' ), - 'features' => [ - __( 'Lead Management', 'tribe-common' ), - __( 'Communication Outreach', 'tribe-common' ), - __( 'Internal Processes', 'tribe-common' ), - __( 'Data Management', 'tribe-common' ), - ], - 'image' => 'images/shop/automator.svg', - 'logo' => 'images/logo/event-automator.svg', - 'is_installed' => class_exists( 'TEC\Event_Automator\Plugin' ), - 'free' => false, - 'active_installs' => 0, - ], 'events-calendar-pro' => [ 'title' => __( 'Events Calendar Pro', 'tribe-common' ), 'slug' => 'events-calendar-pro', @@ -263,46 +243,6 @@ public function get_products() { 'free' => false, 'active_installs' => 2500, ], - 'events-virtual' => [ - 'title' => __( 'Virtual Events', 'tribe-common' ), - 'slug' => 'events-virtual', - 'link' => 'http://evnt.is/virtual-events', - 'plugin-dir' => 'events-virtual', - 'main-file' => 'events-virtual.php', - 'description' => __( 'Features to optimize your calendar for virtual events.', 'tribe-common' ), - 'description-help' => __( 'Highlight virtual events on you calendar and integrate with your favorite online meeting tools.', 'tribe-common' ), - 'features' => [ - __( 'Zoom integration', 'tribe-common' ), - __( 'Virtual event labels', 'tribe-common' ), - __( 'Status control for canceled or postponed events', 'tribe-common' ), - __( 'Embed livestreams and videos', 'tribe-common' ), - ], - 'image' => 'images/shop/virtual-events.jpg', - 'logo' => 'images/logo/virtual-events.svg', - 'is_installed' => defined( 'EVENTS_VIRTUAL_FILE' ), - 'free' => false, - 'active_installs' => 2500, - ], - 'event-tickets-wallet-plus' => [ - 'title' => __( 'Wallet Plus', 'tribe-common' ), - 'slug' => 'event-tickets-wallet-plus', - 'link' => 'https://evnt.is/1bd7', - 'plugin-dir' => 'event-tickets-wallet-plus', - 'main-file' => 'event-tickets-wallet-plus.php', - 'description' => __( 'Make it simple for your attendees to save and find their tickets.', 'tribe-common' ), - 'description-help' => __( 'Allow event attendees to save their tickets to digital wallets.', 'tribe-common' ), - 'features' => [ - __( 'Flexible ticket formats', 'tribe-common' ), - __( 'Easy day-of-event management', 'tribe-common' ), - __( 'Email and checkout integration', 'tribe-common' ), - __( 'Ticket portability', 'tribe-common' ), - ], - 'image' => 'images/shop/wallet-plus.jpg', - 'logo' => 'images/logo/wallet-plus.svg', - 'is_installed' => defined( 'EVENT_TICKETS_WALLET_FILE' ), - 'free' => false, - 'active_installs' => 0, - ], 'event-schedule-manager' => [ 'title' => __( 'Event Schedule Manager', 'tribe-common' ), 'slug' => 'event-schedule-manager', From efaff86774cf338f0e446a0b51c96c12b0a5728f Mon Sep 17 00:00:00 2001 From: Stephen Page Date: Thu, 16 May 2024 13:48:02 -0400 Subject: [PATCH 2/4] Remove from help pages as well. --- src/Tribe/Admin/Help_Page.php | 3 --- src/admin-views/help-calendar.php | 7 +------ 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Tribe/Admin/Help_Page.php b/src/Tribe/Admin/Help_Page.php index d20f5cdb8e..f2547d2492 100644 --- a/src/Tribe/Admin/Help_Page.php +++ b/src/Tribe/Admin/Help_Page.php @@ -1110,8 +1110,6 @@ public function get_calendar_products() { 'events-calendar-pro', 'tribe-filterbar', 'event-aggregator', - 'event-automator', - 'events-virtual', 'event-schedule-manager', ] ); @@ -1206,7 +1204,6 @@ public function get_ticketing_products() { 'event-tickets-plus', 'tribe-eventbrite', 'promoter', - 'event-tickets-wallet-plus', ] ); } diff --git a/src/admin-views/help-calendar.php b/src/admin-views/help-calendar.php index c8511dab87..4416f0b06a 100644 --- a/src/admin-views/help-calendar.php +++ b/src/admin-views/help-calendar.php @@ -109,11 +109,6 @@ class="tribe-events-admin-kb-card__image" -
  • - - - -
    • @@ -247,4 +242,4 @@ class="tribe-events-admin-kb-card__image" - \ No newline at end of file + From 14349caf434812d007b15807e1800b036e1b1310 Mon Sep 17 00:00:00 2001 From: Stephen Page Date: Tue, 28 May 2024 13:48:21 -0400 Subject: [PATCH 3/4] Fix tests --- .github/workflows/tests-php.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests-php.yml b/.github/workflows/tests-php.yml index 2b4c59e6ca..9bfa7119f0 100644 --- a/.github/workflows/tests-php.yml +++ b/.github/workflows/tests-php.yml @@ -167,9 +167,16 @@ jobs: run: | ${SLIC_BIN} use the-events-calendar/common ${SLIC_BIN} composer install + # ------------------------------------------------------------------------------ + # Update WordPress version to our min required. + # ------------------------------------------------------------------------------ - name: Init the WordPress container if: steps.skip.outputs.value != 1 - run: ${SLIC_BIN} up wordpress + run: | + ${SLIC_BIN} up wordpress + ${SLIC_BIN} wp core version + ${SLIC_BIN} wp core update --force --version=6.3.1 + ${SLIC_BIN} wp core version - name: Run suite tests if: steps.skip.outputs.value != 1 run: ${SLIC_BIN} run ${{ matrix.suite }} --debug --ext DotReporter From 31fa703cc917290394537e5a0cf6ae0d42a372b2 Mon Sep 17 00:00:00 2001 From: Camwyn Date: Thu, 27 Jun 2024 16:31:49 -0400 Subject: [PATCH 4/4] Put back EBT and some formatting --- src/Tribe/App_Shop.php | 159 +++++++++++++++++++++-------------------- 1 file changed, 80 insertions(+), 79 deletions(-) diff --git a/src/Tribe/App_Shop.php b/src/Tribe/App_Shop.php index a1ef274558..b9d7fb560d 100755 --- a/src/Tribe/App_Shop.php +++ b/src/Tribe/App_Shop.php @@ -148,17 +148,18 @@ private function get_all_products() { $all_products = tribe( 'plugins.api' )->get_products(); $products = [ - 'the-events-calendar' => (object) $all_products['the-events-calendar'], - 'events-calendar-pro' => (object) $all_products['events-calendar-pro'], - 'event-aggregator' => (object) $all_products['event-aggregator'], - 'event-tickets' => (object) $all_products['event-tickets'], - 'event-tickets-plus' => (object) $all_products['event-tickets-plus'], - 'promoter' => (object) $all_products['promoter'], - 'tribe-filterbar' => (object) $all_products['tribe-filterbar'], - 'events-community' => (object) $all_products['events-community'], - 'events-community-tickets' => (object) $all_products['events-community-tickets'], - 'event-schedule-manager' => (object) $all_products['event-schedule-manager'], - 'image-widget-plus' => (object) $all_products['image-widget-plus'], + 'the-events-calendar' => (object) $all_products['the-events-calendar'], + 'events-calendar-pro' => (object) $all_products['events-calendar-pro'], + 'event-aggregator' => (object) $all_products['event-aggregator'], + 'event-tickets' => (object) $all_products['event-tickets'], + 'event-tickets-plus' => (object) $all_products['event-tickets-plus'], + 'promoter' => (object) $all_products['promoter'], + 'tribe-filterbar' => (object) $all_products['tribe-filterbar'], + 'events-community' => (object) $all_products['events-community'], + 'events-community-tickets' => (object) $all_products['events-community-tickets'], + 'event-schedule-manager' => (object) $all_products['event-schedule-manager'], + 'tribe-eventbrite' => (object) $all_products['tribe-eventbrite'], + 'image-widget-plus' => (object) $all_products['image-widget-plus'], ]; return $products; @@ -172,36 +173,36 @@ private function get_all_products() { private function get_bundles() { $bundles = [ (object) [ - 'title' => __( 'Events Marketing Bundle', 'tribe-common' ), - 'logo' => 'images/logo/bundle-event-marketing.svg', - 'link' => 'https://evnt.is/1aj3', - 'discount' => __( 'Save over 20%', 'tribe-common' ), + 'title' => __( 'Events Marketing Bundle', 'tribe-common' ), + 'logo' => 'images/logo/bundle-event-marketing.svg', + 'link' => 'https://evnt.is/1aj3', + 'discount' => __( 'Save over 20%', 'tribe-common' ), 'description' => __( 'Ticket sales, attendee management, and email marketing for your events', 'tribe-common' ), - 'includes' => [ + 'includes' => [ 'events-calendar-pro', 'event-tickets-plus', 'promoter', ], ], (object) [ - 'title' => __( 'Event Importer Bundle', 'tribe-common' ), - 'logo' => 'images/logo/bundle-event-importer.svg', - 'link' => 'https://evnt.is/1aj2', - 'discount' => __( 'Save over 25%', 'tribe-common' ), + 'title' => __( 'Event Importer Bundle', 'tribe-common' ), + 'logo' => 'images/logo/bundle-event-importer.svg', + 'link' => 'https://evnt.is/1aj2', + 'discount' => __( 'Save over 25%', 'tribe-common' ), 'description' => __( 'Fill your calendar with events from across the web, including Google Calendar, Meetup, and more.', 'tribe-common' ), - 'includes' => [ + 'includes' => [ 'events-calendar-pro', 'tribe-filterbar', 'event-aggregator' ], ], (object) [ - 'title' => __( 'Community Manager Bundle', 'tribe-common' ), - 'logo' => 'images/logo/bundle-community-manager.svg', - 'link' => 'https://evnt.is/1aj4', - 'discount' => __( 'Save over 20%', 'tribe-common' ), /* code review: fix this */ + 'title' => __( 'Community Manager Bundle', 'tribe-common' ), + 'logo' => 'images/logo/bundle-community-manager.svg', + 'link' => 'https://evnt.is/1aj4', + 'discount' => __( 'Save over 20%', 'tribe-common' ), /* code review: fix this */ 'description' => __( 'Handle event submissions with ticket sales and everything you need to build a robust community.', 'tribe-common' ), - 'includes' => [ + 'includes' => [ 'event-tickets-plus', 'events-community', 'events-community-tickets', @@ -209,12 +210,12 @@ private function get_bundles() { ], ], (object) [ - 'title' => __( 'Ultimate Bundle', 'tribe-common' ), - 'logo' => 'images/logo/bundle-ultimate.svg', - 'link' => 'https://evnt.is/1aj5', - 'discount' => __( 'Save over 20%', 'tribe-common' ), /* code review: fix this */ + 'title' => __( 'Ultimate Bundle', 'tribe-common' ), + 'logo' => 'images/logo/bundle-ultimate.svg', + 'link' => 'https://evnt.is/1aj5', + 'discount' => __( 'Save over 20%', 'tribe-common' ), /* code review: fix this */ 'description' => __( 'All of our premium events management plugins at a deep discount.', 'tribe-common' ), - 'includes' => [ + 'includes' => [ 'events-calendar-pro', 'event-tickets-plus', //'events-virtual', // not yet added to the bundle @@ -240,39 +241,39 @@ private function get_bundles() { private function get_extensions() { $extensions = [ (object) [ - 'title' => __( 'Website URL CTA', 'tribe-common' ), - 'link' => 'https://evnt.is/1aj6', - 'image' => 'images/shop/extension-web-url-cta.jpg', + 'title' => __( 'Website URL CTA', 'tribe-common' ), + 'link' => 'https://evnt.is/1aj6', + 'image' => 'images/shop/extension-web-url-cta.jpg', 'description' => __( 'Create a strong call-to-action for attendees to "Join Webinar" instead of only sharing a website address.', 'tribe-common' ), ], (object) [ - 'title' => __( 'Link Directly to Webinar', 'tribe-common' ), - 'link' => 'https://evnt.is/1aj7', - 'image' => 'images/shop/extension-link-to-webinar.jpg', + 'title' => __( 'Link Directly to Webinar', 'tribe-common' ), + 'link' => 'https://evnt.is/1aj7', + 'image' => 'images/shop/extension-link-to-webinar.jpg', 'description' => __( 'When users click on the event title, they’ll be taken right to the source of your event, offering a direct route to join.', 'tribe-common' ), ], (object) [ - 'title' => __( 'Events Happening Now', 'tribe-common' ), - 'link' => 'https://evnt.is/1aj8', - 'image' => 'images/shop/extension-events-happening-now.jpg', + 'title' => __( 'Events Happening Now', 'tribe-common' ), + 'link' => 'https://evnt.is/1aj8', + 'image' => 'images/shop/extension-events-happening-now.jpg', 'description' => __( 'Use this shortcode to display events that are currently in progress, like webinars and livestreams.', 'tribe-common' ), ], (object) [ - 'title' => __( 'Custom Venue Links', 'tribe-common' ), - 'link' => 'https://evnt.is/1aj9', - 'image' => 'images/shop/extension-custom-venue-links.jpg', + 'title' => __( 'Custom Venue Links', 'tribe-common' ), + 'link' => 'https://evnt.is/1aj9', + 'image' => 'images/shop/extension-custom-venue-links.jpg', 'description' => __( 'Turn the venue name for your event into a clickable URL — a great way to link directly to a venue’s website or a virtual meeting.', 'tribe-common' ), ], (object) [ - 'title' => __( 'Adjust Label', 'tribe-common' ), - 'link' => 'https://evnt.is/1aja', - 'image' => 'images/shop/extension-change-label.jpg', + 'title' => __( 'Adjust Label', 'tribe-common' ), + 'link' => 'https://evnt.is/1aja', + 'image' => 'images/shop/extension-change-label.jpg', 'description' => __( 'Change "Events" to "Webinars," or "Venues" to "Livestream," or "Organizers" to "Hosts." Tailor your calendar for virtual events and meetings.', 'tribe-common' ), ], (object) [ - 'title' => __( 'Reach Attendees', 'tribe-common' ), - 'link' => 'https://evnt.is/1ajc', - 'image' => 'images/shop/extension-advanced-options.jpg', + 'title' => __( 'Reach Attendees', 'tribe-common' ), + 'link' => 'https://evnt.is/1ajc', + 'image' => 'images/shop/extension-advanced-options.jpg', 'description' => __( 'From registration to attendance history, view every step of the event lifecycle with this HubSpot integration.', 'tribe-common' ), ], ]; @@ -288,52 +289,52 @@ private function get_extensions() { private function get_stellar_brands() { $stellar_brands = [ (object) [ - 'image' => 'images/shop/stellar-learndash-cta.jpg', - 'logo' => 'images/shop/stellar-learndash-logo.png', - 'title' => __( 'The online course platform created by e-learning experts.', 'tribe-common' ), - 'link' => 'https://evnt.is/learndash', - 'linktext' => __( 'Add Courses', 'tribe-common' ), + 'image' => 'images/shop/stellar-learndash-cta.jpg', + 'logo' => 'images/shop/stellar-learndash-logo.png', + 'title' => __( 'The online course platform created by e-learning experts.', 'tribe-common' ), + 'link' => 'https://evnt.is/learndash', + 'linktext' => __( 'Add Courses', 'tribe-common' ), 'description' => __( 'Trusted to power learning programs for major universities, startups, entrepreneurs, and bloggers worldwide.', 'tribe-common' ), ], (object) [ - 'image' => 'images/shop/stellar-ithemes-cta.jpg', - 'logo' => 'images/shop/stellar-solidwp-logo.png', - 'title' => __( 'Security, backups, and management — that’s Solid Suite.', 'tribe-common' ), - 'link' => 'https://evnt.is/ithemes', - 'linktext' => __( 'Add Security', 'tribe-common' ), + 'image' => 'images/shop/stellar-ithemes-cta.jpg', + 'logo' => 'images/shop/stellar-solidwp-logo.png', + 'title' => __( 'Security, backups, and management — that’s Solid Suite.', 'tribe-common' ), + 'link' => 'https://evnt.is/ithemes', + 'linktext' => __( 'Add Security', 'tribe-common' ), 'description' => __( 'SolidWP, the seriously solid foundation your WordPress site needs. Built with performance in mind.', 'tribe-common' ), ], (object) [ - 'image' => 'images/shop/stellar-rcp-cta.jpg', - 'logo' => 'images/shop/stellar-rcp-logo.png', - 'title' => __( 'Built with developers in mind.', 'tribe-common' ), - 'link' => 'https://evnt.is/rcp', - 'linktext' => __( 'Add Content Restriction', 'tribe-common' ), + 'image' => 'images/shop/stellar-rcp-cta.jpg', + 'logo' => 'images/shop/stellar-rcp-logo.png', + 'title' => __( 'Built with developers in mind.', 'tribe-common' ), + 'link' => 'https://evnt.is/rcp', + 'linktext' => __( 'Add Content Restriction', 'tribe-common' ), 'description' => __( 'Restrict Content Pro is flexible, easy to extend, and chock full of action hooks and filters, making it easy to modify and tweak to your specific needs.', 'tribe-common' ), ], (object) [ - 'image' => 'images/shop/stellar-kadence-cta.jpg', - 'logo' => 'images/shop/stellar-kadence-logo.png', - 'title' => __( 'Build better WordPress websites with Kadence.', 'tribe-common' ), - 'link' => 'https://evnt.is/kadencewp', - 'linktext' => __( 'Add Starter Templates', 'tribe-common' ), + 'image' => 'images/shop/stellar-kadence-cta.jpg', + 'logo' => 'images/shop/stellar-kadence-logo.png', + 'title' => __( 'Build better WordPress websites with Kadence.', 'tribe-common' ), + 'link' => 'https://evnt.is/kadencewp', + 'linktext' => __( 'Add Starter Templates', 'tribe-common' ), 'description' => __( 'Kadence lets you unlock your creativity in the WordPress Block Editor with expertly designed blocks, a robust theme, and a massive library of starter templates.', 'tribe-common' ), ], (object) [ - 'image' => 'images/shop/stellar-iconic-cta.jpg', - 'logo' => 'images/shop/stellar-iconic-logo.png', - 'title' => __( 'Sales-boosting WooCommerce plugins.', 'tribe-common' ), - 'link' => 'https://evnt.is/iconic', - 'linktext' => __( 'Add Commerce Tools', 'tribe-common' ), + 'image' => 'images/shop/stellar-iconic-cta.jpg', + 'logo' => 'images/shop/stellar-iconic-logo.png', + 'title' => __( 'Sales-boosting WooCommerce plugins.', 'tribe-common' ), + 'link' => 'https://evnt.is/iconic', + 'linktext' => __( 'Add Commerce Tools', 'tribe-common' ), 'description' => __( 'Easy-to-use WooCommerce plugins work perfectly together, with any theme. Create a fast and profitable eCommerce store without any technical knowledge. ', 'tribe-common' ), ], (object) [ - 'image' => 'images/shop/stellar-give-cta.jpg', - 'logo' => 'images/shop/stellar-give-logo.png', - 'title' => __( 'The best WordPress donation plugin.', 'tribe-common' ), - 'link' => 'https://evnt.is/givewp', - 'linktext' => __( 'Add Donations', 'tribe-common' ), + 'image' => 'images/shop/stellar-give-cta.jpg', + 'logo' => 'images/shop/stellar-give-logo.png', + 'title' => __( 'The best WordPress donation plugin.', 'tribe-common' ), + 'link' => 'https://evnt.is/givewp', + 'linktext' => __( 'Add Donations', 'tribe-common' ), 'description' => __( 'GiveWP makes it easy to raise money online with donation forms, donor databases, and fundraising reporting.', 'tribe-common' ), ], ];