rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-21 15:54:22 +01:00
Code Issues Releases Activity

[bug] unable to list user's payment schedules in the dashboard

Browse Source
This commit is contained in:
Sylvain 2021-06-14 14:40:54 +02:00
parent 645efa37f4
commit ec301ba07e
4 changed files with 61 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -3,6 +3,7 @@
- Updated user's manual for v5
- Fix a bug: unable to process stripe payments with 3DS authentication
- Fix a bug: unable to book an event
- Fix a bug: unable to list user's payment schedules in the dashboard
## v5.0.2 2021 June 11

2
Procfile
View File

@ -1,4 +1,4 @@
web: bundle exec rails server puma -p $PORT
#web: bundle exec rails server puma -p $PORT
worker: bundle exec sidekiq -C ./config/sidekiq.yml
wp-client: bin/webpack-dev-server
wp-server: SERVER_BUNDLE_ONLY=yes bin/webpack --watch

2
app/controllers/api/payment_schedules_controller.rb
View File

@ -8,7 +8,7 @@ class API::PaymentSchedulesController < API::ApiController
def index
@payment_schedules = PaymentSchedule.where('invoicing_profile_id = ?', current_user.invoicing_profile.id)
.includes(:invoicing_profile, :payment_schedule_items, :subscription)
.includes(:invoicing_profile, :payment_schedule_items, :payment_schedule_objects)
.joins(:invoicing_profile)
.order('payment_schedules.created_at DESC')
.page(params[:page])

5
app/frontend/src/javascript/controllers/dashboard.js
View File

@ -12,7 +12,8 @@
*/
'use strict';
Application.Controllers.controller('DashboardController', ['$scope', 'memberPromise', 'trainingsPromise', 'SocialNetworks', function ($scope, memberPromise, trainingsPromise, SocialNetworks) {
Application.Controllers.controller('DashboardController', ['$scope', 'memberPromise', 'trainingsPromise', 'SocialNetworks', 'growl',
function ($scope, memberPromise, trainingsPromise, SocialNetworks, growl) {
// Current user's profile
$scope.user = memberPromise;
@ -78,6 +79,6 @@ Application.Controllers.controller('DashboardController', ['$scope', 'memberProm
// !!! MUST BE CALLED AT THE END of the controller
return initialize();
}
}
]);