Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
f9777d81
Commit
f9777d81
authored
Mar 17, 2020
by
Jose Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace underscore/lodash in subscriptions
parent
edb7fb3e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
ee/app/assets/javascripts/subscriptions/new/components/checkout/billing_address.vue
...subscriptions/new/components/checkout/billing_address.vue
+5
-5
ee/app/assets/javascripts/subscriptions/new/components/checkout/subscription_details.vue
...riptions/new/components/checkout/subscription_details.vue
+4
-4
No files found.
ee/app/assets/javascripts/subscriptions/new/components/checkout/billing_address.vue
View file @
f9777d81
<
script
>
import
_
from
'
underscore
'
;
import
{
isEmpty
}
from
'
lodash
'
;
import
autofocusonshow
from
'
~/vue_shared/directives/autofocusonshow
'
;
import
{
mapState
,
mapActions
}
from
'
vuex
'
;
import
{
GlFormGroup
,
GlFormInput
,
GlFormSelect
}
from
'
@gitlab/ui
'
;
...
...
@@ -77,10 +77,10 @@ export default {
},
isValid
()
{
return
(
!
_
.
isEmpty
(
this
.
country
)
&&
!
_
.
isEmpty
(
this
.
streetAddressLine1
)
&&
!
_
.
isEmpty
(
this
.
city
)
&&
!
_
.
isEmpty
(
this
.
zipCode
)
!
isEmpty
(
this
.
country
)
&&
!
isEmpty
(
this
.
streetAddressLine1
)
&&
!
isEmpty
(
this
.
city
)
&&
!
isEmpty
(
this
.
zipCode
)
);
},
countryOptionsWithDefault
()
{
...
...
ee/app/assets/javascripts/subscriptions/new/components/checkout/subscription_details.vue
View file @
f9777d81
<
script
>
import
_
from
'
underscore
'
;
import
{
isEmpty
}
from
'
lodash
'
;
import
autofocusonshow
from
'
~/vue_shared/directives/autofocusonshow
'
;
import
{
mapState
,
mapGetters
,
mapActions
}
from
'
vuex
'
;
import
{
NEW_GROUP
}
from
'
ee/subscriptions/new/constants
'
;
...
...
@@ -74,13 +74,13 @@ export default {
isValid
()
{
if
(
this
.
isSetupForCompany
)
{
return
(
!
_
.
isEmpty
(
this
.
selectedPlan
)
&&
(
!
_
.
isEmpty
(
this
.
organizationName
)
||
this
.
isGroupSelected
)
&&
!
isEmpty
(
this
.
selectedPlan
)
&&
(
!
isEmpty
(
this
.
organizationName
)
||
this
.
isGroupSelected
)
&&
this
.
numberOfUsers
>
0
&&
this
.
numberOfUsers
>=
this
.
selectedGroupUsers
);
}
return
!
_
.
isEmpty
(
this
.
selectedPlan
)
&&
this
.
numberOfUsers
===
1
;
return
!
isEmpty
(
this
.
selectedPlan
)
&&
this
.
numberOfUsers
===
1
;
},
isShowingGroupSelector
()
{
return
!
this
.
isNewUser
&&
this
.
groupData
.
length
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment