diff --git a/.github/workflows/plugin-linting.yml b/.github/workflows/plugin-linting.yml index d0e6e60..6161090 100644 --- a/.github/workflows/plugin-linting.yml +++ b/.github/workflows/plugin-linting.yml @@ -50,7 +50,7 @@ jobs: - name: Ember template lint if: ${{ always() }} - run: yarn ember-template-lint assets/javascripts + run: yarn ember-template-lint --no-error-on-unmatched-pattern assets/javascripts - name: Rubocop if: ${{ always() }} diff --git a/Gemfile.lock b/Gemfile.lock index b5197eb..3349b7f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,31 +8,30 @@ GEM remote: https://rubygems.org/ specs: ast (2.4.2) - parallel (1.20.1) - parser (3.0.1.1) + parallel (1.22.1) + parser (3.1.2.0) ast (~> 2.4.1) - rainbow (3.0.0) - regexp_parser (2.1.1) + rainbow (3.1.1) + regexp_parser (2.5.0) rexml (3.2.5) - rubocop (1.18.2) + rubocop (1.30.1) parallel (~> 1.10) - parser (>= 3.0.0.0) + parser (>= 3.1.0.0) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) - rexml - rubocop-ast (>= 1.7.0, < 2.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.18.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 3.0) - rubocop-ast (1.7.0) - parser (>= 3.0.1.1) - rubocop-discourse (2.4.2) + rubocop-ast (1.18.0) + parser (>= 3.1.1.0) + rubocop-discourse (2.5.0) rubocop (>= 1.1.0) rubocop-rspec (>= 2.0.0) - rubocop-rspec (2.4.0) - rubocop (~> 1.0) - rubocop-ast (>= 1.1.0) + rubocop-rspec (2.11.1) + rubocop (~> 1.19) ruby-progressbar (1.11.0) - unicode-display_width (2.0.0) + unicode-display_width (2.1.0) PLATFORMS ruby diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-coupons.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-coupons.hbs index 1ea9127..4a43bc9 100644 --- a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-coupons.hbs +++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-coupons.hbs @@ -1,6 +1,12 @@ {{#if model.unconfigured}}
{{i18n "discourse_subscriptions.admin.unconfigured"}}
-{{i18n "discourse_subscriptions.admin.on_meta"}}
++ + {{i18n "discourse_subscriptions.admin.on_meta"}} + +
{{else}} {{#if model}}{{coupon.code}} | {{coupon.discount}} | {{coupon.times_redeemed}} | -{{input type="checkbox" checked=coupon.active click=(action "toggleActive" coupon)}} | ++ {{input + type="checkbox" + checked=coupon.active + click=(action "toggleActive" coupon) + }} + |
{{d-button
action=(action "deleteCoupon")
@@ -43,6 +55,9 @@
{{/unless}}
{{#if creating}}
- {{create-coupon-form cancel=(action "closeCreateForm") create=(action "createNewCoupon")}}
+ {{create-coupon-form
+ cancel=(action "closeCreateForm")
+ create=(action "createNewCoupon")
+ }}
{{/if}}
{{/if}}
diff --git a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-dashboard.hbs b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-dashboard.hbs
index 4be4370..43fbd4c 100644
--- a/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-dashboard.hbs
+++ b/assets/javascripts/discourse/templates/admin/plugins-discourse-subscriptions-dashboard.hbs
@@ -5,11 +5,33 @@
|