Merge branch 'release/v1.8.4'

CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased] changes
 
+## [v1.8.4] - 2021-08-14
+
+### Fixed
+- Fix ordering of transactions on summary page
+
 ## [v1.8.3] - 2021-08-13
 
 ### New
@@ -285,7 +290,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Account overview with list of all accounts and balances for each
 
 
-[Unreleased]: https://github.com/odinsride/olubalance/compare/v1.8.3...develop
+[Unreleased]: https://github.com/odinsride/olubalance/compare/v1.8.4...develop
+[v1.8.4]: https://github.com/odinsride/olubalance/compare/v1.8.3...v1.8.4
 [v1.8.3]: https://github.com/odinsride/olubalance/compare/v1.8.2...v1.8.3
 [v1.8.2]: https://github.com/odinsride/olubalance/compare/v1.8.1...v1.8.2
 [v1.8.1]: https://github.com/odinsride/olubalance/compare/v1.8.0...v1.8.1

app/models/transaction.rb

@@ -30,8 +30,8 @@ class Transaction < ApplicationRecord
 
   scope :with_balance, -> { includes(:transaction_balance).references(:transaction_balance) }
   scope :desc, -> { order('pending DESC, trx_date DESC, id DESC') }
-  scope :recent, -> { where('created_at > ?', 3.days.ago) }
-  scope :pending, -> { where(pending: true) }
+  scope :recent, -> { where('created_at > ?', 3.days.ago).order('trx_date, id') }
+  scope :pending, -> { where(pending: true).order('trx_date, id') }
 
   scope :search, lambda { |query|
     query = sanitize_sql_like(query)

config/application.rb

@@ -23,7 +23,7 @@ class Application < Rails::Application
     config.load_defaults 6.0
 
     # olubalance Version
-    config.version = "1.8.3"
+    config.version = "1.8.4"
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers