Skip to content

Commit 0f57156

Browse files
MoDaaeMoDaae
committed
Merge remote-tracking branch 'origin/next' into feat-zmskvr-787-ticket-layouts
2 parents f7d4329 + 82b40a4 commit 0f57156

File tree

398 files changed

+712
-13671
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

398 files changed

+712
-13671
lines changed

‎zmsadmin/js/block/queue/index.js‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ class View extends BaseView {
2929
this.onNextProcess = options.onNextProcess;
3030
this.onResetProcess = options.onResetProcess;
3131
this.onSendCustomMail = options.onSendCustomMail;
32-
this.onSendCustomNotification = options.onSendCustomNotification;
33-
this.onSendNotificationReminder = options.onSendNotificationReminder;
3432
this.onChangeTableView = options.onChangeTableView;
3533
this.onChangeScope = options.onChangeScope;
3634
this.onConfirm = options.onConfirm;
@@ -88,12 +86,8 @@ class View extends BaseView {
8886
this.onDatePick($(ev.currentTarget).attr('data-date'));
8987
}).on('click', '.queue-table .calendar-navigation .today', (ev) => {
9088
this.onDateToday($(ev.currentTarget).attr('data-date'))
91-
}).on('click', '.queue-table .process-notification-send', (ev) => {
92-
this.onConfirm(ev, "confirm_notification_reminder", () => { this.onSendNotificationReminder(this.$main, ev) });
9389
}).on('click', '.process-custom-mail-send', (ev) => {
9490
this.onSendCustomMail(this.$main, ev);
95-
}).on('click', '.process-custom-notification-send', (ev) => {
96-
this.onSendCustomNotification(this.$main, ev);
9791
})
9892
}
9993
}

‎zmsadmin/js/lib/schema/definitions.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import log from "bo-zmsentities/schema/dereferenced/log.json"
1616
import mail from "bo-zmsentities/schema/dereferenced/mail.json"
1717
import mimepart from "bo-zmsentities/schema/dereferenced/mimepart.json"
1818
import metaresult from "bo-zmsentities/schema/dereferenced/metaresult.json"
19-
import notification from "bo-zmsentities/schema/dereferenced/notification.json"
2019
import organisation from "bo-zmsentities/schema/dereferenced/organisation.json"
2120
import owner from "bo-zmsentities/schema/dereferenced/owner.json"
2221
import process from "bo-zmsentities/schema/dereferenced/process.json"
@@ -33,4 +32,4 @@ import ticketprinter from "bo-zmsentities/schema/dereferenced/ticketprinter.json
3332
import useraccount from "bo-zmsentities/schema/dereferenced/useraccount.json"
3433
import workstation from "bo-zmsentities/schema/dereferenced/workstation.json"
3534

36-
export default { apikey, appointment, availability, calendar, calldisplay, client, cluster, config, contact, day, dayoff, department, exchange, link, log, mail, mimepart, metaresult, notification, organisation, owner, process, provider, queue, request, requestrelation, scope, session, slot, source, status, ticketprinter, useraccount, workstation }
35+
export default { apikey, appointment, availability, calendar, calldisplay, client, cluster, config, contact, day, dayoff, department, exchange, link, log, mail, mimepart, metaresult, organisation, owner, process, provider, queue, request, requestrelation, scope, session, slot, source, status, ticketprinter, useraccount, workstation }

‎zmsadmin/js/page/workstation/index.js‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ class View extends BaseView {
5555
'onQueueProcess',
5656
'onResetProcess',
5757
'onSendCustomMail',
58-
'onSendCustomNotification',
59-
'onSendNotificationReminder',
6058
'onReloadQueueTable',
6159
'onChangeTableView',
6260
'onChangeSlotCount',
@@ -483,41 +481,6 @@ class View extends BaseView {
483481
});
484482
}
485483

486-
onSendCustomNotification($container, event) {
487-
stopEvent(event);
488-
const processId = $(event.currentTarget).data('process');
489-
this.loadCall(`${this.includeUrl}/notification/?selectedprocess=${processId}&dialog=1`).then((response) => {
490-
this.loadDialog(response, (() => {
491-
showSpinner($container);
492-
const sendData = $('.dialog form').serializeArray();
493-
sendData.push(
494-
{ 'name': 'submit', 'value': 'form' },
495-
{ 'name': 'dialog', 'value': 1 }
496-
);
497-
this.loadCall(`${this.includeUrl}/notification/`, 'POST', $.param(sendData)).then(
498-
(response) => {
499-
hideSpinner($container);
500-
this.loadMessage(response, () => {
501-
}, null, event.currentTarget)
502-
});
503-
}), null, event.currentTarget)
504-
});
505-
}
506-
507-
onSendNotificationReminder($container, event) {
508-
stopEvent(event);
509-
showSpinner($container);
510-
const processId = $(event.currentTarget).data('process');
511-
const sendData = {
512-
'selectedprocess': processId,
513-
'submit': 'reminder'
514-
}
515-
this.loadCall(`${this.includeUrl}/notification/`, 'POST', $.param(sendData)).then(
516-
(response) => this.loadMessage(response, () => {
517-
}, null, event.currentTarget)
518-
);
519-
}
520-
521484
onGhostWorkstationChange($container, event) {
522485
let selectedDate = this.selectedDate
523486
let ghostWorkstationCount = "-1";
@@ -634,8 +597,6 @@ class View extends BaseView {
634597
onResetProcess: this.onResetProcess,
635598
onAbortMessage: this.onAbortMessage,
636599
onSendCustomMail: this.onSendCustomMail,
637-
onSendCustomNotification: this.onSendCustomNotification,
638-
onSendNotificationReminder: this.onSendNotificationReminder,
639600
onChangeScope: this.onChangeScope,
640601
onChangeTableView: this.onChangeTableView,
641602
onConfirm: this.onConfirm,

‎zmsadmin/package-lock.json‎

Lines changed: 12 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎zmsadmin/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@
6363
"util": "^0.12.5"
6464
},
6565
"dependencies": {
66-
"bo-layout-admin-js": "https://gitlab.com/eappointment/includes/layout-admin-js.git#2.24.14",
67-
"bo-layout-admin-scss": "https://gitlab.com/eappointment/includes/layout-admin-scss.git#muc-main",
68-
"bo-zmsentities": "https://gitlab.com/eappointment/zmsentities.git#2.24.14",
66+
"bo-layout-admin-js": "https://gitlab.com/eappointment/includes/layout-admin-js/-/archive/2.24.14/layout-admin-js-2.24.14.tar.gz",
67+
"bo-layout-admin-scss": "https://gitlab.com/eappointment/includes/layout-admin-scss/-/archive/muc-main/layout-admin-scss-muc-main.tar.gz",
68+
"bo-zmsentities": "https://gitlab.com/eappointment/zmsentities/-/archive/2.24.14/zmsentities-2.24.14.tar.gz",
6969
"chart.js": "^4.4.2",
7070
"react-chartjs-2": "^5.3.1"
7171
}

‎zmsadmin/routing.php‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -184,15 +184,6 @@
184184
\App::$slim->map(['GET', 'POST'], '/mail/', \BO\Zmsadmin\Mail::class)
185185
->setName("mail");
186186

187-
/*
188-
* ---------------------------------------------------------------------------
189-
* Notification
190-
* -------------------------------------------------------------------------
191-
*/
192-
193-
\App::$slim->map(['GET', 'POST'], '/notification/', \BO\Zmsadmin\Notification::class)
194-
->setName("notification");
195-
196187
/*
197188
* ---------------------------------------------------------------------------
198189
* Organisation

‎zmsadmin/src/Zmsadmin/Helper/AppointmentFormHelper.php‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -100,18 +100,13 @@ public static function readSelectedProcess($request)
100100
null;
101101
}
102102

103-
public static function updateMailAndNotification($formData, \BO\Zmsentities\Process $process)
103+
public static function updateMail($formData, \BO\Zmsentities\Process $process)
104104
{
105105
if (isset($formData['sendMailConfirmation'])) {
106106
$mailConfirmation = $formData['sendMailConfirmation'];
107107
$mailConfirmation = (isset($mailConfirmation['value'])) ? $mailConfirmation['value'] : $mailConfirmation;
108108
self::writeMail($mailConfirmation, $process);
109109
}
110-
if (isset($formData['sendConfirmation'])) {
111-
$smsConfirmation = $formData['sendConfirmation'];
112-
$smsConfirmation = (isset($smsConfirmation['value'])) ? $smsConfirmation['value'] : $smsConfirmation;
113-
self::writeNotification($smsConfirmation, $process);
114-
}
115110
}
116111

117112
protected static function readProcessListByScopeAndDate($validator, $scopeList, $slotType, $slotsRequired)
@@ -166,20 +161,6 @@ protected static function setSlotsRequired($validator, \BO\Zmsentities\Scope $sc
166161
return $slotsRequired;
167162
}
168163

169-
protected static function writeNotification($smsConfirmation, \BO\Zmsentities\Process $process)
170-
{
171-
if (
172-
$smsConfirmation &&
173-
$process->scope->hasNotificationEnabled() &&
174-
$process->getFirstClient()->hasTelephone()
175-
) {
176-
\App::$http->readPostResult(
177-
'/process/' . $process->id . '/' . $process->authKey . '/confirmation/notification/',
178-
$process
179-
);
180-
}
181-
}
182-
183164
protected static function writeMail($mailConfirmation, \BO\Zmsentities\Process $process)
184165
{
185166
if (

‎zmsadmin/src/Zmsadmin/Helper/DialogHandler.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,6 @@ public function readResponse(
3232
$parameter['settings']['hasMail'] = (
3333
$process->getFirstClient()->hasEmail() && $process->scope->hasEmailFrom()
3434
);
35-
$parameter['settings']['hasTelephone'] = (
36-
$process->getFirstClient()->hasTelephone() && $process->scope->hasNotificationEnabled()
37-
);
3835
$parameter['id'] = $process->queue->number;
3936
}
4037
}

‎zmsadmin/src/Zmsadmin/Notification.php‎

Lines changed: 0 additions & 111 deletions
This file was deleted.

‎zmsadmin/src/Zmsadmin/ProcessChange.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,21 +154,21 @@ protected static function writeChangedProcess($input, $oldProcess, $newProcess)
154154
]
155155
)->getEntity();
156156
}
157-
static::writeDeletedMailAndNotification($oldProcess);
158-
static::writeConfirmedMailAndNotification($input, $newProcess);
157+
static::writeDeletedMail($oldProcess);
158+
static::writeConfirmedMail($input, $newProcess);
159159
return $newProcess;
160160
}
161161

162-
protected static function writeDeletedMailAndNotification($oldProcess)
162+
protected static function writeDeletedMail($oldProcess)
163163
{
164164
$oldProcess->status = 'deleted';
165165
ProcessDelete::writeDeleteMailNotifications($oldProcess);
166166
}
167167

168-
protected static function writeConfirmedMailAndNotification($input, $newProcess)
168+
protected static function writeConfirmedMail($input, $newProcess)
169169
{
170170
if ('confirmed' == $newProcess->getStatus()) {
171-
Helper\AppointmentFormHelper::updateMailAndNotification($input, $newProcess);
171+
Helper\AppointmentFormHelper::updateMail($input, $newProcess);
172172
}
173173
}
174174
}

0 commit comments

Comments
 (0)