Skip to content

Commit

Permalink
fixed routing issues in RH ce fulfillment flows
Browse files Browse the repository at this point in the history
  • Loading branch information
jrbarnes9 committed Jun 1, 2020
1 parent 9614a22 commit c55ccc3
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 23 deletions.
10 changes: 5 additions & 5 deletions _css/base/_sprite.scss
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@

.svg-icons--chevron-down {
@extend %svg-common;
background-position: 98.93992932862191% 43.2%;
background-position: 98.93992932862191% 42.93448275862069%;
}

.svg-icons--chevron-down-dims {
Expand Down Expand Up @@ -294,7 +294,7 @@

.svg-icons--lock {
@extend %svg-common;
background-position: 96.07796040215489% 57.342756183745585%;
background-position: 96.07796040215489% 57.07067137809187%;
}

.svg-icons--lock-dims {
Expand Down Expand Up @@ -334,7 +334,7 @@

.svg-icons--right-arrow {
@extend %svg-common;
background-position: 95.69050955196336% 26.64727272727273%;
background-position: 95.69050955196336% 26.367272727272724%;
}

.svg-icons--right-arrow-dims {
Expand All @@ -344,7 +344,7 @@

.svg-logo {
@extend %svg-common;
background-position: 100% 15.609512722434726%;
background-position: 100% 15.353400964576752%;
}

.svg-logo-dims {
Expand All @@ -359,7 +359,7 @@

.svg-logo-crest-dims {
width: 52px;
height: 46.93px;
height: 46.16px;
}

.svg-logo-cy {
Expand Down
21 changes: 8 additions & 13 deletions _prototypes/end-to-end/confirm-rh-address-ce.html
Original file line number Diff line number Diff line change
Expand Up @@ -94,24 +94,19 @@ <h1 class="question__title u-fs-xl">
* Routing
*/
if (residentBox.checked) {
if (currentJourney = 'new-hh-paper') {
var currentJourney = 'new-ce-resident-paper';
var url = '../uac-request-enter-name';
} else {
var currentJourney = 'new-ce-resident-uac';
var url = '../uac-request-method';
if (currentJourney === 'new-hh-paper' || currentJourney === 'new-ce-resident-paper' || currentJourney === 'new-ce-manager-paper') {
window.location.href = '../uac-request-enter-name' + '?' + 'previous=' + currentPage + '&' + 'current-journey=' + 'new-ce-resident-paper';
} else if (currentJourney === 'new-hh-uac'|| currentJourney === 'new-ce-resident-uac' || currentJourney === 'new-ce-manager-uac') {
window.location.href = '../uac-request-method' + '?' + 'previous=' + currentPage + '&' + 'current-journey=' + 'new-ce-resident-uac';
}
}
else {
if (currentJourney = 'new-hh-paper') {
var currentJourney = 'new-ce-manager-paper';
var url = '../ce-manager-paper';
} else {
var currentJourney = 'new-ce-manager-uac';
var url = '../uac-request-method';
if (currentJourney === 'new-hh-paper' || currentJourney === 'new-ce-manager-paper' || currentJourney === 'new-ce-resident-paper') {
window.location.href = '../ce-manager-paper' + '?' + 'previous=' + currentPage + '&' + 'current-journey=' + 'new-ce-manager-paper';
} else if (currentJourney === 'new-hh-uac' || currentJourney === 'new-ce-manager-uac' || currentJourney === 'new-ce-resident-uac') {
window.location.href = '../uac-request-method' + '?' + 'previous=' + currentPage + '&' + 'current-journey=' + 'new-ce-manager-uac';
}
}
window.location.href = url + '?' + 'previous=' + currentPage + '&' + 'current-journey=' + currentJourney;
});

if (addressParam) {
Expand Down
3 changes: 2 additions & 1 deletion _prototypes/end-to-end/uac-request-enter-name.html
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@
hasErrors = false;
var urlParams = new URLSearchParams(window.location.search);
var previousPage = urlParams.get('previous');
var currentPage = 'uac-request-enter-name';
var currentJourney = urlParams.get('current-journey');
var householdNumber = urlParams.get('hh-members');

Expand Down Expand Up @@ -220,7 +221,7 @@
$(updateQuestion);

function updateAllLinks() {
$('.js-previous-link').attr('href', '../' + previousPage);
$('.js-previous-link').attr('href', '../' + previousPage + '?previous=' + currentPage + '&current-journey=' + currentJourney);
}

$(updateAllLinks);
Expand Down
2 changes: 1 addition & 1 deletion css/fixed.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions css/main.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion css/responsive.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit c55ccc3

Please sign in to comment.