diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index c798c5c..2c1c46a 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -14,12 +14,12 @@ module DiscoursePatrons if %w(created_at amount).include?(params[:order]) { params[:order] => ascending } else - { created_at: :asc } + { created_at: :desc } end end def ascending - if params[:ascending] == 'false' + if params[:descending] == 'false' :desc else :asc diff --git a/app/controllers/patrons_controller.rb b/app/controllers/patrons_controller.rb index b5f16f9..10de186 100644 --- a/app/controllers/patrons_controller.rb +++ b/app/controllers/patrons_controller.rb @@ -42,7 +42,7 @@ module DiscoursePatrons ) Payment.create( - user_id: response[:customer], + user_id: response[:metadata][:user_id], payment_intent_id: response[:id], receipt_email: response[:receipt_email], url: response[:charges][:url], diff --git a/assets/javascripts/discourse/controllers/admin-plugins-discourse-patrons.js.es6 b/assets/javascripts/discourse/controllers/admin-plugins-discourse-patrons.js.es6 index e15a169..eeaf139 100644 --- a/assets/javascripts/discourse/controllers/admin-plugins-discourse-patrons.js.es6 +++ b/assets/javascripts/discourse/controllers/admin-plugins-discourse-patrons.js.es6 @@ -1,14 +1,14 @@ export default Ember.Controller.extend({ - queryParams: ["order", "ascending"], + queryParams: ["order", "descending"], order: null, - ascending: true, + descending: true, actions: { loadMore() {}, orderPayments(order) { if (order === this.get("order")) { - this.toggleProperty("ascending"); + this.toggleProperty("descending"); } this.set("order", order); diff --git a/assets/javascripts/discourse/routes/admin-plugins-discourse-patrons.js.es6 b/assets/javascripts/discourse/routes/admin-plugins-discourse-patrons.js.es6 index 0b1b1f3..275e792 100644 --- a/assets/javascripts/discourse/routes/admin-plugins-discourse-patrons.js.es6 +++ b/assets/javascripts/discourse/routes/admin-plugins-discourse-patrons.js.es6 @@ -5,7 +5,7 @@ export default Discourse.Route.extend({ order: { refreshModel: true }, - ascending: { + descending: { refreshModel: true } }, @@ -15,7 +15,7 @@ export default Discourse.Route.extend({ method: "get", data: { order: params.order, - ascending: params.ascending + descending: params.descending } }).then(results => results); }