Rob Harrington
7af11da901
Use a SubscriptionsCount query object to provide counts to IndexOrderCycleSerializer
2018-06-20 13:06:06 +10:00
Rob Harrington
d5b1041481
Preload subscription counts for serialization in order cycle collection actions
2018-06-20 13:06:06 +10:00
Rob Harrington
8770122eae
Request the subscription count for change warning each time, don't cache
2018-06-20 13:06:05 +10:00
Rob Harrington
86d7453d26
Ask user to confirm oc date change for open order cycles with subsciptions
2018-06-20 13:06:05 +10:00
Maikel Linke
bbe21b7804
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into issue-2297-edit-product-cancel
2018-06-20 10:31:17 +10:00
Matt-Yorkley
ff0e0d9f3d
Move logic from ApplicationController to service and improve clarity
2018-06-20 01:28:35 +01:00
Matt-Yorkley
e73b378201
Adjust embedded response headers
2018-06-20 01:28:35 +01:00
luisramos0
b8f1571282
added directive to make links open in new tab by default in textangular text areas in enterprise description, enterprise group description and in shopfront open and closed messages
2018-06-19 16:53:21 +01:00
Pau Pérez Fabregat
8da8a5a086
Merge pull request #2392 from openfoodfoundation/transifex
...
Transifex
2018-06-19 13:37:38 +02:00
Pau Pérez Fabregat
20c25cd030
Merge pull request #2368 from Matt-Yorkley/uk/admin_orders
...
Uk/admin orders
2018-06-19 11:00:35 +02:00
Frank West
3821b9e0da
Fix ordering of Gemfile.lock
...
When we run bundle the gems are being reordered to be alphabetical.
Seems to have been committed on 26/05/2018 here:
7a64ad1cc1
2018-06-19 17:51:24 +10:00
Frank West
f7848b025f
Add rack-rewrite to handle redirects
...
We are moving bulk edit to a different route and we want to be able to
handle redirects on this route. Handling this at the rack level before
the rails stack is the most performant way outside of rewrites on the
web server itself.
2018-06-19 17:51:23 +10:00
Frank West
8324b00999
Renames product bulk edit action to index
...
When a user hit cancel while editing a product it took them to the spree
products index page instead of the bulk edit page. The button was part
of a shared view for all resources so changing it's actions were not
readily available.
It was suggested that instead of carrying our own separate controller
action we could just override the index action of the products
controller with the bulk edit functionality instead. This has the
advantage of removing some overrides and allows us to not add
additional overrides in the future.
2018-06-19 17:51:23 +10:00
Pau Pérez Fabregat
3484996dbd
Merge pull request #2335 from luisramos0/issue2334
...
Fixed missing translations on shops filter - delivery option
2018-06-19 09:34:13 +02:00
Pau Pérez Fabregat
236920d28f
Merge pull request #2357 from luisramos0/enterprises_country_state
...
changed the country and state selectors to angular on enterprises admin
2018-06-19 09:30:24 +02:00
Pau Pérez Fabregat
b1bccb07f2
Merge pull request #2369 from coopdevs/product-import-for-superadmins-only
...
Show product import's UI only to superadmins
2018-06-19 09:23:58 +02:00
Transifex-Openfoodnetwork
55e619af8d
Updating translations for config/locales/de_DE.yml
2018-06-19 10:59:37 +10:00
Rob Harrington
dabef16606
Use ofn-select2 directive for country and state selectors on enterprise forms
2018-06-19 10:34:02 +10:00
luisramos0
d1019fcc5e
changed the country and state selectors to angular on enterprises admin (new and edit screens) so that states are dynamically updated when country is changed
2018-06-19 10:34:02 +10:00
Maikel
2bfb635bcc
Merge pull request #2341 from luisramos0/checkout_country_state
...
fixed country_state selectors on checkout
2018-06-19 09:34:21 +10:00
Transifex-Openfoodnetwork
fe39d96e7f
Updating translations for config/locales/fr_CA.yml
2018-06-19 05:48:59 +10:00
Frank West
f2e1caabff
Fix NoMethodError in order cycles index
...
When a user's session has timed out and they try to load new data on the
order cycles page by changing filters, the application throws a
`NoMethodError` because we are prepending the load data method before
checking the user's session.
We can fix this by removing the prepend on this action.
2018-06-18 06:36:55 -07:00
Maikel
f272a7b604
Merge pull request #2361 from mkllnk/2356-report-search-hint
...
2356 report search hint
2018-06-18 14:51:48 +10:00
luisramos0
ea9ea83fee
improved checkout country and state selectors code
2018-06-18 14:50:03 +10:00
luisramos0
3cb0b76d21
fixed checkout tests by replacing state abbr with name in address selector boxes
2018-06-18 14:50:03 +10:00
luisramos0
836a5836d9
fixed country_state selectors on checkout
2018-06-18 14:50:03 +10:00
Maikel Linke
b7770510a7
Use CSS for layout
2018-06-18 11:08:58 +10:00
Maikel Linke
67c2574b0b
Show report search instructions
...
Solves: https://github.com/openfoodfoundation/openfoodnetwork/issues/2356
2018-06-18 11:08:58 +10:00
Maikel Linke
7a2218fe26
Style the reports controller
2018-06-18 11:08:58 +10:00
Maikel Linke
6243640bca
Unify sales tax report rendering with others
2018-06-18 11:08:58 +10:00
Maikel Linke
66567fd9e6
Unify report table rendering
...
There is a lot of code duplication in the report views and we would like
to change that code. So we move it into one file first.
2018-06-18 11:08:58 +10:00
Maikel
86ff24b43c
Merge pull request #2386 from frank-west-iii/fix-ssl-errors-specs
...
Set the SSL protocol for secure connections
2018-06-18 08:45:31 +10:00
Frank West
0d7352813c
Set the SSL protocol for secure connections
...
There are ssl errors when using stripe through phantom js. This allows
other SSL protocols now.
2018-06-15 11:43:26 -07:00
Rob H
61f303ced2
Merge pull request #2373 from oeoeaio/fix-import-date-filter
...
Reimplement import date filter as an actual Filter
2018-06-15 16:53:22 +10:00
Rob Harrington
d0f8e9fba6
Reimplement import date filter as an actual Filter
2018-06-15 11:31:47 +10:00
Maikel
46f5f5061a
Merge pull request #2377 from mkllnk/2376-fix-paypal-redirects
...
Pass on redirect path instead of URL
2018-06-15 10:16:31 +10:00
Maikel Linke
561a73e911
Pass on redirect path instead of URL
...
Fixes https://github.com/openfoodfoundation/openfoodnetwork/issues/2376
The checkout doesn't deal with absolute URLs since
fc2cc09ea5
2018-06-14 16:49:52 +10:00
Pau Pérez Fabregat
24c6b940f6
Merge pull request #2370 from openfoodfoundation/transifex
...
Transifex
2018-06-13 12:03:34 +02:00
Pau Pérez Fabregat
d5310eed6c
Merge pull request #2371 from HugsDaniel/2359_js_libs_not_found_or_not_defined
...
Changed require syntax to fit jquery-ui-rails v<5.0
2018-06-13 09:12:57 +02:00
Rob Harrington
c72a2fda91
Use placed_at state to determine whether to remove orphaned proxy orders
2018-06-13 13:46:11 +10:00
Rob Harrington
d9ddad554e
Prevent proxy_orders for active or complete order cycles from being removed automatically by ProxyOrderSyncer
2018-06-13 13:46:11 +10:00
Rob Harrington
ac309ffaf5
Rename obsolete_proxy_orders to orphaned_proxy_orders
2018-06-13 13:46:11 +10:00
Maikel
51bbf64b10
Merge pull request #2363 from oeoeaio/update-contributors
...
Update contributors list in the README
2018-06-13 11:11:29 +10:00
Hugo Daniel
6e2966d7e8
Changed require syntax to fit jquery < 5.0
2018-06-12 15:59:41 +02:00
Matt-Yorkley
ea0d24a5bf
Re-word test names for clarity
2018-06-12 13:20:00 +01:00
Transifex-Openfoodnetwork
644c2e8788
Updating translations for config/locales/nb.yml
2018-06-12 20:33:43 +10:00
Transifex-Openfoodnetwork
03fb5e7ccf
Updating translations for config/locales/fr.yml
2018-06-12 20:03:03 +10:00
Transifex-Openfoodnetwork
6908635822
Updating translations for config/locales/pt.yml
2018-06-12 19:36:28 +10:00
Pau Perez
78e59d059a
Show product import's UI only to superadmins
...
We still need to iterate on its implementation and it's too early to
make it publicly available.
2018-06-11 19:50:53 +02:00
Rob Harrington
56040685a0
Add Matt, Pau and Enrico to the contributors list on the README
2018-06-10 18:26:50 +10:00
