raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-03 22:06:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,373 Commits 19 Branches 452 Tags
e5eb68dffc2b6fa336aa919fa29d1c382cc26edc
Commit Graph

1491 Commits

Author SHA1 Message Date
Pau Perez
e5eb68dffc Replace duplicate method with module inclusion 
No reason to risk diverging their implementations. They are exact
copies.

Likewise, there's no need to have to I18n keys with almost the same
content.
 2021-04-23 12:03:11 +02:00
Andy Brett
4aa2ce4b58 Merge pull request #7362 from richardc2117/master 
Fixes Alphabetical Sorting In Packing Reports
 2021-04-15 09:50:02 -07:00
Maikel
0c182c4606 Merge pull request #7259 from jibees/7193-implements-feature-toggle-with-flipper 
Implements feature toggle with flipper
 2021-04-15 11:33:12 +10:00
Matt-Yorkley
e323d016a2 Simplify arguments of #create_adjustment method 2021-04-14 12:01:21 +01:00
Matt-Yorkley
b6038c01a3 Remove references to Adjustment source 2021-04-14 12:01:21 +01:00
Matt-Yorkley
4bd7f964d0 Fix LocalizedNumber issues 2021-04-13 16:56:03 -07:00
Andy Brett
67e41f4548 remove check for connected? 2021-04-13 16:55:49 -07:00
Matt-Yorkley
39fa315ecc Guard against calls to the database during db:create 
Rails 5.2 has changed the way initializers are called during certain rake tasks including `db:create`. Initializers that were previously not loaded are now loaded (basically the whole app is loaded). This means any calls to #table_exists? that appear in the app will throw fatal errors as the database doesn't exist yet during that task, but those calls are made before `db:create` has even started, which means the database can't be created.

There are also a few other places in Spree code where #table_exists? is called, and they already call #connected? first to guard against this issue.
 2021-04-13 16:55:19 -07:00
Maikel Linke
5775051e35 Simplify FeatureToggle module 
This saves ten lines of code and makes the simplicity of the
FeatureToggle interface clearer.
 2021-04-12 18:26:18 +02:00
Maikel Linke
7a0912d5a4 Use Flipper within the OFN FeatureToggle interface 
This ensures that we keep the same interface as before and can migrate
to Flipper in a backwards-compatible way.
 2021-04-12 18:26:18 +02:00
Maikel Linke
b045a59685 Consider feature toggles without user as well 
This is running the same feature toggle logic when a user is given or no
user is given. This allows features to define what to do with guests.
 2021-04-12 18:26:18 +02:00
ricchen
61bb1bdcdc fix incorrect last name sorting for packing report 2021-04-08 22:47:04 -04:00
Matt-Yorkley
05b8b8e9db Fix outstanding balance sum in payment report 2021-04-07 10:56:20 +01:00
Matt-Yorkley
a26880a3a1 Update shipment tax fetching in Xero Invoices report 2021-04-04 19:19:06 +01:00
Matt-Yorkley
1d1b842e08 Delete dead code 2021-04-04 19:19:06 +01:00
Matt-Yorkley
7d3288ca53 Remove #to_package calls on shipment calculations 2021-04-04 19:19:06 +01:00
Matt-Yorkley
fcb8145a6c Bring in changes to Adjustment#update! and CalculatedAdjustments#update_adjustment 2021-03-30 16:39:40 +01:00
Pau Pérez Fabregat
7d5726b6c7 Merge pull request #7150 from coopdevs/use-order-balance-object 
Feature-toggle all remaining parts of the app where the order balance is shown
 2021-03-30 15:58:12 +02:00
Pau Pérez Fabregat
478008ac0d Merge pull request #7249 from Matt-Yorkley/engine-issues 
Engine issues
 2021-03-29 12:23:03 +02:00
Matt-Yorkley
110d1ef015 Ensure error code on failing tests 2021-03-28 17:33:55 +01:00
Luis Ramos
d66a78ecce Add magic comment 2021-03-26 23:42:07 +00:00
Luis Ramos
34771c89f9 Fix rspec syntax 2021-03-26 22:34:16 +00:00
Andy Brett
19c2c9c1c5 Merge pull request #7175 from openfoodfoundation/7130-notify-on-payment-intent-error 
Record invalid payment states for debugging
 2021-03-26 08:33:07 -07:00
Matt-Yorkley
0f5af2d9f1 Merge pull request #6927 from Matt-Yorkley/adjustments-payment-fee 
[Adjustments] Payment fee adjustment
 2021-03-25 17:40:53 +01:00
Pau Pérez Fabregat
914e6d5f21 Merge pull request #7196 from Matt-Yorkley/deprecations-uniq 
Deprecations: certain uses of #uniq
 2021-03-25 12:12:36 +01:00
Matt-Yorkley
f1e4612c05 Update deprecated uses of #uniq 
Enumerable#uniq is fine (eg calling #uniq on an Array object), but now using #uniq on an ActiveRecord::Relation is deprecated in favour of #distinct (which modifies the query itself, as opposed to iterating over the results of the query).
 2021-03-24 11:42:24 +00:00
Matt-Yorkley
5f4e3c75c7 Update deprecated errors.set syntax 
DEPRECATION WARNING: ActiveModel::Errors#set is deprecated and will be removed in Rails 5.1. Use model.errors.add(:preferred_discount_amount, ["has an invalid format. Please enter a number."]) instead. (called from block (2 levels) in localize_number at /home/runner/work/openfoodnetwork/openfoodnetwork/lib/spree/localized_number.rb:38)
 2021-03-23 20:11:59 +00:00
Matt-Yorkley
5840b0e33c Adapt adjustment interface for payment's adjustment being singular 
Payments only have one adjustment, all other adjustable objects have adjustments (plural).
 2021-03-23 18:19:37 +00:00
Matt-Yorkley
525fef14b1 Merge pull request #6974 from Matt-Yorkley/adjustments-line-item-fees 
[Adjustments] Update line item enteprise fees
 2021-03-23 19:06:02 +01:00
Andy Brett
e9c259ec98 remove unnecessary type check 2021-03-23 08:12:26 -07:00
Pau Perez
c7b85a3591 Sum balances in Payments report implementing #+ 
This avoids consumers of `OrderBalance` having to couple with the inner
details of this abstraction, which makes the code more changeable.
 2021-03-23 09:28:40 +01:00
Andy Brett
eff832c583 cleaner formatting 
Co-authored-by: Maikel <maikel@email.org.au>
 2021-03-22 20:47:12 -07:00
Andy Brett
2fbc5afce6 add rake task to catch all subfolders under /spec 2021-03-22 16:18:19 -07:00
Pau Perez
5082b6dc99 Make BalanceCalculator use old balance calculation 
This class is currently used and it gets skipped when the
:customer_balance toggle is enabled, so there's no point on abstracting
the balance with `OrderBalance`. It'll never go through its
`#new_outstanding_balance` branch and it'll be removed once we active
that toggle to everyone.
 2021-03-22 11:45:12 +01:00
Pau Perez
5815d1a4a4 Make #outstanding_balance return an OrderBalance 
This will let us branch by abstraction. All existing calls to
`#outstanding_balance` will go through `OrderBalance` hence, will
check the feature toggle.

Note that by default, `OrderBalance` will end up calling
`#old_outstanding_balance`. As the name states, that's exactly what
`#outstanding_balance` was so far. This means no consumers will see any
change in behavior. We just added on item in the call stack (sort of).
 2021-03-22 11:45:12 +01:00
Maikel Linke
fce8d3a2f8 Record invalid payment states for debugging 
We observed invalid payment states in Bugsnag but we don't actually know
in which state the payment intent was in. From the context we can guess
that it was "succeeded" but it would be good to validate this. And in
the future it would be good to know if there are other invalid states we
can end up in.

The notification to Bugsnag happens in another part of the code.
 2021-03-22 16:35:22 +11:00
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
a768cb2510 Set adjustment "target" (adjustable) to be the line item when adding enterprise fees on line items 2021-03-18 13:18:20 +00: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