Netsyms
/
Mods-for-HESK-Netsyms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Getting started on manage categories page changes, fixed API config issue

Browse Source
master
Mike Koch 7 years ago
parent 9582689f2a
commit c86788e7fd
2 changed files with 178 additions and 162 deletions
Show Stats Download Patch File Download Diff File

102
admin/manage_categories.php
Unescape Escape View File

@ -93,10 +93,11 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
?> ?>
<div class="content-wrapper"> <div class="content-wrapper">
<section class="content"> <section class="content">
<div class="box collapsed-box"> <!-- OLD ADD CATEGORY -->
<!--<div class="box collapsed-box">
<div class="box-header with-border"> <div class="box-header with-border">
<h1 class="box-title"> <h1 class="box-title">
<?php echo $hesklang['add_cat']; ?> <?php /*echo $hesklang['add_cat']; */?>
</h1> </h1>
<div class="box-tools pull-right"> <div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse"> <button type="button" class="btn btn-box-tool" data-widget="collapse">
@ -107,32 +108,32 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
<div class="box-body"> <div class="box-body">
<form action="manage_categories.php" method="post" role="form" class="form-horizontal" data-toggle="validator"> <form action="manage_categories.php" method="post" role="form" class="form-horizontal" data-toggle="validator">
<div class="form-group"> <div class="form-group">
<label for="name" class="col-sm-4 control-label"><?php echo $hesklang['cat_name']; ?></label> <label for="name" class="col-sm-4 control-label"><?php /*echo $hesklang['cat_name']; */?></label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" <input class="form-control"
placeholder="<?php echo htmlspecialchars($hesklang['cat_name']); ?>" type="text" placeholder="<?php /*echo htmlspecialchars($hesklang['cat_name']); */?>" type="text"
name="name" size="40" maxlength="40" name="name" size="40" maxlength="40"
<?php <?php
if (isset($_SESSION['catname'])) { /* if (isset($_SESSION['catname'])) {
echo ' value="' . hesk_input($_SESSION['catname']) . '" '; echo ' value="' . hesk_input($_SESSION['catname']) . '" ';
} }
?> */?>
data-error="<?php echo htmlspecialchars($hesklang['enter_cat_name']); ?>" data-error="<?php /*echo htmlspecialchars($hesklang['enter_cat_name']); */?>"
required> required>
<div class="help-block"><?php echo $hesklang['max_chars']; ?></div> <div class="help-block"><?php /*echo $hesklang['max_chars']; */?></div>
<div class="help-block with-errors"></div> <div class="help-block with-errors"></div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="priority" class="col-sm-4 control-label"><?php echo $hesklang['def_pri']; ?> <a href="#" <label for="priority" class="col-sm-4 control-label"><?php /*echo $hesklang['def_pri']; */?> <a href="#"
onclick="alert('<?php echo hesk_makeJsString($hesklang['cat_pri']); ?>')"><i onclick="alert('<?php /*echo hesk_makeJsString($hesklang['cat_pri']); */?>')"><i
class="fa fa-question-circle settingsquestionmark"></i> </a> </label> class="fa fa-question-circle settingsquestionmark"></i> </a> </label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="priority" class="form-control"> <select name="priority" class="form-control">
<?php <?php
// Default priority: low /* // Default priority: low
if (!isset($_SESSION['cat_priority'])) { if (!isset($_SESSION['cat_priority'])) {
$_SESSION['cat_priority'] = 3; $_SESSION['cat_priority'] = 3;
} }
@ -141,104 +142,105 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
foreach ($priorities as $value => $info) { foreach ($priorities as $value => $info) {
echo '<option value="' . $value . '"' . ($_SESSION['cat_priority'] == $value ? ' selected="selected"' : '') . '>' . $info['text'] . '</option>'; echo '<option value="' . $value . '"' . ($_SESSION['cat_priority'] == $value ? ' selected="selected"' : '') . '>' . $info['text'] . '</option>';
} }
?> */?>
</select> </select>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="color" class="col-sm-4 control-label"> <label for="color" class="col-sm-4 control-label">
<?php echo $hesklang['category_background_color']; ?> <?php /*echo $hesklang['category_background_color']; */?>
<i class="fa fa-question-circle settingsquestionmark" data-toggle="popover" <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
title="<?php echo htmlspecialchars($hesklang['category_background_color']); ?>" title="<?php /*echo htmlspecialchars($hesklang['category_background_color']); */?>"
data-content="<?php echo htmlspecialchars($hesklang['category_background_color_help']); ?>"></i> data-content="<?php /*echo htmlspecialchars($hesklang['category_background_color_help']); */?>"></i>
</label> </label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control colorpicker-trigger" <input class="form-control colorpicker-trigger"
placeholder="<?php echo htmlspecialchars($hesklang['category_background_color']); ?>" type="text" placeholder="<?php /*echo htmlspecialchars($hesklang['category_background_color']); */?>" type="text"
name="background-color" maxlength="7" required> name="background-color" maxlength="7" required>
<div class="help-block with-errors"></div> <div class="help-block with-errors"></div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="color" class="col-sm-4 control-label"> <label for="color" class="col-sm-4 control-label">
<?php echo $hesklang['category_foreground_color']; ?> <?php /*echo $hesklang['category_foreground_color']; */?>
<i class="fa fa-question-circle settingsquestionmark" data-toggle="popover" <i class="fa fa-question-circle settingsquestionmark" data-toggle="popover"
title="<?php echo htmlspecialchars($hesklang['category_foreground_color']); ?>" title="<?php /*echo htmlspecialchars($hesklang['category_foreground_color']); */?>"
data-content="<?php echo htmlspecialchars($hesklang['category_foreground_color_help']); ?>"></i> data-content="<?php /*echo htmlspecialchars($hesklang['category_foreground_color_help']); */?>"></i>
</label> </label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control colorpicker-trigger" <input class="form-control colorpicker-trigger"
placeholder="<?php echo htmlspecialchars($hesklang['category_foreground_color']); ?>" type="text" placeholder="<?php /*echo htmlspecialchars($hesklang['category_foreground_color']); */?>" type="text"
name="foreground-color" maxlength="7"> name="foreground-color" maxlength="7">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="display-border" class="col-sm-4 control-label"> <label for="display-border" class="col-sm-4 control-label">
<?php echo $hesklang['category_display_border']; ?> <?php /*echo $hesklang['category_display_border']; */?>
<i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover" <i class="fa fa-question-circle settingsquestionmark" data-toggle="htmlpopover"
title="<?php echo htmlspecialchars($hesklang['category_display_border']); ?>" title="<?php /*echo htmlspecialchars($hesklang['category_display_border']); */?>"
data-content="<?php echo htmlspecialchars($hesklang['category_display_border_help']); ?>"></i> data-content="<?php /*echo htmlspecialchars($hesklang['category_display_border_help']); */?>"></i>
</label> </label>
<div class="col-sm-8 form-inline"> <div class="col-sm-8 form-inline">
<div class="radio"> <div class="radio">
<label> <label>
<input type="radio" name="display-border" value="1"> <input type="radio" name="display-border" value="1">
<?php echo $hesklang['yes']; ?> <?php /*echo $hesklang['yes']; */?>
</label> </label>
</div>&nbsp;&nbsp;&nbsp; </div>&nbsp;&nbsp;&nbsp;
<div class="radio"> <div class="radio">
<label> <label>
<input type="radio" name="display-border" value="0" checked> <input type="radio" name="display-border" value="0" checked>
<?php echo $hesklang['no']; ?> <?php /*echo $hesklang['no']; */?>
</label> </label>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="usage" class="col-sm-4 control-label"><?php echo $hesklang['usage']; ?></label> <label for="usage" class="col-sm-4 control-label"><?php /*echo $hesklang['usage']; */?></label>
<div class="col-sm-8"> <div class="col-sm-8">
<select name="usage" class="form-control"> <select name="usage" class="form-control">
<option value="0"><?php echo $hesklang['tickets_and_events']; ?></option> <option value="0"><?php /*echo $hesklang['tickets_and_events']; */?></option>
<option value="1"><?php echo $hesklang['tickets_only']; ?></option> <option value="1"><?php /*echo $hesklang['tickets_only']; */?></option>
<option value="2"><?php echo $hesklang['events_only']; ?></option> <option value="2"><?php /*echo $hesklang['events_only']; */?></option>
</select> </select>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="options" class="col-sm-4 control-label"><?php echo $hesklang['opt']; ?></label> <label for="options" class="col-sm-4 control-label"><?php /*echo $hesklang['opt']; */?></label>
<div class="col-sm-8"> <div class="col-sm-8">
<?php <?php
if ($hesk_settings['autoassign']) { /* if ($hesk_settings['autoassign']) {
?> */?>
<div class="checkbox"> <div class="checkbox">
<label><input type="checkbox" name="autoassign" <label><input type="checkbox" name="autoassign"
value="Y" <?php if (!isset($_SESSION['cat_autoassign']) || $_SESSION['cat_autoassign'] == 1) { value="Y" <?php /*if (!isset($_SESSION['cat_autoassign']) || $_SESSION['cat_autoassign'] == 1) {
echo 'checked="checked"'; echo 'checked="checked"';
} ?> /> <?php echo $hesklang['cat_aa']; ?></label><br/> } */?> /> <?php /*echo $hesklang['cat_aa']; */?></label><br/>
</div> </div>
<?php <?php
} /* }
?> */?>
<div class="checkbox"> <div class="checkbox">
<label><input type="checkbox" name="type" <label><input type="checkbox" name="type"
value="Y" <?php if (isset($_SESSION['cat_type']) && $_SESSION['cat_type'] == 1) { value="Y" <?php /*if (isset($_SESSION['cat_type']) && $_SESSION['cat_type'] == 1) {
echo 'checked="checked"'; echo 'checked="checked"';
} ?> /> <?php echo $hesklang['cat_type']; ?></label> } */?> /> <?php /*echo $hesklang['cat_type']; */?></label>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-9 col-sm-offset-4"> <div class="col-sm-9 col-sm-offset-4">
<input type="hidden" name="a" value="new"/> <input type="hidden" name="a" value="new"/>
<input type="hidden" name="token" value="<?php hesk_token_echo(); ?>"/> <input type="hidden" name="token" value="<?php /*hesk_token_echo(); */?>"/>
<input type="submit" value="<?php echo $hesklang['create_cat']; ?>" class="btn btn-default"/> <input type="submit" value="<?php /*echo $hesklang['create_cat']; */?>" class="btn btn-default"/>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
</div> </div>-->
<!-- END OLD ADD CATEGORY -->
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h1 class="box-title"> <h1 class="box-title">
@ -253,6 +255,7 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
</div> </div>
</div> </div>
<div class="box-body"> <div class="box-body">
<?php <?php
/* This will handle error, success and notice messages */ /* This will handle error, success and notice messages */
hesk_handle_messages(); hesk_handle_messages();
@ -261,7 +264,16 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
hesk_show_notice($hesklang['cat_pri_info'] . ' ' . $hesklang['cpri']); hesk_show_notice($hesklang['cat_pri_info'] . ' ' . $hesklang['cpri']);
} }
?> ?>
<table class="table table-hover"> <div class="row">
<div class="col-md-12 text-right">
<button id="create-button" class="btn btn-success">
<i class="fa fa-plus-circle"></i>&nbsp;
<?php echo $hesklang['create_new']; ?>
</button>
</div>
<div class="col-md-12">
<table class="table table-striped">
<thead>
<tr> <tr>
<th style="display: none"><?php echo $hesklang['id']; ?></th> <th style="display: none"><?php echo $hesklang['id']; ?></th>
<th><?php echo $hesklang['cat_name']; ?></th> <th><?php echo $hesklang['cat_name']; ?></th>
@ -272,7 +284,8 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
<th><?php echo $hesklang['manager']; ?></th> <th><?php echo $hesklang['manager']; ?></th>
<th><?php echo $hesklang['opt']; ?></th> <th><?php echo $hesklang['opt']; ?></th>
</tr> </tr>
</thead>
<tbody>
<?php <?php
/* Get number of tickets per category */ /* Get number of tickets per category */
$tickets_all = array(); $tickets_all = array();
@ -407,9 +420,12 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
} // End while } // End while
?> ?>
</tbody>
</table> </table>
</div> </div>
</div> </div>
</div>
</div>
</section> </section>
</div> </div>
<!-- Edit category modal --> <!-- Edit category modal -->

14
api/index.php
Unescape Escape View File

@ -206,21 +206,21 @@ Link::all(array(
/* Internal use only routes */ /* Internal use only routes */
// Resend email response // Resend email response
'/v1-internal/staff/tickets/{i}/resend-email' => '/v1-internal/staff/tickets/{i}/resend-email' =>
action(\Controllers\Tickets\ResendTicketEmailToCustomerController::class, SecurityHandler::INTERNAL), action(\Controllers\Tickets\ResendTicketEmailToCustomerController::class, RequestMethod::ALL, SecurityHandler::INTERNAL),
// Custom Navigation // Custom Navigation
'/v1-internal/custom-navigation/all' => '/v1-internal/custom-navigation/all' =>
action(\Controllers\Navigation\CustomNavElementController::class . '::getAll', SecurityHandler::INTERNAL), action(\Controllers\Navigation\CustomNavElementController::class . '::getAll', RequestMethod::ALL, SecurityHandler::INTERNAL),
'/v1-internal/custom-navigation' => '/v1-internal/custom-navigation' =>
action(\Controllers\Navigation\CustomNavElementController::class, SecurityHandler::INTERNAL), action(\Controllers\Navigation\CustomNavElementController::class, RequestMethod::ALL, SecurityHandler::INTERNAL),
'/v1-internal/custom-navigation/{i}' => '/v1-internal/custom-navigation/{i}' =>
action(\Controllers\Navigation\CustomNavElementController::class, SecurityHandler::INTERNAL), action(\Controllers\Navigation\CustomNavElementController::class, RequestMethod::ALL, SecurityHandler::INTERNAL),
'/v1-internal/custom-navigation/{i}/sort/{s}' => '/v1-internal/custom-navigation/{i}/sort/{s}' =>
action(\Controllers\Navigation\CustomNavElementController::class . '::sort', SecurityHandler::INTERNAL), action(\Controllers\Navigation\CustomNavElementController::class . '::sort', RequestMethod::ALL, SecurityHandler::INTERNAL),
'/v1-public/hesk-version' => '/v1-public/hesk-version' =>
action(\Controllers\System\HeskVersionController::class . '::getHeskVersion', SecurityHandler::OPEN), action(\Controllers\System\HeskVersionController::class . '::getHeskVersion', RequestMethod::ALL, SecurityHandler::OPEN),
'/v1-public/mods-for-hesk-version' => '/v1-public/mods-for-hesk-version' =>
action(\Controllers\System\HeskVersionController::class . '::getModsForHeskVersion', SecurityHandler::OPEN), action(\Controllers\System\HeskVersionController::class . '::getModsForHeskVersion', RequestMethod::ALL, SecurityHandler::OPEN),
// Any URL that doesn't match goes to the 404 handler // Any URL that doesn't match goes to the 404 handler
'404' => 'handle404' '404' => 'handle404'

Write Preview
Loading…
Cancel
Save