Merge pull request #156 from gocodebox/dev

Version 2.3.2

Author: Thomas Patrick Levy

CHANGELOG.md

@@ -1,6 +1,14 @@
 LifterLMS Blocks Changelog
 ==========================
 
+v2.3.2 - 2022-02-22
+-------------------
+
+##### Updates and Enhancements
+
++ Added an option to specify a custom checkout form title for free access plans.
+
+
 v2.3.1 - 2022-01-26
 -------------------
 

assets/js/llms-blocks.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('jquery', 'lodash', 'react', 'react-dom', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-dom-ready', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-rich-text', 'wp-server-side-render', 'wp-url'), 'version' => 'e0ef8eab7d2ca2ae12996050f03c4ddf');
+<?php return array('dependencies' => array('jquery', 'lodash', 'react', 'react-dom', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-data', 'wp-dom-ready', 'wp-edit-post', 'wp-editor', 'wp-element', 'wp-hooks', 'wp-i18n', 'wp-notices', 'wp-plugins', 'wp-polyfill', 'wp-rich-text', 'wp-server-side-render', 'wp-url'), 'version' => '59f0d96c303b2be3cb16b1f516d10f2f');

assets/js/llms-blocks.js

@@ -2,14 +2,14 @@
 # This file is distributed under the GPLv3.
 msgid ""
 msgstr ""
-"Project-Id-Version: LifterLMS Blocks 2.3.1\n"
+"Project-Id-Version: LifterLMS Blocks 2.3.2\n"
 "Report-Msgid-Bugs-To: https://lifterlms.com/my-account/my-tickets\n"
 "Last-Translator: Team LifterLMS <[email protected]>\n"
 "Language-Team: Team LifterLMS <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2022-01-26T08:48:53-07:00\n"
+"POT-Creation-Date: 2022-02-22T11:28:13-07:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: llms/dev 0.0.3\n"
 "X-Domain: lifterlms\n"
@@ -1082,6 +1082,14 @@ msgstr ""
 msgid "Not displaying form title."
 msgstr ""
 
+#: assets/js/llms-blocks.js:24
+msgid "Free Access Plan Form Title"
+msgstr ""
+
+#: assets/js/llms-blocks.js:24
+msgid "The form title to be shown for free access plans."
+msgstr ""
+
 #: assets/js/llms-blocks.js:24
 msgid "Revert to Default"
 msgstr ""

i18n/lifterlms-blocks.pot

@@ -11,7 +11,7 @@
  * Plugin Name: LifterLMS Blocks
  * Plugin URI: https://github.com/gocodebox/lifterlms-blocks
  * Description: WordPress Editor (Gutenberg) blocks for LifterLMS.
- * Version: 2.3.1
+ * Version: 2.3.2
  * Author: LifterLMS
  * Author URI: https://lifterlms.com/
  * Text Domain: lifterlms
@@ -27,7 +27,7 @@
 
 // Define Constants.
 if ( ! defined( 'LLMS_BLOCKS_VERSION' ) ) {
-	define( 'LLMS_BLOCKS_VERSION', '2.3.1' );
+	define( 'LLMS_BLOCKS_VERSION', '2.3.2' );
 }
 
 /**

lifterlms-blocks.php

@@ -1,6 +1,6 @@
 {
   "name": "lifterlms-blocks",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "description": "blocks",
   "author": "LifterLMS",
   "homepage": "https://lifterlms.com/",

package-lock.json

@@ -4,7 +4,7 @@
  * Displays only on `llms_form` post types.
  *
  * @since 1.6.0
- * @version 2.0.0
+ * @version 2.3.2
  */
 
 // WP Deps.
@@ -14,6 +14,7 @@ import {
 	ExternalLink,
 	PanelRow,
 	ToggleControl,
+	TextControl,
 } from '@wordpress/components';
 import { compose } from '@wordpress/compose';
 import { dispatch, select, withDispatch, withSelect } from '@wordpress/data';
@@ -44,6 +45,7 @@ class FormDocumentSettings extends Component {
 	 * @since 1.12.0 Add a class name to the document sidebar.
 	 *               Add default template restoration.
 	 * @since 2.0.0 Use default template from location definition in favor of from metadata.
+	 * @since 2.3.2 Add control for the checkout's form title for free access plans.
 	 *
 	 * @return {?Fragment} Component HTML fragment or null when not supported.
 	 */
@@ -57,11 +59,17 @@ class FormDocumentSettings extends Component {
 			return null;
 		}
 
-		const { location, link, showTitle, setFormMetas } = this.props,
-			{ formLocations } = window.llms,
+		const {
+			location,
+			link,
+			showTitle,
+			freeApTitle,
+			setFormMetas,
+		} = this.props;
+		const { formLocations } = window.llms,
 			currentLoc = formLocations[ location ];
 
-		// Set default value.
+		// Set default values.
 		if ( '' === showTitle ) {
 			setFormMetas( { _llms_form_show_title: 'yes' } );
 		}
@@ -196,6 +204,25 @@ class FormDocumentSettings extends Component {
 										} )
 									}
 								/>
+								{ 'checkout' === location &&
+									'yes' === showTitle && (
+										<TextControl
+											label={ __(
+												'Free Access Plan Form Title',
+												'lifterlms'
+											) }
+											value={ freeApTitle }
+											onChange={ ( val ) =>
+												setFormMetas( {
+													_llms_form_title_free_access_plans: val,
+												} )
+											}
+											help={ __(
+												'The form title to be shown for free access plans.',
+												'lifterlms'
+											) }
+										/>
+									) }
 								<br />
 								<PanelRow>
 									<Button
@@ -233,6 +260,7 @@ class FormDocumentSettings extends Component {
  * @since 1.7.2 Only modify select when working with an `llms_form` post type.
  * @since 1.12.0 Load the default template meta field.
  * @since 2.0.0 Don't load default template from metadata.
+ * @since 2.3.2 Retrieve form title for free access plans meta field.
  */
 const applyWithSelect = withSelect( ( select ) => {
 	const {
@@ -251,6 +279,7 @@ const applyWithSelect = withSelect( ( select ) => {
 		link: getCurrentPost().link,
 		location: meta._llms_form_location,
 		showTitle: meta._llms_form_show_title,
+		freeApTitle: meta._llms_form_title_free_access_plans,
 	};
 } );