Commit graph

189 commits

Author SHA1 Message Date
Scott Erickson
93c7072d8d Refactor ConfirmModal for #3138 and #3488 2016-03-18 11:03:55 -07:00
Scott Erickson
464430200c Fix AccountSettingsView to only try to change permissions in development 2016-03-11 15:00:55 -08:00
Scott Erickson
ebc98f988f Refactor CreateAccountModal out of AuthModal, add class code to signup 2016-03-10 10:52:11 -08:00
Matt Lott
6a48fbb3aa Add courses to progress-reset warning 2016-02-25 10:08:16 -08:00
Matt Lott
cb29d7068b Add prepaids to payments
Closes #3402
2016-02-17 10:08:44 -08:00
Imperadeiro98
b7ba677b00 Use view in template 2015-12-26 14:21:06 +00:00
Scott Erickson
079109145f Cull recruiting views and translations 2015-12-18 10:34:21 -08:00
Scott Erickson
ef3f847932 Remove SubscriptionSaleView 2015-12-16 16:39:44 -08:00
Scott Erickson
7c516c4d9f Move product information to the db 2015-12-14 11:10:50 -08:00
Barry
3db216a341 Fetched from master repo 2015-12-10 19:25:42 -05:00
Nick Winter
6d6f6138b1 Allow up to 63-character-long TLDs in email addresses 2015-12-04 12:06:42 -08:00
Nick Winter
ecfd982847 Note PayPal payment method. End limited-time year sale. 2015-11-30 10:50:34 -08:00
Nick Winter
7fdd6d5180 Fix #3174: save button triggering on delete/reset account form fields 2015-11-19 15:37:37 -08:00
Nick Winter
9e61928080 Add reset progress feature in account settings 2015-11-12 15:27:28 -08:00
Scott Erickson
669ab416e5 Fix SubscriptionView to keep emails when emails are erroneous 2015-11-04 10:52:47 -08:00
Scott Erickson
05bd12e8cc Merge branch 'email-validation' of https://github.com/JordanLittell/codecombat into JordanLittell-email-validation
# Conflicts:
#	app/views/account/SubscriptionView.coffee
2015-11-04 10:47:39 -08:00
Nick Winter
f100d6dba6 Merge pull request #3118 from codecombat/soffes/ipad
[WIP] Changes for iPad app
2015-10-29 16:24:39 -07:00
Scott Erickson
2e666073f1 Refactor SubscriptionView to use view in template 2015-10-27 12:07:16 -07:00
Scott Erickson
b475815e41 Refactor InvoicesView to use view in template 2015-10-22 15:26:52 -07:00
Scott Erickson
ddf351aac7 Refactor PaymentsView to use view in template 2015-10-21 17:18:38 -07:00
Scott Erickson
680eb04285 Refactor AccountSettingsView to use view in template 2015-10-21 17:18:38 -07:00
Scott Erickson
452e6467b4 Refactor PrepaidView to use new event callback naming guideline
See: https://github.com/codecombat/codecombat/wiki/Events,-subscriptions,-shortcuts#events
2015-10-21 14:16:44 -07:00
Scott Erickson
cef4fc0794 Refactor AccountSettingsView to use new event callback naming guideline
See: https://github.com/codecombat/codecombat/wiki/Events,-subscriptions,-shortcuts#events
2015-10-21 14:02:04 -07:00
Sam Soffes
d2052980c4 Send sign out message directly 2015-10-16 15:02:33 -07:00
Jlit1001
a788533d13 1. simplify regex for email testing
2. keep valid emails in text area
2015-10-14 22:29:15 -07:00
Matt Lott
9ae463ed24 Remove perf killing 'add' event handler from /account/prepaid 2015-10-09 16:03:22 -07:00
Nick Winter
5dde55c1f3 Add premium server recognition for Brazil 2015-10-09 08:05:34 -07:00
Jlit1001
e0be8e94ea 1. email validation when subscribing other users 2015-10-08 21:59:12 -07:00
Jlit1001
b9f0aa1622 1. set periodEnd to the next month if subscription cancelled at periodEnd 2015-10-08 19:43:13 -07:00
Matt Lott
5eadd926b3 Move redeem prepaid code UI out of modal 2015-09-25 15:21:51 -07:00
Matt Lott
928f72e2cf Merge branch 'prepaid-v2' into master 2015-09-25 10:28:27 -07:00
Matt Lott
e10c5d9646 Allow year sub purchases on top of monthly subs
Monthly sub is cancelled, terminal sub of 1 year + remaining month is
added.
2015-08-27 09:45:10 -07:00
Matt Lott
5faeb82d17 Extend terminal sub with year sub purchase 2015-08-27 09:45:10 -07:00
Matt Lott
b6ddb41df6 Add sale end date to year sub page 2015-08-26 15:22:56 -07:00
Matt Lott
ea6bc6faf3 Add new heroes to year sub sale page 2015-08-26 14:49:35 -07:00
Matt Lott
4392da1c20 Redirect to world selector after year sub purchase 2015-08-25 10:59:06 -07:00
Matt Lott
58ff820d7d Prompt for login on year subscription sale page 2015-08-25 10:12:11 -07:00
Matt Lott
9e222d0873 Add subscription sale
Give a discount for purchasing a year
New sale button on subscribe modal
New subscription sale landing page
2015-08-21 11:19:39 -07:00
Lai Tuan
7c680e4efa Removed 'this' and 'tempThis' 2015-06-21 02:09:44 +09:00
Lai Tuan
39fc882303 Require user password for deleting accounts #2842 2015-06-20 23:12:26 +09:00
Matt Lott
5fb8b18a31 🐛Fix managed subs next payment UI 2015-06-17 16:35:30 -07:00
Matt Lott
65e009330a Remove invalid bitcoin comment 2015-04-09 09:42:44 -07:00
Nick Winter
7ebb2d0200 Actually committing my Super Important Fixes. I must have been crazy yesterday. Also, populate i18n may work in the level editor now. 2015-03-24 15:39:35 -07:00
Matt Lott
7e340fcd41 Update purchase tracking to work with GA goals
Need an integer value field.
2015-03-24 15:02:57 -07:00
Nick Winter
b4ea78e5cb Implementing alternative pricing with Alipay in China to support dedicated China server. 2015-03-23 15:26:44 -07:00
Matt Lott
fec3ac38e9 Prepaid subscriptions
Admins can generate a prepaid code, which a user can use to subscribe
for free via the account/subscription page.
The subscription will be identical to the normal monthly subscription
(e.g. 3500 gems per month), except they won’t be charged.
Does not require the recipient to enter billing information.
Can be applied to an existing subscription, which will be converted to
free.
Prepaid code can only be used once.
Prepaid subscription cannot be unsubscribed via the UI.
2015-03-19 15:04:15 -07:00
Nick Winter
c6cd7b032d Fixed Alipay auto locale detection. 2015-03-18 17:17:30 -07:00
Nick Winter
d6cba0de67 Enabled Alipay support. Updated to latest version of Stripe checkout.js. 2015-03-16 10:50:15 -07:00
Matt Lott
5264fc6181 🐛Fix subscription view just subscribed alert message 2015-03-13 15:51:47 -07:00
Matt Lott
af89452b93 Merge branch 'sponsored-subs' 2015-03-13 15:19:20 -07:00