Andy Brett
23494c918d
Merge pull request #7143 from cillian/shorter-transient-data-retention-period
...
Reduce retention period of Spree state changes and log entries from 6 to 3 months
2021-03-18 11:28:29 -07:00
Andy Brett
afa7269f48
Merge branch 'master' into render_plain
2021-03-18 10:53:13 -07:00
Matt-Yorkley
be3e184651
Merge pull request #6973 from Matt-Yorkley/adjustments-line-item-taxes
...
[Adjustments] Update line item taxes
2021-03-18 11:50:01 +01:00
Matt-Yorkley
064f7582cc
Update line_item included taxes
...
Drops use of the `spree_adjustments.included_tax` database field (when summing line item tax), which we are slowly deprecating before eventual removal
2021-03-17 22:23:04 +00:00
Matt-Yorkley
237075dd47
Replace deprecated before_filter syntax
2021-03-17 15:15:26 +00:00
Cillian O'Ruanaidh
a80e1b7625
Reduce retention period of Spree state changes and log entries from 6 to 3 months
...
The UK instance noticed Spree state changes and log entries seem to be filling up quite quickly.
Fixes #7123
2021-03-17 12:12:45 +00:00
Pau Pérez Fabregat
51f63060a4
Merge pull request #6879 from coopdevs/customer-balance-bulk-coop-report
...
Customer balance bulk coop report
2021-03-17 12:08:44 +01:00
Luis Ramos
cb8fd2131e
Use body: nil instead of deprecated nothing:
...
Ideally we would be using render head status but it's issuing quite a lot of double render problems, we can improve later
2021-03-16 23:13:58 +00:00
Pau Perez
16647006c6
Feature-test payments report
...
This report displays order balances and we'll need this basic
feature-test coverage to ensure it keeps working once we refactor them.
2021-03-16 17:05:31 +01:00
Matt-Yorkley
e78fb784c6
Merge pull request #7042 from coopdevs/fix-money-object-deprecation-warnings
...
Fix money object deprecation warnings
2021-03-16 14:30:51 +01:00
Andy Brett
6996001580
add defensive checking for stripe response
2021-03-13 10:58:30 +00:00
Matt-Yorkley
304da48d50
Remove dual boot
2021-03-11 12:19:54 +00:00
Matt-Yorkley
c5feb19e5b
Fix use of ActiveRecord::Type::Boolean#type_cast_from_database
...
This method longer exists.
2021-03-11 12:06:00 +00:00
Pau Perez
0eb14bc0a4
Do not modify the HTML returned by Money gem
...
It was due to these lines that we were returning a broken HTML tag but
also, there's no need to remove blanks.
2021-03-10 16:29:09 +01:00
Pau Perez
96bcde61a3
Fix Money deprecation warning with :html_wrap
...
This fixes the following deprecation warning
```
[DEPRECATION] `html` is deprecated - use `html_wrap` instead. Please
note that `html_wrap` will wrap all parts of currency and if you use
`with_currency` option, currency element class changes from `currency`
to `money-currency`.
```
2021-03-08 13:03:00 +01:00
Pau Perez
485449e289
Fix Money gem deprecation warning with :format
...
This removes millions of deprecation warnings like the following
```
[DEPRECATION] `symbol_position: :before` is deprecated - you can replace it with `format: %u %n`
```
from the build. It gets printed every time a `Spree::Money` is instantiated.
This should result in a non-negligible speed up of the test suite.
2021-03-08 13:03:00 +01:00
Matt-Yorkley
b1bf2487e2
Update adjustment scope use in Xero Invoices report
2021-03-04 14:27:02 +00:00
Matt-Yorkley
e33950721c
Change misleading method name in Xero Invoices code
2021-03-04 14:27:02 +00:00
Matt-Yorkley
55db911334
Update sales tax report
2021-03-04 14:27:02 +00:00
Pau Perez
f67b45a580
Reuse query object in Reports::LineItems
...
This almost removes the responsibility of fetching orders from this
class, that has too many. Ideally, I'd go on and leave this up to the
caller of this class making `Reports::LineItems` rely completely on the
passed in `orders_relation`. Not today.
2021-03-03 18:21:43 +01:00
Pau Perez
72597ea3f9
Optionally inject orders relation
...
So we can fetch them differently if we need to. Spoiler: we do in the
bulk coop report.
2021-03-03 18:21:07 +01:00
Pau Perez
fce98da88d
Reject line items in a more succinct way
...
Thanks for the suggestion @mkllnk!
2021-03-03 18:19:26 +01:00
Pau Perez
d00a35e12c
Split long statement
2021-03-03 18:19:26 +01:00
Pau Perez
a3b2a25ccf
Refactor and reuse :not_state scope
2021-03-03 18:19:26 +01:00
Matt-Yorkley
9852470ef6
Merge pull request #6913 from Matt-Yorkley/rails-5-backports
...
Rails 5 backports
2021-02-23 11:55:31 +01:00
Matt-Yorkley
0e3429dc35
Merge pull request #6758 from Matt-Yorkley/enterprise-fees-refactor
...
Enterprise fees refactor
2021-02-22 17:59:18 +01:00
Matt-Yorkley
c8824ec59f
Fix undefined method #push on ActiveRecord::Relation
2021-02-18 11:00:24 +00:00
Pau Pérez Fabregat
8068c6015f
Merge pull request #6836 from coopdevs/customer-balance-reports
...
Customer balance reports
2021-02-17 17:34:37 +01:00
Pau Perez
36ce39a217
Sort OC report orders by completed_at
...
This is then consistent with the ordering we use to list orders in
/admin, which is more useful. As a result, the test is also more robust.
2021-02-16 13:25:21 +01:00
Pau Pérez Fabregat
b7af92abb2
Merge pull request #6801 from coopdevs/toggle-customer-balance-to-entire-instance
...
Toggle customer balance to entire instance
2021-02-10 17:32:35 +01:00
Matt-Yorkley
12a513c54c
Apply an upstream fix to Spree::I18n
...
See: fe95f637c9
2021-02-08 22:14:42 +00:00
Pau Perez
cbfea1ba97
Hide new report's balance under toggle
2021-02-08 19:43:45 +01:00
Pau Perez
e4319b06e6
Take into account other finalized order states
...
This makes it consistent with other places where we show order balances.
Here though, we purposefully skip canceled ones.
2021-02-08 19:34:42 +01:00
Pau Perez
a66d1b7299
Compute order balance chaining with query object
2021-02-08 19:34:42 +01:00
Pau Perez
106dcbae01
Add test coverage to the two distinct output rows
2021-02-08 19:34:42 +01:00
Pau Perez
412bb24e42
Ensure report rows are always in the same order
...
I saw the row were returned not respecting any ordering when refreshing
the page locally. It made it hard to debug whether or not the customer
balance was right.
It's less than ideal to use `allow_any_instance_of` but with this legacy
and very coupled code, it's the best we can do.
2021-02-08 19:34:42 +01:00
Maikel
173cf9e536
Merge pull request #6565 from Matt-Yorkley/adjustments-inclusive
...
[Adjustments] Improve inclusive/additional tax recording
2021-02-08 09:38:31 +11:00
Pau Perez
d6350c3d0b
Remove deprecated Feature class implementation
...
This became dead code now.
2021-02-04 10:20:54 +01:00
Pau Perez
14cee0e45d
Add new Feature class to toggle based on a closure
...
This enables toggling features as best fits us in each case. With this
new approach we can then toggle :customer_balance to an entire instance,
which is what we want in France.
2021-02-04 10:20:54 +01:00
Matt-Yorkley
e7866db7b1
Improve efficiency in applying enterprise fees in Order#update_distribution_charge!
2021-01-29 18:32:26 +00:00
Matt-Yorkley
4f7c8062a1
Create class to map join table and simplify code
2021-01-28 21:51:50 +00:00
Matt-Yorkley
85c489d303
Ignore carts with failed payments in cleanup
2021-01-27 22:40:23 +00:00
Matt-Yorkley
e6c59fbd96
Update data retention periods
...
Sessions and cart data are removed if older than 3 months, instead of 6.
2021-01-27 22:40:23 +00:00
Matt-Yorkley
3fddaba4bf
Extract private methods
2021-01-27 22:40:23 +00:00
Matt-Yorkley
0a88712926
Clear orphaned records in join table spree_option_value_line_items
2021-01-27 22:40:23 +00:00
Matt-Yorkley
4230d46a06
Remove carts older than 6 months
2021-01-27 22:40:23 +00:00
Maikel
8a757812e7
Merge pull request #6735 from coopdevs/enable-mail-delivery-always
...
Enable mail delivery always
2021-01-28 09:31:12 +11:00
Pau Pérez Fabregat
9fe2cb1a30
Merge pull request #6681 from luisramos0/css
...
[Rails 5] Make the app work in rails 5
2021-01-27 12:08:27 +01:00
Pau Perez
4a5869b60c
Remove ability to toggle mail delivery
...
OFN requires mails to work so there's no point in having this
conditional with the maintenance cost it entails.
2021-01-25 13:27:44 +01:00
Matt-Yorkley
a328a9bc1b
Use included boolean in tax adjustments
2021-01-23 03:59:32 +00:00
