Merge branch 'main' into product-course-type

CHANGELOG.md

@@ -1,3 +1,11 @@
+## v1.11.1 - 2023-10-05
+
+### [1.11.1](https://github.com/eduNEXT/openedx-woocommerce-plugin/compare/v1.11.0...v1.11.1) (2023-10-05)
+
+### Bug Fixes
+
+- bugs in product table fixed & form changes in settings and enrollment ([#43](https://github.com/eduNEXT/openedx-woocommerce-plugin/issues/43)) ([ddaaba7](https://github.com/eduNEXT/openedx-woocommerce-plugin/commit/ddaaba794653f3203ddab352325d657e287b2803))
+
 ## v1.11.0 - 2023-09-27
 
 ### [1.11.0](https://github.com/eduNEXT/openedx-woocommerce-plugin/compare/v1.10.0...v1.11.0) (2023-09-27)

README.txt

@@ -5,7 +5,7 @@ Tags: openedx, woocommerce, integration, open source, courses
 Requires at least: 6.3.1
 Tested up to: 6.3.1
 Requires PHP: 8.0.29
-Stable tag: 1.11.0
+Stable tag: 1.11.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 

admin/class-openedx-woocommerce-plugin-admin.php

@@ -338,6 +338,18 @@ public function add_admin_order_item_values( $product, $item, $item_id = null )
 					'td'    => array(),
 				)
 			);
+		} else {
+
+			$html_output  = '<td>';
+			$html_output .= esc_html__( 'Product is not an Open edX Course', 'woocommerce' );
+			$html_output .= '</td>';
+
+			echo wp_kses(
+				$html_output,
+				array(
+					'td' => array(),
+				)
+			);
 		}
 	}
 

admin/views/class-openedx-woocommerce-plugin-enrollment-info-form.php

@@ -200,10 +200,14 @@ public function render_enrollment_info_form( $post ) {
 							<td class="checkbox-td">		
 								<input class="action-checkbox" type="checkbox" id="force" name="enrollment_force" value="opcion1">
 								<label for="force"><?php esc_html_e( 'Use the "force" flag', 'wp-openedx-woocommerce-plugin' ); ?></label>
+								<span class="tooltip-icon">?</span>
+								<span class="tooltip-text"><?php esc_html_e( 'Lorem ipsum.', 'wp-openedx-woocommerce-plugin' ); ?></span>
 							</td>
 							<td>
 								<input class="action-checkbox" type="checkbox" id="no_pre" name="enrollment_allowed" value="opcion1">
 								<label for="no_pre"><?php esc_html_e( "Create course enrollment allowed if the user doesn't exist", 'wp-openedx-woocommerce-plugin' ); ?></label>
+								<span class="tooltip-icon">?</span>
+								<span class="tooltip-text"><?php esc_html_e( 'Lorem ipsum.', 'wp-openedx-woocommerce-plugin' ); ?></span>
 							</td>
 						</tr>
 

admin/views/class-openedx-woocommerce-plugin-settings.php

@@ -255,7 +255,7 @@ public function openedx_client_secret_callback() {
 		$value = get_option( 'openedx-client-secret' );
 		?>
 
-		<input class="setting_input" type="text" name="openedx-client-secret" id="openedx-client-secret" 
+		<input class="setting_input" type="password" name="openedx-client-secret" id="openedx-client-secret" 
 			value="<?php echo esc_attr( $value ); ?>" required />
 
 		<p class="description">

openedx-woocommerce-plugin.php

@@ -15,7 +15,7 @@
  * Plugin Name:       Open edX WooCommerce Plugin
  * Plugin URI:        https://github.com/eduNEXT/openedx-woocommerce-plugin
  * Description:       Easily connect your WooCommerce store to Open edX.
- * Version:           1.11.0
+ * Version:           1.11.1
  * Author:            eduNEXT
  * Author URI:        https://edunext.co/
  * License:           GPL-2.0+
@@ -38,7 +38,7 @@
  * Start at version 1.0.0 and use SemVer - https://semver.org
  * Rename this for your plugin and update it as you release new versions.
  */
-define( 'OPENEDX_WOOCOMMERCE_PLUGIN_VERSION', '1.11.0' );
+define( 'OPENEDX_WOOCOMMERCE_PLUGIN_VERSION', '1.11.1' );
 
 /**
  * The code that runs during plugin activation.