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 |
|
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 |
|
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 |
|