1
0
mirror of synced 2026-05-22 18:53:16 +00:00
Commit Graph

948 Commits

Author SHA1 Message Date
Faizaan Gagan c9cb338f9b Merge branch 'main' into admin-billing 2022-06-14 12:12:47 +05:30
Faizaan Gagan 3f45b1f19e FIX: allow admin to view any user's Billing page 2022-06-13 17:41:35 +05:30
discoursebot 9a9b5a79c1 DEV: Update CI setup and fix linting issues (#119)
* DEV: Update CI workflows
* DEV: Update deps
* DEV: Fix template linting

Co-authored-by: discoursebuild <build@discourse.org>
Co-authored-by: Jarek Radosz <jradosz@gmail.com>
2022-06-11 12:54:30 +02:00
Blake Erickson 46759c90cd FIX: Duplicate payments showing up in discourse UI (#118)
Duplicate payments were showing up in the discourse ui for users. Actual
transactions in stripe were not being duplicated. This fix ensures that
when parsing the api response we don't append any duplicates. Added a
duplicate entry to the specs to test for this.

I do think there can be some improvements made to this controller
endpoint, but I'd like to save those for a different and larger PR and
just get this fix out first.
2022-05-17 09:22:42 -06:00
dependabot[bot] 4a27a93e8d Bump async from 2.6.3 to 2.6.4 (#117)
Bumps [async](https://github.com/caolan/async) from 2.6.3 to 2.6.4.
- [Release notes](https://github.com/caolan/async/releases)
- [Changelog](https://github.com/caolan/async/blob/v2.6.4/CHANGELOG.md)
- [Commits](https://github.com/caolan/async/compare/v2.6.3...v2.6.4)

---
updated-dependencies:
- dependency-name: async
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-29 18:03:56 +02:00
dependabot[bot] 386d413bf1 Bump minimist from 1.2.5 to 1.2.6 (#116)
Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
- [Release notes](https://github.com/substack/minimist/releases)
- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)

---
updated-dependencies:
- dependency-name: minimist
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-13 19:36:59 +02:00
discoursebot c4093e6820 DEV: Update CI workflows (#115)
Co-authored-by: discoursebuild <build@discourse.org>
2022-03-22 14:06:27 +01:00
Jarek Radosz 044c18e904 DEV: Fix more imports (#114) 2022-03-07 14:34:05 +01:00
discoursebot 9cbdc8c453 DEV: Update CI workflows (#107)
Co-authored-by: discoursebuild <build@discourse.org>
2022-03-07 00:30:12 +01:00
Jarek Radosz 98c843b8f2 DEV: Fix imports (#113) 2022-03-07 00:30:01 +01:00
Jarek Radosz d6eaba632d DEV: Lose the es6 suffix (#112) 2022-03-07 00:20:03 +01:00
David Taylor fa490337ef FIX: Ensure sidebar class is removed when component destroyed (#111) 2022-02-28 11:51:29 +00:00
Gavin 46e0a2aa46 DEV: Update README.md (#109) 2022-02-21 21:04:40 +01:00
Gavin ba6f549f1c DEV: Update README.md (#110) 2022-02-21 20:55:41 +01:00
Vinoth Kannan 6f70af5e42 DEV: execute campaign refresh job only if stripe is configured. (#108) 2022-02-04 11:06:40 +05:30
Discourse Translator Bot 23d5697be4 Update translations (#106) 2022-01-18 14:43:12 +01:00
Discourse Translator Bot f414acee42 Update translations (#104) 2022-01-11 14:23:20 +01:00
Andrei Prigorshnev 45780a1ebc DEV: migrate routes to the new @action pattern (#102) 2022-01-06 15:32:09 +04:00
Discourse Translator Bot 9256a45c2a Update translations (#103) 2022-01-04 17:40:05 +01:00
Discourse Translator Bot 9cf257d6a7 Update translations (#101) 2021-12-28 14:14:38 +01:00
Discourse Translator Bot 306aa0bcca Update translations (#100) 2021-12-17 11:00:50 -07:00
Kim Miller 2c8c04c109 - Subscriptions import Procourse support (#89)
- Stripe pagination support
2021-12-17 11:00:19 -07:00
discoursebot 74923d01b1 DEV: Update CI workflows (#99)
Co-authored-by: CvX <CvX@users.noreply.github.com>
2021-12-16 18:06:07 +00:00
Discourse Translator Bot 11de2a6455 Update translations (#98) 2021-12-14 16:53:32 -07:00
Blake Erickson afe6c10452 FIX: html strong tags showing (#97)
We need to use the `html-safe` helper here so to that the html tags in
the translation template are rendered correctly.

See: https://meta.discourse.org/t/211376
2021-12-09 13:30:45 -07:00
Blake Erickson 23bfa1b567 FIX: Exclude blocked charges in campaign total (#96)
The campaign total should only include payments that have succeeded.

See: https://meta.discourse.org/t/209591/14
2021-11-25 08:11:52 -07:00
Blake Erickson c6c5ed2ed3 FIX: Include one-time purchases in campaign total (#95)
* FIX: Include one-time purchases in campaign total

On the subscription banner that shows on the top of the forum it shows
the total amount raised toward a goal. But the amount shown was not
including one-time purchases. It was only showing subscriptions.

This change updates the sync with stripe logic so that it also includes
one-time purchases.

See: https://meta.discourse.org/t/-/209591

* rubocop: remove extra blank line
2021-11-22 12:46:40 -07:00
Blake Erickson 4f2af3b01a FIX: 500 error when editing a pricing plan (#94)
`.dig` isn't valid for stripe objects. This commit fixes this 500 error
you get when trying to edit a pricing plan:

```
NoMethodError (undefined method `dig' for #<Stripe::Price:0x....)
```
2021-11-12 16:20:16 -07:00
Martin Brennan e8621cf5d1 DEV: Update code for eslint object-shorthand-rule (#93)
See https://github.com/discourse/eslint-config-discourse/commit/4f7aba06c03fdd22bb26669aeb8ed4af3127c409
2021-11-10 12:00:39 +11:00
Vinoth Kannan 33008b0b47 DEV: use existing customer id instead of creating. (#92)
Previosuly, new customer record is created in Stripe for each subscription in Discourse.
2021-10-08 09:40:16 +05:30
Vinoth Kannan 3ce422ffbe FIX: set interval field correctly in object root for recurring plans. (#91)
The interval field was missing in the Ember object since it was only available inside the nested object.

Co-authored-by: Jarek Radosz <jradosz@gmail.com>
2021-09-21 18:12:17 +05:30
discoursebot 6052366472 DEV: Update CI workflows (#90)
Co-authored-by: CvX <CvX@users.noreply.github.com>
2021-09-15 19:54:13 +02:00
dependabot[bot] 6e96f07378 Bump path-parse from 1.0.6 to 1.0.7 (#87)
Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-13 00:51:37 +02:00
Justin DiRose 5ead25feb6 REFACTOR: Rename s to subscribe (#86) 2021-07-19 19:56:19 -05:00
Justin DiRose 6414a1f6e5 FEATURE: Show/hide campaign banner with goal status (#85) 2021-07-15 15:05:27 -05:00
Jarek Radosz ef21e3da58 DEV: Restore gems in .gitignore (#84) 2021-07-05 12:10:20 +02:00
Jarek Radosz 21d71e09fc DEV: Fix linting errors (#83)
Template lint errors and broken rubocop linting.
2021-07-04 21:53:55 +02:00
discoursebot 03aec5a44a DEV: Update CI workflows (#52)
Co-authored-by: davidtaylorhq <davidtaylorhq@users.noreply.github.com>
2021-07-04 20:49:19 +02:00
Penar Musaraj 1c104da947 DEV: Use CSS custom properties for colors (#82) 2021-06-24 09:19:56 -04:00
Justin DiRose d660149ad2 UX: Hide campaign button on goal completion (#81) 2021-06-22 11:26:28 -05:00
Justin DiRose eee1adc40f FIX: New user sessions redirected weirdly on login-required sites (#80) 2021-06-22 10:04:02 -05:00
haroldus- 0b2c8bd513 fix strong (#78) 2021-06-22 09:22:35 -05:00
Discourse Translator Bot b4bc5ef3e2 Update translations (#79) 2021-06-22 15:18:09 +02:00
Jordan Vidrine beb73b58f3 FEATURE: Add fireworks + gradient animation to campaign success banner (#77) 2021-06-21 09:01:35 -05:00
Jordan Vidrine 787c5550c6 FEATURE: Add ability to use custom background image (#76)
* FEATURE: Add ability to use custom background image

* Prettier
2021-06-18 10:20:54 -05:00
Justin DiRose 8ab7a63167 FEATURE: Validate coupon codes on form submit (#74) 2021-06-16 12:54:54 -05:00
Discourse Translator Bot 5f9a84242b Update translations (#75) 2021-06-15 15:59:45 +02:00
dependabot[bot] 28148e2dda Bump glob-parent from 5.1.1 to 5.1.2 (#73)
Bumps [glob-parent](https://github.com/gulpjs/glob-parent) from 5.1.1 to 5.1.2.
- [Release notes](https://github.com/gulpjs/glob-parent/releases)
- [Changelog](https://github.com/gulpjs/glob-parent/blob/main/CHANGELOG.md)
- [Commits](https://github.com/gulpjs/glob-parent/compare/v5.1.1...v5.1.2)

---
updated-dependencies:
- dependency-name: glob-parent
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-06-12 13:57:52 +02:00
Jordan Vidrine a4f36e4966 Campaign topic footer (#72)
* UX: Restyle banner, add topic footer functionality, other updates
2021-06-10 16:02:54 -05:00
Justin DiRose 227c55e6f5 FIX: Restrict mods from seeing Subscriptions admin features (#70)
As reported [on Meta](https://meta.discourse.org/t/discourse-subscriptions/140818/352?u=justin), moderators could access all of the subscriptions data (plugins/prices/subscribers) and manage them. This should not be the case, so this PR adds a route constraint to 404 moderators from these routes.
2021-06-08 17:24:13 -05:00