raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-11 23:17:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,627 Commits 19 Branches 453 Tags
55018260dffae2ea3ddfc32285be511ed02c38bf
Commit Graph

298 Commits

Author SHA1 Message Date
Andy Brett
a7331efd67 Merge pull request #7477 from luisramos0/require_dependency 
Remove require_dependency or use require
 2021-05-05 13:24:19 -07:00
Matt-Yorkley
e9b6f89ae0 Update params syntax in engine controller specs 2021-05-03 14:17:54 +01:00
Matt-Yorkley
c7ce10f998 Handle order objects with no distributor 2021-04-30 11:12:41 +01:00
Matt-Yorkley
5b29243847 Delete unused method Stock::Package#currency 2021-04-30 11:10:20 +01:00
Matt-Yorkley
3897c3af68 Refactor Stock::Package#shipping_methods 2021-04-30 11:10:20 +01:00
Matt-Yorkley
c3c396eaea Add soft-deletion test coverage to Package#shipping_methods 2021-04-30 11:10:19 +01:00
Matt-Yorkley
0291a7c471 Merge pull request #7482 from Matt-Yorkley/updater-update 
Updater update
 2021-04-29 21:12:15 +02:00
Pau Pérez Fabregat
6c5db0f836 Merge pull request #7507 from Matt-Yorkley/shipment-state-update 
Shipment callback state update
 2021-04-29 12:01:55 +02:00
Matt-Yorkley
290c1d0ebf Bring in shipment state updating from Spree 2.2 2021-04-28 21:43:28 +01:00
Matt-Yorkley
f52d03fbf4 Refactor Order::Updater#update so we don't call update_totals twice 
Calling this method twice on every update is really expensive and not necessary.
 2021-04-26 11:46:05 +01:00
Luis Ramos
f357c3ff30 Remove require_dependency or use require 
See here https://edgeguides.rubyonrails.org/upgrading_ruby_on_rails.html#require-dependency
 2021-04-23 19:20:25 +01:00
Andy Brett
5e21480ae0 add packer spec 2021-04-23 09:35:27 -07:00
Andy Brett
56cf43f1c1 scope variant to take overrides into account in packer 2021-04-22 11:45:12 -07:00
Pau Perez
5bca7d1f8f Remove the old balance's code branch 
This keeps the `OrderBalance` abstraction but removes the old code now
that the feature is enabled for all users in all instances and there are
no bugs reported. It's become dead code.
 2021-04-19 11:52:41 +02:00
Matt-Yorkley
b6038c01a3 Remove references to Adjustment source 2021-04-14 12:01:21 +01:00
Pau Perez
5cf4aecc26 Enable customer_balance toggle in tests 
This makes all tests exercise the new branch that `OrderBalance`
abstracts. It follows up #7363 addressing code review comments.
 2021-04-12 09:31:23 +02:00
Andy Brett
d00970e05d Merge pull request #7207 from andrewpbrett/fix-nil-price-subs 
Report subscription failures
 2021-04-09 12:13:11 -07:00
Matt-Yorkley
d635d70add Update Order::Updater adjustment handling 2021-04-04 19:19:06 +01:00
Matt-Yorkley
a8366a3a72 Update Order::Updater totals counts 2021-04-04 19:19:06 +01:00
Matt-Yorkley
3f14694b2b Merge pull request #6960 from andrewpbrett/namespace-api 
Namespace existing API endpoints to api/v0/*
 2021-03-30 19:45:27 +02:00
Andy Brett
a67038720c Merge pull request #7255 from mkllnk/fail-on-translations 
Raise errors in specs with missing translations
 2021-03-30 08:37:15 -07: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
Maikel Linke
0980b81742 Raise errors in specs with missing translations 
The previous mechanism didn't seem to work and newer Rails versions have
an easier config for this now.

Also fixing all i18n errors which were now failing specs.
 2021-03-30 17:08:17 +11:00
Andy Brett
61a39311b4 improve specs 2021-03-29 22:51:40 -07:00
Andy Brett
3664b86e03 ignore long module in rubocop 2021-03-29 14:53:13 -07:00
Andy Brett
d0d3b73257 add specs 2021-03-29 14:53:13 -07:00
Andy Brett
9d2fd373ce record subscription issue if no order is generated 2021-03-29 14:53:13 -07:00
Andy Brett
d92510db56 fix some easy rubocop offenses 2021-03-27 11:21:18 -07:00
Andy Brett
5a19a14042 rename to v0 2021-03-27 11:21:18 -07:00
Matt-Yorkley
2ccaf80013 Update EnterpriseFeeSummary report scopes 2021-03-23 18:19:06 +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
Pau Perez
1a1552a6ed Make OrderUpdater use new balance implementation 
In this class we properly calculated the balance taking into account the
orders in cancellation state so we need to use the new implementation if
we don't want to introduce a regression by using
`#old_oustanding_balance`.

I was initially a bit dubious because this method was checking
`order.payments` as well but now I see that was redundant. Is on
`payment_total` to take into account whether or not the order is paid or
any other payment related details.
 2021-03-22 11:45:12 +01:00
Pau Perez
9762275555 Use old_outstanding_balance on disabled toggle 
No need to go through the `OrderBalance` in this context since we
already check for the toggle.
 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
Pau Pérez Fabregat
72b3dbbf44 Merge pull request #7149 from coopdevs/rearrange-order-updater-specs 
Rearrange order updater tests to make them method-centric
 2021-03-18 15:53:37 +01:00
Pau Pérez Fabregat
71b902d9d2 Merge pull request #6980 from drummer83/clean-footer 
Cleaner and consistent design of front-end footer
 2021-03-18 15:53:09 +01:00
Matt-Yorkley
62a495a42e Allow line item enterprise fees to be found in EnterpriseFeeSummary report 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
Pau Perez
93bc60664a Fix long lines 2021-03-18 10:00:33 +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
Pau Perez
b48677c624 Rearrange tests to make them method-centric 
If these are unit tests, it's much easier to find a `describe` with the
method under test and putting all the tests exercising that method
together.

It turns out that `#update_payment_state` is by far the method that we
test the most which leads me to think:

a) this class might be doing too many things.
b) other methods might not be that well covered.
 2021-03-17 17:05:19 +01:00
Matt-Yorkley
237075dd47 Replace deprecated before_filter syntax 2021-03-17 15:15:26 +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
Matt-Yorkley
dcf982c1c3 Fix params mangling issues in SubscriptionsController 2021-03-11 12:06:00 +00:00
Matt-Yorkley
2fdb1861a6 Fix uses of ActionController::TestResponse in specs 
This class has moved / changed slightly.
 2021-03-11 12:06:00 +00:00
Matt-Yorkley
791a47d170 Merge pull request #6858 from Matt-Yorkley/adjustments-shipping-cost 
[Adjustments] Move shipping adjustment from order to shipment
 2021-03-11 12:17:14 +01:00
Pau Perez
5c74668726 Make test rely on container rather than parent 
This decouples it a bit from the actual HTML markup and makes it a bit
more resilient.
 2021-03-08 16:20:07 +01:00
Matt-Yorkley
9deadc8ae1 Simplify order.adjustment_total sum 2021-03-04 14:27:02 +00:00
Matt-Yorkley
00f116f35f Update Order::Updater to include shipment adjustments 2021-03-04 14:27:01 +00:00
Matt-Yorkley
9ed6ae588f Update EnterpriseFeeSummary report adjustment scopes 2021-03-04 14:27:01 +00:00