Skip to content

Commit 6d75457

Browse files
BhushanKBhagatBhushanKBhagat
committed
Update to version: v2.2.56
1 parent b601b17 commit 6d75457

File tree

2 files changed

+135
-135
lines changed

2 files changed

+135
-135
lines changed

‎bookingbug-angular-queue.js‎

Lines changed: 132 additions & 132 deletions
Original file line numberDiff line numberDiff line change
@@ -946,138 +946,6 @@ angular.module('BBQueue.translations').config(['$translateProvider', function ($
946946
}]);
947947
'use strict';
948948

949-
var AddQueueCustomerController = function AddQueueCustomerController($scope, $log, AdminServiceService, AdminQueuerService, ModalForm, BBModel, $interval, $sessionStorage, $uibModal, $q, AdminBookingPopup, bbLocale) {
950-
951-
var addQueuer = function addQueuer(form) {
952-
953-
var defer = $q.defer();
954-
var service = form.service;
955-
var person = form.server;
956-
$scope.new_queuer.service_id = service.id;
957-
$scope.new_queuer.service = service;
958-
$scope.new_queuer.locale = bbLocale.getLocale();
959-
var new_queuer = $scope.new_queuer;
960-
$scope.$emit('addPendingQueuer', new_queuer);
961-
resetQueuer();
962-
service.$post('queuers', {}, new_queuer).then(function (response) {
963-
var queuer = new BBModel.Admin.Queuer(response);
964-
if (person) {
965-
queuer.startServing(person).then(function () {
966-
defer.resolve();
967-
}, function () {
968-
defer.reject();
969-
});
970-
} else {
971-
defer.resolve();
972-
}
973-
});
974-
return defer.promise;
975-
};
976-
977-
var resetQueuer = function resetQueuer() {
978-
$scope.new_queuer = {};
979-
$scope.loading = false;
980-
};
981-
982-
$scope.addToQueue = function () {
983-
$scope.loading = true;
984-
var modalInstance = $uibModal.open({
985-
templateUrl: 'queue/pick_a_service.html',
986-
scope: $scope,
987-
controller: function controller($scope, $uibModalInstance) {
988-
989-
$scope.dismiss = function () {
990-
return $uibModalInstance.dismiss('cancel');
991-
};
992-
993-
$scope.submit = function (form) {
994-
return $uibModalInstance.close(form);
995-
};
996-
}
997-
});
998-
999-
modalInstance.result.then(addQueuer).finally(function () {
1000-
return $scope.loading = false;
1001-
});
1002-
};
1003-
1004-
$scope.availableServers = function () {
1005-
return _.filter($scope.servers, function (server) {
1006-
return server.attendance_status == 1;
1007-
});
1008-
};
1009-
1010-
$scope.serveCustomerNow = function () {
1011-
$scope.loading = true;
1012-
var modalInstance = $uibModal.open({
1013-
templateUrl: 'queue/serve_now.html',
1014-
resolve: {
1015-
services: function services() {
1016-
return $scope.services;
1017-
},
1018-
servers: function servers() {
1019-
return $scope.availableServers();
1020-
}
1021-
},
1022-
controller: function controller($scope, $uibModalInstance, services, servers) {
1023-
1024-
$scope.form = {};
1025-
1026-
$scope.services = services;
1027-
1028-
$scope.servers = servers;
1029-
1030-
$scope.dismiss = function () {
1031-
return $uibModalInstance.dismiss('cancel');
1032-
};
1033-
1034-
$scope.submit = function (form) {
1035-
return $uibModalInstance.close(form);
1036-
};
1037-
}
1038-
});
1039-
1040-
modalInstance.result.then(addQueuer).then(resetQueuer).finally(function () {
1041-
return $scope.loading = false;
1042-
});
1043-
};
1044-
1045-
$scope.makeAppointment = function (options) {
1046-
var defaultOptions = {
1047-
item_defaults: {
1048-
pick_first_time: true,
1049-
merge_people: true,
1050-
merge_resources: true,
1051-
date: moment().format('YYYY-MM-DD')
1052-
},
1053-
on_conflict: "cancel()",
1054-
company_id: $scope.company.id
1055-
};
1056-
1057-
options = _.extend(defaultOptions, options);
1058-
1059-
var popup = AdminBookingPopup.open(options);
1060-
1061-
popup.result.finally(resetQueuer);
1062-
};
1063-
};
1064-
1065-
angular.module('BBQueue.controllers').controller('bbQueueAddCustomer', AddQueueCustomerController);
1066-
'use strict';
1067-
1068-
angular.module('BBQueue.directives').directive('bbQueueAddCustomer', function () {
1069-
return {
1070-
controller: 'bbQueueAddCustomer',
1071-
templateUrl: 'queue/add_customer.html',
1072-
scope: {
1073-
services: '=',
1074-
servers: '=',
1075-
company: '='
1076-
}
1077-
};
1078-
});
1079-
'use strict';
1080-
1081949
var QueueDashboardController = function QueueDashboardController($scope, $log, AdminServiceService, AdminQueuerService, ModalForm, BBModel, $interval, $sessionStorage, $uibModal, $q, AdminPersonService) {
1082950

1083951
$scope.loading = true;
@@ -1397,6 +1265,138 @@ angular.module('BBQueue.directives').directive('bbQueueDashboard', function () {
13971265
});
13981266
'use strict';
13991267

1268+
var AddQueueCustomerController = function AddQueueCustomerController($scope, $log, AdminServiceService, AdminQueuerService, ModalForm, BBModel, $interval, $sessionStorage, $uibModal, $q, AdminBookingPopup, bbLocale) {
1269+
1270+
var addQueuer = function addQueuer(form) {
1271+
1272+
var defer = $q.defer();
1273+
var service = form.service;
1274+
var person = form.server;
1275+
$scope.new_queuer.service_id = service.id;
1276+
$scope.new_queuer.service = service;
1277+
$scope.new_queuer.locale = bbLocale.getLocale();
1278+
var new_queuer = $scope.new_queuer;
1279+
$scope.$emit('addPendingQueuer', new_queuer);
1280+
resetQueuer();
1281+
service.$post('queuers', {}, new_queuer).then(function (response) {
1282+
var queuer = new BBModel.Admin.Queuer(response);
1283+
if (person) {
1284+
queuer.startServing(person).then(function () {
1285+
defer.resolve();
1286+
}, function () {
1287+
defer.reject();
1288+
});
1289+
} else {
1290+
defer.resolve();
1291+
}
1292+
});
1293+
return defer.promise;
1294+
};
1295+
1296+
var resetQueuer = function resetQueuer() {
1297+
$scope.new_queuer = {};
1298+
$scope.loading = false;
1299+
};
1300+
1301+
$scope.addToQueue = function () {
1302+
$scope.loading = true;
1303+
var modalInstance = $uibModal.open({
1304+
templateUrl: 'queue/pick_a_service.html',
1305+
scope: $scope,
1306+
controller: function controller($scope, $uibModalInstance) {
1307+
1308+
$scope.dismiss = function () {
1309+
return $uibModalInstance.dismiss('cancel');
1310+
};
1311+
1312+
$scope.submit = function (form) {
1313+
return $uibModalInstance.close(form);
1314+
};
1315+
}
1316+
});
1317+
1318+
modalInstance.result.then(addQueuer).finally(function () {
1319+
return $scope.loading = false;
1320+
});
1321+
};
1322+
1323+
$scope.availableServers = function () {
1324+
return _.filter($scope.servers, function (server) {
1325+
return server.attendance_status == 1;
1326+
});
1327+
};
1328+
1329+
$scope.serveCustomerNow = function () {
1330+
$scope.loading = true;
1331+
var modalInstance = $uibModal.open({
1332+
templateUrl: 'queue/serve_now.html',
1333+
resolve: {
1334+
services: function services() {
1335+
return $scope.services;
1336+
},
1337+
servers: function servers() {
1338+
return $scope.availableServers();
1339+
}
1340+
},
1341+
controller: function controller($scope, $uibModalInstance, services, servers) {
1342+
1343+
$scope.form = {};
1344+
1345+
$scope.services = services;
1346+
1347+
$scope.servers = servers;
1348+
1349+
$scope.dismiss = function () {
1350+
return $uibModalInstance.dismiss('cancel');
1351+
};
1352+
1353+
$scope.submit = function (form) {
1354+
return $uibModalInstance.close(form);
1355+
};
1356+
}
1357+
});
1358+
1359+
modalInstance.result.then(addQueuer).then(resetQueuer).finally(function () {
1360+
return $scope.loading = false;
1361+
});
1362+
};
1363+
1364+
$scope.makeAppointment = function (options) {
1365+
var defaultOptions = {
1366+
item_defaults: {
1367+
pick_first_time: true,
1368+
merge_people: true,
1369+
merge_resources: true,
1370+
date: moment().format('YYYY-MM-DD')
1371+
},
1372+
on_conflict: "cancel()",
1373+
company_id: $scope.company.id
1374+
};
1375+
1376+
options = _.extend(defaultOptions, options);
1377+
1378+
var popup = AdminBookingPopup.open(options);
1379+
1380+
popup.result.finally(resetQueuer);
1381+
};
1382+
};
1383+
1384+
angular.module('BBQueue.controllers').controller('bbQueueAddCustomer', AddQueueCustomerController);
1385+
'use strict';
1386+
1387+
angular.module('BBQueue.directives').directive('bbQueueAddCustomer', function () {
1388+
return {
1389+
controller: 'bbQueueAddCustomer',
1390+
templateUrl: 'queue/add_customer.html',
1391+
scope: {
1392+
services: '=',
1393+
servers: '=',
1394+
company: '='
1395+
}
1396+
};
1397+
});
1398+
'use strict';
1399+
14001400
var QueuersController = function QueuersController($scope, $log, AdminQueuerService, AdminQueueService, ModalForm, $interval, $q, BBModel, AlertService, ErrorService, $translate) {
14011401

14021402
$scope.loading = true;

‎bower.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bookingbug-angular-queue",
3-
"version": "2.2.55",
3+
"version": "2.2.56",
44
"authors": [
55
"BookingBug <[email protected]>"
66
],
@@ -22,8 +22,8 @@
2222
"dependencies": {
2323
"bootstrap-sass": "^3.3.7",
2424
"angular-sass-adminlte": "AdminLTE-angular-sass#^0.0.2",
25-
"bookingbug-angular-core": "2.2.55",
26-
"bookingbug-angular-admin-dashboard": "2.2.55",
25+
"bookingbug-angular-core": "2.2.56",
26+
"bookingbug-angular-admin-dashboard": "2.2.56",
2727
"angular-timer": "~1.3.4",
2828
"angular-dragdrop": "1.0.12"
2929
}

0 commit comments

Comments
 (0)