Skip to content

Tenzing / Tz Tools

Go to a project
Toggle navigation
Toggle navigation pinning
ecce9470 by Kevin Burton
Options

Update to notification views.

1 parent 486be7eb
Inline Side-by-side
Showing 4 changed files with 26 additions and 18 deletions
......@@ -59,6 +59,7 @@ function display_page() {
$validation->set_rules('text','Text Version','trim|min_length[16]');
$validation->set_rules('html','HTML Version','trim|min_length[16]');
$validation->set_rules('system_message_type','System Message Type','trim');
$validation->set_rules('system','System Message','trim|min_length[16]');
$validation->set_rules('sms','SMS Message','trim|min_length[16]');
......@@ -87,6 +88,7 @@ function display_page() {
}
// system
$system_message_type = $_POST['system_message_type'];
$system = $_POST['system'];
// SMS
......@@ -106,8 +108,13 @@ function display_page() {
, 'html' => $html
, 'attachments' => $attachments
));
update_post_meta($id, "system", $system);
update_post_meta($id, "sms", $sms);
update_post_meta($id, "system", array(
'system_message_type' => $system_message_type
, 'message' => $system
));
update_post_meta($id, "sms", array(
'message' => $sms
));
$update = array();
$update['ID'] = $id;
......@@ -238,7 +245,6 @@ function notification_settings() {
$validation = new Notifications\Validation;
$validation->set_rules('company','Company','required|trim');
$validation->set_rules('address','Address','required|trim');
$validation->set_rules('address2','Apt/Unit/Suite','required|trim');
$validation->set_rules('city','City','required|trim');
$validation->set_rules('province','Province','required|trim');
$validation->set_rules('postal','POstal Code','required|trim');
......@@ -279,9 +285,8 @@ function create_notification() {
$validation->set_rules('system','System Message','trim|min_length[16]');
$validation->set_rules('sms','SMS Message','trim|min_length[16]');
if ($_POST && (($_POST['subject']=="" || $_POST['text']) && $_POST['sms']=="" && $_POST['system']=="")) {
if ($_POST && ($_POST['subject']=="" && $_POST['sms']=="" && $_POST['system']=="")) {
$form_error = true;
require_once(__DIR__ . DIRECTORY_SEPARATOR . 'views' . DIRECTORY_SEPARATOR . 'create.php');
} else {
......
......@@ -16,14 +16,13 @@ const OPTION_NAME = "notif_options";
});
/**
Send Notifications
@trigger = notification unique slug name
@user = user id (to get email and name)
@type = instant or cron
*/
function send_notification($trigger="NO_TRIGGER",$user=0,$type="instant") {
function send_notification($trigger="NO_TRIGGER") {
// if the system notification has set current user than get current user otherwise loop through the users needed.
}
......
......@@ -130,6 +130,17 @@ use Tz\WordPress\Tools;
</thead>
<tbody style="<?php echo ($validation->set_value('system',$entry->system)=="") ? "display:none" : "";?>;">
<tr>
<td>Message Type</td>
<td>
<select name="system_message_type">
<option value="none" <?php echo ($validation->set_value('system_message_type',$entry->details['system_message_type'])=="none") ? 'selected="selected"' : "";?>>General Message</option>
<option value="action_required" <?php echo ($validation->set_value('system_message_type',$entry->details['system_message_type'])=="action_required") ? 'selected="selected"' : "";?>>Action Required</option>
<option value="eflash" <?php echo ($validation->set_value('system_message_type',$entry->details['system_message_type'])=="eflash") ? 'selected="selected"' : "";?>>E-Flash</option>
<option value="newevent" <?php echo ($validation->set_value('system_message_type',$entry->details['system_message_type'])=="newevent") ? 'selected="selected"' : "";?>>New Event</option>
</select>
</td>
</tr>
<tr>
<td>Message (Text/HTML)</td>
<td><textarea name="system" class="wide-input-field" rows="4" style="width:100%;" ><?php echo $validation->set_value('system',$entry->system);?></textarea><?php echo $validation->form_error('system');?></td>
</tr>
......
......@@ -3,9 +3,6 @@ use Tz\WordPress\Tools\Notifications\Settings;
use Tz\WordPress\Tools\Notifications;
use Tz\WordPress\Tools;
register_settings
?>
<link type="text/css" href="<?php echo Tools\url('assets/css/smoothness/jquery-ui-1.8.4.custom.css', __FILE__)?>" rel="stylesheet" />
......@@ -41,10 +38,6 @@ register_settings
<td><input type="text" name="address" class="wide-input-field" /></td>
</tr>
<tr>
<td width="150">Apt/Unit/Suite:</td>
<td><input type="text" name="address2" class="wide-input-field" /></td>
</tr>
<tr>
<td width="150">City:</td>
<td><input type="text" name="city" class="wide-input-field" /></td>
</tr>
......@@ -86,7 +79,7 @@ register_settings
</tr>
<tr>
<td width="150">OPT-OUT Message::</td>
<td><textarea name="opt_message" class="wide-input-field" rows="4" style="width:100%;color:#999" onkeydown="this.style.color = '#000000';" >If you do not wish to further receive emails from us, please opt-out by clicking here: http://cbv.wp.kb/no-emails-please.php?u={uid}.</textarea></td>
<td><textarea name="opt_message" class="wide-input-field" rows="4" style="width:100%;color:#999" onkeydown="this.style.color = '#000000';" >If you do not wish to further receive emails from us, you can change your notification settings in your profile.</textarea></td>
</tr>
</body>
</table>
......