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
c0b03f88
Commit
c0b03f88
authored
Jul 08, 2021
by
Vitaly Slobodin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Pass all required options for purchase
parent
955bd323
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
1 deletion
+15
-1
ee/app/assets/javascripts/subscriptions/buy_minutes/components/checkout/confirm_order.vue
...iptions/buy_minutes/components/checkout/confirm_order.vue
+14
-0
ee/app/controllers/subscriptions_controller.rb
ee/app/controllers/subscriptions_controller.rb
+1
-1
No files found.
ee/app/assets/javascripts/subscriptions/buy_minutes/components/checkout/confirm_order.vue
View file @
c0b03f88
...
@@ -31,7 +31,21 @@ export default {
...
@@ -31,7 +31,21 @@ export default {
confirmOrderParams
:
{
confirmOrderParams
:
{
query
:
stateQuery
,
query
:
stateQuery
,
update
(
data
)
{
update
(
data
)
{
const
{
customer
}
=
data
;
return
{
return
{
setup_for_company
:
data
.
isSetupForCompany
,
selected_group
:
data
.
subscription
.
namespaceId
,
new_user
:
data
.
isNewUser
,
customer
:
{
country
:
customer
.
country
,
address_1
:
customer
.
address1
,
address_2
:
customer
.
address2
,
city
:
customer
.
city
,
state
:
customer
.
state
,
zip_code
:
customer
.
zipCode
,
company
:
customer
.
company
,
},
selected_group
:
data
.
subscription
.
namespaceId
,
selected_group
:
data
.
subscription
.
namespaceId
,
subscription
:
{
subscription
:
{
plan_id
:
data
.
selectedPlanId
,
plan_id
:
data
.
selectedPlanId
,
...
...
ee/app/controllers/subscriptions_controller.rb
View file @
c0b03f88
...
@@ -32,7 +32,7 @@ class SubscriptionsController < ApplicationController
...
@@ -32,7 +32,7 @@ class SubscriptionsController < ApplicationController
def
buy_minutes
def
buy_minutes
return
render_404
unless
Feature
.
enabled?
(
:new_route_ci_minutes_purchase
,
default_enabled: :yaml
)
return
render_404
unless
Feature
.
enabled?
(
:new_route_ci_minutes_purchase
,
default_enabled: :yaml
)
@group
=
current_user
.
manageable_groups
.
top_most
.
find
(
params
[
:namespace_id
])
@group
=
find_group
return
render_404
if
@group
.
nil?
return
render_404
if
@group
.
nil?
end
end
...
...
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