[ YC-905 ] Improved registration and validation process

- email is now assignable from attribute - password/confirmPassword attributes in form - configuration for email validation in a shop - temporary passwords in JAM + password change form - customer password flows
inspire-software · May 19, 2018 · 4de74a1 · 4de74a1
1 parent 463fb04
commit 4de74a1
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/env/migration/migrate-3.4.0-3.5.0/YC-905-README.txt b/env/migration/migrate-3.4.0-3.5.0/YC-905-README.txt
@@ -44,7 +44,7 @@ their choice. The password is validated using same configurations as registratio
 JAM has password reset functionality in CallCenter section. Depending on the desired behaviour shop owner can set
 SHOP_CUSTOMER_PASSWORD_RESET_CC shop attribute. If it is filled in (with secure token of shop owner choice) the behaviour
 would be to auto generate the password. If it is not filled in the the customer will be sent password reset link via email.
-In case password reset is triggered from Admin email template will have $callCentrePasswordReset variable set to 'true',
+In case password reset is triggered from Admin email template will have $additionalData.callCentrePasswordReset variable set to 'true',
 otherwise this variable is 'false'.
 
 3. Auto generated passwords (old behaviour)

diff --git a/...il/src/main/resources/default/mail/customer-change-password/customer-change-password.html b/...il/src/main/resources/default/mail/customer-change-password/customer-change-password.html
@@ -32,7 +32,7 @@
                     <td width="2%">&nbsp;</td>
                     <td>
                         Dear <b>$firstName $lastName</b>,<br>
-                        <% if (callCentrePasswordReset) { %>
+                        <% if (additionalData.callCentrePasswordReset) { %>
                         Call centre requested new password at
                         <% } else { %>
                         You or somebody else requested new password at

diff --git a/...ail/src/main/resources/default/mail/customer-change-password/customer-change-password.txt b/...ail/src/main/resources/default/mail/customer-change-password/customer-change-password.txt
@@ -1,6 +1,6 @@
 Dear $firstName $lastName,
 
-<% if (callCentrePasswordReset) { %>
+<% if (additionalData.callCentrePasswordReset) { %>
 Call centre requested new password at "$shopName"
 <% } else { %>
 You or somebody else requested new password at "$shopName"

diff --git a/...src/main/resources/default/mail/customer-change-password/customer-change-password_de.html b/...src/main/resources/default/mail/customer-change-password/customer-change-password_de.html
@@ -32,7 +32,7 @@
                         <td width="2%">&nbsp;</td>
                         <td>
                             Guten Tag <b>$firstName $lastName</b>,<br>
-                            <% if (callCentrePasswordReset) { %>
+                            <% if (additionalData.callCentrePasswordReset) { %>
                             Das Call Center hat ein neues Passwort angefragt bei
                             <% } else { %>
                             Sie haben ein neues Passwort angefragt bei

diff --git a/.../src/main/resources/default/mail/customer-change-password/customer-change-password_de.txt b/.../src/main/resources/default/mail/customer-change-password/customer-change-password_de.txt
@@ -1,6 +1,6 @@
 Guten Tag $firstName $lastName,
 
-<% if (callCentrePasswordReset) { %>
+<% if (additionalData.callCentrePasswordReset) { %>
 Das Call Center hat ein neues Passwort angefragt bei $shopName
 <% } else { %>
 Sie haben ein neues Passwort angefragt bei $shopName

diff --git a/...src/main/resources/default/mail/customer-change-password/customer-change-password_en.html b/...src/main/resources/default/mail/customer-change-password/customer-change-password_en.html
@@ -32,7 +32,7 @@
                         <td width="2%">&nbsp;</td>
                         <td>
                             Dear <b>$firstName $lastName</b>,<br>
-                            <% if (callCentrePasswordReset) { %>
+                            <% if (additionalData.callCentrePasswordReset) { %>
                             Call centre requested new password at
                             <% } else { %>
                             You or somebody else requested new password at

diff --git a/.../src/main/resources/default/mail/customer-change-password/customer-change-password_en.txt b/.../src/main/resources/default/mail/customer-change-password/customer-change-password_en.txt
@@ -1,6 +1,6 @@
 Dear $firstName $lastName,
 
-<% if (callCentrePasswordReset) { %>
+<% if (additionalData.callCentrePasswordReset) { %>
 Call centre requested new password at "$shopName"
 <% } else { %>
 You or somebody else requested new password at "$shopName"

diff --git a/...src/main/resources/default/mail/customer-change-password/customer-change-password_ru.html b/...src/main/resources/default/mail/customer-change-password/customer-change-password_ru.html
@@ -32,7 +32,7 @@
                         <td width="2%">&nbsp;</td>
                         <td>
                             Уважаемый (-ая) <b>$firstName $lastName</b>,<br>
-                            <% if (callCentrePasswordReset) { %>
+                            <% if (additionalData.callCentrePasswordReset) { %>
                             Служба поддержки запросила новый пароль на
                             <% } else { %>
                             Вы или кто то другой запросили новый пароль на

diff --git a/.../src/main/resources/default/mail/customer-change-password/customer-change-password_ru.txt b/.../src/main/resources/default/mail/customer-change-password/customer-change-password_ru.txt
@@ -1,6 +1,6 @@
 Уважаемый (-ая) $firstName $lastName,
 
-<% if (callCentrePasswordReset) { %>
+<% if (additionalData.callCentrePasswordReset) { %>
 Служба поддержки запросила новый пароль на $shopName
 <% } else { %>
 Вы или кто то другой запросили новый пароль на $shopName

diff --git a/...src/main/resources/default/mail/customer-change-password/customer-change-password_uk.html b/...src/main/resources/default/mail/customer-change-password/customer-change-password_uk.html
@@ -32,7 +32,7 @@
                         <td width="2%">&nbsp;</td>
                         <td>
                             Шановний (-на) <b>$firstName $lastName</b>,<br>
-                            <% if (callCentrePasswordReset) { %>
+                            <% if (additionalData.callCentrePasswordReset) { %>
                             Служба підтримки зробила запит на новий пароль на
                             <% } else { %>
                             Вами або кимось іншим був зроблений запит на новий пароль на

diff --git a/.../src/main/resources/default/mail/customer-change-password/customer-change-password_uk.txt b/.../src/main/resources/default/mail/customer-change-password/customer-change-password_uk.txt
@@ -1,6 +1,6 @@
 Шановний (-на) $firstName $lastName,
 
-<% if (callCentrePasswordReset) { %>
+<% if (additionalData.callCentrePasswordReset) { %>
 Служба підтримки зробила запит на новий пароль на $shopName
 <% } else { %>
 Вами або кимось іншим був зроблений запит на новий пароль на $shopName