Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge ru urm q2 #2805

Closed
wants to merge 59 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
85920aa
New payment details implementation
AndriiMysko Feb 8, 2023
aa51d29
Fix tests
AndriiMysko Feb 9, 2023
9cfef7e
Antifraud for v1 plans
AndriiMysko Feb 9, 2023
6376286
Adjust tests
AndriiMysko Feb 10, 2023
c975f4c
Merge branch 'payment_method_tab_am' into new_user_journey_dev
AndriiMysko Feb 10, 2023
5de968c
fix for lack of first_sync for assembla
AndriiMysko Feb 10, 2023
62e6d28
added hosted billing help
AndriiMysko Feb 10, 2023
d97e061
Add the new macOS information section in select-plan and modify billi…
Jullianos Jan 31, 2023
105949e
Adjust manual and github plans view
AndriiMysko Feb 13, 2023
6e2a22a
Fix local registration checkbox
AndriiMysko Feb 16, 2023
773022e
ui updates
AndriiMysko Feb 23, 2023
6bea8b3
redirection attempt, wizard fix, trial plan desc
AndriiMysko Feb 28, 2023
02ad650
ui updates
AndriiMysko Mar 9, 2023
6ae4961
sync subscriptions on first_syn
AndriiMysko Mar 13, 2023
21cd028
redirect from ghapp installation to firstsync
AndriiMysko Mar 15, 2023
4d42873
style fixes,profile menu update,fix for company
gbarc80 Mar 16, 2023
1c2bfbb
tests update
gbarc80 Mar 16, 2023
c3d6c3c
ui updates
gbarc80 Mar 20, 2023
30201a8
ui updates
gbarc80 Mar 20, 2023
028299d
redirection updates, typos fixed
gbarc80 Mar 21, 2023
4fa677a
ui updates - plan, wizard, activation
gbarc80 Mar 23, 2023
b105838
coupon
gbarc80 Mar 23, 2023
c33ec59
installation redirections, email banner update
gbarc80 Mar 24, 2023
edf92a0
random ui updates
gbarc80 Mar 24, 2023
6340e63
lint
gbarc80 Mar 24, 2023
fee0e23
total price hide
gbarc80 Mar 24, 2023
09cf0e4
empty invoices field, installation_id fix
gbarc80 Mar 27, 2023
ee76cf6
radio color,mail banner, double badge
gbarc80 Mar 28, 2023
4b41c15
ui fixes - review 03.28
gbarc80 Mar 30, 2023
80313d7
sync popup improvement
gbarc80 Mar 30, 2023
24c8644
billing css merge
gbarc-dt May 22, 2023
167d2fe
activation button fix
gbarc-dt May 24, 2023
ef0700b
lint
gbarc-dt May 24, 2023
120be38
user roles wip
gbarc-dt May 26, 2023
3f31080
Merge branch 'master' into new_user_journey_dev
murtaza-swati May 30, 2023
6d31388
logs, settings, caches
gbarc-dt Jun 7, 2023
a654110
fixed the condition for settings
gbarc-dt Jun 7, 2023
8ca05ca
perm fixes/test fixes
gbarc-dt Jun 9, 2023
5b530c3
usage banner fix, settings from profile access check
gbarc-dt Jun 23, 2023
c65308e
tests
gbarc-dt Jun 23, 2023
0d61a3d
PRD Travis ASM Handshake
Jul 10, 2023
ff9738d
PRD New User Journey
Jul 10, 2023
4c54695
Merge branch 'new_user_journey_dev' into dt-userroles-prd
gbarc-dt Jul 14, 2023
9b2e683
selected plan up
gbarc-dt Jul 14, 2023
c5fdd38
lint
gbarc-dt Jul 14, 2023
8237b79
lint
gbarc-dt Jul 14, 2023
5e1c004
activate update
gbarc-dt Jul 14, 2023
d99d257
ruby up
gbarc-dt Jul 24, 2023
736ae5d
Merge branch 'dt-ror-update' into prd-ruby-upgrade-dev
gbarc-dt Jul 24, 2023
d4c514d
some rubocop reverts
gbarc-dt Jul 25, 2023
8f0cdaf
w/a for stripe issue with font
gbarc-dt Aug 16, 2023
5b82c6e
Merge remote-tracking branch 'origin/prd-ruby-upgrade' into prd-ruby-…
gbarc-dt Sep 18, 2023
563636f
Merge remote-tracking branch 'origin/dt-userroles-prd' into prd-ror-u…
gbarc-dt Sep 26, 2023
82fcadc
Q2+Q1 merge
gbarc-dt Jan 2, 2024
0ff576a
log limit env
gbarc-dt Jan 8, 2024
5810221
removed org admin reqs for some menus
gbarc-dt Feb 20, 2024
ed053c5
typo fix
GbArc Feb 23, 2024
b6255d3
Merge branch 'dt-q2-ror' into merge_ror_urm_q2
DominikAlberski Feb 28, 2024
9e40072
Merge branch 'dt-orgadmin_fixes' into merge_ror_urm_q2
DominikAlberski Feb 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions app/controllers/help.js
Original file line number Diff line number Diff line change
@@ -15,14 +15,15 @@ const UTM_SOURCE = 'help-page';
const UTM_MEDIUM = 'travisweb';
const UTM_PARAMS = `?utm_source=${UTM_SOURCE}&utm_medium=${UTM_MEDIUM}`;

const { docs, community, docker, node, multiOS, noRun, tutorial } = config.urls;
const { docs, community, docker, node, multiOS, noRun, tutorial, billingOverview, autoRefill, billingFaq } = config.urls;

export default Controller.extend({
auth: service(),
features: service(),

queryParams: ['anchor', 'page'],
queryParams: ['anchor', 'page', 'billing'],
anchor: ANCHOR.TOP,
billing: 'false',
page: '',

isSignedIn: reads('auth.signedIn'),
@@ -31,6 +32,7 @@ export default Controller.extend({
toDocs: equal('anchor', ANCHOR.DOCS),
toCommunity: equal('anchor', ANCHOR.COMMUNITY),
toForm: equal('anchor', ANCHOR.FORM),
isBilling: equal('billing', 'true'),

utmParams: computed(() => UTM_PARAMS),
docsUrl: computed(() => `${docs}${UTM_PARAMS}`),
@@ -39,6 +41,9 @@ export default Controller.extend({
multiOsUrl: computed(() => `${multiOS}${UTM_PARAMS}`),
noRunUrl: computed(() => `${noRun}${UTM_PARAMS}`),
tutorialUrl: computed(() => `${tutorial}${UTM_PARAMS}`),
billingOverviewUrl: computed(() => `${billingOverview}${UTM_PARAMS}`),
autoRefillUrl: computed(() => `${autoRefill}${UTM_PARAMS}`),
faqUrl: computed(() => `${billingFaq}${UTM_PARAMS}`),

communityUrl: computed(() => `${community}/top${UTM_PARAMS}`),

2 changes: 1 addition & 1 deletion app/templates/components/billing-manual.hbs
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@
</div>
<span class="py-1 leading-loose" data-test-manual-subscription-banner='true'>
This manual subscription is paid to Travis CI by bank transfer. If you have any questions or would like to update your plan,
<LinkTo @route='help' @query={{hash anchor='form'}}>
<LinkTo @route='help' @query={{hash anchor='form' billing=true}}>
contact our support team.
</LinkTo>
</span>
2 changes: 1 addition & 1 deletion app/templates/components/billing/invoices.hbs
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
<p class="invoice-issue-banner" data-test-help-text='true'>
<SvgImage @name='icon-help' @class='icon-help' />
Having trouble with your invoices?
<LinkTo @route='help' @query={{hash anchor='form'}}>
<LinkTo @route='help' @query={{hash anchor='form' billing=true}}>
We’re happy to help
</LinkTo>
</p>
2 changes: 1 addition & 1 deletion app/templates/components/billing/summary-v2.hbs
Original file line number Diff line number Diff line change
@@ -278,7 +278,7 @@
<Billing::Address @subscription={{this.subscription}} @account={{this.account}} @hideEdit={{true}}/>
<div class="yellow-message" data-test-plan-yellow-message='true'>
This manual subscription is paid to Travis CI by bank transfer. If you have any questions or would like to update your plan,
<LinkTo @route="help" @query={{hash anchor="form"}}>
<LinkTo @route="help" @query={{hash anchor="form" billing=true}}>
contact our support team.
</LinkTo>
</div>
2 changes: 1 addition & 1 deletion app/templates/components/manual-subscription-help.hbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<p class="manual-help">
If you have any questions or would like to update your plan, please
<LinkTo @route="help" @query={{hash anchor="form"}}>
<LinkTo @route="help" @query={{hash anchor="form" billing=true}}>
contact our support team.
</LinkTo>
</p>
52 changes: 42 additions & 10 deletions app/templates/help.hbs
Original file line number Diff line number Diff line change
@@ -40,6 +40,36 @@
<div class="help-duo-image" data-test-help-page-resources-image>
<SvgImage @name="docs" />
</div>

{{#if this.isBilling}}
<div class="help-duo-text">
<h1 class="header-main" data-test-help-page-resources-header>
Hosted Billing
</h1>
<div class="page-notice" data-test-help-page-navigation-links>
If you have problems with billing, please check the Billing section
in the documentation or fill out the form below
<br/>
</div>
<ul class="help-duo-list" data-test-help-page-resources-list>
<li>
<ExternalLinkTo @href={{this.billingOverviewUrl}}>
Billing Overview
</ExternalLinkTo>
</li>
<li>
<ExternalLinkTo @href={{this.autoRefillUrl}}>
Auto-refill
</ExternalLinkTo>
</li>
<li>
<ExternalLinkTo @href={{this.faqUrl}}>
FAQ
</ExternalLinkTo>
</li>
</ul>
</div>
{{else}}
<div class="help-duo-text">
<h1 class="header-main" data-test-help-page-resources-header>
Handy Resources
@@ -79,8 +109,20 @@
Check Our Documentation
</ExternalLinkTo>
</div>
{{/if}}
</div>
</layout.section>
<layout.section
@hasBackground={{false}}
class="help-page__support"
data-test-help-page-support-section="true"
>
{{#if this.toForm}}
<ScrollHere />
{{/if}}
<ZendeskRequestForm @page={{this.page}} @utmParams={{this.utmParams}} />
</layout.section>

<layout.section
class="help-page__topics"
data-test-help-page-topics-section="true"
@@ -110,14 +152,4 @@
</div>
</div>
</layout.section>
<layout.section
@hasBackground={{false}}
class="help-page__support"
data-test-help-page-support-section="true"
>
{{#if this.toForm}}
<ScrollHere />
{{/if}}
<ZendeskRequestForm @page={{this.page}} @utmParams={{this.utmParams}} />
</layout.section>
</TravisLayout>
3 changes: 3 additions & 0 deletions config/environment.js
Original file line number Diff line number Diff line change
@@ -115,6 +115,9 @@ module.exports = function (environment) {
planDocs: 'https://docs.travis-ci.com/user/billing-overview/',
planCreditDocs: 'https://docs.travis-ci.com/user/billing-overview/#usage---credits',
planUsersDocs: 'https://docs.travis-ci.com/user/billing-overview/#usage---user-licenses',
billingOverview: 'https://docs.travis-ci.com/user/billing-overview/',
autoRefill: 'https://docs.travis-ci.com/user/billing-autorefill/',
billingFaq: 'https://docs.travis-ci.com/user/billing-faq/',
},
endpoints: {},
githubApps: false,