diff --git a/src/constants/query-strings.js b/src/constants/query-strings.js
index 5c056c934..5e12b0d9d 100644
--- a/src/constants/query-strings.js
+++ b/src/constants/query-strings.js
@@ -19,6 +19,7 @@ const queryStrings = {
AUTH_CODE: "auth_code",
TRANSACTION_ID: "transaction_id",
TRANS_REFERENCE_NUMBER: "auth_trans_ref_no",
+ LAST_FOUR: "last_four",
DISPLAY_PIA_ALERT: "displayPiaAlert",
};
diff --git a/src/digital-components/question-chain/question-chain.spec.js b/src/digital-components/question-chain/question-chain.spec.js
index 2444fd22d..d516afc03 100644
--- a/src/digital-components/question-chain/question-chain.spec.js
+++ b/src/digital-components/question-chain/question-chain.spec.js
@@ -265,8 +265,8 @@ describe("Question Chain component", () => {
],
},
],
- index: 0,
});
+ await wrapper.setProps({ index: 0 });
//Act
const result = wrapper.vm.getQuestionChainAnswerIfComplete(testReturnedAnswer);
diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index cd50a8fda..2d268e81a 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -834,7 +834,7 @@ export default {
display: flex;
justify-content: space-between;
padding: 0.5rem 1.5rem;
- &:nth-last-child(-n + 3) {
+ &:nth-last-child(-n + 4) {
background-color: $green-100;
}
&:last-child {
diff --git a/src/layouts/capability-questions/capability-questions.vue b/src/layouts/capability-questions/capability-questions.vue
index 717865e41..e46629bf1 100644
--- a/src/layouts/capability-questions/capability-questions.vue
+++ b/src/layouts/capability-questions/capability-questions.vue
@@ -5,11 +5,13 @@
:isMetaValid="meta.valid"
:alertFewMoreQuestionsHeader="AlertFewMoreQuestionsHeader"
:alertFewMoreQuestionsCopy="AlertFewMoreQuestionsCopy"
+ v-if="questionsData"
:questionsData="questionsData"
validationRules="questions-required"
v-model="selectedAnswers"
@forwardButtonAction="forwardButtonAction"
@back-click="navigateBack"
+ :key="currentGlassIndex"
:index="currentGlassIndex" />
@@ -55,7 +57,7 @@ export default {
},
data() {
return {
- questionsData: [],
+ questionsData: null,
selectedAnswers: {},
currentGlassIndex: 0,
};
@@ -120,6 +122,12 @@ export default {
return updatedGlass;
});
+
+ // if no preanswered questions then make sure index starts with the correct value
+ this.currentGlassIndex = this.calculateQuestionIndex(
+ this.currentGlassIndex,
+ this.questionsData
+ );
},
async forwardButtonAction() {
const questionAnswersArray = this.questionsData.map((glass) => {
diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue
index 45c73f096..d9fe2e479 100644
--- a/src/layouts/confirmation/confirmation.vue
+++ b/src/layouts/confirmation/confirmation.vue
@@ -145,6 +145,8 @@ export default {
computed: {
ShowCart() {
if (this.isPia && store.getters.submittedOrder.settledTenderAmount == 0) {
+ // settleTenderAmount always shows 0 via localhost or dev.
+ // Temporarily set return true to see cart in localhost or dev environment
return false;
}
diff --git a/src/layouts/molding-questions/molding-questions.vue b/src/layouts/molding-questions/molding-questions.vue
index ee1b33a9f..b2d6804bc 100644
--- a/src/layouts/molding-questions/molding-questions.vue
+++ b/src/layouts/molding-questions/molding-questions.vue
@@ -5,11 +5,13 @@
:isMetaValid="meta.valid"
:alertFewMoreQuestionsHeader="AlertFewMoreQuestionsHeader"
:alertFewMoreQuestionsCopy="AlertFewMoreQuestionsCopy"
+ v-if="questionsData"
:questionsData="questionsData"
validationRules="questions-required"
v-model="selectedAnswers"
@forwardButtonAction="forwardButtonAction"
@back-click="navigateBack"
+ :key="currentGlassIndex"
:index="currentGlassIndex" />
@@ -55,7 +57,7 @@ export default {
},
data() {
return {
- questionsData: [],
+ questionsData: null,
selectedAnswers: {},
currentGlassIndex: 0,
};
@@ -119,6 +121,12 @@ export default {
return updatedGlass;
});
+
+ // if no preanswered questions then make sure index starts with the correct value
+ this.currentGlassIndex = this.calculateQuestionIndex(
+ this.currentGlassIndex,
+ this.questionsData
+ );
},
async forwardButtonAction() {
const questionAnswersArray = this.questionsData.map((glass) => {
diff --git a/src/layouts/part-questions/part-questions.vue b/src/layouts/part-questions/part-questions.vue
index 113e91e42..9f4a13902 100644
--- a/src/layouts/part-questions/part-questions.vue
+++ b/src/layouts/part-questions/part-questions.vue
@@ -5,11 +5,13 @@
:isMetaValid="meta.valid"
:alertFewMoreQuestionsHeader="AlertFewMoreQuestionsHeader"
:alertFewMoreQuestionsCopy="AlertFewMoreQuestionsCopy"
+ v-if="questionsData"
:questionsData="questionsData"
validationRules="questions-required"
v-model="selectedAnswers"
@forwardButtonAction="forwardButtonAction"
@back-click="navigateBack"
+ :key="currentGlassIndex"
:index="currentGlassIndex" />
@@ -55,7 +57,7 @@ export default {
},
data() {
return {
- questionsData: [],
+ questionsData: null,
selectedAnswers: {},
currentGlassIndex: 0,
};
@@ -71,7 +73,7 @@ export default {
return this.$store.getters.pageData(fmgPageValues.PART_QUESTIONS).partsOrQuestions;
},
},
- created() {
+ mounted() {
this.getInitialQuestionData();
},
methods: {
@@ -117,6 +119,12 @@ export default {
return updatedGlass;
});
+
+ // if no preanswered questions then make sure index starts with the correct value
+ this.currentGlassIndex = this.calculateQuestionIndex(
+ this.currentGlassIndex,
+ this.questionsData
+ );
},
async forwardButtonAction() {
const questionAnswersArray = this.questionsData.map((glass) => {
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 96f2fda75..ea9633157 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -15,10 +15,6 @@
- {{ noPiaDisclaimer }} -
-