github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-29 09:53:39 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4002 from overleaf/cmg-subscriptions-new-validation

Browse source 
Add missing validation messages on subscriptions new

GitOrigin-RevId: 451b75d4adb0d92911579f0ea728625c561b767f
This commit is contained in:
Timothée Alby 2021-05-19 10:29:46 +02:00 committed by Copybot
parent 7957c2eae7
commit 88d00424cc
3 changed files with 30 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
services/web/app/views/subscriptions/new.pug
View file

@ -101,7 +101,7 @@ block content
div(ng-show="paymentMethod.value === 'credit_card'") div(ng-show="paymentMethod.value === 'credit_card'")
.row .row
.col-xs-6 .col-xs-6
.form-group(ng-class="validation.errorFields.first_name || inputHasError(simpleCCForm.firstName) ? 'has-external-error' : ''") .form-group(ng-class="validation.errorFields.first_name || inputHasError(simpleCCForm.firstName) ? 'has-error' : ''")
label(for="first-name") #{translate('first_name')} label(for="first-name") #{translate('first_name')}
input#first-name.form-control( input#first-name.form-control(
type="text" type="text"
@ -111,9 +111,9 @@ block content
ng-model="data.first_name" ng-model="data.first_name"
required required
) )
span.input-feedback-message {{ simpleCCForm.firstName.$error.required ? 'This field is required' : '' }} span.input-feedback-message(ng-if="simpleCCForm.firstName.$error.required") #{translate('this_field_is_required')}
.col-xs-6 .col-xs-6
.form-group(ng-class="validation.errorFields.last_name || inputHasError(simpleCCForm.lastName)? 'has-external-error' : ''") .form-group(ng-class="validation.errorFields.last_name || inputHasError(simpleCCForm.lastName)? 'has-error' : ''")
label(for="last-name") #{translate('last_name')} label(for="last-name") #{translate('last_name')}
input#last-name.form-control( input#last-name.form-control(
type="text" type="text"
@ -123,8 +123,9 @@ block content
ng-model="data.last_name" ng-model="data.last_name"
required required
) )
span.input-feedback-message(ng-if="simpleCCForm.lastName.$error.required") #{translate('this_field_is_required')}
.form-group(ng-class="validation.errorFields.number ? 'has-external-error' : ''") .form-group(ng-class="validation.errorFields.number ? 'has-error' : ''")
label(for="card-no") #{translate("credit_card_number")} label(for="card-no") #{translate("credit_card_number")}
div#card-no( div#card-no(
type="text" type="text"
@ -134,7 +135,7 @@ block content
.row .row
.col-xs-3 .col-xs-3
.form-group.has-feedback(ng-class="validation.errorFields.month ? 'has-external-error' : ''") .form-group.has-feedback(ng-class="validation.errorFields.month ? 'has-error' : ''")
label(for="month").capitalised #{translate("month")} label(for="month").capitalised #{translate("month")}
div( div(
type="number" type="number"
@ -142,7 +143,7 @@ block content
data-recurly="month" data-recurly="month"
) )
.col-xs-3 .col-xs-3
.form-group.has-feedback(ng-class="validation.errorFields.year ? 'has-external-error' : ''") .form-group.has-feedback(ng-class="validation.errorFields.year ? 'has-error' : ''")
label(for="year").capitalised #{translate("year")} label(for="year").capitalised #{translate("year")}
div( div(
type="number" type="number"
@ -151,7 +152,7 @@ block content
) )
.col-xs-6 .col-xs-6
.form-group.has-feedback(ng-class="validation.errorFields.cvv ? 'has-external-error' : ''") .form-group.has-feedback(ng-class="validation.errorFields.cvv ? 'has-error' : ''")
label #{translate("security_code")} label #{translate("security_code")}
div( div(
type="number" type="number"
@ -172,7 +173,7 @@ block content
div div
.row .row
.col-xs-12 .col-xs-12
.form-group(ng-class="validation.errorFields.address1 || inputHasError(simpleCCForm.address1) ? 'has-external-error' : ''") .form-group(ng-class="validation.errorFields.address1 || inputHasError(simpleCCForm.address1) ? 'has-error' : ''")
label(for="address-line-1") #{translate('address_line_1')} label(for="address-line-1") #{translate('address_line_1')}
input#address-line-1.form-control( input#address-line-1.form-control(
type="text" type="text"
@ -182,11 +183,11 @@ block content
ng-model="data.address1" ng-model="data.address1"
required required
) )
span.input-feedback-message {{ simpleCCForm.address1.$error.required ? 'This field is required' : '' }} span.input-feedback-message(ng-if="simpleCCForm.address1.$error.required") #{translate('this_field_is_required')}
.row .row
.col-xs-12 .col-xs-12
.form-group.has-feedback(ng-class="validation.errorFields.address2 ? 'has-external-error' : ''") .form-group.has-feedback(ng-class="validation.errorFields.address2 ? 'has-error' : ''")
label(for="address-line-2") #{translate('address_line_2')} label(for="address-line-2") #{translate('address_line_2')}
input#address-line-2.form-control( input#address-line-2.form-control(
type="text" type="text"
@ -198,7 +199,7 @@ block content
.row .row
.col-xs-4 .col-xs-4
.form-group(ng-class="validation.errorFields.postal_code || inputHasError(simpleCCForm.postalCode) ? 'has-external-error' : ''") .form-group(ng-class="validation.errorFields.postal_code || inputHasError(simpleCCForm.postalCode) ? 'has-error' : ''")
label(for="postal-code") #{translate('postal_code')} label(for="postal-code") #{translate('postal_code')}
input#postal-code.form-control( input#postal-code.form-control(
type="text" type="text"
@ -208,10 +209,10 @@ block content
ng-model="data.postal_code" ng-model="data.postal_code"
required required
) )
span.input-feedback-message {{ simpleCCForm.postalCode.$error.required ? 'This field is required' : '' }} span.input-feedback-message(ng-if="simpleCCForm.postalCode.$error.required") #{translate('this_field_is_required')}
.col-xs-8 .col-xs-8
.form-group(ng-class="validation.errorFields.country || inputHasError(simpleCCForm.country) ? 'has-external-error' : ''") .form-group(ng-class="validation.errorFields.country || inputHasError(simpleCCForm.country) ? 'has-error' : ''")
label(for="country") #{translate('country')} label(for="country") #{translate('country')}
select#country.form-control( select#country.form-control(
data-recurly="country" data-recurly="country"
@ -225,7 +226,7 @@ block content
option(value='', disabled) #{translate("country")} option(value='', disabled) #{translate("country")}
option(value='-', disabled) -------------- option(value='-', disabled) --------------
option(ng-repeat="country in countries" ng-bind-html="country.name" value="{{country.code}}") option(ng-repeat="country in countries" ng-bind-html="country.name" value="{{country.code}}")
span.input-feedback-message {{ simpleCCForm.country.$error.required ? 'This field is required' : '' }} span.input-feedback-message(ng-if="simpleCCForm.country.$error.required") #{translate('this_field_is_required')}
.form-group .form-group
.checkbox .checkbox
@ -296,15 +297,7 @@ block content
| {{ monthlyBilling ? '#{translate("upgrade_cc_btn")}' : '#{translate("upgrade_now")}'}} | {{ monthlyBilling ? '#{translate("upgrade_cc_btn")}' : '#{translate("upgrade_now")}'}}
span(ng-if="paymentMethod.value !== 'credit_card'") #{translate("upgrade_paypal_btn")} span(ng-if="paymentMethod.value !== 'credit_card'") #{translate("upgrade_paypal_btn")}
p.tos-agreement-notice p.tos-agreement-notice !{translate("by_subscribing_you_agree_to_our_terms_of_service", {}, [{name: 'a', attrs: {href: '/legal#Terms', target:'_blank', rel:'noopener noreferrer'}}])}
| By subscribing, you agree to our
|
a(
href="/legal#Terms"
target="_blank"
rel="noopener noreferrer"
) terms of service
| .
div.three-d-secure-container.card.card-highlighted.card-border(ng-show="threeDSecureFlow") div.three-d-secure-container.card.card-highlighted.card-border(ng-show="threeDSecureFlow")
.alert.alert-info.small(aria-live="assertive") .alert.alert-info.small(aria-live="assertive")
@ -334,7 +327,7 @@ block content
| #{translate("collabs_per_proj_single", {collabcount:collaboratorCount})} | #{translate("collabs_per_proj_single", {collabcount:collaboratorCount})}
else else
| #{translate("collabs_per_proj", {collabcount:collaboratorCount})} | #{translate("collabs_per_proj", {collabcount:collaboratorCount})}
p #{translate("work_on_single_version")}. #{translate("view_collab_edits")} in real time. p #{translate("work_on_single_version")}. #{translate("view_collab_edits_in_real_time")}
h3 #{translate("full_doc_history")} h3 #{translate("full_doc_history")}
p.track-changes-example p.track-changes-example
@ -350,8 +343,7 @@ block content
hr hr
p.small.text-center(ng-non-bindable) We're confident that you'll love #{settings.appName}, but if not you can cancel anytime. We'll give you your money back, no questions asked, if you let us know within 30 days. p.small.text-center(ng-non-bindable) !{translate("cancel_anytime", { appName:'{{settings.appName}}' })}
script(type="text/javascript", nonce=scriptNonce). script(type="text/javascript", nonce=scriptNonce).
ga('send', 'event', 'pageview', 'payment_form', "#{plan_code}") ga('send', 'event', 'pageview', 'payment_form', "#{plan_code}")
@ -360,5 +352,5 @@ block content
type="text/ng-template" type="text/ng-template"
id="cvv-tooltip-tpl.html" id="cvv-tooltip-tpl.html"
) )
p For #[strong Visa, MasterCard and Discover], the #[strong 3 digits] on the #[strong back] of your card. p !{translate("for_visa_mastercard_and_discover", {}, ['strong', 'strong', 'strong'])}
p For #[strong American Express], the #[strong 4 digits] on the #[strong front] of your card. p !{translate("for_american_express", {}, ['strong', 'strong', 'strong'])}

2
services/web/frontend/stylesheets/components/forms.less
View file

@ -318,7 +318,7 @@ input[type='checkbox'],
@state-warning-text; @state-warning-text; @state-warning-bg @state-warning-text; @state-warning-text; @state-warning-bg
); );
} }
.has-external-error { .has-error {
.form-control-validation( .form-control-validation(
@state-danger-text; @state-danger-text; @state-danger-bg @state-danger-text; @state-danger-text; @state-danger-bg
); );

11
services/web/locales/en.json
View file

@ -1066,7 +1066,7 @@
"sl_used_over_x_people_at": "__appName__ is used by over __numberOfUsers__ students and academics at:", "sl_used_over_x_people_at": "__appName__ is used by over __numberOfUsers__ students and academics at:",
"collaboration": "Collaboration", "collaboration": "Collaboration",
"work_on_single_version": "Work together on a single version", "work_on_single_version": "Work together on a single version",
"view_collab_edits": "View collaborator edits ", "view_collab_edits_in_real_time": "View collaborator edits in real time.",
"ease_of_use": " Ease of Use", "ease_of_use": " Ease of Use",
"no_complicated_latex_install": "No complicated LaTeX installation", "no_complicated_latex_install": "No complicated LaTeX installation",
"all_packages_and_templates": "All the packages and <0>__templatesLink__</0> you need", "all_packages_and_templates": "All the packages and <0>__templatesLink__</0> you need",
@ -1446,5 +1446,12 @@
"search": "Search", "search": "Search",
"also": "Also", "also": "Also",
"add_email": "Add Email", "add_email": "Add Email",
"dropbox_unlinked_premium_feature": "<0>Your Dropbox account has been unlinked</0> because Dropbox Sync is a premium feature that you had through an institutional license. Please confirm you are still at the institution or upgrade your account in order to relink your Dropbox account." "dropbox_unlinked_premium_feature": "<0>Your Dropbox account has been unlinked</0> because Dropbox Sync is a premium feature that you had through an institutional license. Please confirm you are still at the institution or upgrade your account in order to relink your Dropbox account.",
"pay_with_visa_mastercard_or_amex": "Pay with Mastercard, Visa, or Amex",
"pay_with_paypal": "Pay with PayPal",
"this_field_is_required": "This field is required",
"by_subscribing_you_agree_to_our_terms_of_service": "By subscribing, you agree to our <0>terms of service</0>.",
"cancel_anytime": "We're confident that you'll love __appName__, but if not you can cancel anytime. We'll give you your money back, no questions asked, if you let us know within 30 days.",
"for_visa_mastercard_and_discover": "For <0>Visa, MasterCard and Discover</0>, the <1>3 digits</1> on the <2>back</2> of your card.",
"for_american_express": "For <0>American Express</0>, the <1>4 digits</1> on the <2>front</2> of your card."
} }