James Allen
d2e54c5e0c
Merge pull request #504 from sharelatex/afc-show-group-export-csv
...
Show export user CSV even if the group has reached max capacity
2018-05-01 08:50:04 +01:00
Henry Oswald
c6f4df4f77
Merge pull request #498 from sharelatex/ho-recurly-v4
...
Payment page improvments
2018-04-24 09:01:34 +01:00
Jessica Lawshe
5d5edb7808
Button text for annual plan
...
Annual plan users are charged right away but `upgrade_cc_btn`
translates to `Upgrade now, pay after 7 days`.
Update the button for annual plans to use `upgrade_now`, which
translates to `Upgrade Now`
2018-04-23 11:34:34 -05:00
Alberto Fernández Capel
5d266c7f04
Show export user CSV even if the group has reached max capacity
2018-04-17 16:12:33 +01:00
Henry Oswald
b5e6181c49
added .capitalised style
2018-04-17 11:26:02 +01:00
Henry Oswald
45f51c9a27
change country select to proper angular setup so pre population works
...
it may have been broken from an angular upgrade or similar.
2018-04-16 15:12:03 +01:00
Henry Oswald
e64c398352
capitalise month and year on payment page
2018-04-16 15:11:31 +01:00
Henry Oswald
39e41681a0
change to plans[currencyCode]['symbol'] from price.currency.symbol
...
price.currency.symbol returns bad chars. '£12.00' and '€14.40' for
eur
2018-04-16 12:19:55 +01:00
Henry Oswald
086f080ee4
add !isFormValid(simpleCCForm) back in, was used during debugging
2018-04-16 11:01:14 +01:00
Henry Oswald
c3eeefdc5b
only use recurly.js from our public libs folder
2018-04-16 10:52:33 +01:00
Henry Oswald
7940b60144
make a seperate external error class which is used on entire payment form
2018-04-16 10:35:12 +01:00
Henry Oswald
06fb31533f
add highlight for bad card/cvv/mmyy number in.
2018-04-16 10:26:39 +01:00
Henry Oswald
a1be0e95b4
remove the dead validation
2018-04-16 10:10:25 +01:00
Henry Oswald
c050791905
change ng to use show/hide
...
ng-if doesn't render html until evaulated to true, need the form
to be there at time of recurly.configure
2018-04-13 16:57:33 +01:00
Henry Oswald
ccef0760ae
remove the form control, it just breaks the iframe styling
2018-04-13 16:51:55 +01:00
Henry Oswald
ae3858bcd0
can subscribe using new form. terrible styling
2018-04-13 16:35:32 +01:00
Henry Oswald
7e8b59cbb3
wip form loads as ifram
2018-04-13 16:01:41 +01:00
Jessica Lawshe
18c6802b84
Revert "Revert "Merge pull request #480 from sharelatex/jel-remove-old-exp""
...
This reverts commit 5c3f391041303456aeb800522c0fdcfe900625ac.
2018-04-12 13:53:26 -05:00
Jessica Lawshe
5290c29ce1
Revert "Merge pull request #480 from sharelatex/jel-remove-old-exp"
...
This reverts commit c5919be6d2e880ac4d3f5820c38211b1c88812ff, reversing
changes made to 3c8772cf020738c767b6f7a956bd002b47988932.
2018-04-12 13:25:42 -05:00
Jessica Lawshe
5683f48d97
Fix conditional
2018-04-12 10:18:15 -05:00
Jessica Lawshe
f44ddcb928
Remove "plans-1610" experiment
...
There is 1 place that the variants appear still,
`/web/public/coffee/main/subscription-dashboard.coffee`. This should
remain for users that bought these plans.
2018-04-12 10:18:15 -05:00
Jessica Lawshe
89cfd98af3
Add details to analytics label
2018-03-20 08:31:35 -05:00
Paulo Reis
8b9f3268b1
Make plans page consistent with others, fixing header issues.
2018-01-03 13:54:33 +00:00
Henry Oswald
ec41f984e6
Merge branch 'ho-remove-groove'
2017-12-20 13:37:15 +00:00
Shane Kilkelly
cc9986cefd
Remove the obsolete update-billing-details page
2017-11-28 11:52:14 +00:00
Shane Kilkelly
22c163c60a
Move the recurly-billing-details link up to main subscription page
2017-11-28 11:40:48 +00:00
Henry Oswald
7ce56aa3b6
add http catch onto form
2017-11-28 10:13:54 +00:00
Henry Oswald
b16862fa31
add error handling for form
2017-11-27 18:03:42 +00:00
Henry Oswald
7eb2f0d917
move generic sales modal to use new support endpoint
2017-11-27 12:49:12 +00:00
Shane Kilkelly
caa65dddc1
Send user to hosted recurly billing-details page.
...
And remove our update-billing-details form, the APIs for which will be
deprecated soon.
2017-11-23 16:16:13 +00:00
Henry Oswald
085cc7a0b2
json stringify and trim recommended currency
2017-03-14 17:53:48 +00:00
Henry Oswald
58c7dda945
fix couple of bad translations
2017-02-17 11:05:32 +00:00
Shane Kilkelly
b0dd7475b0
fix pug syntax
2017-01-31 14:57:22 +00:00
Shane Kilkelly
57cd54bf55
WIP: migrate from jade to pug
2017-01-20 12:03:02 +00:00
Shane Kilkelly
acce8853ba
Remove redundant baseUrl from plans page.
2016-11-25 15:24:50 +00:00
Henry Oswald
11a097c9a6
remove some old sixpack tests
2016-11-02 10:09:12 +00:00
Shane Kilkelly
a63f7685b8
Move the planCode logic for Collaborator into a helper function.
2016-11-02 09:56:33 +00:00
Shane Kilkelly
e268275e77
Fix participate/convert flow for plan tests
2016-10-25 10:47:14 +01:00
Shane Kilkelly
667c7ce520
Show correct number of collaborators for plans
2016-10-24 11:47:01 +01:00
Shane Kilkelly
c051b56abf
Cloak plans until they have loaded
2016-10-24 11:24:28 +01:00
Shane Kilkelly
d5a7514923
Add AB test for plans (+15 squashed commits)
...
Squashed commits:
[45c2237] Add a `subscription-form-switch-to-student` event
[1ad9b8f] change experiment name, and re-enable switch-to-student workflow
[f7cdb78] Remove debug
[4b9778a] Incorporate collaborator alternative plans
[701e80b] Add collaborator plans for heron and ibis
[287aa0f] AB test plans from editor page
[c74052e] Fix change-plan view for default plans
[1a947d6] Use correct plan codes
[1eecda7] Adjust prices
[69c4c7b] Introduce two plans
[8b8d5f8] Rename sixpack experiment
[c332002] Fix up the change-plan page
[c7af52d] Overhaul change-plan page, show only plans from current generation
[33d86bf] update plan
[5bbd946] Add a basic plans AB test
2016-10-21 16:17:37 +01:00
Shane Kilkelly
3ec0e65ae1
Merge branch 'master' into sk-end-subform-test
2016-10-12 14:34:55 +01:00
Brian Gough
380487abf0
use separate jade template block for requirejs
...
removes the need to suppressDefaultJs
2016-10-11 14:31:04 +01:00
Shane Kilkelly
e2cf40ff33
Remove old default subscription form, replace with 'simple' form
2016-10-11 14:07:31 +01:00
Brian Gough
0f2959eb3b
use suppressDefaultJs instead of suppressFooter
2016-10-11 13:04:10 +01:00
Henry Oswald
3141f91b59
Merge pull request #322 from sharelatex/ho-password-limits
...
Ho password limits
2016-10-05 10:03:54 +01:00
Henry Oswald
0d0f0e8604
wip
2016-09-23 16:38:46 +01:00
Henry Oswald
67f8ec756c
Revert "wip"
...
This reverts commit a6c0b3e2bf9fd747cfce785a023e5f56614a8ca2.
2016-09-23 16:19:11 +01:00
Henry Oswald
7c0e338352
fix bug where users are always shown downgrade option when not required
2016-09-23 16:18:22 +01:00
Henry Oswald
0802ab6ddc
wip
2016-09-23 15:44:47 +01:00
Paulo Reis
bba39cc902
Also hide button, when viewing student plans.
2016-08-31 11:40:27 +01:00
Paulo Reis
09c188030c
Hide sign up button via visibility, to keep the layout fixed.
2016-08-30 17:42:23 +01:00
Paulo Reis
c82ab65077
Bind to an object to avoid writing in different .
2016-08-24 11:02:53 +01:00
Paulo Jorge Reis
f4aab93dfa
Merge pull request #303 from sharelatex/pr-ab-subscription-form
...
PR AB Subscription form
2016-08-24 09:45:36 +01:00
Paulo Reis
ba71ed2a3d
Merge branch 'master' into pr-ab-subscription-form
2016-08-23 14:10:19 +01:00
Paulo Reis
8abf839d55
Add country to the paypal form.
2016-08-23 13:36:54 +01:00
Paulo Reis
bc16999a4e
Validate on blur; reset validation on focus.
2016-08-23 11:55:23 +01:00
Paulo Reis
f79bee7893
Loading indicator when submitting.
2016-08-23 11:27:09 +01:00
James Allen
bcc8bfbe6c
Redirect to working update billing details end point that shows a nice message
2016-08-22 17:36:33 +01:00
Paulo Reis
23ed1e2aa3
Add form validation.
2016-08-22 17:03:29 +01:00
Shane Kilkelly
03aa9b87f1
Add debug query string origin to invocations of the updateSubscription endpoint.
2016-08-22 10:09:54 +01:00
Paulo Reis
f4b8cc7fc8
Use first and last name instead of full name as input.
2016-08-19 16:46:44 +01:00
Paulo Reis
53c6e48da9
Remove left-hand panel experiment.
2016-08-19 16:03:15 +01:00
Paulo Reis
6a1f0de912
Add i18n keys.
2016-08-19 15:12:05 +01:00
Paulo Reis
452abe94be
Add coupon code, VAT and pricing breakdown. Styling adjustments.
2016-08-19 14:51:07 +01:00
Paulo Reis
26e21732f8
Added validations + minor fixes.
2016-08-18 17:41:55 +01:00
Paulo Reis
43b832965f
Layout and styling for simple subscription form.
2016-08-18 16:56:23 +01:00
Paulo Reis
4814fc2606
Simple layout for subscription form.
2016-08-17 17:34:17 +01:00
Paulo Reis
672d4f8767
Setup AB test (alternative is still empty).
2016-08-17 12:11:17 +01:00
Henry Oswald
a2a8b7123b
created buildCssPath img and js path funcs
2016-07-18 17:18:51 +01:00
Henry Oswald
c21549220c
mvp for cdn
2016-07-18 14:05:07 +01:00
Henry Oswald
101e98ed83
simpliyfied dashboard & fixed error with leave group shown to group owner
...
- always show the manage button if you are the group owne
- only show the recurly subscription part if you are the subscription owner
- always try and loop through groups you can leave
2016-06-16 09:17:43 +01:00
Henry Oswald
cb3eb88af2
Merge branch 'subscriptionimprovements'
2016-03-31 11:58:56 +01:00
Henry Oswald
db8fb63bb5
fixed change payment details page
...
also increased size of year field for firefox users
and removed unnded options in new plan page
2016-03-31 11:54:52 +01:00
Henry Oswald
c554b0630d
if user has subscription before joining group is given option to cancel personal one
2016-03-22 16:59:47 +00:00
Henry Oswald
85a8bc97ed
add leave group button for group subscriptions
2016-02-19 12:27:32 +00:00
Henry Oswald
8af9aa6396
move wufoo form on plans page to groovehq
2016-02-03 16:50:34 +00:00
Henry Oswald
1f6b43e1b1
added universties site angular controler
2016-02-01 14:33:50 +00:00
Henry Oswald
d202538504
added ng-cloak to successful subscription page
2016-01-04 12:22:31 +00:00
Henry Oswald
5f66dbebf4
2015 -> 2016
2016-01-04 11:12:10 +00:00
Henry Oswald
134e733b01
change succesful subscription message
2015-12-21 10:31:22 +00:00
Henry Oswald
297e33f1a0
remove unneeded hide on cancelation basic
2015-12-09 14:44:26 +00:00
Henry Oswald
d5cf8f6886
simplified cancelation logic
2015-12-09 13:58:26 +00:00
Henry Oswald
7a88afc953
make button for downgrade centered and lower
2015-12-09 12:09:17 +00:00
Henry Oswald
bdc2206ef1
yes_please != yes_please!
2015-12-09 12:03:18 +00:00
Henry Oswald
db8349351d
escape html in cancel message
2015-12-09 12:01:55 +00:00
Henry Oswald
e6f92c181f
ill_take_it != ill_take_it!
2015-12-09 12:00:31 +00:00
Henry Oswald
56fa51f9b2
got translations done for subscription dashboard
2015-12-09 11:24:14 +00:00
Henry Oswald
aafdeb031e
wip - downgrade options it all works, need unit tests & translations
2015-12-08 18:23:28 +00:00
Henry Oswald
8fb1f9e00b
wip: downgrade to student if they are a collab monthly
2015-12-08 15:45:52 +00:00
Henry Oswald
89b2cd8477
added secure banner to both payment forms
2015-11-23 17:10:53 +00:00
Henry Oswald
003cdc01fc
consolidated 2 options in payment left menu
2015-11-18 15:21:48 +00:00
Henry Oswald
b1c0dfb0e4
show discount rate on pricing page
2015-11-17 12:23:27 +00:00
Henry Oswald
264839e27d
don't show tax or subtotal if there is no info on it
2015-11-17 11:44:31 +00:00
Henry Oswald
d959a51f36
show normal price if there is a discount
2015-11-17 11:42:03 +00:00
Henry Oswald
8a6c3b5838
covert payment-left-menu test
2015-11-12 09:57:06 +00:00
Henry Oswald
3a61f48068
added payment page with security seal
2015-11-11 17:59:35 +00:00
Henry Oswald
cf6998cac3
added ab test into payment page left hand feature list
2015-11-11 16:42:04 +00:00
Henry Oswald
453415ff7c
fixed tab index on payments page
2015-11-11 16:22:07 +00:00
Henry Oswald
730088b6ab
set button colour to red for free trial
2015-10-27 23:35:13 +00:00
