Merge pull request #13 from mt-support/task/updates-april-2023

Task/updates april 2023

plugin.php

@@ -4,7 +4,7 @@
  * Plugin URI:
  * GitHub Plugin URI: https://github.com/mt-support/tec-labs-members-only-tickets
  * Description:       Hide or limit purchase of members only tickets.
- * Version:           1.0.1
+ * Version:           1.0.2
  * Author:            The Events Calendar
  * Author URI:        https://evnt.is/1971
  * License:           GPL version 3 or any later version

readme.txt

@@ -3,9 +3,9 @@ Contributors: theeventscalendar
 Donate link: https://evnt.is/29
 Tags: events, calendar
 Requires at least: 4.9
-Tested up to: 5.7
+Tested up to: 6.2
 Requires PHP: 5.6
-Stable tag: 1.0.0
+Stable tag: 1.0.2
 License: GPL version 3 or any later version
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -33,6 +33,12 @@ We're always interested in your feedback and our [Help Desk](https://theeventsca
 
 == Changelog ==
 
+= [1.0.2] 2023-04-30 =
+
+* Fix - MemberPress now shows members tickets when expected.
+* Fix - Added check for existence of WooCommerce before adding actions.
+* Enhancement - Added style wrapper around admin settings.
+
 = [1.0.1] 2022-05-19 =
 
 * Remove trailing commas

src/TEC_Labs/Integrations/Integration_Abstract.php

@@ -35,7 +35,7 @@ public function __construct( $plugin ) {
 	 * @return void
 	 */
 	public function boot() {
-		if ( ! $this->is_active() ) {
+		if ( ! $this->is_active() || ! class_exists( 'Woocommerce' ) ) {
 			return;
 		}
 

src/TEC_Labs/Integrations/MemberPress.php

@@ -70,7 +70,10 @@ public function can_purchase( $product_id ) {
 			return false;
 		}
 
-		return current_user_can( 'mepr-active', "product: {$product_id}" );
+		$product = get_post( $product_id );
+		$is_locked = \MeprRule::is_locked( $product );
+
+        return ! $is_locked;
 	}
 
 	/**
@@ -95,6 +98,10 @@ protected function is_member_ticket( $ticket_id ) {
 	 */
 	public function settings( $settings ) {
 		$settings[ $this->get_id() ] = [
+            "{$this->get_id()}_members_settings_start" => [
+				'type' => 'html',
+				'html' => '<div class="tribe-settings-form-wrap">'
+			],
 			"{$this->get_id()}_members_settings_intro" => [
 				'type' => 'html',
 				'html' => sprintf(
@@ -107,15 +114,19 @@ public function settings( $settings ) {
 				'type'            => 'checkbox_bool',
 				'label'           => esc_html__( "Hide members only tickets.", 'et-members-only-tickets' ),
 				'tooltip'         => esc_html__( "When enabled, only members will see members only tickets.", 'et-members-only-tickets'),
-				'validation_type' => 'boolean'
+				'validation_type' => 'boolean',
 			],
 			"{$this->get_id()}_members_only_message" => [
 				'type'            => 'textarea',
 				'label'           => esc_html__( "Message for non-members.", 'et-members-only-tickets' ),
 				'tooltip'         => esc_html__( "Non-members will see this text as the ticket description.", 'et-members-only-tickets'),
 				'default' 		  => esc_html__( "This ticket is for members only.", 'et-members-only-tickets' ),
 				'validation_type' => 'html'
-			]
+            ],
+            "{$this->get_id()}_members_settings_end" => [
+				'type' => 'html',
+				'html' => '</div>'
+			],            
 		];
 
 		return $settings;

src/TEC_Labs/Integrations/Paid_Memberships_Pro.php

@@ -101,6 +101,10 @@ public function can_purchase( $product_id ) {
 	 */
 	public function settings( $settings ) {
 		$settings[ $this->get_id() ] = [
+            "{$this->get_id()}_members_settings_start" => [
+				'type' => 'html',
+				'html' => '<div class="tribe-settings-form-wrap">'
+			],            
 			"{$this->get_id()}_members_settings_intro"   => [
 				'type' => 'html',
 				'html' => sprintf(
@@ -153,7 +157,11 @@ public function settings( $settings ) {
 				'tooltip'         => esc_html__( 'Non-members will see this text in place of the ticket description.', 'et-members-only-tickets' ),
 				'default' 		  => esc_html__( 'This ticket is for members only.', 'et-members-only-tickets' ),
 				'validation_type' => 'html'
-			]
+            ],
+            "{$this->get_id()}_members_settings_end" => [
+				'type' => 'html',
+				'html' => '</div>'
+			],            
 		];
 
 		return $settings;

src/TEC_Labs/Integrations/Restrict_Content_Pro.php

@@ -67,6 +67,10 @@ public function can_purchase( $product_id ) {
 	 */
 	public function settings( $settings ) {
 		$settings[ $this->get_id() ] = [
+            "{$this->get_id()}_members_settings_start" => [
+				'type' => 'html',
+				'html' => '<div class="tribe-settings-form-wrap">'
+			],            
 			"{$this->get_id()}_members_settings_intro" => [
 				'type' => 'html',
 				'html' => sprintf(
@@ -81,7 +85,11 @@ public function settings( $settings ) {
 				'tooltip'         => esc_html__( 'Non-members will see this text as the ticket description.', 'et-members-only-tickets'),
 				'default' 		  => esc_html__( 'This ticket is for members only.', 'et-members-only-tickets' ),
 				'validation_type' => 'html'
-			]
+            ],
+            "{$this->get_id()}_members_settings_end" => [
+				'type' => 'html',
+				'html' => '</div>'
+			],            
 		];
 
 		return $settings;

src/TEC_Labs/Integrations/WooCommerce_Memberships.php

@@ -95,6 +95,10 @@ public function can_purchase( $product_id ) {
 	 */
 	public function settings( $settings ) {
 		$settings[ $this->get_id() ] = [
+            "{$this->get_id()}_members_settings_start" => [
+				'type' => 'html',
+				'html' => '<div class="tribe-settings-form-wrap">'
+			],            
 			"{$this->get_id()}_members_settings_intro" => [
 				'type' => 'html',
 				'html' => sprintf(
@@ -109,7 +113,11 @@ public function settings( $settings ) {
 				'tooltip'         => esc_html__( 'Non-members will see this text as the ticket description.', 'et-members-only-tickets'),
 				'default' 		  => esc_html__( 'This ticket is for members only.', 'et-members-only-tickets' ),
 				'validation_type' => 'html'
-			]
+            ],
+            "{$this->get_id()}_members_settings_end" => [
+				'type' => 'html',
+				'html' => '</div>'
+			],            
 		];
 
 		return $settings;