Merge pull request #133 from ankush-maherwal/joomla-4

Joomla 4
techjoomla · Feb 7, 2022 · 1f7bf66 · 1f7bf66
2 parents dfaec70 + f3311f1
commit 1f7bf66
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 60 deletions.
diff --git a/src/com_tjnotifications/admin/models/forms/filter_subscriptions.xml b/src/com_tjnotifications/admin/models/forms/filter_subscriptions.xml
@@ -1,38 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <form>
-	<fields name="filter">
-		<field name="search" type="text" hint="COM_TJNOTIFICATIONS_SEARCH_FILTER_SUBMIT" label="COM_TJNOTIFICATIONS_FILTER_SEARCH_DESC" class="js-stools-search-string" />
+    <fields name="filter">
+        <field name="search" type="text" hint="COM_TJNOTIFICATIONS_SEARCH_FILTER_SUBMIT" label="COM_TJNOTIFICATIONS_FILTER_SEARCH_DESC" class="js-stools-search-string" />
+        <field name="backend" type="backends" label="COM_TJNOTIFICATIONS_FORM_SUBSCRIPTION_BACKEND_LBL" description="COM_TJNOTIFICATIONS_FORM_SUBSCRIPTION_BACKEND_DESC" onchange="this.form.submit();" />
+        <field name="platform" type="platforms" label="COM_TJNOTIFICATIONS_FORM_SUBSCRIPTION_PLATFORM_LBL" description="COM_TJNOTIFICATIONS_FORM_SUBSCRIPTION_PLATFORM_DESC" onchange="this.form.submit();" />
+        <field name="state" type="list" label="COM_TJNOTIFICATIONS_FILTER_STATE" description="COM_TJNOTIFICATIONS_FILTER_STATE_DESC" onchange="this.form.submit();">
+            <option value="">JOPTION_SELECT_PUBLISHED</option>
+            <option value="1">JPUBLISHED</option>
+            <option value="0">JUNPUBLISHED</option>
+            <!-- <option value="2">JARCHIVED</option> -->
+            <option value="-2">JTRASHED</option>
+        </field>
+    </fields>
 
-		<field name="backend" type="backends"
-			label="COM_TJNOTIFICATIONS_FORM_SUBSCRIPTION_BACKEND_LBL"
-			description="COM_TJNOTIFICATIONS_FORM_SUBSCRIPTION_BACKEND_DESC"
-			onchange="this.form.submit();" />
-
-		<field name="platform" type="platforms"
-			label="COM_TJNOTIFICATIONS_FORM_SUBSCRIPTION_PLATFORM_LBL"
-			description="COM_TJNOTIFICATIONS_FORM_SUBSCRIPTION_PLATFORM_DESC"
-			onchange="this.form.submit();" />
-
-		<field name="state" type="list" label="COM_TJNOTIFICATIONS_FILTER_STATE" description="COM_TJNOTIFICATIONS_FILTER_STATE_DESC" onchange="this.form.submit();">
-			<option value="">JOPTION_SELECT_PUBLISHED</option>
-			<option value="1">JPUBLISHED</option>
-			<option value="0">JUNPUBLISHED</option>
-			<!-- <option value="2">JARCHIVED</option> -->
-			<option value="-2">JTRASHED</option>
-		</field>
-	</fields>
-
-	<fields name="list">
-		<field name="fullordering" type="list" label="COM_TJNOTIFICATIONS_LIST_FULL_ORDERING" description="COM_TJNOTIFICATIONS_LIST_FULL_ORDERING_DESC" onchange="this.form.submit();" default="a.id DESC">
-			<option value="">JGLOBAL_SORT_BY</option>
-			<option value="a.id ASC">COM_TJNOTIFICATIONS_SUBSCRIPTIONS_ORDER_ID_ASC</option>
-			<option value="a.id DESC">COM_TJNOTIFICATIONS_SUBSCRIPTIONS_ORDER_ID_DESC</option>
-			<option value="a.title ASC">COM_TJNOTIFICATIONS_SUBSCRIPTIONS_ORDER_TITLE_ASC</option>
-			<option value="a.title DESC">COM_TJNOTIFICATIONS_SUBSCRIPTIONS_ORDER_TITLE_DESC</option>
-			<option value="a.state ASC">COM_TJNOTIFICATIONS_SUBSCRIPTIONS_ORDER_STATE_ASC</option>
-			<option value="a.state DESC">COM_TJNOTIFICATIONS_SUBSCRIPTIONS_ORDER_STATE_DESC</option>
-		</field>
-
-		<field name="limit" type="limitbox" class="input-mini" default="25" onchange="this.form.submit();" />
-	</fields>
-</form>
+    <fields name="list">
+        <field name="fullordering" type="list" label="COM_TJNOTIFICATIONS_LIST_FULL_ORDERING" description="COM_TJNOTIFICATIONS_LIST_FULL_ORDERING_DESC" onchange="this.form.submit();" default="a.id DESC">
+            <option value="">JGLOBAL_SORT_BY</option>
+            <option value="a.id ASC">COM_TJNOTIFICATIONS_SUBSCRIPTIONS_ORDER_ID_ASC</option>
+            <option value="a.id DESC">COM_TJNOTIFICATIONS_SUBSCRIPTIONS_ORDER_ID_DESC</option>
+            <option value="a.title ASC">COM_TJNOTIFICATIONS_SUBSCRIPTIONS_ORDER_TITLE_ASC</option>
+            <option value="a.title DESC">COM_TJNOTIFICATIONS_SUBSCRIPTIONS_ORDER_TITLE_DESC</option>
+            <option value="a.state ASC">COM_TJNOTIFICATIONS_SUBSCRIPTIONS_ORDER_STATE_ASC</option>
+            <option value="a.state DESC">COM_TJNOTIFICATIONS_SUBSCRIPTIONS_ORDER_STATE_DESC</option>
+        </field>
+        <field name="limit" type="limitbox" class="input-mini" default="25" onchange="this.form.submit();" />
+    </fields>
+</form>
diff --git a/src/com_tjnotifications/admin/sql/updates/mysql/2.0.0.sql b/src/com_tjnotifications/admin/sql/updates/mysql/2.0.0.sql
@@ -1,5 +1,5 @@
-ALTER TABLE `#__tj_notification_templates` MODIFY `created_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00';
-ALTER TABLE `#__tj_notification_templates` MODIFY `updated_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00';
+ALTER TABLE `#__tj_notification_templates` MODIFY `created_on` datetime DEFAULT NULL;
+ALTER TABLE `#__tj_notification_templates` MODIFY `updated_on` datetime DEFAULT NULL;
 
 CREATE TABLE IF NOT EXISTS `#__tj_notification_template_configs` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
@@ -10,8 +10,8 @@ CREATE TABLE IF NOT EXISTS `#__tj_notification_template_configs` (
   `body` text NOT NULL,
   `params` text NOT NULL,
   `state` int(11) NOT NULL,
-  `created_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `updated_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `created_on` datetime DEFAULT NULL,
+  `updated_on` datetime DEFAULT NULL,
   `is_override` int(1) NOT NULL,
   PRIMARY KEY (`id`),
   CONSTRAINT `#__tj_notification_template_configs` FOREIGN KEY (`template_id`) REFERENCES `#__tj_notification_templates` (`id`)
@@ -29,7 +29,7 @@ CREATE TABLE IF NOT EXISTS `#__tj_notification_logs` (
   `to` text NOT NULL,
   `cc` text NOT NULL,
   `bcc` text NOT NULL,
-  `date` datetime NOT NULL,
+  `date` datetime DEFAULT NULL,
   `state` tinyint(2) NOT NULL,
   `params` text NOT NULL,
   `priority`int(11) NOT NULL,
@@ -51,9 +51,9 @@ CREATE TABLE IF NOT EXISTS `#__tjnotifications_subscriptions` (
   `created_by` int(11) NOT NULL,
   `modified_by` int(11) NOT NULL,
   `checked_out` int(11) NOT NULL,
-  `created_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `updated_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `created_on` datetime DEFAULT NULL,
+  `updated_on` datetime DEFAULT NULL,
+  `checked_out_time` datetime DEFAULT NULL,
   `params` text DEFAULT NULL,
   PRIMARY KEY (`id`),
   KEY `user_id_idx` (`user_id`)

diff --git a/src/com_tjnotifications/admin/sql/updates/mysql/3.0.0.sql b/src/com_tjnotifications/admin/sql/updates/mysql/3.0.0.sql
@@ -42,7 +42,7 @@ ALTER TABLE `#__tj_notification_logs` CHANGE `bcc` `bcc` text DEFAULT NULL;
 ALTER TABLE `#__tj_notification_logs` CHANGE `date` `date` datetime NULL DEFAULT NULL;
 ALTER TABLE `#__tj_notification_logs` CHANGE `state` `state` tinyint(2) NOT NULL DEFAULT 0;
 ALTER TABLE `#__tj_notification_logs` CHANGE `params` `params` text DEFAULT NULL;
-ALTER TABLE `#__tj_notification_logs` CHANGE `priority` `priority`int(11) NOT NULL DEFAULT 0;
+ALTER TABLE `#__tj_notification_logs` CHANGE `priority` `priority` int(11) NOT NULL DEFAULT 0;
 ALTER TABLE `#__tj_notification_logs` CHANGE `message` `message` text DEFAULT NULL;
 ALTER TABLE `#__tj_notification_logs` CHANGE `category` `category` text DEFAULT NULL;
 

diff --git a/src/com_tjnotifications/admin/views/logs/tmpl/default.xml b/src/com_tjnotifications/admin/views/logs/tmpl/default.xml
@@ -2,7 +2,7 @@
 <metadata>
     <layout title="COM_TJNOTIFICATIONS_LIST_LOGS" option="View">
         <message>
-			<![CDATA[COM_TJNOTIFICATIONS_LIST_LOGS_DESC]]>
+            <![CDATA[COM_TJNOTIFICATIONS_LIST_LOGS_DESC]]>
         </message>
     </layout>
-</metadata>
+</metadata>
diff --git a/src/com_tjnotifications/admin/views/notifications/tmpl/default.xml b/src/com_tjnotifications/admin/views/notifications/tmpl/default.xml
@@ -2,7 +2,7 @@
 <metadata>
     <layout title="List Notifications" option="View">
         <message>
-			<![CDATA[List all notifications]]>
+            <![CDATA[List all notifications]]>
         </message>
     </layout>
-</metadata>
+</metadata>
diff --git a/src/com_tjnotifications/site/views/preferences/tmpl/default.xml b/src/com_tjnotifications/site/views/preferences/tmpl/default.xml
@@ -2,7 +2,7 @@
 <metadata>
     <layout title="List Preferences" option="View">
         <message>
-			<![CDATA[List all preferences]]>
+            <![CDATA[List all preferences]]>
         </message>
     </layout>
-</metadata>
+</metadata>
diff --git a/src/com_tjnotifications/tjnotifications.xml b/src/com_tjnotifications/tjnotifications.xml
@@ -6,8 +6,8 @@
 	<authorUrl>https://techjoomla.com</authorUrl>
 	<copyright>Copyright (C) 2016 - 2022 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<creationDate>25th Jan 2022</creationDate>
-	<version>3.0.0</version>
+	<creationDate>7th Feb 2022</creationDate>
+	<version>3.0.1</version>
 	<install>
 		<sql>
 			<file driver="mysql" charset="utf8">sql/install.mysql.utf8.sql</file>

diff --git a/src/plugins/actionlog/tjnotification/tjnotification.xml b/src/plugins/actionlog/tjnotification/tjnotification.xml
@@ -2,12 +2,12 @@
 <extension version="3.9" type="plugin" group="actionlog" method="upgrade">
 	<name>plg_actionlog_tjnotification</name>
 	<author>Techjoomla</author>
-	<creationDate>25th Jan 2022</creationDate>
+	<creationDate>7th Feb 2022</creationDate>
 	<copyright>Copyright (C) 2016 - 2022 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
 	<authorEmail>extensions@techjoomla.com</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>
-	<version>3.0.0</version>
+	<version>3.0.1</version>
 	<description>PLG_ACTIONLOG_TJNOTIFICATION_XML_DESCRIPTION</description>
 	<files>
 		<filename plugin="tjnotification">tjnotification.php</filename>

diff --git a/src/plugins/api/tjnotifications/tjnotifications.xml b/src/plugins/api/tjnotifications/tjnotifications.xml
@@ -5,10 +5,10 @@
 	<author>Techjoomla</author>
 	<authorEmail>extensions@techjoomla.com</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>
-	<creationDate>25th Jan 2022</creationDate>
+	<creationDate>7th Feb 2022</creationDate>
 	<copyright>Copyright (C) 2016 - 2022 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<version>3.0.0</version>
+	<version>3.0.1</version>
 
 	<files>
 		<filename plugin="tjnotifications">tjnotifications.php</filename>

diff --git a/src/plugins/privacy/tjnotification/tjnotification.xml b/src/plugins/privacy/tjnotification/tjnotification.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension version="3.9" type="plugin" group="privacy" method="upgrade">
 	<name>plg_privacy_tjnotification</name>
-	<version>3.0.0</version>
-	<creationDate>25th Jan 2022</creationDate>
+	<version>3.0.1</version>
+	<creationDate>7th Feb 2022</creationDate>
 	<author>Techjoomla</author>
 	<authorEmail>extensions@techjoomla.com</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>

diff --git a/src/plugins/user/tjnotificationsmobilenumber/tjnotificationsmobilenumber.xml b/src/plugins/user/tjnotificationsmobilenumber/tjnotificationsmobilenumber.xml
@@ -5,10 +5,10 @@
 	<author>Techjoomla</author>
 	<authorEmail>extensions@techjoomla.com</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>
-	<creationDate>25th Jan 2022</creationDate>
+	<creationDate>7th Feb 2022</creationDate>
 	<copyright>Copyright (C) 2016 - 2022 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<version>3.0.0</version>
+	<version>3.0.1</version>
 
 	<files>
 		<filename plugin="tjnotificationsmobilenumber">tjnotificationsmobilenumber.php</filename>