Skip to content

Commit 1b9e274

Browse files
authored
Merge pull request #121 from techjoomla/release-2.0.1
Merge `Release 2.0.1` into `release-2.1.0`
2 parents 66acabd + 7b41cc0 commit 1b9e274

File tree

8 files changed

+45
-35
lines changed

8 files changed

+45
-35
lines changed

.github/workflows/greetings.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Greetings
2+
3+
on: [pull_request, issues]
4+
5+
jobs:
6+
greeting:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/first-interaction@v1
10+
with:
11+
repo-token: ${{ secrets.GITHUB_TOKEN }}
12+
issue-message: 'Thank you for reporting your first issue'
13+
pr-message: 'Congratulations! You just sent your first pull request'

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

Lines changed: 11 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ COM_TJNOTIFICATIONS_FIELD_CLIENT_LABEL="Client"
1515
COM_TJNOTIFICATIONS_FIELD_KEY_LABEL="Key"
1616
COM_TJNOTIFICATIONS_FIELD_TITLE_LABEL="Title"
1717
COM_TJNOTIFICATIONS_FIELD_CLIENT_DESC="The client (extension) that is defining the notifications"
18-
COM_TJNOTIFICATIONS_FIELD_KEY_DESC="The unique key for the notification. This is unique within a client"
18+
COM_TJNOTIFICATIONS_FIELD_KEY_DESC="The unique key that is defining the notifications. This is unique within a client."
1919
COM_TJNOTIFICATIONS_FIELD_TITLE_DESC="The title for the notification template."
2020
COM_TJNOTIFICATIONS_FIELD_CLIENT_OPTION="Choose Client"
2121
COM_TJNOTIFICATIONS_FIELD_KEY_OPTION="Choose Key"
@@ -53,15 +53,14 @@ COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_PUBLISH="Publish"
5353
COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_UNPUBLISH="Unpublish"
5454
COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DELETE="Delete"
5555
COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DELETE_MESSAGE="Are you sure ?"
56-
COM_TJNOTIFICATIONS_N_ITEMS_DELETED=" %s items deleted"
56+
COM_TJNOTIFICATIONS_N_ITEMS_DELETED=" %d records successfully deleted"
5757
COM_TJNOTIFICATIONS_CORE_TEMPLATE_DELETE_MESSAGE="Cannot delete core template."
5858
COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_SEARCH_NOTIFICATIONS="Search Notifications"
5959

6060
COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_ID="ID"
6161
COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_TITLE="Title"
6262
COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_CLIENT="Client"
6363
COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_KEY="Key"
64-
COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_TITLE="Title"
6564
COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_UNSUBCRIBED_USERS="Unsubscribed Users"
6665
COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_USER_CONTROL="User Control"
6766
COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_BACKEND_STATUS="Backend Status"
@@ -70,16 +69,14 @@ COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_BACKEND_STATUS="Backend Sta
7069
;COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_WEB_STATUS="Web Status"
7170
COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_STATE="State"
7271

73-
COM_TJNOTIFICATIONS_N_ITEMS_PUBLISHED="%s Items published"
74-
COM_TJNOTIFICATIONS_N_ITEMS_UNPUBLISHED="%s Items unpublished"
72+
COM_TJNOTIFICATIONS_N_ITEMS_PUBLISHED="%d records successfully published"
73+
COM_TJNOTIFICATIONS_N_ITEMS_UNPUBLISHED="%d records successfully unpublished"
7574
COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_NO_MATCHING_RESULTS="No matching results"
7675
COM_TJNOTIFICATIONS_VIEW_NOTIFICATION_TOOLTIP_MESSAGE="This is client / key of your template"
7776
COM_TJNOTIFICATIONS_MODEL_NOTIFICATION_KEY_DUPLICATE_MESSAGE="Key is already taken"
7877
COM_TJNOTIFICATIONS_VIEW_NOTIFICATION_UNSUBSCRIBED_EMAIL_USERS=" Users unsubscribed E-mail notification %s "
79-
8078
COM_TJNOTIFICATIONS_NOTIFICATION_TITLE="%s: Notification Templates"
8179
COM_TJNOTIFICATIONS_NOTIFICATION_BASE_TITLE="Notifications"
82-
8380
COM_TJNOTIFICATIONS_FIELD_USER_CONTROL_LABEL="User Control"
8481
COM_TJNOTIFICATIONS_FIELD_USER_CONTROL_DESC="If you turn off user control user can't set preferences for this notification."
8582
COM_TJNOTIFICATIONS_STATE_ENABLE="Enable"
@@ -145,32 +142,25 @@ COM_TJNOTIFICATION="Notifications"
145142
COM_TJNOTIFICATIONS_ALLOW_SAVE_OPTION="Enable logs?"
146143
; Logs list
147144
COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_SUBJECT="Subject"
148-
COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_KEY="Key"
149-
COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_TITLE="Title"
150145
COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_BACKEND="Backend"
151146
COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_FROM="From"
152147
COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_TO="To"
153148
COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_CC="CC"
154149
COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_BCC="BCC"
155150
COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_DATE="Date"
156-
COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_STATE="State"
157151
COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_PARAMS="Params"
158152
COM_TJNOTIFICATIONS_TITLE_NOTIFICATIONS="Notifications"
159153
COM_TJNOTIFICATIONS_TITLE_NOTIFICATIONLOGS="Notifications Logs"
160154
COM_TJNOTIFICATIONS_LOGS="Logs"
161-
COM_TJNOTIFICATIONS_EXPORT_FILE_SUCCESS="Download complete"
155+
COM_TJNOTIFICATIONS_EXPORT_FILE_SUCCESS="Download Complete"
162156
COM_TJNOTIFICATIONS_VIEW_EMAIL_BODY="Email Body"
163157
COM_TJNOTIFICATIONS_VIEW_EMAIL_POPUP_CLOSE="Close"
164158
COM_TJNOTIFICATIONS_VIEW_PARAMS_POPUP="Show Params"
165159
COM_TJNOTIFICATIONS_FIELD_BACKEND_LABEL="Backend"
166160
COM_TJNOTIFICATIONS_FIELD_BACKEND_DESC="The backend that is defining the notifications"
167161
COM_TJNOTIFICATIONS_BACKEND_EMAIL="Email"
168162
COM_TJNOTIFICATIONS_BACKEND_SMS="SMS"
169-
COM_TJNOTIFICATIONS_BACKEND_PUSH="Push Message"
170-
COM_TJNOTIFICATIONS_FIELD_KEY_LABEL="Key"
171-
COM_TJNOTIFICATIONS_FIELD_KEY_DESC="The key that is defining the notifications"
172-
COM_TJNOTIFICATIONS_FIELD_KEY_OPTION="Choose Key"
173-
COM_TJNOTIFICATIONS_EXPORT_FILE_SUCCESS="Download Complete"
163+
COM_TJNOTIFICATIONS_BACKEND_PUSH="Push"
174164
COM_TJNOTIFICATIONS_EXPORT_FILE_ERROR="<strong>Something went wrong.</strong>"
175165
COM_TJNOTIFICATIONS_EXPORT_FILE_NOTICE="<strong>Do not click anywhere or refresh the page until CSV download successfully.</strong>"
176166
COM_TJNOTIFICATIONS_FIELD_STATE_LABEL="State"
@@ -184,11 +174,8 @@ COM_TJNOTIFICATIONS_APPLICATION_OPTION_DESC="Enable logs?"
184174
COM_TJNOTIFICATIONS_BACKEND_WEB="Web"
185175
COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_FIELD_BODY="Body"
186176
COM_TJNOTIFICATIONS_TITLE_VIEW_CONTENTS="View Content"
187-
COM_TJNOTIFICATIONS_STATE_SENT="Sent"
188-
COM_TJNOTIFICATIONS_STATE_FAILED="Failed"
189177
COM_TJNOTIFICATIONS_FIELD_NOTIFICATION_BODY_LABEL="Notification Body"
190178
COM_TJNOTIFICATIONS_LIST_LOGS_DESC="List all notification logs"
191-
192179
COM_TJNOTIFICATIONS_CONFIGURATION="TJNotifications Configuration"
193180
COM_TJNOTIFICATIONS_SETTINGS_GENERAL="General"
194181
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"
197184
COM_TJNOTIFICATIONS_SETTINGS_CHOOSE_SMS_PLUGIN_DESC="Choose SMS provider plugin to be used"
198185
COM_TJNOTIFICATIONS_SETTINGS_CHOOSE_WHATSAPP_PROVIDER="Choose Whatsapp provider plugin to be used"
199186
COM_TJNOTIFICATIONS_SETTINGS_CHOOSE_WHATSAPP_PROVIDER_DESC="Choose Whatsapp provider plugin to be used"
200-
201187
;COM_TJNOTIFICATIONS_WHATSAPP_GUPSHUP_SOURCE="Sender Number"
202188
;COM_TJNOTIFICATIONS_WHATSAPP_GUPSHUP_SOURCE_DESC="Set sender number"
203189
;COM_TJNOTIFICATIONS_WHATSAPP_GUPSHUP_API_KEY="Whatsapp Gupshup API key"
@@ -232,9 +218,6 @@ COM_TJNOTIFICATIONS_FORM_SUBSCRIPTION_TITLE_DESC="Enter Title"
232218
COM_TJNOTIFICATIONS_MSG_SUCCESS_SAVE_SUBSCRIPTION="Subscription saved successfully"
233219
; Backends list
234220
COM_TJNOTIFICATIONS_BACKEND_LIST_CHOOSE="Choose backend"
235-
COM_TJNOTIFICATIONS_BACKEND_EMAIL="Email"
236-
COM_TJNOTIFICATIONS_BACKEND_PUSH="Push"
237-
COM_TJNOTIFICATIONS_BACKEND_SMS="SMS"
238221
COM_TJNOTIFICATIONS_BACKEND_WHATSAPP="Whatsapp"
239222
COM_TJNOTIFICATIONS_PLATFORM_LIST_CHOOSE="Choose platform"
240223
COM_TJNOTIFICATIONS_PLATFORM_ANDROID="Android"
@@ -247,20 +230,15 @@ COM_TJNOTIFICATIONS_FILTER_STATE="Status"
247230
COM_TJNOTIFICATIONS_FILTER_STATE_DESC="Status"
248231
COM_TJNOTIFICATIONS_LIST_FULL_ORDERING="Sort By"
249232
COM_TJNOTIFICATIONS_LIST_FULL_ORDERING_DESC="Sort By"
250-
251-
; General
252233
COM_TJNOTIFICATIONS_N_ITEMS_ARCHIVED="%d records successfully archived"
253234
COM_TJNOTIFICATIONS_N_ITEMS_ARCHIVED_1="%d record successfully archived"
254235
COM_TJNOTIFICATIONS_N_ITEMS_CHECKED_IN_0="No record successfully checked in"
255236
COM_TJNOTIFICATIONS_N_ITEMS_CHECKED_IN_1="%d record successfully checked in"
256237
COM_TJNOTIFICATIONS_N_ITEMS_CHECKED_IN_MORE="%d records successfully checked in"
257-
COM_TJNOTIFICATIONS_N_ITEMS_DELETED="%d records successfully deleted"
258238
COM_TJNOTIFICATIONS_N_ITEMS_DELETED_1="%d record successfully deleted"
259-
COM_TJNOTIFICATIONS_N_ITEMS_PUBLISHED="%d records successfully published"
260239
COM_TJNOTIFICATIONS_N_ITEMS_PUBLISHED_1="%d record successfully published"
261240
COM_TJNOTIFICATIONS_N_ITEMS_TRASHED="%d records successfully trashed"
262241
COM_TJNOTIFICATIONS_N_ITEMS_TRASHED_1="%d record successfully trashed"
263-
COM_TJNOTIFICATIONS_N_ITEMS_UNPUBLISHED="%d records successfully unpublished"
264242
COM_TJNOTIFICATIONS_N_ITEMS_UNPUBLISHED_1="%d record successfully unpublished"
265243

266244
; Subscriptions - list view
@@ -303,3 +281,8 @@ COM_TJNOTIFICATIONS_SETTINGS_CHOOSE_BACKEND_SHORTENING_DESC="Choose backends (li
303281
; Notification - SMS Template
304282
COM_TJNOTIFICATIONS_NOTIFICATION_SMS_REMAINING_CHARACTER="characters remaining"
305283
COM_TJNOTIFICATIONS_NOTIFICATION_SMS_REMAINING_EXCEEDED="characters exceeded"
284+
285+
; Since v_2.0.1
286+
; Notification - SMS provider template ID
287+
COM_TJNOTIFICATIONS_FIELD_SMS_TEMPLATE_ID_LABEL="SMS template ID"
288+
COM_TJNOTIFICATIONS_FIELD_SMS_TEMPLATE_ID_DESC="Set template ID which is proided by SMS provider"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ protected function getOptions()
5050
{
5151
$client = explode('_', $obj->client);
5252

53-
if ($client[1])
53+
if (!empty($client[1]))
5454
{
5555
$options[] = JHtml::_('select.option', $obj->client, ucfirst($client[1]));
5656
}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,12 @@
2626
required="true"
2727
onchange="tjnotificationsAdmin.notification.validateSmsLength(this)"
2828
/>
29+
30+
<field
31+
name="provider_template_id"
32+
type="text"
33+
label="COM_TJNOTIFICATIONS_FIELD_SMS_TEMPLATE_ID_LABEL"
34+
description="COM_TJNOTIFICATIONS_FIELD_SMS_TEMPLATE_ID_DESC"
35+
/>
2936
</fieldset>
3037
</form>

src/com_tjnotifications/admin/models/notification.php

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ public function getReplacementTagsCount($key, $client)
267267
$db->setQuery($query);
268268
$replacementTags = $db->loadResult();
269269

270-
return count(json_decode($replacementTags));
270+
return count((array) json_decode($replacementTags));
271271
}
272272

273273
/**
@@ -461,9 +461,14 @@ public function save($data)
461461
$templateConfigTable->params = json_encode($params);
462462

463463
// Repeatable data
464-
$templateConfigTable->subject = !empty($backendFieldValues['subject']) ? $backendFieldValues['subject']: '';
465-
$templateConfigTable->body = $backendFieldValues['body'];
466-
$templateConfigTable->language = $backendFieldValues['language'];
464+
$templateConfigTable->subject = !empty($backendFieldValues['subject']) ? $backendFieldValues['subject']: '';
465+
$templateConfigTable->body = $backendFieldValues['body'];
466+
$templateConfigTable->language = $backendFieldValues['language'];
467+
468+
if (!empty($backendFieldValues['provider_template_id']))
469+
{
470+
$templateConfigTable->provider_template_id = $backendFieldValues['provider_template_id'];
471+
}
467472

468473
// Save backend in config table
469474
if (empty($backendFieldValues['id']))

src/com_tjnotifications/admin/models/notifications.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ public function getTemplate($client, $key, $language, $backend = 'email')
323323
$db->quoteName(
324324
array(
325325
't.id', 't.client', 't.key', 't.title', 't.replacement_tags',
326-
'ntc.backend', 'ntc.language', 'ntc.subject', 'ntc.body', 'ntc.params', 'ntc.state'
326+
'ntc.backend', 'ntc.language', 'ntc.subject', 'ntc.body', 'ntc.params', 'ntc.state', 'ntc.provider_template_id'
327327
)
328328
)
329329
)
@@ -342,7 +342,7 @@ public function getTemplate($client, $key, $language, $backend = 'email')
342342
$db->quoteName(
343343
array(
344344
't.id', 't.client', 't.key', 't.title', 't.replacement_tags',
345-
'ntc.backend', 'ntc.language', 'ntc.subject', 'ntc.body', 'ntc.params', 'ntc.state'
345+
'ntc.backend', 'ntc.language', 'ntc.subject', 'ntc.body', 'ntc.params', 'ntc.state', 'ntc.provider_template_id'
346346
)
347347
)
348348
)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ CREATE TABLE IF NOT EXISTS `#__tj_notification_template_configs` (
3333
`created_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
3434
`updated_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
3535
`is_override` int(1) NOT NULL,
36+
`provider_template_id` varchar(255) DEFAULT NULL,
3637
PRIMARY KEY (`id`),
3738
CONSTRAINT `#__tj_notification_template_configs` FOREIGN KEY (`template_id`) REFERENCES `#__tj_notification_templates` (`id`)
3839
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_unicode_ci AUTO_INCREMENT=1;
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTER TABLE `#__tj_notification_template_configs` ADD `provider_template_id` varchar(255) DEFAULT NULL AFTER `is_override`;

0 commit comments

Comments
 (0)