From 9299f68d951e7cdfef9763d10f991258d8199407 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Thu, 2 May 2019 19:01:34 +0200
Subject: [PATCH] FEAT #10387 TIME 0:20 add warn msg if no address page
---
.../shipping/shipping-administration.component.html | 1 +
.../shipping/shipping-administration.component.ts | 2 +-
src/frontend/lang/lang-en.ts | 1 +
src/frontend/lang/lang-fr.ts | 1 +
src/frontend/lang/lang-nl.ts | 1 +
5 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/frontend/app/administration/shipping/shipping-administration.component.html b/src/frontend/app/administration/shipping/shipping-administration.component.html
index 68ca94a24a9..8ad929a541c 100644
--- a/src/frontend/app/administration/shipping/shipping-administration.component.html
+++ b/src/frontend/app/administration/shipping/shipping-administration.component.html
@@ -38,6 +38,7 @@
<mat-slide-toggle color="primary" name="{{option}}" [checked]="shipping.options.shapingOptions.indexOf(option) > -1"
(change)="toggleShapingOption(option)">{{lang['maileva_'+option]}}</mat-slide-toggle>
</mat-list-item>
+ <div *ngIf="shipping.options.shapingOptions.indexOf('addressPage') == -1" class="alert-message alert-message-danger" role="alert" style="margin-top: 30px;" [innerHTML]="lang.warnShapingOption"></div>
</mat-list>
</div>
<div class="formType ratio-1 col-sm-12">
diff --git a/src/frontend/app/administration/shipping/shipping-administration.component.ts b/src/frontend/app/administration/shipping/shipping-administration.component.ts
index 0c60ff073b7..bd57b6eea83 100644
--- a/src/frontend/app/administration/shipping/shipping-administration.component.ts
+++ b/src/frontend/app/administration/shipping/shipping-administration.component.ts
@@ -31,7 +31,7 @@ export class ShippingAdministrationComponent implements OnInit {
label: '',
description: '',
options: {
- shapingOptions: [],
+ shapingOptions: ['addressPage'],
sendMode: 'fast',
},
fee: {
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index 1e0e2ab9e05..7af68928cdf 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -991,4 +991,5 @@ export const LANG_EN = {
"roles" : "Roles",
"contextParaph" : "Context",
"addNewAccount" : "Add new account",
+ "warnShapingOption" : "<b>Be carefull !</b> The address will be setted in the first page of sended documents",
};
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index 6b7d8a59c21..0deb97ba952 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -1024,4 +1024,5 @@ export const LANG_FR = {
"roles" : "Rôles",
"contextParaph" : "En tant que",
"addNewAccount" : "Ajouter un nouveau compte",
+ "warnShapingOption" : "<b>Attention !</b> L'adresse sera 'incrustée' sur la première page des documents envoyés",
};
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index a93b75f9267..4510bdb56af 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -1018,4 +1018,5 @@ export const LANG_NL = {
"roles" : "Roles", //_TO_TRANSLATE
"contextParaph" : "Context", //_TO_TRANSLATE
"addNewAccount" : "Add new account", //_TO_TRANSLATE
+ "warnShapingOption" : "<b>Be carefull !</b> The address will be setted in the first page of sended documents", //_TO_TRANSLATE
};
--
GitLab