Merge pull request #121 from techjoomla/release-2.0.1

Merge `Release 2.0.1` into `release-2.1.0`

Author: manojLondhe

.github/workflows/greetings.yml

@@ -0,0 +1,13 @@
+name: Greetings
+
+on: [pull_request, issues]
+
+jobs:
+  greeting:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/first-interaction@v1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        issue-message: 'Thank you for reporting your first issue'
+        pr-message: 'Congratulations! You just sent your first pull request'

src/com_tjnotifications/admin/language/en-GB.com_tjnotifications.ini

@@ -15,7 +15,7 @@ COM_TJNOTIFICATIONS_FIELD_CLIENT_LABEL="Client"
 COM_TJNOTIFICATIONS_FIELD_KEY_LABEL="Key"
 COM_TJNOTIFICATIONS_FIELD_TITLE_LABEL="Title"
 COM_TJNOTIFICATIONS_FIELD_CLIENT_DESC="The client (extension) that is defining the notifications"
-COM_TJNOTIFICATIONS_FIELD_KEY_DESC="The unique key for the notification. This is unique within a client"
+COM_TJNOTIFICATIONS_FIELD_KEY_DESC="The unique key that is defining the notifications. This is unique within a client."
 COM_TJNOTIFICATIONS_FIELD_TITLE_DESC="The title for the notification template."
 COM_TJNOTIFICATIONS_FIELD_CLIENT_OPTION="Choose Client"
 COM_TJNOTIFICATIONS_FIELD_KEY_OPTION="Choose Key"
@@ -53,15 +53,14 @@ COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_PUBLISH="Publish"
 COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_UNPUBLISH="Unpublish"
 COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DELETE="Delete"
 COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DELETE_MESSAGE="Are you sure ?"
-COM_TJNOTIFICATIONS_N_ITEMS_DELETED=" %s items deleted"
+COM_TJNOTIFICATIONS_N_ITEMS_DELETED=" %d records successfully deleted"
 COM_TJNOTIFICATIONS_CORE_TEMPLATE_DELETE_MESSAGE="Cannot delete core template."
 COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_SEARCH_NOTIFICATIONS="Search Notifications"
 
 COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_ID="ID"
 COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_TITLE="Title"
 COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_CLIENT="Client"
 COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_KEY="Key"
-COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_TITLE="Title"
 COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_UNSUBCRIBED_USERS="Unsubscribed Users"
 COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_USER_CONTROL="User Control"
 COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_BACKEND_STATUS="Backend Status"
@@ -70,16 +69,14 @@ COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_BACKEND_STATUS="Backend Sta
 ;COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_WEB_STATUS="Web Status"
 COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_STATE="State"
 
-COM_TJNOTIFICATIONS_N_ITEMS_PUBLISHED="%s Items published"
-COM_TJNOTIFICATIONS_N_ITEMS_UNPUBLISHED="%s Items unpublished"
+COM_TJNOTIFICATIONS_N_ITEMS_PUBLISHED="%d records successfully published"
+COM_TJNOTIFICATIONS_N_ITEMS_UNPUBLISHED="%d records successfully unpublished"
 COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_NO_MATCHING_RESULTS="No matching results"
 COM_TJNOTIFICATIONS_VIEW_NOTIFICATION_TOOLTIP_MESSAGE="This is  client / key of your template"
 COM_TJNOTIFICATIONS_MODEL_NOTIFICATION_KEY_DUPLICATE_MESSAGE="Key is already taken"
 COM_TJNOTIFICATIONS_VIEW_NOTIFICATION_UNSUBSCRIBED_EMAIL_USERS=" Users unsubscribed E-mail notification  %s "
-
 COM_TJNOTIFICATIONS_NOTIFICATION_TITLE="%s: Notification Templates"
 COM_TJNOTIFICATIONS_NOTIFICATION_BASE_TITLE="Notifications"
-
 COM_TJNOTIFICATIONS_FIELD_USER_CONTROL_LABEL="User Control"
 COM_TJNOTIFICATIONS_FIELD_USER_CONTROL_DESC="If you turn off user control user can't set preferences for this notification."
 COM_TJNOTIFICATIONS_STATE_ENABLE="Enable"
@@ -145,32 +142,25 @@ COM_TJNOTIFICATION="Notifications"
 COM_TJNOTIFICATIONS_ALLOW_SAVE_OPTION="Enable logs?"
 ; Logs list
 COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_SUBJECT="Subject"
-COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_KEY="Key"
-COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_TITLE="Title"
 COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_BACKEND="Backend"
 COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_FROM="From"
 COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_TO="To"
 COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_CC="CC"
 COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_BCC="BCC"
 COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_DATE="Date"
-COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_STATE="State"
 COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_PARAMS="Params"
 COM_TJNOTIFICATIONS_TITLE_NOTIFICATIONS="Notifications"
 COM_TJNOTIFICATIONS_TITLE_NOTIFICATIONLOGS="Notifications Logs"
 COM_TJNOTIFICATIONS_LOGS="Logs"
-COM_TJNOTIFICATIONS_EXPORT_FILE_SUCCESS="Download complete"
+COM_TJNOTIFICATIONS_EXPORT_FILE_SUCCESS="Download Complete"
 COM_TJNOTIFICATIONS_VIEW_EMAIL_BODY="Email Body"
 COM_TJNOTIFICATIONS_VIEW_EMAIL_POPUP_CLOSE="Close"
 COM_TJNOTIFICATIONS_VIEW_PARAMS_POPUP="Show Params"
 COM_TJNOTIFICATIONS_FIELD_BACKEND_LABEL="Backend"
 COM_TJNOTIFICATIONS_FIELD_BACKEND_DESC="The backend that is defining the notifications"
 COM_TJNOTIFICATIONS_BACKEND_EMAIL="Email"
 COM_TJNOTIFICATIONS_BACKEND_SMS="SMS"
-COM_TJNOTIFICATIONS_BACKEND_PUSH="Push Message"
-COM_TJNOTIFICATIONS_FIELD_KEY_LABEL="Key"
-COM_TJNOTIFICATIONS_FIELD_KEY_DESC="The key that is defining the notifications"
-COM_TJNOTIFICATIONS_FIELD_KEY_OPTION="Choose Key"
-COM_TJNOTIFICATIONS_EXPORT_FILE_SUCCESS="Download Complete"
+COM_TJNOTIFICATIONS_BACKEND_PUSH="Push"
 COM_TJNOTIFICATIONS_EXPORT_FILE_ERROR="<strong>Something went wrong.</strong>"
 COM_TJNOTIFICATIONS_EXPORT_FILE_NOTICE="<strong>Do not click anywhere or refresh the page until CSV download successfully.</strong>"
 COM_TJNOTIFICATIONS_FIELD_STATE_LABEL="State"
@@ -184,11 +174,8 @@ COM_TJNOTIFICATIONS_APPLICATION_OPTION_DESC="Enable logs?"
 COM_TJNOTIFICATIONS_BACKEND_WEB="Web"
 COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_BODY="Body"
 COM_TJNOTIFICATIONS_TITLE_VIEW_CONTENTS="View Content"
-COM_TJNOTIFICATIONS_STATE_SENT="Sent"
-COM_TJNOTIFICATIONS_STATE_FAILED="Failed"
 COM_TJNOTIFICATIONS_FIELD_NOTIFICATION_BODY_LABEL="Notification Body"
 COM_TJNOTIFICATIONS_LIST_LOGS_DESC="List all notification logs"
-
 COM_TJNOTIFICATIONS_CONFIGURATION="TJNotifications Configuration"
 COM_TJNOTIFICATIONS_SETTINGS_GENERAL="General"
 COM_TJNOTIFICATIONS_SETTINGS_CHOOSE_PUSH_PROVIDER="Choose Push service provider plugin"
@@ -197,7 +184,6 @@ COM_TJNOTIFICATIONS_SETTINGS_CHOOSE_SMS_PLUGIN="Choose SMS provider plugin"
 COM_TJNOTIFICATIONS_SETTINGS_CHOOSE_SMS_PLUGIN_DESC="Choose SMS provider plugin to be used"
 COM_TJNOTIFICATIONS_SETTINGS_CHOOSE_WHATSAPP_PROVIDER="Choose Whatsapp provider plugin to be used"
 COM_TJNOTIFICATIONS_SETTINGS_CHOOSE_WHATSAPP_PROVIDER_DESC="Choose Whatsapp provider plugin to be used"
-
 ;COM_TJNOTIFICATIONS_WHATSAPP_GUPSHUP_SOURCE="Sender Number"
 ;COM_TJNOTIFICATIONS_WHATSAPP_GUPSHUP_SOURCE_DESC="Set sender number"
 ;COM_TJNOTIFICATIONS_WHATSAPP_GUPSHUP_API_KEY="Whatsapp Gupshup API key"
@@ -232,9 +218,6 @@ COM_TJNOTIFICATIONS_FORM_SUBSCRIPTION_TITLE_DESC="Enter Title"
 COM_TJNOTIFICATIONS_MSG_SUCCESS_SAVE_SUBSCRIPTION="Subscription saved successfully"
 ; Backends list
 COM_TJNOTIFICATIONS_BACKEND_LIST_CHOOSE="Choose backend"
-COM_TJNOTIFICATIONS_BACKEND_EMAIL="Email"
-COM_TJNOTIFICATIONS_BACKEND_PUSH="Push"
-COM_TJNOTIFICATIONS_BACKEND_SMS="SMS"
 COM_TJNOTIFICATIONS_BACKEND_WHATSAPP="Whatsapp"
 COM_TJNOTIFICATIONS_PLATFORM_LIST_CHOOSE="Choose platform"
 COM_TJNOTIFICATIONS_PLATFORM_ANDROID="Android"
@@ -247,20 +230,15 @@ COM_TJNOTIFICATIONS_FILTER_STATE="Status"
 COM_TJNOTIFICATIONS_FILTER_STATE_DESC="Status"
 COM_TJNOTIFICATIONS_LIST_FULL_ORDERING="Sort By"
 COM_TJNOTIFICATIONS_LIST_FULL_ORDERING_DESC="Sort By"
-
-; General
 COM_TJNOTIFICATIONS_N_ITEMS_ARCHIVED="%d records successfully archived"
 COM_TJNOTIFICATIONS_N_ITEMS_ARCHIVED_1="%d record successfully archived"
 COM_TJNOTIFICATIONS_N_ITEMS_CHECKED_IN_0="No record successfully checked in"
 COM_TJNOTIFICATIONS_N_ITEMS_CHECKED_IN_1="%d record successfully checked in"
 COM_TJNOTIFICATIONS_N_ITEMS_CHECKED_IN_MORE="%d records successfully checked in"
-COM_TJNOTIFICATIONS_N_ITEMS_DELETED="%d records successfully deleted"
 COM_TJNOTIFICATIONS_N_ITEMS_DELETED_1="%d record successfully deleted"
-COM_TJNOTIFICATIONS_N_ITEMS_PUBLISHED="%d records successfully published"
 COM_TJNOTIFICATIONS_N_ITEMS_PUBLISHED_1="%d record successfully published"
 COM_TJNOTIFICATIONS_N_ITEMS_TRASHED="%d records successfully trashed"
 COM_TJNOTIFICATIONS_N_ITEMS_TRASHED_1="%d record successfully trashed"
-COM_TJNOTIFICATIONS_N_ITEMS_UNPUBLISHED="%d records successfully unpublished"
 COM_TJNOTIFICATIONS_N_ITEMS_UNPUBLISHED_1="%d record successfully unpublished"
 
 ; Subscriptions - list view
@@ -303,3 +281,8 @@ COM_TJNOTIFICATIONS_SETTINGS_CHOOSE_BACKEND_SHORTENING_DESC="Choose backends (li
 ; Notification - SMS Template
 COM_TJNOTIFICATIONS_NOTIFICATION_SMS_REMAINING_CHARACTER="characters remaining"
 COM_TJNOTIFICATIONS_NOTIFICATION_SMS_REMAINING_EXCEEDED="characters exceeded"
+
+; Since v_2.0.1
+; Notification - SMS provider template ID
+COM_TJNOTIFICATIONS_FIELD_SMS_TEMPLATE_ID_LABEL="SMS template ID"
+COM_TJNOTIFICATIONS_FIELD_SMS_TEMPLATE_ID_DESC="Set template ID which is proided by SMS provider"

src/com_tjnotifications/admin/models/fields/clients.php

@@ -50,7 +50,7 @@ protected function getOptions()
 			{
 				$client = explode('_', $obj->client);
 
-				if ($client[1])
+				if (!empty($client[1]))
 				{
 					$options[] = JHtml::_('select.option', $obj->client, ucfirst($client[1]));
 				}

src/com_tjnotifications/admin/models/forms/smsfields.xml

@@ -26,5 +26,12 @@
 			required="true"
 			onchange="tjnotificationsAdmin.notification.validateSmsLength(this)"
 		/>
+
+		<field
+			name="provider_template_id"
+			type="text"
+			label="COM_TJNOTIFICATIONS_FIELD_SMS_TEMPLATE_ID_LABEL"
+			description="COM_TJNOTIFICATIONS_FIELD_SMS_TEMPLATE_ID_DESC"
+		/>
 	</fieldset>
 </form>

src/com_tjnotifications/admin/models/notification.php

@@ -267,7 +267,7 @@ public function getReplacementTagsCount($key, $client)
 		$db->setQuery($query);
 		$replacementTags = $db->loadResult();
 
-		return count(json_decode($replacementTags));
+		return count((array) json_decode($replacementTags));
 	}
 
 	/**
@@ -461,9 +461,14 @@ public function save($data)
 				$templateConfigTable->params = json_encode($params);
 
 				// Repeatable data
-				$templateConfigTable->subject     = !empty($backendFieldValues['subject']) ? $backendFieldValues['subject']: '';
-				$templateConfigTable->body        = $backendFieldValues['body'];
-				$templateConfigTable->language    = $backendFieldValues['language'];
+				$templateConfigTable->subject  = !empty($backendFieldValues['subject']) ? $backendFieldValues['subject']: '';
+				$templateConfigTable->body     = $backendFieldValues['body'];
+				$templateConfigTable->language = $backendFieldValues['language'];
+
+				if (!empty($backendFieldValues['provider_template_id']))
+				{
+					$templateConfigTable->provider_template_id = $backendFieldValues['provider_template_id'];
+				}
 
 				// Save backend in config table
 				if (empty($backendFieldValues['id']))

src/com_tjnotifications/admin/models/notifications.php

@@ -323,7 +323,7 @@ public function getTemplate($client, $key, $language, $backend = 'email')
 				$db->quoteName(
 					array(
 						't.id', 't.client', 't.key', 't.title', 't.replacement_tags',
-						'ntc.backend', 'ntc.language', 'ntc.subject', 'ntc.body', 'ntc.params', 'ntc.state'
+						'ntc.backend', 'ntc.language', 'ntc.subject', 'ntc.body', 'ntc.params', 'ntc.state', 'ntc.provider_template_id'
 					)
 				)
 			)
@@ -342,7 +342,7 @@ public function getTemplate($client, $key, $language, $backend = 'email')
 				$db->quoteName(
 					array(
 						't.id', 't.client', 't.key', 't.title', 't.replacement_tags',
-						'ntc.backend', 'ntc.language', 'ntc.subject', 'ntc.body', 'ntc.params', 'ntc.state'
+						'ntc.backend', 'ntc.language', 'ntc.subject', 'ntc.body', 'ntc.params', 'ntc.state', 'ntc.provider_template_id'
 					)
 				)
 			)

src/com_tjnotifications/admin/sql/install.mysql.utf8.sql

@@ -33,6 +33,7 @@ CREATE TABLE IF NOT EXISTS `#__tj_notification_template_configs` (
   `created_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `updated_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
   `is_override` int(1) NOT NULL,
+  `provider_template_id` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`),
   CONSTRAINT `#__tj_notification_template_configs` FOREIGN KEY (`template_id`) REFERENCES `#__tj_notification_templates` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci AUTO_INCREMENT=1;

src/com_tjnotifications/admin/sql/updates/mysql/2.0.1.sql

@@ -0,0 +1 @@
+ALTER TABLE `#__tj_notification_template_configs` ADD `provider_template_id` varchar(255) DEFAULT NULL AFTER `is_override`;