Commit Graph

433 Commits

Author SHA1 Message Date
Rimian Perkins 399dca953a Merge branch 'feature/logged-in-subscribe-page' of github.com:rimian/discourse-patrons into feature/logged-in-subscribe-page 2019-11-14 10:51:27 +11:00
Rimian Perkins 6590d8051c delete subscriptions in admin 2019-11-14 10:51:04 +11:00
Rimian Perkins 370566b570 only show subscribe buttons when logged in 2019-11-14 09:47:15 +11:00
Rimian Perkins 0f17acc47e rm unused var 2019-11-13 15:33:53 +11:00
Rimian Perkins 5fdd81ac77 link to user admin 2019-11-13 15:27:32 +11:00
Rimian Perkins 8aed6b8d30 add link to user 2019-11-13 14:21:21 +11:00
Rimian Perkins dafa08f43e disable dashboard 2019-11-07 12:09:40 +11:00
Rimian Perkins 482ce178d5 pretty js 2019-11-06 20:59:35 +11:00
Rimian Perkins 78cbfc2652 rm unused arg 2019-11-06 20:51:16 +11:00
Rimian Perkins 4a812ceff6 toggle the subscribe button 2019-11-06 20:43:16 +11:00
Rimian Perkins e14b4dcd96 the subscribe product page 2019-11-04 16:37:21 +11:00
Rimian Perkins 2b3c52bdd4 name space user subscription request 2019-11-01 13:43:09 +11:00
Rimian Perkins e3ac6f7dac date format and product description 2019-11-01 12:30:19 +11:00
Rimian Perkins 86c77a7395 rubocop && fix i18n 2019-11-01 10:50:34 +11:00
Rimian Perkins 3dfa261c19 serialize and order the plans 2019-11-01 10:18:57 +11:00
Rimian Perkins 5fe08c110f format some currency 2019-10-31 14:35:19 +11:00
Rimian Perkins bec2d57920 pretty 2019-10-31 13:31:24 +11:00
Rimian Perkins b0a4665bf4 set the dollar amount 2019-10-31 13:29:11 +11:00
Rimian Perkins 1074d84901 feedback error when plan creates and updates 2019-10-31 12:41:02 +11:00
Rimian Perkins ced4d1c786 format the amount in admin 2019-10-31 11:41:01 +11:00
Rimian Perkins 842fac9176 format the rate in the plan model 2019-10-31 10:44:46 +11:00
Rimian Perkins dbaa30ba18 user cancels subscription 2019-10-31 10:01:41 +11:00
Rimian Perkins 03cbc235b1 list customer subscriptions 2019-10-30 14:19:43 +11:00
Rimian Perkins ee0901aeca delete subscription 2019-10-29 14:35:07 +11:00
Rimian Perkins 2a985ae554 fix subscribe request 2019-10-29 14:15:13 +11:00
Rimian Perkins 7edb0fe39b list subscriptions 2019-10-29 11:43:32 +11:00
Rimian Perkins 5a7097b774 billing/subscriptions 2019-10-28 14:48:59 +11:00
Rimian Perkins 87c83abcd3 add basic invoices page 2019-10-28 14:05:58 +11:00
Rimian Perkins 1f7549060d fix eslint and rubocop 2019-10-25 14:00:59 +11:00
Rimian Perkins 570ef2fbb4 use the billing page 2019-10-25 13:55:57 +11:00
Rimian Perkins 948399662d transition to billing after payment 2019-10-25 13:40:03 +11:00
Rimian Perkins edd6449105 basic user billing page 2019-10-25 13:23:32 +11:00
Rimian Perkins 9e981c3dae whoops translation 2019-10-25 13:18:18 +11:00
Rimian Perkins 4d2d98037a fix paths to translations 2019-10-25 11:13:14 +11:00
Rimian Perkins 6fbcea2cf3 product controller 2019-10-25 08:18:16 +11:00
Rimian Perkins 5f71def8a4 format the select dropdowns for plans 2019-10-24 16:51:58 +11:00
Rimian Perkins 21b27f169a show a bootbox message instead of console log 2019-10-24 16:37:14 +11:00
Rimian Perkins eead6fd345 user group specs. help page 2019-10-24 15:48:03 +11:00
Rimian Perkins 603ddc354b plan can be active or not 2019-10-24 10:02:31 +11:00
Rimian Perkins 922dee581c fix bugs in create plans 2019-10-23 15:55:06 +11:00
Rimian Perkins a94287434d plans have group names 2019-10-23 11:50:54 +11:00
Rimian Perkins bb1e330f68 eslint rm & old files 2019-10-23 10:36:12 +11:00
Rimian Perkins fb37c200cd more info on subscription page 2019-10-23 10:30:04 +11:00
Rimian Perkins c6bf9ca4d3 fix trial period 2019-10-23 10:16:17 +11:00
Rimian Perkins 296d5eff1b destroy plan 2019-10-22 19:32:36 +11:00
Rimian Perkins 5cce5f2b84 format dates for plan and product list 2019-10-22 16:35:41 +11:00
Rimian Perkins c26ce1fc80 plans are child of product 2019-10-22 15:45:51 +11:00
Rimian Perkins 2179e3d280 fix statement descriptor param 2019-10-22 09:24:54 +11:00
Rimian Perkins c6dd47d328 templates, plans 2019-10-21 15:28:45 +11:00
Rimian Perkins 0d4cd5b1e5 add nested route 2019-10-21 09:47:18 +11:00
Rimian Perkins b05b03e25b fix up forms and requests to plan api 2019-10-17 20:34:26 +11:00
Rimian Perkins e2b915b905 plans and products 2019-10-17 12:07:06 +11:00
Rimian Perkins 01b78b31df subscriptions list 2019-10-16 21:29:40 +11:00
Rimian Perkins c845f3be4b form fields 2019-10-16 21:18:29 +11:00
Rimian Perkins d02ba3ef6a meta data 2019-10-16 21:06:19 +11:00
Rimian Perkins 496f2b9706 save the product 2019-10-16 14:15:01 +11:00
Rimian Perkins e2f1f0f523 destroy plans 2019-10-16 11:22:58 +11:00
Rimian Perkins 1bedc1ba2f destroy products 2019-10-15 23:14:04 +11:00
Rimian Perkins 23cb6ef93e create the products 2019-10-15 21:50:30 +11:00
Rimian Perkins e51aa5f6f0 products admin route and basic pages 2019-10-15 13:18:25 +11:00
Rimian Perkins b727347b6c basic plans form 2019-10-15 09:40:49 +11:00
Rimian Perkins 892478ab57 initial product pages 2019-10-14 15:39:24 +11:00
Rimian Perkins c6dcff5c06 redirect to group landing page on success 2019-10-14 13:54:46 +11:00
Rimian Perkins 16513e29ea list plans in admin 2019-10-14 12:36:46 +11:00
Rimian Perkins 4e615908f4 create the subscription 2019-10-14 11:47:49 +11:00
Rimian Perkins bab76db863 subscriptions controller 2019-10-14 09:52:43 +11:00
Rimian Perkins fcfb826929 create the token and make the customer request 2019-10-11 12:26:01 +11:00
Rimian Perkins bb31deae89 basic subscribe page 2019-10-10 13:52:55 +11:00
Rimian Perkins bde208ecb6 merge in master 2019-10-09 09:11:02 +11:00
Rimian Perkins 829199ffb2 form not rendering 2019-10-09 09:06:12 +11:00
Rimian Perkins 0a6ade7ab9 stylin, translations 2019-10-08 22:26:58 +11:00
Rimian Perkins 8d24ff455e have a dash board page 2019-10-08 21:59:20 +11:00
Rimian Perkins 19a03aa2ca plan model with destroy and find 2019-10-08 19:37:22 +11:00
Rimian Perkins 6f9195a7d4 Create Plans
* rescue and respond to error from stripe
* save plan name and id
2019-10-08 15:55:38 +11:00
Rimian Perkins 99abd87c73 rm dup title; use nav items 2019-10-08 12:17:47 +11:00
Rimian Perkins 48af25b707 merge master 2019-10-08 11:48:31 +11:00
Rimian Perkins 89e53744ed Hide disabled
* Do not show the form if the plugin is disabled
* Upgrade Stripe Gem
2019-10-08 11:36:48 +11:00
Rimian Perkins bee940e672 url for edit 2019-09-27 09:42:32 +10:00
Rimian Perkins 9d982307d5 filter by deleted 2019-09-25 13:39:23 +10:00
Rimian Perkins d4afe93a5d delete plans 2019-09-25 13:20:28 +10:00
Rimian Perkins 1b232a1bd4 list plans 2019-09-25 11:18:11 +10:00
Rimian Perkins a2d120c8b5 save plan model 2019-09-24 20:44:51 +10:00
Rimian Perkins 0d82bcf37e Plans, subscriptions
* Plans controller
* Subscription controller
* Clean admin controller
* Ember Plans route
* Index page
* New Plans
* Translations
2019-09-24 16:04:42 +10:00
Rimian Perkins dfef3c49cf initial templates and routes 2019-09-24 15:20:07 +10:00
Rimian Perkins 308c8ea771 initial templates and routes 2019-09-24 15:18:58 +10:00
Rimian Perkins e1ed1a41b0 add initial controllers 2019-09-23 17:53:05 +10:00
Rimian Perkins e004a18071 templates and routes for subscriptions 2019-09-23 15:01:03 +10:00
Rimian Perkins 8b61747fbd FEATURE: Upgrades, translations
* Name space the translations for extensibilty
* Upgrade the Stripe Gem
* Correct the plugin version in the Stripe setup info
2019-09-23 12:04:30 +10:00
Rimian Perkins 910e08e4c9 flip ordering 2019-09-15 22:03:42 +10:00
Rimian Perkins 18cf0e7f26 FIX: ordering
* Fix broken user id
* ascending/descending
2019-09-15 21:44:10 +10:00
Rimian Perkins ca62cad04e order the payments in admin 2019-09-15 21:00:39 +10:00
Rimian Perkins a42e98ee5b error for user not permitted 2019-09-15 08:40:52 +10:00
Rimian Perkins ad5961a4c5 show the payment on the thankyou page 2019-09-14 20:54:13 +10:00
Rimian Perkins 5d94ed8974 redirect to show page with payment id 2019-09-14 18:31:11 +10:00
Rimian Perkins b77c211a71 request index url not show 2019-09-14 18:21:43 +10:00
Rimian Perkins d100de9d19 name not email 2019-09-14 17:56:37 +10:00
Rimian Perkins 871cec9ec3 pretty js 2019-09-14 17:28:58 +10:00
Rimian Perkins 813937dd22 intial load more 2019-09-14 17:04:02 +10:00
Rimian Perkins 0b8b89f1d4 link username 2019-09-14 16:53:07 +10:00
Rimian Perkins cf46065635 show username 2019-09-14 16:34:51 +10:00
Rimian Perkins 9631ddc7e5 format currency and user 2019-09-14 15:55:25 +10:00
Rimian Perkins 5c33268477 created at and url 2019-09-14 14:20:16 +10:00
Rimian Perkins 6fe149c4a5 basic admin interface 2019-09-14 12:56:28 +10:00
Rimian Perkins c90d4b2f8e fix params 2019-09-13 14:34:06 +10:00
Rimian Perkins 4287e8aa5d load model 2019-09-13 13:52:41 +10:00
Rimian Perkins 404bede398 fix snake case 2019-09-13 13:46:32 +10:00
Rimian Perkins 68b4d07a94 fix jslint and some settings 2019-09-13 13:02:28 +10:00
Rimian Perkins 63ea563553 Set the user email initially in stripe form 2019-09-13 12:56:26 +10:00
Rimian Perkins cb9af7c258 send the current user 2019-09-13 12:35:38 +10:00
Rimian Perkins c6555ccc63 some css 2019-09-12 19:04:10 +10:00
Rimian Perkins 22af03a42e add billing to confirm dialog 2019-09-12 18:51:40 +10:00
Rimian Perkins 926aee79bb make the payment section a different colour 2019-09-12 18:34:00 +10:00
Rimian Perkins 83fc234b90 settings, headings 2019-09-12 18:27:25 +10:00
Rimian Perkins 9cfdd3f07e This always catches me. Pretty quotes! 2019-09-12 18:18:50 +10:00
Rimian Perkins 6f87f11e4a currency format helper 2019-09-12 18:16:47 +10:00
Rimian Perkins 035187d843 pretty js 2019-09-12 17:47:44 +10:00
Rimian Perkins ba73e688f2 validate billing 2019-09-12 17:47:08 +10:00
Rimian Perkins b60244e809 form text 2019-09-12 16:28:19 +10:00
Rimian Perkins e2cec16b99 forms and settings 2019-09-12 16:16:38 +10:00
Rimian Perkins 1add7e9cdf Fix broken test and form wrap 2019-09-12 15:52:30 +10:00
Rimian Perkins 9b69c58be4 Add some billing details 2019-09-12 15:13:08 +10:00
Rimian Perkins a87fcae149 a little formatting 2019-09-12 13:46:30 +10:00
Rimian Perkins 2a1a17793f add some settings for text 2019-09-12 13:40:18 +10:00
Rimian Perkins c79541a48b pretty 2019-09-12 11:51:28 +10:00
Rimian Perkins c636a2896a some translations 2019-09-12 11:34:54 +10:00
Rimian Perkins 7ad42c9b48 combo box with amounts. use decimals 2019-09-12 11:21:27 +10:00
Rimian Perkins 55bab5d936 rm redundant component 2019-09-12 09:28:01 +10:00
Rimian Perkins 43fde60f3a proper setting 2019-09-12 08:10:41 +10:00
Rimian Perkins c2af580718 import URL helper 2019-09-12 07:58:08 +10:00
Rimian Perkins 36c1731565 add success handler 2019-09-12 07:43:27 +10:00
Rimian Perkins fdd4d1ed5f yarn prettier 2019-09-12 07:14:16 +10:00
Rimian Perkins 11b2917254 eslint 2019-09-11 22:17:07 +10:00
Rimian Perkins 381315f9f3 add settings 2019-09-11 22:06:01 +10:00
Rimian Perkins df1d5a3181 the form submits but an ajax error happens 2019-09-11 21:52:04 +10:00
Rimian Perkins 02c9ea873a add stylesheets 2019-09-11 21:14:48 +10:00
Rimian Perkins 5cddda6703 add controllers 2019-09-11 21:09:34 +10:00
Rimian Perkins a9434f5723 load in components 2019-09-11 20:37:23 +10:00
Rimian Perkins ee2be672f7 initial components 2019-09-11 20:19:50 +10:00
Rimian Perkins 683c36e5d1 rm redundant index template 2019-09-11 17:44:26 +10:00
Rimian Perkins a5dbe4f9bd Show route 2019-09-11 17:38:55 +10:00
Rimian Perkins ac267fabaf basic route and template 2019-09-11 17:13:12 +10:00
Rimian Perkins 78914e0511 Add new plugin files.
This gets the plugin running again without name collisions. A solid starting point
2019-09-11 13:19:07 +10:00
Rimian Perkins d2f85f1a97 Merge branch 'master' into upgrade-stripe-gem 2019-08-28 19:54:07 +10:00
Rimian Perkins 05da88009d whoops add invoice list back 2019-08-28 19:53:29 +10:00
Rimian Perkins 6d1c4dd28c deprecations and documentation 2019-08-28 19:02:56 +10:00
Rimian Perkins 32f883a7ad pretty code 2019-08-28 18:36:19 +10:00
Rimian Perkins e891eb1517 fix eslint, bump patch 2019-08-28 18:27:45 +10:00
Rimian Perkins 9b2ca50671 fix deprecations 2019-08-28 18:24:55 +10:00
Rimian Perkins e539c34653 apply the css colour to the card 2019-08-28 18:10:54 +10:00
Rimian Perkins 8d8e9f9ad1 abstract out the stripe component for easy future testing 2019-08-28 14:59:45 +10:00
Rimian Perkins f1de907c32 add the basic form 2019-08-27 22:05:30 +10:00
Rimian Perkins 0cb3a9acde format with prettier 2019-08-27 20:37:20 +10:00
Rimian Perkins 675c3d27ba appease eslint 2019-08-27 20:18:02 +10:00
Rimian Perkins f49c0c89a3 empty form component 2019-08-27 19:56:55 +10:00
Rimian Perkins abaf101173 initial spec for donation-row component 2019-08-26 17:34:40 +10:00
Rimian Perkins d0bdfab44b fix the test runner 2019-08-26 16:01:57 +10:00
Angus McLeod 06b775c8c1 add equal to 2019-04-09 09:04:24 +10:00
Angus McLeod 794793f7c3 tweak 2019-04-03 13:15:01 +11:00
Angus McLeod 262ae0f96c add mobile styles 2019-04-03 12:40:03 +11:00
Angus McLeod 44410fa375 add cause release fields 2019-04-03 12:32:24 +11:00
Angus McLeod b98e603e59 Add proper user path 2018-09-30 11:51:20 +10:00
Angus McLeod a353eed1c3 small fixes 2018-09-30 11:23:05 +10:00
Angus McLeod 02e3438a9c only add metadata element if there is metadata 2018-09-29 10:12:48 +10:00
Angus McLeod e1eb585974 Add additional settings and customizations 2018-09-28 17:33:27 +10:00
Angus McLeod ae793ad247 Add setting for monthly total and other minor improvements 2018-09-24 10:17:53 +10:00
Angus McLeod a3636a5038 if not a category route remove body class 2018-09-23 09:08:39 +10:00
Angus McLeod c4c96046cd only show github and meta links if they exist 2018-09-23 08:44:50 +10:00
Angus McLeod b8cf45aa7f ensure widget is hidden on non-category paths 2018-09-23 08:36:28 +10:00
Angus McLeod b4fd0287ed Add meta link 2018-09-22 17:48:38 +10:00
Angus McLeod d58c04a592 only show cause UI in cause categories 2018-09-22 17:09:06 +10:00
Angus McLeod 45ece34200 Add donations causes 2018-09-22 14:03:30 +10:00
Angus McLeod d686ece85b Redirect to root from '/donate' if the plugin is disabled 2018-07-02 10:30:38 +10:00
Angus McLeod 0260197e9e various 2018-06-28 13:46:02 +10:00
Angus McLeod 1b1eb215e4 various 2018-06-28 09:32:58 +10:00
Angus McLeod fd0b53c67c Properly validate email 2018-06-25 18:37:55 +10:00
Angus McLeod 8453d5cc03 various 2018-06-25 18:14:50 +10:00
Angus McLeod 90f5083fb6 Small fixes 2018-06-22 11:55:16 +10:00
Angus McLeod d55d149d7d Add recurring donations 2018-06-21 19:00:43 +10:00
Angus McLeod 5723b91ba2 Donation form style updates 2018-06-21 19:00:19 +10:00
Angus McLeod 446cc75cbc Make donation amounts a customisable setting 2018-02-02 19:49:58 +08:00
Angus McLeod e307a75a3b
Merge branch 'master' into transaction_fee 2018-02-02 17:47:53 +08:00
Angus McLeod e8e558c3e2 Add ability to allow donor to include stripe transaction fee in their donation 2018-02-02 17:43:54 +08:00
Chris Beach 9ec48bc6b1
Merge pull request #8 from chrisbeach/associate_stripe_customer_id_with_users
Save and reuse stripe customer id when user is present
2018-02-02 08:27:56 +00:00
Angus McLeod f46d3394cb BUGFIX: default amount should be 1
This seems to have been broken for a little while.

The bug was that if you just left the donation combo-box as is (i.e. at
‘1.00’), entered your card details and clicked ‘donate’ you would get
an error, because the default ``amount`` property was null rather than
0.
2018-02-02 16:19:21 +08:00
Angus McLeod ccf7f1b73b Save and reuse stripe customer id when user is present 2018-02-02 16:06:43 +08:00
Angus McLeod 19f197e780 Add page description setting 2018-02-02 13:43:20 +08:00
Chris Beach dd7e86930f Include timestamp in messages to user.
Permit email param in checkout_controller
Fix failing tests
2018-01-18 00:21:41 +00:00
Chris Beach c6f416788c Hide nav link if plugin disabled 2018-01-17 23:10:15 +00:00
Angus McLeod 23bc79513a Rm test element 2017-11-27 10:39:32 +08:00
Angus McLeod bcebbd583b Move script to jquery insertion on render 2017-11-27 10:28:21 +08:00
Chris Beach df91a44277 fix client/server messages and locales
zip code should be a positive boolean not negative
remove dollar signs
fix stripe.rb method signature and charging logic
2017-11-26 12:24:27 +00:00
Angus McLeod c22ef46224 rm stripe.js from build
It needs to be loaded directly.

https://stripe.com/docs/stripe-js/reference#including-stripejs
2017-11-12 11:01:08 +08:00
Angus McLeod c2fa248b79 Include stripe js && inherit from the application controller 2017-11-08 08:45:18 +08:00
Chris Beach d563cd1ddd Working checkout_controller.rb that charges Stripe
* Add billing address setting
2017-10-19 23:51:05 +01:00
Chris Beach 20a38095dd Enable checkout route 2017-10-19 23:51:05 +01:00
Chris Beach 238f4c4eb4 Include amount on form and increase logging 2017-10-19 23:51:05 +01:00
Chris Beach 943343ffa4 Use siteSettings properly 2017-10-12 02:13:20 +01:00
Chris Beach 92639a483f Fix discourse-markdown 2017-10-12 00:37:29 +01:00
Chris Beach 8fdd5dad27 Revert removal of donate menu item 2017-10-11 23:58:22 +01:00
Chris Beach 6814c80540 Stripe Checkout can be created via BBCode markup 2017-10-09 08:39:21 +01:00