Commit Graph

1023 Commits

Author SHA1 Message Date
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 4f7aba06c0
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
Justin DiRose 791c7fa7a5
UX: Improve mobile campaign flow (#69)
1. Improve mobile checkout styling

These are pretty simple changes. The buttons were crammed together and not wrapping properly on mobile if there were more than a few. Also the padding was weird and causing text to overflow out of the #main-outlet on phone viewports.
2. Renders the top campaign banner on mobile even if sidebar is selected

In the original PR, we refactored using the connector JS out since we now have more Ember operators; however, we needed some more complex logic that couldn't be done in the template. Basically, we choose which outlet to render the component in based on two criteria:

    If the setting is set to sidebar or top
    If we're on a mobile device

Previously, if the site showed the banner on the sidebar and the user browsed to mobile, they wouldn't see a banner at all. This PR changes the logic to use the top outlet on mobile, even if the sidebar is selected.
2021-06-08 12:52:29 -05:00
Discourse Translator Bot 2d7807aeb3
Update translations (#71) 2021-06-08 16:30:55 +02:00
Justin DiRose f596a0f78a
FEATURE: Campaigns (#67)
Co-authored-by: Jordan Vidrine <jordan@jordanvidrine.com>

See https://github.com/discourse/discourse-subscriptions/pull/67 for the full description.
2021-06-02 13:15:03 -05:00
Discourse Translator Bot dcec7703f8
Update translations (#68) 2021-06-01 15:10:10 +02:00
Jay Pfaffman 3fb597a4cf
FIX: Don't use `Discourse` global (#66)
Discourse.SiteSettings should be this.siteSettings.
2021-05-26 21:33:31 +02:00
haroldus- ccd9454da8
FIX: Allow more than 10 Stripe records (#62) 2021-05-22 20:30:09 -05:00
dependabot[bot] d83425872f
Bump lodash from 4.17.20 to 4.17.21 (#65)
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.20...4.17.21)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-10 13:41:45 -04:00
dependabot[bot] 916e2f01ce
Bump handlebars from 4.7.6 to 4.7.7 (#64)
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.7.6 to 4.7.7.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/handlebars-lang/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.7.6...v4.7.7)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-10 10:49:04 +10:00
dependabot[bot] 8abcf34858
Bump rexml from 3.2.4 to 3.2.5 (#63)
Bumps [rexml](https://github.com/ruby/rexml) from 3.2.4 to 3.2.5.
- [Release notes](https://github.com/ruby/rexml/releases)
- [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md)
- [Commits](https://github.com/ruby/rexml/compare/v3.2.4...v3.2.5)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-02 17:10:56 +02:00
chalkadmin 1ae5a552a6
FEATURE: Add SGD as supported currency (#60)
Add additional currency Singapore dollars as supported Stripe currency
2021-04-13 12:20:00 +02:00
Brian Bønk 312b1182b9
FEATURE: Add DKK as supported currency 2021-04-06 09:59:27 -05:00
dependabot[bot] f1dd035ec1
Bump y18n from 4.0.0 to 4.0.1 (#59)
Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/yargs/y18n/releases)
- [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yargs/y18n/commits)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-04-01 10:04:40 +02:00
Discourse Translator Bot 252a11ed15
Update translations (#58) 2021-03-23 16:07:51 +01:00
Justin DiRose 7f84cee940
UX: Improve usability of purchase page (#54)
Commit does 3 things:

    Remove the duplicative currency abbreviation in favor of the currency symbol alone
    Reorders plans by the cost in ascending order.
    Fixes a flexbox button bug
2021-02-16 12:07:53 -06:00
Justin DiRose 0126b12761
DEV: Remove unused CSS selector (#55) 2021-02-16 11:54:21 -06:00
Discourse Translator Bot 13c3fbdf44
Update translations (#56) 2021-02-16 15:22:44 +01:00
Justin DiRose ab9b81471b
UX: Adjust repurchase styles to look better (#53)
Suggested here: https://meta.discourse.org/t/subscriptions-suggestions-for-interface-improvements/177970

Changes order and alignment so it makes a bit more sense in the UX of the /s route. Otherwise it looks too cluttered. This specifically impacted products that can be repurchased.
2021-02-15 15:17:45 -06:00
Discourse Translator Bot cab037574c
Update translations (#51) 2021-02-09 14:46:37 +01:00
Justin DiRose a282475da3
FEATURE: Admin > Subscriptions Pagination (#50)
Meta topic: https://meta.discourse.org/t/subscriptions-add-pagination-to-admin-subscriptions-view/172500

This adds support for pagination using our `{{load-more}}` component in core. Implementation on the backend was a bit tricky because we don't return all results from Stripe, only those that match local subscriptions stored in the `DiscourseSubscriptions::Subscription` model.
2021-02-05 11:57:53 -06:00
Discourse Translator Bot eaf1729f6f
Update translations (#49) 2021-02-02 14:37:20 +01:00
Justin DiRose 072b558d40
FEATURE: Give option to repurchase products multiple times (#46)
Feature requested here: https://meta.discourse.org/t/subscriptions-allow-users-to-purchase-one-time-products-multiple-times/173732/

There may be cases where a site admin wants to allow the repurchasing of a product. This implements the functionality by adding a repurchaseable toggle in the admin screen when creating a product. This saves an attribute to the Stripe product metadata.

When a user has already purchased an item with this toggle enabled, they will be able to purchase it again when browsing to `/s`.
2021-01-31 14:17:44 -06:00
Joffrey JAFFEUX 3f8fca3246
DEV: prettier 2.2.1 (#48) 2021-01-27 10:38:33 +01:00
Discourse Translator Bot 49c49fe36e
Update translations (#47) 2021-01-26 14:48:14 +01:00
Discourse Translator Bot 1c298d8fa4
Update translations (#45) 2021-01-19 15:47:39 +01:00
Justin DiRose 400313cded
FEATURE: Allow creation of coupons in admin panel (#43)
Adds full support to create coupon/promo codes in the Admin > Plugins > Subscriptions section of the plugin. The Create Coupon button opens a form on the same page, and the active checkboxes toggle the active status of the coupon code.
2021-01-13 11:47:22 -06:00