rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-17 06:52:27 +01:00
Code Issues Releases Activity

trainings tour: change tab on tracking step

Browse Source 
invoices tour: do not show listing steps if invoicing is disabled
+ typo
This commit is contained in:
Sylvain 2020-02-25 09:48:55 +01:00
parent 7dd5979d64
commit 64e41910ec
3 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
app/assets/javascripts/controllers/admin/invoices.js.erb
View File

@ -576,39 +576,41 @@ Application.Controllers.controller('InvoicesController', ['$scope', '$state', 'I
placement: 'bottom',
orphan: true
});
uitour.createStep({
selector: '.invoices-management .invoices-list',
stepId: 'list',
order: 1,
title: _t('app.admin.tour.invoices.list.title'),
content: _t('app.admin.tour.invoices.list.content'),
placement: 'top'
});
if ($scope.invoices.length > 0) {
if (!Fablab.withoutInvoices) {
uitour.createStep({
selector: '.invoices-management .invoices-list .chained-indicator',
stepId: 'chained',
order: 2,
title: _t('app.admin.tour.invoices.chained.title'),
content: _t('app.admin.tour.invoices.chained.content'),
placement: 'right'
});
uitour.createStep({
selector: '.invoices-management .invoices-list .download-button',
stepId: 'download',
order: 3,
title: _t('app.admin.tour.invoices.download.title'),
content: _t('app.admin.tour.invoices.download.content'),
placement: 'left'
});
uitour.createStep({
selector: '.invoices-management .invoices-list .refund-button',
stepId: 'refund',
order: 4,
title: _t('app.admin.tour.invoices.refund.title'),
content: _t('app.admin.tour.invoices.refund.content'),
placement: 'left'
selector: '.invoices-management .invoices-list',
stepId: 'list',
order: 1,
title: _t('app.admin.tour.invoices.list.title'),
content: _t('app.admin.tour.invoices.list.content'),
placement: 'top'
});
if ($scope.invoices.length > 0) {
uitour.createStep({
selector: '.invoices-management .invoices-list .chained-indicator',
stepId: 'chained',
order: 2,
title: _t('app.admin.tour.invoices.chained.title'),
content: _t('app.admin.tour.invoices.chained.content'),
placement: 'right'
});
uitour.createStep({
selector: '.invoices-management .invoices-list .download-button',
stepId: 'download',
order: 3,
title: _t('app.admin.tour.invoices.download.title'),
content: _t('app.admin.tour.invoices.download.content'),
placement: 'left'
});
uitour.createStep({
selector: '.invoices-management .invoices-list .refund-button',
stepId: 'refund',
order: 4,
title: _t('app.admin.tour.invoices.refund.title'),
content: _t('app.admin.tour.invoices.refund.content'),
placement: 'left'
});
}
}
uitour.createStep({
selector: '.invoices-management .invoices-settings',

5
app/assets/javascripts/controllers/admin/trainings.js.erb
View File

@ -395,9 +395,8 @@ Application.Controllers.controller('TrainingsAdminController', ['$scope', '$stat
});
// on step change, change the active tab if needed
uitour.on('stepChanged', function (nextStep) {
if (nextStep.stepId === 'filter' || nextStep.stepId === 'machines') {
$scope.tabs.active = 0;
}
if (nextStep.stepId === 'filter' || nextStep.stepId === 'machines') { $scope.tabs.active = 0; }
if (nextStep.stepId === 'tracking') { $scope.tabs.active = 1; }
});
// on tour end, save the status in database
uitour.on('ended', function () {

2
config/locales/app.admin.fr.yml
View File

@ -1154,7 +1154,7 @@ fr:
pricing:
welcome:
title: "Abonnements & Tarifs"
content: "Gérez les formules d'abonnement et les prix des différents services que vous proposez à vos membres"
content: "Gérez les formules d'abonnement et les prix des différents services que vous proposez à vos membres."
new_plan:
title: "Nouvelle formule d'abonnement"
content: "Créez des formules d'abonnement pour proposer des prix préférentiels sur les machines et les espaces, aux utilisateurs réguliers."