raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-01 21:47:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,608 Commits 18 Branches 452 Tags
20c41ce69e04299a6bf821094de21f63f678dcc2
Commit Graph

15608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt-Yorkley
4ef682915c Eager-load option_values in Admin::EnterprisesController 2019-11-23 10:58:18 +01:00
Matt-Yorkley
e693e8ac37 Eager-load option_values in Admin::BulkLineItemsController 2019-11-23 10:58:18 +01:00
Matt-Yorkley
07fe8e8390 Eager-load option_values in various reports 2019-11-23 10:58:18 +01:00
Matt-Yorkley
6e58ffa927 Enable variant option_values to be successfully eager-loaded 2019-11-23 10:58:18 +01:00
Transifex-Openfoodnetwork
8a8e612fd3 Updating translations for config/locales/fr.yml 2019-11-23 06:03:21 +11:00
Transifex-Openfoodnetwork
1e8ad4748a Updating translations for config/locales/fr.yml 2019-11-23 06:00:16 +11:00
Transifex-Openfoodnetwork
4c346549f5 Updating translations for config/locales/en_FR.yml 2019-11-23 05:58:47 +11:00
Transifex-Openfoodnetwork
427e44aee9 Updating translations for config/locales/fr.yml 2019-11-23 05:57:03 +11:00
Transifex-Openfoodnetwork
8dfc62b206 Updating translations for config/locales/ar.yml 2019-11-23 02:57:34 +11:00
Transifex-Openfoodnetwork
ef4a99eadc Updating translations for config/locales/ar.yml 2019-11-23 02:54:27 +11:00
Transifex-Openfoodnetwork
8337e43e64 Updating translations for config/locales/ar.yml 2019-11-23 02:51:17 +11:00
Luis Ramos
689eb88332 Merge pull request #4450 from luisramos0/return_auth 
Move return authorizations from spree_backend to OFN
 2019-11-22 14:33:45 +00:00
Matt-Yorkley
698210c849 Create release-template.md 2019-11-22 14:48:50 +01:00
luisramos0
e2087bcc8c Bring return authorizations view from spree_backend 2019-11-22 13:39:36 +00:00
luisramos0
b066b87141 Bring return authorizations controller from spree_backend 2019-11-22 13:39:04 +00:00
Matt-Yorkley
d88a766de4 Merge pull request #4461 from openfoodfoundation/dependabot/bundler/i18n-js-3.5.0 
Bump i18n-js from 3.4.2 to 3.5.0
 2019-11-22 14:37:10 +01:00
Matt-Yorkley
6c7910c8fa Merge pull request #4477 from openfoodfoundation/transifex 
Transifex
 2019-11-22 14:30:05 +01:00
Transifex-Openfoodnetwork
f83d469833 Updating translations for config/locales/en_CA.yml 2019-11-22 08:25:52 +11:00
Transifex-Openfoodnetwork
1cea5327e9 Updating translations for config/locales/en_CA.yml 2019-11-22 08:13:47 +11:00
dependabot-preview[bot]
6df7ec9dbd Bump ddtrace from 0.28.0 to 0.29.0 
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.28.0 to 0.29.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.28.0...v0.29.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-21 19:20:49 +00:00
dependabot-preview[bot]
0f7357166d Bump rspec-retry from 0.6.1 to 0.6.2 
Bumps [rspec-retry](https://github.com/noredink/rspec-retry) from 0.6.1 to 0.6.2.
- [Release notes](https://github.com/noredink/rspec-retry/releases)
- [Changelog](https://github.com/NoRedInk/rspec-retry/blob/master/changelog.md)
- [Commits](https://github.com/noredink/rspec-retry/compare/v0.6.1...v0.6.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-21 19:17:49 +00:00
Transifex-Openfoodnetwork
26c854df5b Updating translations for config/locales/en_FR.yml 2019-11-21 21:18:34 +11:00
Transifex-Openfoodnetwork
a43ef174f6 Updating translations for config/locales/nb.yml 2019-11-21 21:13:56 +11:00
Transifex-Openfoodnetwork
99f8bf039a Updating translations for config/locales/fr.yml 2019-11-21 21:12:07 +11:00
Transifex-Openfoodnetwork
bdb2c6efb3 Updating translations for config/locales/nb.yml 2019-11-21 21:10:49 +11:00
Transifex-Openfoodnetwork
21512e9722 Updating translations for config/locales/fr.yml 2019-11-21 21:09:00 +11:00
Luis Ramos
008921c201 Merge pull request #4447 from luisramos0/clickable_steps 
Clickable steps on the OC edit page
 2019-11-20 21:16:07 +00:00
Luis Ramos
0882887abe Merge pull request #4452 from luisramos0/ready_for 
Make "Ready for" field show a red border when added to the list of outgoing exchanges
 2019-11-20 21:14:25 +00:00
Luis Ramos
0eb4574b37 Merge pull request #4422 from luisramos0/the_poc 
New Order Cycles edit page with steps
 2019-11-20 21:11:23 +00:00
Maikel
b54edff4cc Merge pull request #4470 from luisramos0/oc_perms 
Improve readability of OC permissions...
 2019-11-20 11:38:38 +11:00
Maikel
0d6911f41c Merge pull request #4467 from openfoodfoundation/transifex 
Transifex
 2019-11-20 08:04:54 +11:00
Luis Ramos
498acaefbc Merge pull request #4469 from Matt-Yorkley/shipping_selection 
Fix shipping_rate fetching in customer_totals_report
 2019-11-19 09:39:13 +00:00
Maikel Linke
50093c325a Move checkout locking to its own service 
It gives this complex logic more space and allows for better structure
and more comments at the right places.
 2019-11-19 18:18:01 +11:00
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
Matt-Yorkley
585135d27e Fix shipping_method querying in customer totals reports 2019-11-18 15:14:10 +00:00
Matt-Yorkley
06fabe491d Add failing shipping_methods spec 2019-11-18 15:06:54 +00:00
luisramos0
052cc2848f Make visible_variants_for_incoming_exchanges_from and editable_variants_for_incoming_exchanges_from a bit easier to read 2019-11-18 13:25:38 +00:00
Transifex-Openfoodnetwork
b5b9d42764 Updating translations for config/locales/nb.yml 2019-11-18 19:04:54 +11:00
Transifex-Openfoodnetwork
d8e2239438 Updating translations for config/locales/nb.yml 2019-11-18 19:01:46 +11:00
Transifex-Openfoodnetwork
403ca3e538 Updating translations for config/locales/nb.yml 2019-11-18 18:58:37 +11:00
Transifex-Openfoodnetwork
ed65c80869 Updating translations for config/locales/ar.yml 2019-11-17 02:51:01 +11:00
Transifex-Openfoodnetwork
ca6ec9ee68 Updating translations for config/locales/ar.yml 2019-11-17 02:47:54 +11:00
Transifex-Openfoodnetwork
04fa4d3587 Updating translations for config/locales/fr.yml 2019-11-16 22:49:18 +11:00
Transifex-Openfoodnetwork
eedbcb6f1e Updating translations for config/locales/fr.yml 2019-11-16 22:46:21 +11:00
Transifex-Openfoodnetwork
61e3798533 Updating translations for config/locales/en_FR.yml 2019-11-16 22:44:43 +11:00
Transifex-Openfoodnetwork
bca978aacc Updating translations for config/locales/en_CA.yml 2019-11-16 15:06:46 +11:00
Transifex-Openfoodnetwork
190cb1dede Updating translations for config/locales/en_NZ.yml 2019-11-16 07:30:50 +11:00