113 commits

Author	SHA1	Message	Date
Henry Oswald	d959a51f36	show normal price if there is a discount	2015-11-17 11:42:03 +00:00
Henry Oswald	ef3613371f	don't show coupon area for upgrades	2015-11-17 11:41:39 +00:00
Henry Oswald	471b285ad7	changed plan choice using ab sixpack not ga	2015-11-16 16:40:14 +00:00
Henry Oswald	f7854649e2	added 20% off option	2015-11-16 15:58:04 +00:00
Henry Oswald	89381e84eb	switch to student switches to free trial	2015-11-16 15:51:54 +00:00
Henry Oswald	5598624ee1	only run participate test for sign up if user has no projects	2015-11-10 14:06:06 +00:00
Henry Oswald	0ef8d77ce3	project list minimal to work with projects	2015-11-02 18:44:12 +00:00
Henry Oswald	730088b6ab	set button colour to red for free trial	2015-10-27 23:35:13 +00:00
James Allen	64ffcde3df	Namespace subscription groups as SubscriptionGroup	2015-10-05 16:37:03 +01:00
Shane Kilkelly	96619bde8c	Move the template-browser code into the 'templates' module. ... Now located to be located at `modules/templates/public/coffee/main/index.coffee`, moved to complete a migration of template related code into the templates module. Corresponding commit in sharelatex-web-modules: 625c556e42072d30f30d474aaef72deff24ca154	2015-08-18 14:21:35 +01:00
Henry Oswald	b657c5207e	cleaned up the views a bit	2015-05-27 21:45:29 +01:00
Henry Oswald	481bd67fbd	changed paths to use hyphens and add succesfull join page	2015-05-26 15:26:45 +01:00
Henry Oswald	cad8d8a23b	v1 basic invite works, not pretty or tested	2015-05-22 13:57:15 +01:00
James Allen	358242a5e0	Merge pull request #159 from SibrenVasse/adblock_fix ... Fix for adblock blocking loginscreen.	2015-03-23 12:29:40 +00:00
James Allen	9b8cf7bcfa	Remove public registration and require that a user be registered by an admin	2015-03-19 14:22:48 +00:00
Sibren Vasse	f4f74a2baf	Fix for adblock blocking loginscreen.	2015-03-17 20:14:55 +01:00
Henry Oswald	97f0fad525	add vat number option to payment form	2015-03-04 18:08:06 +00:00
Henry Oswald	80dc2f9224	send coupon code server side to be applied to users subscription	2015-03-04 17:50:24 +00:00
Henry Oswald	f7f681d2a3	deal with nan tax rate if user is not in taxable location for subscription dashboard/change plan	2015-02-22 18:35:59 +00:00
Henry Oswald	1d6c928c81	fix bug which showed all plans as monthly in payment form. ... Also use translations for string of month/year	2015-02-10 18:05:39 +00:00
Henry Oswald	6f5b524b56	use currency for change plan pricing	2015-02-06 17:08:42 +00:00
Henry Oswald	79e7f82a36	only setup recurly once for subscription dashboard and apply async to make sure updates on pricing are applied	2015-02-06 16:54:11 +00:00
Henry Oswald	7030d5f822	change plan shows price including tax	2015-02-06 16:19:52 +00:00
Henry Oswald	e9ab77351a	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-02-03 11:36:16 +00:00
Henry Oswald	e4976539d9	show generic error handler only on error	2015-02-03 10:41:58 +00:00
James Allen	860de1528f	Load default coupon code if provided in query string	2015-02-02 17:42:27 +00:00
James Allen	36513f443c	Ensure we are in a digest loop when updating validation errors	2015-01-29 14:43:38 +00:00
James Allen	3731c62e17	Get validation working with address fields and Angular digest loop	2015-01-29 14:22:57 +00:00
James Allen	2a78a7843a	Allow subscriptions with no free plans, and adjust styles	2015-01-29 14:11:25 +00:00
Henry Oswald	69c3f48c1e	if there is a validation error re enable the button	2015-01-29 13:56:19 +00:00
Henry Oswald	90bb12db40	added state to payment form	2015-01-19 20:27:01 +00:00
Henry Oswald	7508ba6c47	improved validation so that fields recurly said are wrong get highlighted	2015-01-07 16:43:20 +00:00
Henry Oswald	f9843b3709	tax auto updates on change of address now. Is also preset based on users ip address	2015-01-07 13:16:19 +00:00
Henry Oswald	d678af4417	only validate credit card an cvv if there is data in them	2014-12-28 22:19:15 +00:00
Henry Oswald	474fa5fe19	only validate expiry when both are set	2014-12-28 21:53:12 +00:00
Henry Oswald	7f979e77db	- fixed new payment page so it uses correct plan and currency ... - submit button is disabled while processing - removed test data	2014-12-28 17:16:21 +00:00
Henry Oswald	ecb71d5bbf	pull recurely pub api key from settings file	2014-12-23 12:08:01 +00:00
Henry Oswald	e2819c3bc6	added generic error handling to recurly processing and required fields	2014-12-23 11:04:54 +00:00
Henry Oswald	a7eb836c79	redirect to /thank-you on success and fix broken unit test from a few commits ago	2014-12-22 16:37:09 +00:00
Henry Oswald	d0c9783718	added paypal option in, not tested as we don't have paypal in stag	2014-12-22 15:51:50 +00:00
Henry Oswald	fb0a083b36	added address 2	2014-12-22 15:19:40 +00:00
Henry Oswald	6cedfb19d9	cleaned up form and added basic validation	2014-12-22 15:07:55 +00:00
Henry Oswald	fa1ec44e22	coupons work	2014-12-22 14:06:39 +00:00
Henry Oswald	a47b25d4b2	works with multi plan and currency, auto updates view on change	2014-12-22 12:55:29 +00:00
Henry Oswald	5305cbfd3e	got more correct details making it to recurly and improved form.	2014-12-19 11:17:35 +00:00
Henry Oswald	cc545db17b	can add account just about into recurly	2014-12-18 18:59:29 +00:00
Henry Oswald	47fb2a0878	basic angular form which has data bound to it	2014-12-18 17:48:23 +00:00
Henry Oswald	ba784c3e62	changed swiss franks to show Fr for display issues	2014-11-25 13:18:57 +00:00
Henry Oswald	d070c0acd8	fixed SGD collab price	2014-11-25 13:14:38 +00:00
Henry Oswald	02ef07dca4	broken free trial func into own file. added ab test on upgrade button colour	2014-11-24 23:59:55 +00:00