Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 3.0.4 #167

Merged
merged 18 commits into from
Nov 22, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/com_tjnotifications/admin/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@
default="" label="COM_TJNOTIFICATIONS_SETTINGS_CHOOSE_URL_SHORTENING_PLUGIN" description="COM_TJNOTIFICATIONS_SETTINGS_CHOOSE_URL_SHORTENING_PLUGIN_DESC" query="SELECT element, name FROM #__extensions WHERE type='plugin' AND folder='tjurlshortner' AND enabled=1" key_field="element" value_field="name" />

<field name="url_shortening_enabled_backends" type="tjnotificationsbackends" showon="enable_url_shortening:1" default="sms" multiple="multiple" label="COM_TJNOTIFICATIONS_SETTINGS_CHOOSE_BACKEND_SHORTENING" description="COM_TJNOTIFICATIONS_SETTINGS_CHOOSE_BACKEND_SHORTENING_DESC" />

<field name="web_notification_provider" type="list" default="easysocial"
description="COM_TJNOTIFICATIONS_WEB_NOTIFICATION_PROVIDER_DESC"
label="COM_TJNOTIFICATIONS_WEB_NOTIFICATION_PROVIDER">
<option value="easysocial">COM_TJNOTIFICATIONS_WEB_NOTIFICATION_PROVIDER_EASYSOCIAL</option>
</field>

</fieldset>

Expand Down
2 changes: 1 addition & 1 deletion src/com_tjnotifications/admin/defines.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@

if (!defined('TJNOTIFICATIONS_CONST_BACKENDS_ARRAY'))
{
define('TJNOTIFICATIONS_CONST_BACKENDS_ARRAY', "email,sms");
define('TJNOTIFICATIONS_CONST_BACKENDS_ARRAY', "email,sms,web");
}
Original file line number Diff line number Diff line change
Expand Up @@ -286,3 +286,10 @@ COM_TJNOTIFICATIONS_NOTIFICATION_SMS_REMAINING_EXCEEDED="characters exceeded"
; 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"

; Notification - WEB provider
COM_TJNOTIFICATIONS_WEB_NOTIFICATION_PROVIDER="Web Notification Provider"
COM_TJNOTIFICATIONS_WEB_NOTIFICATION_PROVIDER_DESC="Choose Web Notification Provider"
COM_TJNOTIFICATIONS_WEB_NOTIFICATION_PROVIDER_EASYSOCIAL="Easysocial"
COM_TJNOTIFICATIONS_WEB_FIELDS="Web Fields"
COM_TJNOTIFICATIONS_VIEW_NOTIFICATIONS_DEFAULT_WEB_TITLE="Web"
58 changes: 27 additions & 31 deletions src/com_tjnotifications/admin/models/forms/notification.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,33 @@
groupByFieldset="false" />
</fieldset>
</fields>

<fields name="web">
<fieldset name="web_fieldset">
<field
name="state"
type="radio"
default="0"
label="COM_TJNOTIFICATIONS_FIELD_WEB_STATUS_LABEL"
description="COM_TJNOTIFICATIONS_FIELD_WEB_STATUS_DESC"
class="btn-group btn-group-yesno"
>
<option value="1">JON</option>
<option value="0">JOFF</option>
</field>
<field
name="webfields"
description="COM_TJNOTIFICATIONS_WEB_FIELDS_DESC"
type="subform"
label="COM_TJNOTIFICATIONS_WEB_FIELDS"
min="1"
formsource="/administrator/components/com_tjnotifications/models/forms/webfields.xml"
multiple="true"
buttons="add,remove"
layout="joomla.form.field.subform.repeatable"
groupByFieldset="false" />
</fieldset>
</fields>

<fields name="push">
<fieldset name="push_fieldset">
Expand Down Expand Up @@ -194,35 +221,4 @@
groupByFieldset="false" />
</fieldset>
</fields>

<!--
<fields name="web">
<fieldset name="web_fieldset">
<field
name="state"
type="radio"
default="0"
label="COM_TJNOTIFICATIONS_FIELD_WEB_STATUS_LABEL"
description="COM_TJNOTIFICATIONS_FIELD_WEB_STATUS_DESC"
class="btn-group btn-group-yesno"
>
<option value="1">JON</option>
<option value="0">JOFF</option>
</field>
<field
name="subject"
type="textarea"
label="COM_TJNOTIFICATIONS_FIELD_WEB_SUBJECT_LABEL"
description="COM_TJNOTIFICATIONS_FIELD_WEB_SUBJECT_DESC"
/>

<field
name="body"
type="editor"
label="COM_TJNOTIFICATIONS_FIELD_WEB_BODY_LABEL"
description="COM_TJNOTIFICATIONS_FIELD_WEB_BODY_DESC"
validation="required"
/>
</fieldset>
</fields>-->
</form>
34 changes: 34 additions & 0 deletions src/com_tjnotifications/admin/models/forms/webfields.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<form>
<fieldset>
<field
name="id"
type="hidden" />

<field
name="language"
type="contentlanguage"
label="JFIELD_LANGUAGE_LABEL"
description="COM_TJNOTIFICATIONS_NOTIFICATION_LANGUAGE_DESC"
required="true"
>
<option value="*">JALL</option>
</field>

<field
name="subject"
type="textarea"
label="COM_TJNOTIFICATIONS_FIELD_WEB_SUBJECT_LABEL"
description="COM_TJNOTIFICATIONS_FIELD_WEB_SUBJECT_DESC"
required="true"
/>

<field
name="body"
type="textarea"
label="COM_TJNOTIFICATIONS_FIELD_WEB_BODY_LABEL"
description="COM_TJNOTIFICATIONS_FIELD_WEB_BODY_DESC"
required="true"
/>
</fieldset>
</form>