Commit Graph

428 Commits

Author SHA1 Message Date
Rimian Perkins 2bc780c4f9 Merge branch 'feature/one-time-payment' of github.com:rimian/discourse-subscriptions into feature/one-time-payment 2019-12-18 08:47:17 +11:00
Rimian Perkins 49ac965b24 tidy some scss class names etc 2019-12-18 08:47:01 +11:00
Rimian Perkins 9176471551 toggle single payments allowed setting 2019-12-17 21:14:13 +11:00
Rimian Perkins bf4fdd18ef fix white space 2019-12-17 17:43:30 +11:00
Rimian Perkins 52db93ecd8 user payments page 2019-12-17 16:31:58 +11:00
Rimian Perkins 38c444c489 tidy scss a bit 2019-12-16 13:59:58 +11:00
Rimian Perkins 7d3ca0421a rm old donation form 2019-12-16 10:59:59 +11:00
Rimian Perkins b79eed42ef redirect and rm activity connector 2019-12-16 10:47:59 +11:00
Rimian Perkins 55f4592033 subscription and billing templates 2019-12-16 10:42:55 +11:00
Rimian Perkins 8264930e92 user activity link to payments 2019-12-13 13:44:25 +11:00
Rimian Perkins 53ed40bfc3 fix api routes and eslint 2019-12-13 12:29:34 +11:00
Rimian Perkins 4b334a69b5 remove subscribe index 2019-12-13 11:54:32 +11:00
Rimian Perkins 57fb508514 buttons for selecting price and one time payment 2019-12-13 10:41:14 +11:00
Rimian Perkins e27b55ea6f customer declared already in upper scope 2019-12-12 13:45:16 +11:00
Rimian Perkins 831e64317b refactor models, routes and buttons 2019-12-12 12:59:26 +11:00
Rimian Perkins ff1740d035 validate plan 2019-12-10 10:55:24 +11:00
Rimian Perkins 86bc9bb3e6 rm redundant action 2019-12-10 10:15:30 +11:00
Rimian Perkins 1c31884475 show the plans in the buttons proper 2019-12-09 12:01:10 +11:00
Rimian Perkins 71d6c6dab2 display the plan in the plan buttons 2019-12-09 10:30:34 +11:00
Rimian Perkins d3eed3546d test button click 2019-12-06 14:33:38 +11:00
Rimian Perkins 2ce314fc8d initial payment buttons component 2019-12-06 13:52:03 +11:00
Rimian Perkins 09bfe419d8 set new product inactive by default 2019-12-05 17:07:26 +11:00
Rimian Perkins 7db60e2c4b tidy up the user subscription list 2019-12-05 14:59:07 +11:00
Rimian Perkins 80b721ddd8 rename some settings 2019-12-04 11:53:05 +11:00
Rimian Perkins 49591130a5 wrapping with longer names 2019-12-04 09:35:07 +11:00
Rimian Perkins 21b8340f4f rename the translations 2019-12-04 09:29:13 +11:00
Rimian Perkins 6d71d26574 rename assets 2019-12-03 11:51:18 +11:00
Rimian Perkins ccb6e5fcbd prettier does not like line lengths 2019-12-03 10:52:46 +11:00
Rimian Perkins 08cbff0c1c change engine mount point and base path in jsapp 2019-12-03 10:29:44 +11:00
Rimian Perkins 382fd4ac41 name space the js admin 2019-12-02 18:58:14 +11:00
Rimian Perkins b1db6e7a4c set currency 2019-11-30 17:44:16 +11:00
Rimian Perkins 8afae3f3f2 fx prettier 2019-11-30 16:46:38 +11:00
Rimian Perkins 709aebb593 set the currency in the plan 2019-11-30 16:39:28 +11:00
Rimian Perkins b4429e4473 rm extra line prettier is complaining about 2019-11-29 15:26:33 +11:00
Rimian Perkins 947ec4338e css the card 2019-11-29 15:08:51 +11:00
Rimian Perkins 7580b68711 rm extra line in product page 2019-11-29 10:16:00 +11:00
Rimian Perkins 298e70b32a delete customer record 2019-11-28 20:44:38 +11:00
Rimian Perkins e5753095d8 cannot subscribe to a product twice 2019-11-28 20:11:48 +11:00
Rimian Perkins ca00b530aa show the product name in subscription lists 2019-11-27 10:48:30 +11:00
Rimian Perkins 3e4fd76891 show product and plan nickname in admin 2019-11-26 12:55:49 +11:00
Rimian Perkins b65fd5568a upgrade prettier 2019-11-19 11:01:55 +11:00
Rimian Perkins 75f5ec4393 fix missing radix on parseInt 2019-11-19 10:21:05 +11:00
Rimian Perkins b3b7d88481 spinner on subscription cancel 2019-11-14 14:07:45 +11:00
Rimian Perkins d9b5aa6a35 loading on subscription page 2019-11-14 13:43:18 +11:00
Rimian Perkins 3999e1f7fd style the product page a bit 2019-11-14 11:13:12 +11:00
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