Move conact information above Mailing address.

CruGlobal · Dec 23, 2024 · c270f79 · c270f79
1 parent aaa0a93
commit c270f79
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
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
@@ -23,7 +23,7 @@
 <div ng-if="!$ctrl.loadingProductConfig && !$ctrl.errorLoadingProductConfig">
   <div class="panel">
     <div class="panel-body">
-      <h3 class="panel-name" translate>{{'YOUR_INFORMATION'}}</h3>
+      <h3 ng-if="$ctrl.useV3 !== 'true'" class="panel-name" translate>{{'YOUR_INFORMATION'}}</h3>
       <contact-info
         submitted="$ctrl.submitted"
         on-submit="$ctrl.onContactInfoSubmit(success)"

diff --git a/src/common/components/contactInfo/contactInfo.tpl.html b/src/common/components/contactInfo/contactInfo.tpl.html
@@ -46,6 +46,7 @@
   <form novalidate ng-keyup="$event.key === 'Enter' && $ctrl.submitDetails()" name="$ctrl.detailsForm">
     <div class="mb">
       <h4 ng-if="$ctrl.useV3 !== 'true'" class="panel-title  border-bottom-small  visible" translate>{{'YOUR_INFORMATION'}}</h4>
+      <h4 ng-if="$ctrl.useV3 === 'true'" class="panel-title  border-bottom-small  visible" translate>{{'CONTACT_INFO'}}</h4>
       <div class="row">
         <div class="col-sm-4">
           <div class="form-group is-required" ng-class="{'has-error': ($ctrl.detailsForm.nameGivenName | showErrors)}">
@@ -118,8 +119,23 @@ <h4 ng-if="$ctrl.useV3 !== 'true'" class="panel-title  border-bottom-small  visi
             </label>
           </div>
         </div>
-
       </div>
+
+        <div ng-if="$ctrl.useV3 === 'true'" class="row">
+          <div class="col-sm-6">
+            <div class="form-group is-required" ng-class="{'has-error': ($ctrl.detailsForm.email | showErrors)}">
+              <label>
+                <span translate>{{'EMAIL'}}</span>
+                <input type="email" class="form-control  form-control-subtle" name="email" ng-model="$ctrl.donorDetails['email']" required ng-maxlength="100" ng-disabled="$ctrl.donorDetails.staff">
+              </label>
+              <div role="alert" ng-messages="$ctrl.detailsForm.email.$error" ng-if="($ctrl.detailsForm.email | showErrors)">
+                <div class="help-block" ng-message="required" translate>{{'EMAIL_MISSING_ERROR'}}</div>
+                <div class="help-block" ng-message="email" translate>{{'EMAIL_INVALID_ERROR'}}</div>
+                <div class="help-block" ng-message="maxlength" translate>{{'EMAIL_LENGTH_ERROR'}}</div>
+              </div>
+            </div>
+          </div>
+        </div>
 
       <div class="row" ng-if="$ctrl.donorDetails['donor-type'] === 'Household' && $ctrl.useV3 !== 'true'">
         <div class="col-sm-4">
@@ -222,7 +238,7 @@ <h4 class="panel-title  border-bottom-small  visible" translate>{{'MAILING_ADDRE
       </address-form>
     </div>
 
-    <div class="mb">
+    <div ng-if="$ctrl.useV3 !== 'true'" class="mb">
       <h4 class="panel-title  border-bottom-small  visible" translate>{{'CONTACT_INFO'}}</h4>
       <div class="row">
         <div class="col-sm-6">
@@ -238,7 +254,7 @@ <h4 class="panel-title  border-bottom-small  visible" translate>{{'CONTACT_INFO'
             </div>
           </div>
         </div>
-        <div ng-if="$ctrl.useV3 !== 'true'" class="col-sm-6">
+        <div class="col-sm-6">
           <div class="form-group" ng-class="{'has-error': ($ctrl.detailsForm.phoneNumber | showErrors)}">
             <label>
               <span translate>{{'PHONE'}}</span>