diff --git a/src/app/branded/branded-checkout.component.js b/src/app/branded/branded-checkout.component.js index 3c7b6e26a..4011bb267 100644 --- a/src/app/branded/branded-checkout.component.js +++ b/src/app/branded/branded-checkout.component.js @@ -182,6 +182,6 @@ export default angular onOrderFailed: '&', language: '@', showCoverFees: '@', - useV3: '@', + useV3: '@' } }) diff --git a/src/app/branded/step-1/branded-checkout-step-1.component.js b/src/app/branded/step-1/branded-checkout-step-1.component.js index ae84fbe0a..017f8e1ed 100644 --- a/src/app/branded/step-1/branded-checkout-step-1.component.js +++ b/src/app/branded/step-1/branded-checkout-step-1.component.js @@ -189,6 +189,6 @@ export default angular onPaymentFailed: '&', radioStationApiUrl: '<', radioStationRadius: '<', - useV3: '<', + useV3: '<' } }) diff --git a/src/app/branded/step-1/branded-checkout-step-1.tpl.html b/src/app/branded/step-1/branded-checkout-step-1.tpl.html index e2f85b2e2..6d6ff6fc8 100644 --- a/src/app/branded/step-1/branded-checkout-step-1.tpl.html +++ b/src/app/branded/step-1/branded-checkout-step-1.tpl.html @@ -11,7 +11,10 @@ submitted="$ctrl.submitted" on-state-change="$ctrl.onGiftConfigStateChange(state)" disable-session-restart="true" - ng-if="!$ctrl.loadingProductConfig && !$ctrl.errorLoadingProductConfig"> + ng-if="!$ctrl.loadingProductConfig && !$ctrl.errorLoadingProductConfig" + use-v3="$ctrl.useV3" + > +
-
+
+
- + - + - + - + -

- {{'GIFT_AMOUNT'}} -

-
-
-
- -
-
-
+

+ {{'GIFT_AMOUNT'}} +

+
+
-
-
{{'VALID_DOLLAR_AMOUNT_ERROR'}}
-
{{'AMOUNT_EMPTY_ERROR'}}
-
{{'AMOUNT_MIN_ERROR'}}
-
- {{'AMOUNT_MAX_ERROR'}} +
+
+
+ +
+
{{'VALID_DOLLAR_AMOUNT_ERROR'}}
+
{{'AMOUNT_EMPTY_ERROR'}}
+
{{'AMOUNT_MIN_ERROR'}}
+
+ {{'AMOUNT_MAX_ERROR'}} +
-
-
- - - -
-
{{'VALID_DOLLAR_AMOUNT_ERROR'}}
-
{{'AMOUNT_EMPTY_ERROR'}}
-
-
+
+ + + +
+
{{'VALID_DOLLAR_AMOUNT_ERROR'}}
+
{{'AMOUNT_EMPTY_ERROR'}}
+
+
+
+
+
+

+ {{'GIFT_FREQUENCY'}} +

+
+
+ +
+ + {{'CHANGING_FREQUENCY'}} +
-
-

- {{'GIFT_FREQUENCY'}} -

-
-
- - -
- - {{'CHANGING_FREQUENCY'}} - -
-
-
-
-

- {{'RECURRING_START'}} -

-
-
-
-
- +
+
+

+ {{'RECURRING_START'}} +

+
+
+
+
+ +
-
-
-
- +
+
+ +
-
-
-
- +
- {{$ctrl.startMonth( $ctrl.itemConfig['RECURRING_DAY_OF_MONTH'], $ctrl.itemConfig['RECURRING_START_MONTH'], $ctrl.nextDrawDate ).format('ll')}} + +
+ {{$ctrl.startMonth( $ctrl.itemConfig['RECURRING_DAY_OF_MONTH'], $ctrl.itemConfig['RECURRING_START_MONTH'], $ctrl.nextDrawDate ).format('ll')}} +
-
-
-
+
+
+

diff --git a/src/assets/scss/_gift-config.scss b/src/assets/scss/_gift-config.scss index 8888cf81c..fc1ff1f0a 100644 --- a/src/assets/scss/_gift-config.scss +++ b/src/assets/scss/_gift-config.scss @@ -25,8 +25,6 @@ label.custom-amount { width: auto; } - - .radio, .checkbox { label { @@ -217,6 +215,11 @@ label.btn.btn-default-form.active { } } +.give-selection-reverse-order { + display: flex; + flex-direction: column-reverse; +} + @media (max-width: 549px) { .give-modal-recipient { margin-top: 5px; @@ -340,4 +343,3 @@ label.btn.btn-default-form.active { } } } -