diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue index 718573c87..f8270183c 100644 --- a/src/layouts/payment-method/payment-method.vue +++ b/src/layouts/payment-method/payment-method.vue @@ -21,6 +21,10 @@
+ + +
+ diff --git a/src/layouts/review/review-block/review-block.spec.js b/src/layouts/payment-method/review-dropdown/review-block/review-block.spec.js similarity index 91% rename from src/layouts/review/review-block/review-block.spec.js rename to src/layouts/payment-method/review-dropdown/review-block/review-block.spec.js index 1a25e8bfd..bf0557d05 100644 --- a/src/layouts/review/review-block/review-block.spec.js +++ b/src/layouts/payment-method/review-dropdown/review-block/review-block.spec.js @@ -1,7 +1,7 @@ import { shallowMount } from "@vue/test-utils"; import { getMountOptions } from "@/helpers/unit-test-helper.js"; import store from "@/store"; -import reviewBlock from "@/layouts/review/review-block/review-block"; +import reviewBlock from "@/layouts/payment-method/review-dropdown/review-block/review-block"; jest.mock("@/helpers/cms-content-helper", () => ({ fetchCmsContentForPage: () => Promise.resolve("content"), diff --git a/src/layouts/review/review-block/review-block.vue b/src/layouts/payment-method/review-dropdown/review-block/review-block.vue similarity index 58% rename from src/layouts/review/review-block/review-block.vue rename to src/layouts/payment-method/review-dropdown/review-block/review-block.vue index f5819ca8c..6afd393d5 100644 --- a/src/layouts/review/review-block/review-block.vue +++ b/src/layouts/payment-method/review-dropdown/review-block/review-block.vue @@ -6,17 +6,6 @@ :customText="customHeaderText" typeStyle="body small bold dark" marginTopSizeOverride="0" /> - - -
diff --git a/src/layouts/payment-method/review-dropdown/review-dropdown.vue b/src/layouts/payment-method/review-dropdown/review-dropdown.vue new file mode 100644 index 000000000..321599820 --- /dev/null +++ b/src/layouts/payment-method/review-dropdown/review-dropdown.vue @@ -0,0 +1,174 @@ + + + + + diff --git a/src/layouts/review/review-sections/customer-review/customer-review.spec.js b/src/layouts/payment-method/review-dropdown/review-sections/customer-review/customer-review.spec.js similarity index 96% rename from src/layouts/review/review-sections/customer-review/customer-review.spec.js rename to src/layouts/payment-method/review-dropdown/review-sections/customer-review/customer-review.spec.js index 45627df2e..13138a182 100644 --- a/src/layouts/review/review-sections/customer-review/customer-review.spec.js +++ b/src/layouts/payment-method/review-dropdown/review-sections/customer-review/customer-review.spec.js @@ -1,7 +1,7 @@ import { shallowMount } from "@vue/test-utils"; import { getMountOptions } from "@/helpers/unit-test-helper.js"; -import customerReview from "@/layouts/review/review-sections/customer-review/customer-review"; +import customerReview from "@/layouts/payment-method/review-dropdown/review-sections/customer-review/customer-review"; const testConstants = { cms: { diff --git a/src/layouts/review/review-sections/customer-review/customer-review.vue b/src/layouts/payment-method/review-dropdown/review-sections/customer-review/customer-review.vue similarity index 78% rename from src/layouts/review/review-sections/customer-review/customer-review.vue rename to src/layouts/payment-method/review-dropdown/review-sections/customer-review/customer-review.vue index f3f664927..2fd82c716 100644 --- a/src/layouts/review/review-sections/customer-review/customer-review.vue +++ b/src/layouts/payment-method/review-dropdown/review-sections/customer-review/customer-review.vue @@ -1,13 +1,9 @@ - - diff --git a/src/router/router-constants/fmgPage-values.js b/src/router/router-constants/fmgPage-values.js index 7b840ce18..3bd994ad3 100644 --- a/src/router/router-constants/fmgPage-values.js +++ b/src/router/router-constants/fmgPage-values.js @@ -15,7 +15,6 @@ const fmgPageValues = { HERITAGE: "heritage", SCHEDULE: "schedule", CUSTOMER_DETAILS: "customer-details", - REVIEW: "review", PAYMENT_METHOD: "payment-method", PAYMENT: "payment", PAYMENT_PIA_RETURN: "payment-pia-return", diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js index 01f8e503f..13906f755 100644 --- a/src/router/router-constants/navigation-scenarios.js +++ b/src/router/router-constants/navigation-scenarios.js @@ -44,14 +44,6 @@ const navigationScenarios = { // Schedule CLICKED_CHANGE_LOCATION: "CLICKED_CHANGE_LOCATION", - // Review - CLICKED_VEHICLE_EDIT: "CLICKED_VEHICLE_EDIT", - CLICKED_DAMAGE_EDIT: "CLICKED_DAMAGE_EDIT", - CLICKED_SERVICE_PACKAGE_EDIT: "CLICKED_SERVICE_PACKAGE_EDIT", - CLICKED_SERVICE_LOCATION_EDIT: "CLICKED_SERVICE_LOCATION_EDIT", - CLICKED_SCHEDULE_EDIT: "CLICKED_SCHEDULE_EDIT", - CLICKED_CUSTOMER_EDIT: "CLICKED_CUSTOMER_EDIT", - // Payment CLICKED_PAY_NOW: "CLICKED_PAY_NOW", PIA_ERROR: "PIA_ERROR", diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js index 841d57fd8..052bda142 100644 --- a/src/router/router-constants/routing-table.js +++ b/src/router/router-constants/routing-table.js @@ -428,43 +428,6 @@ const routingTable = function (store) { scenario: navigationScenarios.CLICKED_BACK, destinationFmgPageValue: fmgPageValues.SCHEDULE, }, - { - scenario: navigationScenarios.CLICKED_FORWARD, - destinationFmgPageValue: fmgPageValues.REVIEW, - }, - ], - }, - { - fmgPageValue: fmgPageValues.REVIEW, - maps: [ - { - scenario: navigationScenarios.CLICKED_VEHICLE_EDIT, - destinationFmgPageValue: fmgPageValues.VEHICLE, - }, - { - scenario: navigationScenarios.CLICKED_DAMAGE_EDIT, - destinationFmgPageValue: fmgPageValues.VEHICLE_DAMAGE, - }, - { - scenario: navigationScenarios.CLICKED_SERVICE_PACKAGE_EDIT, - destinationFmgPageValue: fmgPageValues.QUOTE, - }, - { - scenario: navigationScenarios.CLICKED_BACK, - destinationFmgPageValue: fmgPageValues.CUSTOMER_DETAILS, - }, - { - scenario: navigationScenarios.CLICKED_SERVICE_LOCATION_EDIT, - destinationFmgPageValue: fmgPageValues.SERVICE_LOCATION, - }, - { - scenario: navigationScenarios.CLICKED_SCHEDULE_EDIT, - destinationFmgPageValue: fmgPageValues.SCHEDULE, - }, - { - scenario: navigationScenarios.CLICKED_CUSTOMER_EDIT, - destinationFmgPageValue: fmgPageValues.CUSTOMER_DETAILS, - }, { scenario: navigationScenarios.CLICKED_FORWARD, destinationFmgPageValue: fmgPageValues.PAYMENT_METHOD, @@ -476,7 +439,7 @@ const routingTable = function (store) { maps: [ { scenario: navigationScenarios.CLICKED_BACK, - destinationFmgPageValue: fmgPageValues.REVIEW, + destinationFmgPageValue: fmgPageValues.CUSTOMER_DETAILS, }, { scenario: navigationScenarios.CLICKED_FORWARD,