raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,535 Commits 17 Branches 455 Tags
4288428c70cb8bb5b5862d628ee0728dfcbb7418
Commit Graph

13535 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel Linke
4288428c70 Separating concurrency spec as it's entirely different 2019-11-19 18:18:01 +11:00
Maikel Linke
dc122a9450 Fix infinite loop in spec 
The spec was setting the order's state to "complete" but didn't save
that state to the database. The new locking mechanism is was reloading
the order which loaded the cart state again. And since the order.next
method was mocked to just return true, the controller was trying to do
that in an infinite loop.
 2019-11-19 18:18:01 +11:00
Maikel Linke
ec1b5a7a92 Test concurrent checkouts 
When two people tried to buy the same item at the same time, it was
possible to oversell the item and end up with negative stock.

Parallel checkouts could also lead to other random failures. This spec
is testing that scenario by starting two threads which would run into a
race condition unless they use effective synchronisation. The added spec
fails if the synchronisation is removed from the CheckoutController.
 2019-11-19 18:18:01 +11:00
Maikel Linke
df2306cf82 Lock variants during checkout to avoid race condition 
It was possible that several people bought the same variant even though
there wasn't enough stock for everybody. That resulted in negative
stock.
 2019-11-19 18:18:01 +11:00
Luis Ramos
9c8c71bd08 Merge pull request #4443 from openfoodfoundation/dependabot/bundler/roadie-rails-1.3.0 
Bump roadie-rails from 1.1.1 to 1.3.0
 2019-11-15 16:48:23 +00:00
Luis Ramos
2b37592280 Merge pull request #4449 from luisramos0/properties 
Move properties and product properties from spree_backend to OFN
 2019-11-15 08:57:32 +00:00
luisramos0
8546e11ffc Update all locales with the latest Transifex translations 2019-11-14 13:34:29 +00:00
Luis Ramos
76659d63d8 Merge pull request #4464 from openfoodfoundation/transifex 
Transifex
 2019-11-14 13:32:04 +00:00
Transifex-Openfoodnetwork
4d9cbf5d16 Updating translations for config/locales/nb.yml 2019-11-15 00:07:13 +11:00
Transifex-Openfoodnetwork
2166791554 Updating translations for config/locales/nb.yml 2019-11-15 00:04:04 +11:00
Luis Ramos
879e2f5c3a Merge pull request #4444 from openfoodfoundation/dependabot/bundler/wkhtmltopdf-binary-0.12.5 
Bump wkhtmltopdf-binary from 0.12.4 to 0.12.5
 2019-11-14 12:07:34 +00:00
Luis Ramos
471ec2023e Merge pull request #4426 from Matt-Yorkley/customer_totals 
Orders and Fulfilment reports
 2019-11-14 12:07:16 +00:00
Luis Ramos
5026afc011 Merge pull request #4141 from Matt-Yorkley/oc_performance 
OC performance
 2019-11-14 11:24:16 +00:00
Maikel
7c9cdccb49 Merge pull request #4460 from openfoodfoundation/transifex 
Transifex
 2019-11-13 10:29:22 +11:00
Transifex-Openfoodnetwork
19fbdb1848 Updating translations for config/locales/ar.yml 2019-11-13 05:24:53 +11:00
Transifex-Openfoodnetwork
c9b53022f2 Updating translations for config/locales/ar.yml 2019-11-13 05:21:47 +11:00
Pau Pérez Fabregat
a00b770229 Merge pull request #4459 from coopdevs/temporarily-disable-flaky-spec 
Temporarily disable flaky line item spec
 2019-11-12 13:59:02 +01:00
Pau Perez
16f570b8f7 Temporarily disable flaky line item spec 
This is causing almost all PRs to fail in CI and blocking our delivery
pipe. We're already working on a solution in
https://github.com/openfoodfoundation/openfoodnetwork/pull/4458.
 2019-11-12 13:23:04 +01:00
Luis Ramos
49bd21f29a Merge pull request #4456 from openfoodfoundation/dependabot/bundler/i18n-js-3.4.2 
Bump i18n-js from 3.4.1 to 3.4.2
 2019-11-12 12:09:34 +00:00
Matt-Yorkley
1a5eea3303 Refactor #all_incoming_editable_variants 2019-11-12 11:59:39 +00:00
Matt-Yorkley
a1146aed1b Refactor #sort_by_supplier_id 2019-11-12 11:59:39 +00:00
Matt-Yorkley
ab30307b1a Simplify #active_outgoing_variants 2019-11-12 11:59:39 +00:00
Matt-Yorkley
35b68239b0 Tidy up AR query syntax 2019-11-12 11:59:39 +00:00
Matt-Yorkley
9e09a3b379 Memoize #active_outgoing_variants result 2019-11-12 11:59:39 +00:00
Matt-Yorkley
77105e265e Memoize more repeated queries in #managed_enterprises 2019-11-12 11:59:38 +00:00
Matt-Yorkley
e73f2d682c Remove N+1 in editable_variants_for_incoming_exchanges 2019-11-12 11:59:13 +00:00
Matt-Yorkley
f4d71ae352 Fix order_cycle_permissions tests not running locally 2019-11-12 11:59:13 +00:00
Matt-Yorkley
c2823b3ffe Memoize #user_manages_coordinator_or result 2019-11-12 11:59:13 +00:00
Matt-Yorkley
c1366fced5 DRY some more variant queries 2019-11-12 11:59:13 +00:00
Matt-Yorkley
170bc94d92 Refactor order_cycle_serializer 2019-11-12 11:59:13 +00:00
Matt-Yorkley
2a5403e23f Clean up "visible and editable" variants 2019-11-12 11:59:13 +00:00
Matt-Yorkley
dc540444a2 Remove pointless code 2019-11-12 11:59:13 +00:00
Matt-Yorkley
ca5ecc4696 Refactor "active outgoing variants" 2019-11-12 11:59:13 +00:00
Matt-Yorkley
5082a133a1 Refactor adjustment fetching into new service and module 2019-11-12 11:57:54 +00:00
Matt-Yorkley
1f8e0ae637 Improve SupplierTotalsByDistributorReport 2019-11-12 11:57:19 +00:00
Matt-Yorkley
24e66b635b Improve DistributorTotalsBySupplierReport 2019-11-12 11:57:19 +00:00
Matt-Yorkley
891db4b81b Move methods to helper 2019-11-12 11:57:19 +00:00
Matt-Yorkley
8a57977b44 Increase eager-loading and adjustment calculations 2019-11-12 11:57:19 +00:00
Matt-Yorkley
77e70fd7d3 Eager-load adjustments and calculate in place 2019-11-12 11:57:19 +00:00
Matt-Yorkley
7b5e5f4039 Clean up OpenFoodNetwork::Permissions 2019-11-12 11:57:19 +00:00
Pau Pérez Fabregat
ed15bc422e Merge pull request #4453 from luisramos0/rubo 
run rubocop --auto-correct
 2019-11-12 10:30:21 +01:00
dependabot-preview[bot]
030747cff8 Bump i18n-js from 3.4.1 to 3.4.2 
Bumps [i18n-js](https://github.com/fnando/i18n-js) from 3.4.1 to 3.4.2.
- [Release notes](https://github.com/fnando/i18n-js/releases)
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/fnando/i18n-js/compare/v3.4.1...v3.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-11 19:15:49 +00:00
Luis Ramos
3e318e5c4e Merge pull request #4425 from Matt-Yorkley/admin_eager_loading 
Eager-load variant associations in admin ProductsController
 2019-11-11 15:29:45 +00:00
Luis Ramos
3eb4caeb3e Merge pull request #4408 from luisramos0/poc_oc 
Remove dead code from OC edit page code
 2019-11-11 14:55:37 +00:00
luisramos0
555ae12b35 Add exceptions to some unresolved rubocop issues 2019-11-10 19:40:41 +00:00
luisramos0
553d4ebaa0 Fix a few rubocop issues in reports code 2019-11-10 19:27:41 +00:00
luisramos0
73ee14cc7c Fix long line in injection helper 2019-11-10 19:21:08 +00:00
luisramos0
c9177feb19 Fix a few more rubocop issues manually 2019-11-10 19:14:12 +00:00
luisramos0
71ea281424 Regenerate rubocop todo files after last large fix of issues 2019-11-10 19:07:16 +00:00
luisramos0
9404aacfb2 run rubocop --auto-correct 2019-11-10 18:42:43 +00:00