Maikel
d254df7ccc
Merge pull request #5073 from Matt-Yorkley/mobile-checkout
...
[Mobile UX] Order cycle section updates
2020-03-27 15:34:19 +11:00
Pau Pérez Fabregat
8caf10f634
Merge pull request #5079 from openfoodfoundation/dependabot/bundler/unicorn-5.5.4
...
Bump unicorn from 5.5.3 to 5.5.4
2020-03-26 17:32:17 +01:00
Matt-Yorkley
2966dd9536
Update all locales with the latest Transifex translations
2020-03-26 14:25:34 +01:00
Matt-Yorkley
21e1c0ed0b
Merge pull request #5025 from openfoodfoundation/transifex
...
Transifex
2020-03-26 14:22:38 +01:00
Matt-Yorkley
48b99d02b9
Merge pull request #5060 from Matt-Yorkley/weight-calculator
...
Fix weight calculator
2020-03-26 14:19:21 +01:00
Pau Pérez Fabregat
f17a2eeaea
Merge pull request #5062 from luisramos0/prop_bug
...
Fix broken new property button in properties page (regression from removing spree_backend)
2020-03-26 11:35:47 +01:00
Pau Pérez Fabregat
18419d0276
Merge pull request #5043 from luisramos0/fix_cookies
...
Fix cookies policy helper spec in rails 4
2020-03-26 11:23:49 +01:00
Pau Pérez Fabregat
bd19d8b0bd
Merge pull request #5042 from luisramos0/api_base
...
Make explicit the namespace of the BaseController for api controllers
2020-03-26 11:21:27 +01:00
Maikel Linke
4bcd665379
Handle all line items without unit_value in weight calculation
2020-03-26 17:13:29 +11:00
Matt-Yorkley
e63dbcfa89
Fix some SCSS linting warnings
2020-03-25 23:12:23 +01:00
Matt-Yorkley
c3283adcf5
Show full-width ordercycle subheader on tablet and below
2020-03-25 23:12:23 +01:00
Matt-Yorkley
b2ed69831b
Adjust style contexts
2020-03-25 23:12:23 +01:00
Matt-Yorkley
7daba62f43
Update colours for different order cycle sidebar cases
2020-03-25 23:12:23 +01:00
Matt-Yorkley
a08020490d
Define new colour and use variable where already in use
2020-03-25 23:12:23 +01:00
Matt-Yorkley
eb4d970bc7
Adjust positioning for order cycle sidebar
2020-03-25 23:12:23 +01:00
Matt-Yorkley
7a3549209f
Use 4 columns on checkout sidebar
2020-03-25 23:12:23 +01:00
Matt-Yorkley
52ebd1b402
Remove order cycle popovers; these styles are no longer used
2020-03-25 23:12:08 +01:00
Matt-Yorkley
a3a26f704f
Extract re-used box-shadow style
2020-03-25 23:07:39 +01:00
Matt-Yorkley
cff8f6dd96
Add box-shadow to distributor header for cart, checkout, and order confirmation pages
2020-03-25 23:07:39 +01:00
Matt-Yorkley
81537d92cf
Extract styles for distributor header
...
These styles are used in shop, cart, checkout, order confirmation. Not just shop.
2020-03-25 23:07:39 +01:00
Matt-Yorkley
91e88bd028
Allow conditional use of order cycle sidebar
...
We need to re-use the "shopping_shared/header" partial in multiple places, but we don't always want the (nested) order cycle sidebar inside it.
2020-03-25 23:07:39 +01:00
Matt-Yorkley
f5e254a105
Remove quick fix for hiding oc selector
2020-03-25 23:07:39 +01:00
Sigmund Petersen
b41b5d0395
Update Slack invitation link
2020-03-25 20:38:45 +01:00
dependabot-preview[bot]
296d2e5edb
Bump unicorn from 5.5.3 to 5.5.4
...
Bumps [unicorn](https://yhbt.net/unicorn/ ) from 5.5.3 to 5.5.4.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-25 19:17:31 +00:00
Luis Ramos
ac0a62e962
Merge pull request #5050 from Matt-Yorkley/bullet_tweaks
...
Performance tweaks 2
2020-03-25 18:32:49 +00:00
Luis Ramos
2c5db8935b
Merge pull request #5022 from Matt-Yorkley/performance_tweaks
...
Performance tweaks
2020-03-25 15:42:07 +00:00
Luis Ramos
24c8f38111
Restructure spec to avoid variable names with numbers
2020-03-25 15:48:57 +01:00
Luis Ramos
b801bffcd9
Merge pull request #5030 from Matt-Yorkley/reports-loading
...
Improve reports performance
2020-03-25 12:54:34 +00:00
Luis Ramos
434b68b019
Merge pull request #5048 from Matt-Yorkley/3-0-user-spec
...
Ensure perform_deliveries is correctly set in user email spec
2020-03-25 11:52:43 +00:00
Luis Ramos
9af4bb9757
Use create instead of build so that we test with callbacks
2020-03-25 11:22:40 +00:00
Matt-Yorkley
d847560d7c
Fix rubocop issues
2020-03-25 10:15:03 +01:00
Pau Pérez Fabregat
87fae15434
Merge pull request #4909 from luisramos0/line_items_spec
...
Adapt line_items_spec to work in the rails 4 branch as well
2020-03-25 10:05:20 +01:00
Matt-Yorkley
e27f7a4301
Ensure perform_deliveries is correctly set when testing user confirmation emails
2020-03-25 08:42:21 +01:00
Luis Ramos
bddfa95eb5
Fix broken new property button in properties page
2020-03-24 21:50:49 +00:00
Matt-Yorkley
ef0fb18fda
Fix calculations for weight when variant.unit_value is zero
2020-03-24 22:05:55 +01:00
Matt-Yorkley
87ee4bbebc
Add spec for current problematic behaviour
2020-03-24 20:09:54 +01:00
Transifex-Openfoodnetwork
f5567e556b
Updating translations for config/locales/pt_BR.yml
2020-03-25 02:22:31 +11:00
Matt-Yorkley
54c3c73ed2
Fix duplicate key in hash
2020-03-24 12:46:21 +01:00
Luis Ramos
8dfdc9bc15
Merge pull request #5056 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.5.0
...
Bump rubocop-rails from 2.4.2 to 2.5.0
2020-03-24 11:22:21 +00:00
Matt-Yorkley
36aa52736a
Refactor order filtering logic
2020-03-24 09:36:59 +01:00
Matt-Yorkley
ac38b2735c
Eager-load data in OrdersController
2020-03-23 22:38:57 +01:00
Matt-Yorkley
8b93c5ab56
Invert conditionals for better readability
2020-03-23 22:38:57 +01:00
Matt-Yorkley
434f98fb46
Fix insane N+1 in Package
...
The #ships_with? method was being called ~800 times when loading the admin order edit page (with Aus production data), and triggering a new query each time it was called.
2020-03-23 22:38:57 +01:00
Matt-Yorkley
c82c54873c
Pluck :id when querying active distributors for serializer data
2020-03-23 22:38:55 +01:00
dependabot-preview[bot]
de180d32bf
Bump rubocop-rails from 2.4.2 to 2.5.0
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.4.2 to 2.5.0.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.4.2...v2.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-23 20:37:57 +00:00
Matt-Yorkley
5b481c19cc
Eager-load country in Producers controller
2020-03-23 19:33:15 +01:00
Matt-Yorkley
7110f9e6ee
Eager-load data used in EnterpriseGroupsController
...
Cuts page load time by ~75%
2020-03-23 19:33:13 +01:00
Transifex-Openfoodnetwork
63d748b2a4
Updating translations for config/locales/pt_BR.yml
2020-03-24 03:32:23 +11:00
Transifex-Openfoodnetwork
310906c7da
Updating translations for config/locales/en_NZ.yml
2020-03-23 15:49:19 +11:00
Transifex-Openfoodnetwork
b81843921b
Updating translations for config/locales/en_CA.yml
2020-03-23 08:57:54 +11:00
Matt-Yorkley
dd0e135a4d
Add test coverage for Permissions::Order with search_params
2020-03-22 11:45:40 +01:00
Luis Ramos
0f2c5d379a
Add test locales to I18n.available_locales before the test and reset them afterwards
2020-03-22 10:32:16 +00:00
Luis Ramos
a29f263041
Make explicit the namespace of the BaseController for api controllers
2020-03-22 09:55:07 +00:00
Luis Ramos
26cd0f4a9d
Merge pull request #5023 from mkllnk/5019-invoice-bill-address
...
Display shipping and billing address on invoices
2020-03-21 20:38:00 +00:00
Matt-Yorkley
0b878dd0a2
Use named scope for finding line_items in a set of orders
2020-03-21 09:45:35 +01:00
Matt-Yorkley
45c204017f
Improve reports performance
...
Add the scoping from the search filters for reports into the logic of building sets like `editable_line_items` before combining them into the query to reduce the number of `line_item` ids in the IN clause.
2020-03-21 09:45:33 +01:00
Transifex-Openfoodnetwork
fa98a8ea17
Updating translations for config/locales/en_NZ.yml
2020-03-21 15:19:06 +11:00
Luis Ramos
17c2f7b138
Merge pull request #4889 from luisramos0/3-0-prod-set
...
[Spree 2.1] Fix ProductSet spec (1 broken spec)
2020-03-20 19:33:19 +00:00
Matt-Yorkley
70643a84b2
Update all locales with the latest Transifex translations
2020-03-20 18:44:23 +01:00
Matt-Yorkley
62a00b17a2
Merge pull request #5026 from Matt-Yorkley/checkout_display
...
Temporarily hide OC selector in checkout page
2020-03-20 18:33:47 +01:00
Pau Pérez Fabregat
c4f96a1dcf
Merge pull request #4972 from mkllnk/4810-tab-navigation
...
4810 Shop tab / page navigation with browser buttons
2020-03-20 15:24:50 +01:00
Pau Pérez Fabregat
6f4f3d42cc
Merge pull request #5012 from openfoodfoundation/dependabot/bundler/rack-mini-profiler-2.0.1
...
Bump rack-mini-profiler from 2.0.0 to 2.0.1
2020-03-20 15:22:43 +01:00
Transifex-Openfoodnetwork
7582df2771
Updating translations for config/locales/en_CA.yml
2020-03-21 00:37:37 +11:00
Matt-Yorkley
e8692fec4c
Temporarily hide OC selector in checkout page
2020-03-20 12:08:58 +01:00
Luis Ramos
3b2c10526d
Merge pull request #4838 from openfoodfoundation/dependabot/bundler/jquery-rails-3.1.5
...
[Security] Bump jquery-rails from 3.0.4 to 3.1.5
2020-03-20 09:49:22 +00:00
Transifex-Openfoodnetwork
c788f1ae57
Updating translations for config/locales/it.yml
2020-03-20 19:32:35 +11:00
Maikel Linke
b1a274ea27
Update translations
2020-03-20 16:20:21 +11:00
Maikel
00c7b9986b
Merge pull request #5020 from openfoodfoundation/transifex
...
Transifex
2020-03-20 16:15:54 +11:00
Maikel Linke
25b11f1f4b
Display delivery details in the header
2020-03-20 15:51:49 +11:00
Maikel Linke
22384cb4da
Display shipping and billing address on invoices
2020-03-20 15:14:24 +11:00
Transifex-Openfoodnetwork
9dc18afef0
Updating translations for config/locales/pt_BR.yml
2020-03-20 12:20:04 +11:00
Matt-Yorkley
7baa875a91
Fix big N+1 issues in enterprises#edit for superadmin
...
The page is usable now as superadmin. Roughly 10x faster...
2020-03-19 23:41:47 +01:00
Matt-Yorkley
3de887e1d8
Remove some N+1s relating to address (found with bullet gem)
2020-03-19 23:41:47 +01:00
Transifex-Openfoodnetwork
d2d3d767ac
Updating translations for config/locales/en_GB.yml
2020-03-19 23:53:09 +11:00
Transifex-Openfoodnetwork
a4ff74272b
Updating translations for config/locales/nb.yml
2020-03-19 22:47:36 +11:00
Transifex-Openfoodnetwork
1000dc52bf
Updating translations for config/locales/en_FR.yml
2020-03-19 19:37:32 +11:00
Transifex-Openfoodnetwork
54b8d22e0d
Updating translations for config/locales/fr.yml
2020-03-19 19:37:21 +11:00
Maikel Linke
7e00f78a77
Highlight menu item only when active or hovered
...
The `:focus` selector meant that every link that was clicked on was
still highlighted after going back or forward in the browser history. We
don't need that selector because tabs you click on are then active and
are highlighted anyway.
2020-03-19 15:49:29 +11:00
Maikel Linke
5a9b5660f1
Simplify logic in PageSelectionCtrl
2020-03-19 15:38:00 +11:00
Maikel Linke
1d42ce885b
Stay on shop page when opening login modal
...
The login modal changes the URL to `#/login` which interfers with our
shop pages. In order to show the right shop page, we need to know which
pages are valid and where we have been before we clicked on Login.
2020-03-19 15:38:00 +11:00
Maikel Linke
17751c448f
Rename PageSelectionCtrl for clarity
2020-03-19 15:37:13 +11:00
Maikel Linke
4b8d9d18d7
Simplify PagesetCtrl
2020-03-19 15:37:13 +11:00
Maikel Linke
a21ef19529
Render only shop tabs within shop
...
The include directive was listening to all $location paths including
`#login` which is unrelated to the shop tabs. Angular tried to load the
template `shop/login.html` which doesn't exist.
We now whitelist the templates that can be included by having an include
tag for each shop tab/page.
2020-03-19 15:37:13 +11:00
Maikel Linke
ea80ae3832
Enable page navigation via URL fragment
...
The broadcasting of notifications didn't update properly and I couldn't
find a way to listen to $location updates. I replaced the three
intertwined directives with one controller and a bit more HTML code. Now
we have only one scope that listens to $location and all browser actions
like the back button is reflected in the page.
As nice side-effect, the menu links have now the right destination so
that you can copy the link and paste it into another browser window.
40 lines less code.
2020-03-19 15:37:13 +11:00
Maikel Linke
bf26a26743
Reduce complexity by removing unused code branch
2020-03-19 15:36:24 +11:00
Maikel Linke
e3f840f48c
Remove dependency to Tabsets
2020-03-19 15:36:23 +11:00
Maikel Linke
42ca7888c0
Simplify by reducing unused options
2020-03-19 15:36:23 +11:00
Maikel Linke
8aa892136e
Duplicate shop tab code for rewrite
...
The old code is still used on the user page.
2020-03-19 15:36:23 +11:00
Maikel Linke
2d21341183
Update all locales with the latest Transifex translations
2020-03-19 14:06:04 +11:00
Maikel
5cabf59015
Merge pull request #5016 from openfoodfoundation/revert-4879-inner-join-visible-orders
...
Revert "Inner join visible orders"
2020-03-19 12:37:20 +11:00
Maikel
289dff5b91
Merge pull request #4988 from openfoodfoundation/transifex
...
Transifex
2020-03-19 12:06:37 +11:00
Maikel
c4e4beb912
Revert "Inner join visible orders"
2020-03-19 12:01:00 +11:00
Maikel
27d8951add
Merge pull request #5013 from openfoodfoundation/mobile-ux-3
...
Merge mobile-ux-3 branch into master
2020-03-19 11:51:41 +11:00
Transifex-Openfoodnetwork
f7720f1b1f
Updating translations for config/locales/en_FR.yml
2020-03-19 05:18:19 +11:00
Transifex-Openfoodnetwork
c46ae4354d
Updating translations for config/locales/en_FR.yml
2020-03-19 05:15:09 +11:00
Transifex-Openfoodnetwork
5f00323cbb
Updating translations for config/locales/fr.yml
2020-03-19 05:14:27 +11:00
Transifex-Openfoodnetwork
c52f29706b
Updating translations for config/locales/en_CA.yml
2020-03-19 03:47:42 +11:00
Luis Ramos
2590745b2e
Merge pull request #4954 from luisramos0/dead_temp
...
Delete templates that are not used
2020-03-18 13:52:15 +00:00
Matt-Yorkley
6db0421347
Merge pull request #4764 from Matt-Yorkley/mobile-tabs-styling
...
[mobile ux] Mobile tabs styling
2020-03-18 08:42:44 +01:00
Maikel
b63c47cca2
Merge pull request #4816 from mkllnk/1860-copy-paste
...
1860 Remove style from pasted text for shopfront messages
2020-03-18 16:23:50 +11:00
Maikel
2b9f57f4e0
Merge pull request #4998 from mkllnk/4277-signup-flow
...
Direct new enterprise users to their dashboard
2020-03-18 16:17:41 +11:00
Matt-Yorkley
8a1de72542
Center order cycle select elements in tablet view
2020-03-17 20:32:18 +01:00
Matt-Yorkley
2cb3a0cd99
Adjust padding, size, colour (transparency), caret size and position, border-radius, etc
2020-03-17 20:32:18 +01:00
Matt-Yorkley
b0637a24ff
Adjust padding, size, colour transparency, caret size
2020-03-17 20:32:18 +01:00
Matt-Yorkley
d969b68c8c
Add placeholder to order cycle selector
2020-03-17 20:32:18 +01:00
Matt-Yorkley
a89d4266d5
Update ordercycleselector to show message in red and remove powertip.
2020-03-17 20:32:18 +01:00
Matt-Yorkley
4b8ced5fc0
Add right-margin on bullet points in groups tab
2020-03-17 20:32:18 +01:00
Matt-Yorkley
2678342122
Reduce padding on ordercycle selector
2020-03-17 20:32:18 +01:00
Matt-Yorkley
b33c819863
Reduce rounding on ordercycle edges (box-radius)
2020-03-17 20:32:18 +01:00
Matt-Yorkley
97d7e27786
Update social icon colours
2020-03-17 20:32:18 +01:00
Matt-Yorkley
e73e43838c
Add 2px margin under Contact subheadings
2020-03-17 20:32:18 +01:00
Matt-Yorkley
cdc40fbc38
Update Contact tab subheading text colour
2020-03-17 20:32:18 +01:00
Matt-Yorkley
3430cc617a
Maximise space for tabs to fit on small screens
2020-03-17 20:32:18 +01:00
Matt-Yorkley
ed6f042446
Adjust tab widths/spacing on mobile and tablet
2020-03-17 20:32:18 +01:00
Matt-Yorkley
80a8c436d6
Update box-shadow underneath tab buttons
2020-03-17 20:32:18 +01:00
Matt-Yorkley
049a87e8a9
Remove defunct text-shadow from tab text
2020-03-17 20:32:18 +01:00
Matt-Yorkley
deb5b8e74c
Fix minor display issue where "Ready For" option with lots of characters is too big to fit on screen on mobile.
...
The layout was breaking in some specific cases where the content didn't fit on very small screens.
2020-03-17 20:32:18 +01:00
Matt-Yorkley
a5dd14d902
Adjust new colour variables to match Zeplin
2020-03-17 20:32:18 +01:00
Matt-Yorkley
9a6859edc0
Fix CodeClimate issue with SCSS variable naming
2020-03-17 20:32:18 +01:00
Matt-Yorkley
c0c53113d3
Change font on shop tab titles
2020-03-17 20:32:18 +01:00
Matt-Yorkley
26688409a1
Use alternate dots in <ul> display
2020-03-17 20:32:18 +01:00
Matt-Yorkley
0893d14025
Add new shop link colours
2020-03-17 20:32:18 +01:00
Matt-Yorkley
efd314e3b1
Restyle contact tab
2020-03-17 20:23:45 +01:00
Matt-Yorkley
bd7549c57f
Update layout for producers and groups tabs
2020-03-17 20:23:45 +01:00
Matt-Yorkley
45cf54408d
Readjust layout after rebase
2020-03-17 20:23:45 +01:00
Matt-Yorkley
15360740b1
Add ng-cloak to ordercycle box to improve appearance whilst page loads
2020-03-17 20:23:45 +01:00
Matt-Yorkley
5ce5072f26
Adjust position of OC popover tip to not cover up the "ready for" label
2020-03-17 20:23:45 +01:00
Matt-Yorkley
35133f7ee8
Adjust height of ordercycle selector on desktop
2020-03-17 20:23:45 +01:00
Matt-Yorkley
5becbc2a11
Move caret svg to /app/assets/images
2020-03-17 20:23:45 +01:00
Matt-Yorkley
390d80f0eb
Update order cycle selector positioning
2020-03-17 20:23:45 +01:00
Matt-Yorkley
6da43850d1
Restyle order cycle dropdown
2020-03-17 20:23:45 +01:00
Matt-Yorkley
a146bdacc8
Realign ordercycle text on tablet downwards
2020-03-17 20:23:45 +01:00
Matt-Yorkley
43cadb00c4
Recolour order cycle selector
2020-03-17 20:23:45 +01:00
Matt-Yorkley
2e616a9e31
Fix conditional display of order cycle selection element
2020-03-17 20:23:45 +01:00
Matt-Yorkley
1927e2883e
Move brackets inside conditionals for rendering last closed / next open message
2020-03-17 20:23:45 +01:00
Matt-Yorkley
a4b94cf39f
Add dividing line on tabs
...
Shows a thin grey line when the tab view content is white, but doesn't interfere when the content below is a full-width colour image.
2020-03-17 20:23:45 +01:00
Matt-Yorkley
a35f3c130e
Recolour shop tab buttons
2020-03-17 20:23:45 +01:00
Matt-Yorkley
a93243a8b7
Change vertical position of shop name in relation to logo
2020-03-17 20:23:45 +01:00
Matt-Yorkley
de4402457a
Improve layout and positioning on mobile and tablet
2020-03-17 20:23:45 +01:00
Matt-Yorkley
bf9f7309f7
Adapt style definitions to altered layout
2020-03-17 20:23:45 +01:00
Matt-Yorkley
4b0e1610ec
Update order cycle selection box
2020-03-17 20:23:45 +01:00
dependabot-preview[bot]
0c6fe20e82
Bump rack-mini-profiler from 2.0.0 to 2.0.1
...
Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler ) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases )
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md )
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v2.0.0...v2.0.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-17 19:19:22 +00:00
Luis Ramos
0f2e23d225
Merge pull request #4968 from lin-d-hop/customer-balances
...
Revert changes that broke existing usage of this report
2020-03-17 18:06:35 +00:00
Pau Pérez Fabregat
129de8fd57
Merge pull request #5006 from Matt-Yorkley/loggageddon
...
Logageddon Hotfix
2020-03-17 14:48:12 +01:00
Matt-Yorkley
e24d858af9
Ensure log level is the default :info for staging and production
...
The default was being ignored in our new logging configuration, and the actual log output was way too high. This was causing serious disk space issues.
2020-03-17 12:25:25 +01:00
Matt-Yorkley
d2cacf5330
Add comments for unusable log_level setting
2020-03-17 12:22:58 +01:00
Transifex-Openfoodnetwork
af231d2ebe
Updating translations for config/locales/fr.yml
2020-03-17 20:32:15 +11:00
Pau Pérez Fabregat
711a3debe7
Merge pull request #4990 from openfoodfoundation/dependabot/bundler/webmock-3.8.3
...
Bump webmock from 3.8.2 to 3.8.3
2020-03-17 09:59:10 +01:00
Pau Pérez Fabregat
d09b0849e4
Merge pull request #4936 from luisramos0/fix_order_syncer
...
Fixes spec/services/order_syncer_spec in rails 4
2020-03-17 09:56:17 +01:00
Pau Pérez Fabregat
c639821dc3
Merge pull request #4931 from luisramos0/fix_ent_ser
...
Fix serializers/api/enterprise_shopfront_serializer_spec in rails 4
2020-03-17 09:53:31 +01:00
Maikel
d9b643d795
Merge pull request #4799 from mkllnk/4771-back-to-shop-button
...
4771 Back to shop button
2020-03-17 19:51:02 +11:00
Maikel Linke
6b8b3be524
Show "Back To Store" button when no shop has been selected yet
2020-03-17 10:28:03 +11:00
Maikel Linke
1db8283e98
Link "Back To Store" button to products page
2020-03-17 10:28:03 +11:00
Maikel Linke
5fce40ee71
Link "Continue shopping" to products tab
2020-03-17 10:28:03 +11:00
Maikel Linke
c64493ca77
Continue shopping with the products list
2020-03-17 10:28:03 +11:00
Maikel Linke
5b942e6933
Add spec for "continue shopping" from cart
...
https://github.com/openfoodfoundation/openfoodnetwork/issues/4771
2020-03-17 10:28:03 +11:00
Luis Ramos
ffbb5934d7
Merge pull request #4989 from luisramos0/specs_in_engines
...
Adapt task that runs engine specs
2020-03-16 19:17:04 +00:00
Luis Ramos
bae9df8214
Merge pull request #4787 from luisramos0/catalog_domain
...
Add new domain/engine Catalog
2020-03-16 18:47:55 +00:00
Luis Ramos
5da47b3f19
Merge pull request #4757 from luisramos0/stripe_sca_extra
...
StripeSCA - Handle further SCA auth request when checking out
2020-03-16 16:45:28 +00:00
Luis Ramos
b14e4237cc
Make the task that runs engines specs run from the main app, not inside the engine
...
Right now and for some time the engines are not independent of the main_app. We should aim for that but it will naturally take a while to disentangle the code
2020-03-16 16:20:36 +00:00
Pau Pérez Fabregat
3e7685193f
Merge pull request #4996 from luisramos0/fix_build
...
Fix broken master build
2020-03-16 16:37:09 +01:00
Luis Ramos
8558000c22
Merge pull request #5 from coopdevs/fix-suppliers-report-test-case
...
Fix suppliers report test case
2020-03-16 13:47:03 +00:00
Pau Perez
6486e5f908
Provide a non-zero amount for ship/pay calculator
...
This way the adjustment's total_amount is not 0 and thus, not filtered
out but the report service.
2020-03-16 13:56:52 +01:00
Maikel Linke
9244a95472
Direct new enterprise users to their dashboard
...
People were directed to the home page and had to do several more clicks
to continue with their enterprise setup.
2020-03-16 11:18:32 +11:00
Transifex-Openfoodnetwork
bd237ef257
Updating translations for config/locales/fr_CA.yml
2020-03-15 07:22:12 +11:00
Transifex-Openfoodnetwork
bc06e10146
Updating translations for config/locales/en_CA.yml
2020-03-15 07:21:33 +11:00
Pau Perez
05eadac935
Fix some filtering test cases for fee report
...
The calculators of the adjustments related to the enterprise fees
created in the test setup have a preferred_amount of 0. So, when
computed, the adjustments' amounts end up being `0 = 0 * 1 line_item`.
Then, the ReportService filters these out in
`#exclude_groups_with_zero_total` from the result set. This is why the
assertions can't find them in `totals`.
2020-03-14 11:19:35 +01:00
Pau Perez
5a83b12c66
Make EnterpriseFee report SQL readable
2020-03-14 11:04:49 +01:00
Pau Perez
71576fd7db
Refactor PerItem calculator to ease readability
2020-03-14 11:04:16 +01:00
Luis Ramos
63a1d4145a
Adapt order factories to work with enterprise fees summaries report specs
2020-03-13 12:36:01 +00:00
Luis Ramos
1049525e50
Merge pull request #4963 from luisramos0/variants_fix
...
Fix 2 broken buttons in the product variants list page
2020-03-12 23:48:50 +00:00
Luis Ramos
bd32510837
Merge pull request #4860 from mkllnk/3395-remove-unused-assets
...
3395 remove unused assets
2020-03-12 22:44:41 +00:00
dependabot-preview[bot]
f0b40eea1e
Bump webmock from 3.8.2 to 3.8.3
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.8.2 to 3.8.3.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.8.2...v3.8.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-12 19:20:17 +00:00
Transifex-Openfoodnetwork
ed790ab65d
Updating translations for config/locales/en_GB.yml
2020-03-13 05:26:37 +11:00
Luis Ramos
46e23b28fd
Merge pull request #4975 from openfoodfoundation/dependabot/bundler/rspec-rails-3.9.1
...
Bump rspec-rails from 3.9.0 to 3.9.1
2020-03-12 16:47:14 +00:00
Luis Ramos
bc904a7afa
Merge pull request #4976 from openfoodfoundation/dependabot/bundler/rack-mini-profiler-2.0.0
...
Bump rack-mini-profiler from 1.1.6 to 2.0.0
2020-03-12 16:46:43 +00:00
Pau Perez
8ccc8dfaf6
Update all locales with the latest Transifex translations
2020-03-12 13:33:42 +01:00
Luis Ramos
55b32c828c
Merge pull request #4978 from Matt-Yorkley/dev-env-reload
...
Fix reloading issue in dev environment
2020-03-12 12:22:00 +00:00
Pau Pérez Fabregat
25dfd8ad40
Merge pull request #4939 from openfoodfoundation/transifex
...
Transifex
2020-03-12 13:19:59 +01:00
Pau Pérez Fabregat
2a5311493f
Merge pull request #4969 from luisramos0/oc_apli
...
Fix spec in rails 4 branch by making code in OrderCycleFormApplicator a bit more resilient
2020-03-12 12:51:23 +01:00
Pau Pérez Fabregat
57ac28cfbd
Merge pull request #4970 from openfoodfoundation/dependabot/bundler/ddtrace-0.33.1
...
Bump ddtrace from 0.33.0 to 0.33.1
2020-03-12 12:50:01 +01:00
Pau Pérez Fabregat
fb02043e6e
Merge pull request #4926 from luisramos0/prod_api
...
Fix products api spec in rails 4
2020-03-12 12:46:45 +01:00
Transifex-Openfoodnetwork
30d7cc89fa
Updating translations for config/locales/pt_BR.yml
2020-03-12 09:25:51 +11:00
Transifex-Openfoodnetwork
d14b5eb46b
Updating translations for config/locales/pt_BR.yml
2020-03-12 09:22:44 +11:00
dependabot-preview[bot]
8eb60388fd
Bump rack-mini-profiler from 1.1.6 to 2.0.0
...
Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler ) from 1.1.6 to 2.0.0.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases )
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md )
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v1.1.6...v2.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-11 19:19:24 +00:00
dependabot-preview[bot]
633f1bd7cf
Bump rspec-rails from 3.9.0 to 3.9.1
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.9.0 to 3.9.1.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.9.0...v3.9.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-11 19:15:51 +00:00
Matt-Yorkley
933b5f1606
Fix reloading issue in dev environment
...
I constantly get `NameError: uninitialized constant Spree::AuthenticationHelpers` when touching local files and then reloading a page, and have to restart my rails server every time (in development). I read the other day that this is the best way to fix the issue, and it seems to work...
2020-03-11 15:31:25 +01:00
Transifex-Openfoodnetwork
4c7b8209b9
Updating translations for config/locales/nb.yml
2020-03-11 19:49:14 +11:00
Pau Pérez Fabregat
802ac647e3
Merge pull request #4879 from coopdevs/inner-join-visible-orders
...
Inner join visible orders
2020-03-10 22:54:03 +01:00
dependabot-preview[bot]
c83bded763
Bump ddtrace from 0.33.0 to 0.33.1
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.33.0 to 0.33.1.
- [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.33.0...v0.33.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-10 19:19:31 +00:00
Luis Ramos
03246d425d
Make this method handle the case where the variants hash passed is nil
...
This fixes a spec in the rails 4 branch
2020-03-10 18:41:26 +00:00
Luis Ramos
7585e3d1d6
The variants_to_a method was dead but actually we can use it to make the code simpler
2020-03-10 18:40:46 +00:00
Luis Ramos
bc1430c984
Make new_variant button work again by making a normal call to the server, isntead of an ajax call that was no longer working
2020-03-10 14:21:26 +00:00
Luis Ramos
676d949972
Make variants collection show deleted again by bypassing the default scope that removed deleted variants
2020-03-10 14:21:20 +00:00
lin-d-hop
e4bd7c4e30
Revert changes that broke existing usage of this report
2020-03-10 10:59:18 +00:00
Pau Pérez Fabregat
50cdda7c63
Merge pull request #4802 from luisramos0/too_many
...
Last batch to fix error "subquery with too many columns" in rails 4 branch
2020-03-10 09:20:44 +01:00
Pau Pérez Fabregat
d0af046e59
Merge pull request #4908 from luisramos0/package_spec
...
Make package spec work in rails 4
2020-03-10 09:17:53 +01:00
Pau Pérez Fabregat
5811f3ead1
Merge pull request #4905 from luisramos0/untouch
...
Remove some live but elderly debug code
2020-03-10 09:17:13 +01:00
Pau Pérez Fabregat
d7d3c9ea53
Merge pull request #4938 from openfoodfoundation/dependabot/bundler/ddtrace-0.33.0
...
Bump ddtrace from 0.32.0 to 0.33.0
2020-03-10 08:48:31 +01:00
Pau Pérez Fabregat
a02cc1de34
Merge pull request #4857 from luisramos0/schedules_ctrl
...
Remove dead spec in SchedulesController
2020-03-10 08:38:46 +01:00
Luis Ramos
94783f44f9
Delete templates that are not used
2020-03-09 15:30:37 +00:00
Luis Ramos
2184c7c06b
Merge pull request #4856 from Matt-Yorkley/dead-code
...
Delete some dead code in Product Import (fixes 1 broken spec)
2020-03-07 15:26:39 +00:00
Transifex-Openfoodnetwork
928bf0d9c7
Updating translations for config/locales/fr.yml
2020-03-08 01:24:08 +11:00
Transifex-Openfoodnetwork
0d02b2afcf
Updating translations for config/locales/en_FR.yml
2020-03-08 01:21:12 +11:00
Transifex-Openfoodnetwork
1e76f3f744
Updating translations for config/locales/fr.yml
2020-03-08 01:20:57 +11:00
dependabot-preview[bot]
7c3a0a292f
Bump ddtrace from 0.32.0 to 0.33.0
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.32.0 to 0.33.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.32.0...v0.33.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-06 19:31:47 +00:00
Luis Ramos
c5ca0976a5
Merge pull request #4873 from jeduardo824/ampersand-not-showing-correctly
...
fix ampersand problem using ng-bind-html
2020-03-06 17:40:54 +00:00
Pau Pérez Fabregat
be7b3d5a12
Merge pull request #4809 from jeduardo824/redirect-to-shops-when-shop-does-not-exist
...
redirect to shops list when an enterprise is not found
2020-03-06 18:39:00 +01:00
Luis Ramos
d3f498f5b1
The shipping rates refresh process changed a little in spree 2.1 and the selection is and was random, it picks the first acceptable
...
In this case we need to specifically select one shipping method so that the test is valid
2020-03-06 16:39:20 +00:00
Luis Ramos
55941a1206
Round time values to make spec green as in rails 4, for unknown reason, the timestamps are differing in some miliseconds
2020-03-06 10:16:58 +00:00
Luis Ramos
6304a085c0
Update all locales with the latest Transifex translations
2020-03-06 08:30:04 +00:00
Luis Ramos
7c708de937
Merge pull request #4928 from openfoodfoundation/transifex
...
Transifex
2020-03-06 08:28:09 +00:00
Transifex-Openfoodnetwork
5d51e5d393
Updating translations for config/locales/pt_BR.yml
2020-03-06 07:41:46 +11:00
Transifex-Openfoodnetwork
464717dec5
Updating translations for config/locales/pt_BR.yml
2020-03-06 07:38:36 +11:00
Pau Pérez Fabregat
7a06018c3e
Merge pull request #4874 from openfoodfoundation/transifex
...
Transifex
2020-03-05 19:29:21 +01:00
Pau Pérez Fabregat
b8c76ff633
Merge pull request #4906 from luisramos0/ent_caching
...
Fix enterprise_caching_spec in rails 4
2020-03-05 19:28:54 +01:00
Pau Pérez Fabregat
1ecc0bfe07
Merge pull request #4927 from luisramos0/variants_delete
...
Fix spree/admin/variants_controller_spec.rb in rails 4
2020-03-05 19:24:35 +01:00
Pau Pérez Fabregat
600d2d23c8
Merge pull request #4912 from luisramos0/cart_serv_fix
...
Make cart_service spec green in rails 4 branch
2020-03-05 19:11:58 +01:00
Pau Pérez Fabregat
bf3211fd01
Merge pull request #4918 from luisramos0/bulk_lis
...
Fix spec/controllers/admin/bulk_line_items_controller_spec in rails 4
2020-03-05 19:07:37 +01:00
Pau Pérez Fabregat
5fd0d9406d
Merge pull request #4923 from openfoodfoundation/dependabot/bundler/oj-3.10.5
...
Bump oj from 3.10.3 to 3.10.5
2020-03-05 19:06:20 +01:00
Pau Pérez Fabregat
c78a6bea91
Merge pull request #4921 from luisramos0/li_ctrl
...
Fix line_items_controller_spec in the rails 4 branch
2020-03-05 19:05:46 +01:00
Pau Pérez Fabregat
be9f33312b
Merge pull request #4904 from luisramos0/tax_rates_match
...
Move TaxRate#match to OFN to avoid having to adapt to the spree 2.1 version
2020-03-05 18:55:55 +01:00
Luis Ramos
f23575302b
In rails 4 variant.destroy is removing the variants from the exchanges as needed and variant.exchange_variants becomes immediatly empty but variant.exchanges is not automatically updated anymore and needs a refresh to become empty
2020-03-05 17:07:08 +00:00
Pau Perez
0042ab2f28
Rewrite INNER JOIN in ActiveRecord's DSL
2020-03-05 17:45:06 +01:00
Pau Perez
53a63775fe
Replace LEFT JOIN with INNER JOIN
...
I see no reason why a LEFT might be needed and its the root cause of the
awful performance.
2020-03-05 17:45:06 +01:00
Pau Perez
461b1b26f3
Add controller tests to cover totals by supplier
2020-03-05 17:45:06 +01:00
Luis Ramos
f13d7d6845
Fix products api spec in rails 4
2020-03-05 15:20:45 +00:00
dependabot-preview[bot]
e4d09b5404
Bump oj from 3.10.3 to 3.10.5
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.3 to 3.10.5.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.10.3...v3.10.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-04 19:16:40 +00:00
Luis Ramos
415415273c
In rails 4 we need to update the stub after we update the order.user otherwise the stub will return the previous value
2020-03-04 15:50:52 +00:00
Luis Ramos
d969190ca5
Bypass problem with quick_login_as_admin in rails 4 and just user simple factory
2020-03-04 14:29:11 +00:00
Luis Ramos
a180576c0a
Make cart_service spec green in rails 4 branch
2020-03-03 17:29:38 +00:00
Luis Ramos
1382bb3c6b
For some reason in rails 4/spree 2.1 setting the line item as adjustable on the adjustment is not enough to populate line_item.adjustments. Here we make this assignment explicit fixing the spec in rails 4
2020-03-03 15:04:51 +00:00
Luis Ramos
7fdaa0f0c7
Make package spec work in rails 4 by persisting the test enterprises so that the copnnection between shipping methods and enterprises works
2020-03-03 14:46:12 +00:00
Luis Ramos
ba750547a2
The touch process in 'belongs_to :supplier, class_name: 'Enterprise', touch: true' must have changed in rails 4 and now we need to reload the enterprise to get the new updated_at value
2020-03-03 12:26:18 +00:00
Luis Ramos
af8369ae1b
Remove 5 years old debug code
...
This reverts ab9bc7b1dc , it can be added if the issue happens again
2020-03-03 10:56:57 +00:00
Luis Ramos
829a73c58d
Merge pull request #4886 from openfoodfoundation/dependabot/bundler/oj-3.10.3
...
Bump oj from 3.10.2 to 3.10.3
2020-03-03 09:57:46 +00:00
Luis Ramos
a2691df64e
Merge pull request #4887 from openfoodfoundation/dependabot/bundler/rubocop-0.80.1
...
Bump rubocop from 0.80.0 to 0.80.1
2020-03-03 09:56:37 +00:00
Luis Ramos
6c8b175344
Merge match and its alias method
2020-03-03 09:29:02 +00:00
Pau Pérez Fabregat
ad10053271
Merge pull request #4903 from luisramos0/address_finder
...
[Spree 2.1] Adapt address finder spec to work with spree 2.1 code
2020-03-03 10:27:13 +01:00
Luis Ramos
a508c55700
Bring TaxRate.match to OFN
...
The version of this method in spree 2.1 will break our build
This way we simply bypass this fix in spree: https://github.com/spree/spree/pull/3669
We can get back to this in the future if we ever experience the mentioned bug
2020-03-03 09:27:04 +00:00
Transifex-Openfoodnetwork
2712be3fa4
Updating translations for config/locales/fr.yml
2020-03-03 14:14:38 +11:00
Transifex-Openfoodnetwork
484326561f
Updating translations for config/locales/en_GB.yml
2020-03-03 14:11:28 +11:00
Transifex-Openfoodnetwork
7ea96f88e8
Updating translations for config/locales/en_CA.yml
2020-03-03 14:08:26 +11:00
Transifex-Openfoodnetwork
de752b05a7
Updating translations for config/locales/fr_CA.yml
2020-03-03 14:08:17 +11:00
Maikel
0b18344572
Merge pull request #4790 from mkllnk/4779-payment-method-display
...
4779 payment method display
2020-03-03 10:10:51 +11:00
Luis Ramos
690474c01a
Adapt address finder spec to work with spree 2.1 code
...
Order ship address is required to get have an order with shipping rates
2020-03-02 21:55:21 +00:00
Luis Ramos
777754f8a9
Remove dead code that creates products in product_set
2020-03-02 19:41:51 +00:00
dependabot-preview[bot]
e4c5893c1e
Bump rubocop from 0.80.0 to 0.80.1
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.80.0 to 0.80.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.80.0...v0.80.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-02 19:36:43 +00:00
dependabot-preview[bot]
67aeae4a6d
Bump oj from 3.10.2 to 3.10.3
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.2 to 3.10.3.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.10.2...v3.10.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-03-02 19:34:09 +00:00
Luis Ramos
02008769e9
Make spree_payment.cvv_response_message without size limit so that long stripe redirect URLs can be stored there
2020-03-02 17:31:01 +00:00
Luis Ramos
65dd9f51cf
Add spec to cover update request where a stripe redirect must happen
2020-03-02 17:30:12 +00:00
Luis Ramos
a224c53200
Add spec to test receiving a redirect from stripe with a valid payment intent id
2020-03-02 17:30:12 +00:00
Luis Ramos
66f07c0d1c
Make checkout controller spec test both extracted payment redirects
2020-03-02 17:30:12 +00:00
Luis Ramos
d5287026f8
Add spec for Checkout::PostCheckoutActions
2020-03-02 17:30:12 +00:00
Luis Ramos
6b80eb2c16
Add spec for AuthorizeResponsePatcher
2020-03-02 17:30:12 +00:00
Luis Ramos
b54b981740
Improve readability of PaymentIntentValidator and cover with specs
2020-03-02 17:30:12 +00:00
Luis Ramos
895032fe6a
Move stubbed requests to the top as they are the same for every test
2020-03-02 17:30:12 +00:00
Luis Ramos
531c385aae
Adapt stripe sca spec to new double step auth+capture payment process
2020-03-02 17:30:12 +00:00
Luis Ramos
d0a3ab68f3
Make processing payments also pending payments
2020-03-02 17:30:12 +00:00
luisramos0
b5038c5745
Adapt subscriptionPaymentUpdater to include pending payments as pending payments! Pending payments of credit cards are payments already authorized, ready to be captured
...
This is problably what will happen with subscriptions credit cards where payments will be authorized by the customer and the confirmation process on process_payments! will just capture the payment
2020-03-02 17:30:12 +00:00
luisramos0
6877485c90
Extract AuthorizeResponsePatcher from stripeSCA gateway
2020-03-02 17:30:12 +00:00
luisramos0
95c1b7f7a6
Extract PaymentIntentValidator from StripeSCA gateway
2020-03-02 17:30:12 +00:00
luisramos0
3fcf286516
Extract PostCheckoutActions from checkout controller
2020-03-02 17:30:12 +00:00
luisramos0
e2cdb01a28
Improve readability of stripe sca gateway code
2020-03-02 17:30:12 +00:00
luisramos0
08e729673f
Move stripe sca gateway error messages to translatable keys
2020-03-02 17:30:12 +00:00
luisramos0
c0bf09131f
Make order.pending_payments include payments in pending state so that these payments (pending is the state after authorization for credit cards) are also processed as part of the normal order workflow
2020-03-02 17:30:12 +00:00
luisramos0
19042e0d37
Make checkout controller able to receive a redirect from stripe with a payment_intent as parameter
2020-03-02 17:30:12 +00:00
luisramos0
4b3b4e00ff
Add authorize action to the stripe_sca gateway and make it fetch the redirect url if provided
...
Change the purchase action to only capture the alrteady authorized payment intent
2020-03-02 17:30:12 +00:00
luisramos0
e3ffe8fe6b
Add Checkout Stripe redirect logic to get users redirected to stripe authentication pages provided by the stripe API
2020-03-02 17:30:12 +00:00
luisramos0
d91578ab80
Rename checkout payment redirect to checkout paypal redirect
2020-03-02 17:30:12 +00:00
luisramos0
873dcc373f
Small refactoring to make next commit easier
2020-03-02 17:30:12 +00:00
luisramos0
1289c3f1a2
Fix rubocop issues in credit_cards_controller
2020-03-02 17:29:30 +00:00
Luis Ramos
c37218fdc5
Merge pull request #4719 from luisramos0/stripe_card_to_pm
...
Make StripeSCA payment method work with existing credit cards (the ones saved through the Stripe Charges API)
2020-03-02 17:22:07 +00:00
Luis Ramos
dad21a52b2
Merge pull request #4672 from luisramos0/stripe_sca_method
...
Add new Stripe payment method compatible with the new Stripe Payment Intents API
2020-03-02 17:19:05 +00:00
Pau Pérez Fabregat
97a65d760f
Merge pull request #4527 from luisramos0/subs_logs
...
Improve Subscriptions logging
2020-03-02 15:48:45 +01:00
Transifex-Openfoodnetwork
63e92197f5
Updating translations for config/locales/pt_BR.yml
2020-03-02 09:40:20 +11:00
Transifex-Openfoodnetwork
fd534bf629
Updating translations for config/locales/pt_BR.yml
2020-03-02 09:37:10 +11:00
Eduardo
64d83bfc4d
fix ampersand problem using ng-bind-html
2020-03-01 17:54:36 -03:00
Pau Pérez Fabregat
83065a798e
Merge pull request #4814 from luisramos0/rubop_rules
...
Add new cops (disabled) to rubocop config
2020-02-28 11:15:34 +01:00
Matt-Yorkley
b661b3ee40
Merge pull request #4823 from luisramos0/require_specs
...
Add some require statements to specs
2020-02-28 10:46:29 +01:00
Luis Ramos
b528903aa8
Remove spec covering html format in SchedulesController#index, this is not used anywhere
2020-02-27 19:05:36 +00:00
Matt-Yorkley
38215c2a88
Delete some dead code
...
This feature for assigning defaults via the UI was previously removed
2020-02-27 19:28:25 +01:00
Matt-Yorkley
d280bf0d4d
Update all locales with the latest Transifex translations
2020-02-27 11:42:02 +01:00
Eduardo
4c3916a93d
redirect to shops list when an enterprise is not found
2020-02-26 19:25:38 -03:00
Luis Ramos
677f31ffa8
Make payment source_views/gateway work with nil credit card
...
This will happen if user deletes a saved credit card used previously. In this case, the admin payment details page will render empty details and the payment amount
2020-02-26 11:55:17 +00:00
Luis Ramos
5848a46149
Add missing template to render stripeSCA payment and add spec to verify it's presence
2020-02-26 11:38:42 +00:00
Luis Ramos
03c91dfac1
Merge pull request #4780 from luisramos0/bulk_prod_errors
...
Fix javascript logic that parses server errors in the bulk product edit page
2020-02-25 18:49:54 +00:00
Luis Ramos
60e12063cd
Merge pull request #4758 from luisramos0/fix_incomplete_stripe
...
Make the payment methods filter handle misconfigured stripe payment methods
2020-02-25 18:47:09 +00:00
Pau Pérez Fabregat
e5b57af315
Merge pull request #4815 from openfoodfoundation/transifex
...
Transifex
2020-02-25 13:37:30 +01:00
Pau Pérez Fabregat
a396a7f0af
Merge pull request #4818 from luisramos0/delete_dead_code
...
Delete dead code after PRs 4512 and 4508
2020-02-25 13:32:23 +01:00
Luis Ramos
6b6cdf07fb
Remove inactive confirm
...
The new version of jquery is picking up a confirm in the ship action that was not being triggered in the previous version
The orders_spec was not expecting this confirm to appear so we are removing here to keep the behaviour and the spec green
2020-02-25 11:56:23 +00:00
Transifex-Openfoodnetwork
d084789c56
Updating translations for config/locales/nb.yml
2020-02-25 19:57:08 +11:00
Transifex-Openfoodnetwork
dafac32e70
Updating translations for config/locales/nb.yml
2020-02-25 19:53:59 +11:00
Maikel Linke
8432dab142
Remove unused Javascript manifest
...
It reduces compilation from 25s to 24s.
2020-02-25 11:43:53 +11:00
Maikel Linke
0b0263a605
Remove unused stylesheet manifest
...
Compiling assets with application.css: 40s
Compiling assets without application.css: 25s
2020-02-25 11:43:39 +11:00
Transifex-Openfoodnetwork
6ca39f3aa5
Updating translations for config/locales/fr_CA.yml
2020-02-25 09:10:13 +11:00
Transifex-Openfoodnetwork
234a9ef1b4
Updating translations for config/locales/en_CA.yml
2020-02-25 08:41:07 +11:00
Luis Ramos
24a1327805
Merge pull request #4785 from openfoodfoundation/dependabot/bundler/stripe-5.15.0
...
Bump stripe from 5.11.0 to 5.15.0
2020-02-24 20:12:39 +00:00
Luis Ramos
33d77d57f4
Merge pull request #4776 from luisramos0/remove_assets_group
...
Remove the assets group from the gemfile (taken from spree upgrade branch)
2020-02-24 20:12:01 +00:00
dependabot-preview[bot]
51dd55c5b9
[Security] Bump jquery-rails from 3.0.4 to 3.1.5
...
Bumps [jquery-rails](https://github.com/rails/jquery-rails ) from 3.0.4 to 3.1.5. **This update includes a security fix.**
- [Release notes](https://github.com/rails/jquery-rails/releases )
- [Changelog](https://github.com/rails/jquery-rails/blob/v3.1.5/CHANGELOG.md )
- [Commits](https://github.com/rails/jquery-rails/compare/v3.0.4...v3.1.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-24 19:14:38 +00:00
Transifex-Openfoodnetwork
0571b657aa
Updating translations for config/locales/en_FR.yml
2020-02-25 04:39:02 +11:00
Transifex-Openfoodnetwork
e4958baddc
Updating translations for config/locales/en_FR.yml
2020-02-25 04:35:52 +11:00
Transifex-Openfoodnetwork
c985747297
Updating translations for config/locales/fr.yml
2020-02-25 04:31:33 +11:00
Maikel Linke
17ea2cd510
Clean up JS assets comments
2020-02-24 11:22:47 +11:00
Maikel Linke
325c427219
Remove style from pasted HTML in editor
2020-02-24 11:22:47 +11:00
Maikel Linke
a3e87d893a
Remove obsolete angular-sanitize
...
Our TextAngular module supplies that code.
2020-02-24 11:22:47 +11:00
Maikel Linke
480a629349
Bump textAngular to latest v1.5.16
...
I'm not sure which version we had previously. This update should come
with lots of minor improvements even though we didn't have anyone
complain.
2020-02-24 11:22:47 +11:00
Luis Ramos
03fac6f285
Avoid subquery with too many columns error by specifying the selected column
2020-02-23 20:05:13 +00:00
Transifex-Openfoodnetwork
f5ffdfc258
Updating translations for config/locales/en_NZ.yml
2020-02-23 22:32:56 +11:00
Luis Ramos
2108a282c8
Add some require statements to specs
2020-02-22 11:49:52 +00:00
Luis Ramos
a3a61967a8
Merge pull request #4621 from luisramos0/spree_backend_js
...
OFN without spree_backend 🎉
2020-02-22 10:24:50 +00:00
luisramos0
404e7c1f37
Make credit card cloner clone the payment method even if the customer is not given
...
This makes the payments without saving card work again in the frontoffice as well as the payments taken by the seller in the backoffice
2020-02-21 14:11:13 +00:00
Luis Ramos
1bdeda4a21
Delete dead code after PRs 4512 and 4508
2020-02-21 12:25:07 +00:00
Luis Ramos
47916f823f
Add spec to credit card cloner. No customer given.
2020-02-21 10:56:32 +00:00
Luis Ramos
ab4add1954
Fix CreditCardCloner basic spec
2020-02-21 10:56:32 +00:00
Luis Ramos
10fff31dca
Fix stripe_sca spec
2020-02-21 10:56:32 +00:00
Luis Ramos
7fb85092ce
Remove duplicate customers stubs
2020-02-21 10:56:32 +00:00
Luis Ramos
7584e96759
Make customer stub always return the same customer id
...
I cant make stripe customers stub return different customer_ids based on the stripe_account header
2020-02-21 10:56:32 +00:00
Luis Ramos
f8ab64d71e
Move specs around in stripe_sca_spec so we can re-use the cloning stubs when storing a new card and when re-using a new card
2020-02-21 10:56:32 +00:00
Luis Ramos
ccb4c77d1f
Adapt credit card cloner to not clone card if it's a card to be used only once
...
Adapt stripe_sca specs to new cloner logic
2020-02-21 10:56:32 +00:00
luisramos0
5ef1510fc7
Adapt CreditCard cloner to clone not 'cards of the platform account to payment_methods of the connected accounts' but instead 'cards or payment_methods of the platform account to payment_methods of the connected accounts'
...
This process mimicks the existing process of generating a token on the connected account from a card on the platform account. In the Payment Intents API we need to create a payment method in the connected account, a token is not enough
2020-02-21 10:56:32 +00:00
luisramos0
1afd712ff4
Make StripeSCA store cards (and delete them) on the Stripe platform account and not the Stripe Connected account (the sellers accounts)
...
This is important so that cards can be re-used across sellers in OFN
2020-02-21 10:56:32 +00:00
luisramos0
699110258b
Add spec for credit_card_cloner
2020-02-21 10:56:32 +00:00
luisramos0
3fb1df9bb3
Rename CardCloner to CreditCardCloner because it's dependent on Spree:CreditCard attributes
2020-02-21 10:56:32 +00:00
luisramos0
14c03ead31
Extract CardCloner to separate class
2020-02-21 10:56:32 +00:00
luisramos0
4480c2f0f0
Add logic to stripe_sca gateway to handle cards stored in the platform account with the stripe Charges API: card_*
2020-02-21 10:56:32 +00:00
luisramos0
b3ac5d8f41
Improve code readability a little
2020-02-21 10:52:56 +00:00
luisramos0
6fb74c88cd
Fix a typo
2020-02-21 10:52:56 +00:00
luisramos0
38fd028a9f
Fix some rubocop issues from previous commit
2020-02-21 10:52:56 +00:00
luisramos0
4e84310d63
Add StripeSCA where StripeConnect is treated as an exception in the setting up of process of a payment method and subscriptions
...
Here we are copy pasting and adding stripe SCA because we are planning to delete the StripeConnect that will be replaced by the stripe sca implementation
2020-02-21 10:52:56 +00:00
luisramos0
66440f9e4c
Add missing translations for new payment method stripe sca
2020-02-21 10:52:56 +00:00
luisramos0
b8457ebece
Make profile storer a bit easier to read
2020-02-21 10:52:56 +00:00
Luis Ramos
668fd1c7c0
Add spec for profile storer to cover happy path for both response attribute cases: existin stripe integration and new stripe sca
2020-02-21 10:52:55 +00:00
Luis Ramos
aff934c814
Remove unnecessary test setup code
2020-02-21 10:52:55 +00:00
Luis Ramos
6bb04f6cc6
Adapt stripe_sca_spec to actual stripe SCA API
2020-02-21 10:52:55 +00:00
luisramos0
0e815439b3
Duplicate stripe_connect_spec and adapt to new stripe_sca
...
stripe_connect_spec will be deleted at some point when all users are migrated to the sca api
2020-02-21 10:52:55 +00:00
luisramos0
c7b01c37af
Fix a problem in credit cards controller spec and test case where stripe_account_id must be included in the stripe api call
2020-02-21 10:52:55 +00:00
luisramos0
ac8f3c811f
Fix rubocop issues in some stripe integration related files
2020-02-21 10:52:55 +00:00
luisramos0
1b820ea85c
Fix rubocop issues in credit_cards_controller
2020-02-21 10:52:55 +00:00
luisramos0
ec7b91bb68
Make ProfileStorer a bit easier to read
2020-02-21 10:52:29 +00:00
luisramos0
c773cde191
Add admin payment template for stripe sca and respective js code to make it work
2020-02-21 10:52:29 +00:00
luisramos0
db1065a69e
Make saving a card on checkout work with the payment intents api by making profile storer work with the slightly different api responses from stripe
2020-02-21 10:52:29 +00:00
luisramos0
9fa4bad0b4
Add stripe SCA checkotu payment template and move stripe object definition to it and the other stripe template
...
We need to set the stripe object with the stripe account id to work with the payment intents api but we cannot set it to work with the stripe charges api
This makes the two payment methods incompatible: a given enterprise cannot use both the old stripe integration and this new one at the same time.
2020-02-21 10:52:29 +00:00
luisramos0
a52c4b542c
Make destroy stored cards work for stripe SCA by setting stripe account id before making the call to the stripe api
...
This account id cannot be sent when dealing with the old StripeConnect gateway
2020-02-21 10:52:29 +00:00
luisramos0
283abf9a88
Remove dead code from Stripe connect gateway
...
Update Source is dead since a74c502fd9
2020-02-21 10:52:29 +00:00
luisramos0
f691d1aafd
Add new payment method StripeSCA that will use the Stripe Payment Intents API instead of the Stripe Charges API that the current StripeConnect gatreway uses
2020-02-21 10:52:29 +00:00
luisramos0
5724c3bb0a
Add code from ActiveMerchant v1.98.0 that supports the Stripe Payment Intents API
...
This commit can be reverted once we upgrade to v1.98.0
2020-02-21 10:52:29 +00:00
Transifex-Openfoodnetwork
49ba83da6d
Updating translations for config/locales/en_GB.yml
2020-02-21 05:32:39 +11:00
Transifex-Openfoodnetwork
19d1497c4b
Updating translations for config/locales/en_GB.yml
2020-02-21 05:29:31 +11:00
Luis Ramos
06200c9d3c
Add new cops (disabled) to rubocop config
2020-02-20 18:04:43 +00:00
Luis Ramos
2412658e51
Update db/schema timestamp according to last change
2020-02-20 11:41:49 +00:00
Luis Ramos
0c4f22f847
Fix images/new.js path and add simple spec to verify the page loads correctly
...
Testing the file upload would be a bit more complicated
2020-02-20 11:18:22 +00:00
Luis Ramos
1803ea3c38
Add traling breakline to case where errors come in a array
2020-02-20 10:06:10 +00:00
Pau Pérez Fabregat
93fda02e43
Merge pull request #4803 from openfoodfoundation/dependabot/bundler/rubocop-0.80.0
...
Bump rubocop from 0.79.0 to 0.80.0
2020-02-20 09:34:10 +01:00
Pau Pérez Fabregat
77958f9afe
Merge pull request #4796 from openfoodfoundation/dependabot/bundler/i18n-js-3.6.0
...
Bump i18n-js from 3.5.1 to 3.6.0
2020-02-20 09:32:02 +01:00
Maikel Linke
82e402f31a
Update translations from Transifex
2020-02-20 16:20:06 +11:00
Maikel Linke
03fa3e2269
Find last payment deterministically
2020-02-20 15:59:57 +11:00
Maikel Linke
11fbe7d5c9
Show last payment method in order confirmations
2020-02-20 15:59:57 +11:00
Maikel Linke
799c1f08de
Optimise finding last payment
...
Suggested by Rubocop.
2020-02-20 15:59:56 +11:00
Maikel Linke
6b66458bfd
Replace andand with new Ruby syntax
2020-02-20 15:59:56 +11:00
Maikel Linke
3e0a5bac6a
Move helper to service for re-use
2020-02-20 15:59:56 +11:00
Maikel Linke
2c2023df03
Show last payment method in order confirmation
...
If we had multiple failed payments and then a successful payment, the
order confirmation was displaying the payment method of the first failed
payment. That was confusing and is now changed to the last payment
method.
2020-02-20 15:59:56 +11:00
Maikel Linke
7306d379a5
Display payment method literally
...
Don't allow for HTML and potentially bad scripts. But this also prevents
accidental display errors. If someone wrote, "We only take <cash>", it
would mess with the site.
2020-02-20 15:59:56 +11:00
Maikel Linke
e15c61d862
Add spec for order confirmation view
2020-02-20 15:59:56 +11:00
Maikel
35aeb98d45
Merge pull request #4792 from openfoodfoundation/transifex
...
Transifex
2020-02-20 10:43:45 +11:00
Luis Ramos
d99cba3b6e
Merge pull request #4709 from mkllnk/4172-js-pluralize
...
Pluralize common variant unit names
2020-02-19 22:28:54 +00:00
dependabot-preview[bot]
4c6fd96bcc
Bump rubocop from 0.79.0 to 0.80.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.79.0 to 0.80.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.79.0...v0.80.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-18 19:18:53 +00:00
Luis Ramos
1eba17f048
Make select column explicit to avoid too many columns sql error
2020-02-18 18:32:52 +00:00
dependabot-preview[bot]
ff088c6203
Bump stripe from 5.11.0 to 5.15.0
...
Bumps [stripe](https://github.com/stripe/stripe-ruby ) from 5.11.0 to 5.15.0.
- [Release notes](https://github.com/stripe/stripe-ruby/releases )
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stripe/stripe-ruby/compare/v5.11.0...v5.15.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-18 12:01:10 +00:00
Luis Ramos
a1cb6928db
Merge pull request #4793 from openfoodfoundation/dependabot/bundler/webmock-3.8.2
...
Bump webmock from 3.8.1 to 3.8.2
2020-02-18 11:59:14 +00:00
Luis Ramos
40a5b60dcb
Merge pull request #4794 from openfoodfoundation/dependabot/bundler/oauth2-1.4.4
...
Bump oauth2 from 1.4.3 to 1.4.4
2020-02-18 11:58:58 +00:00
Luis Ramos
2711736004
Use Array#join and make code simpler
2020-02-18 10:49:41 +00:00
Luis Ramos
18c165e893
Merge pull request #4784 from CSCI-462-01-2020/Issue4731
...
Add Order Cycle Button Tooltips
2020-02-17 19:32:39 +00:00
Luis Ramos
0aaa04295b
Improve and unit test errorsParser
2020-02-17 11:21:21 +00:00
Luis Ramos
7639e9a38d
Extrac ErrorsParser to separate class and make it handle the rails error structure with keys
2020-02-17 11:21:21 +00:00
Transifex-Openfoodnetwork
d783bd771f
Updating translations for config/locales/ar.yml
2020-02-15 09:33:06 +11:00
Transifex-Openfoodnetwork
9dd9d14107
Updating translations for config/locales/ar.yml
2020-02-15 09:29:56 +11:00
Transifex-Openfoodnetwork
e942266dd7
Updating translations for config/locales/pt_BR.yml
2020-02-15 07:05:18 +11:00
dependabot-preview[bot]
c8f78904d6
Bump i18n-js from 3.5.1 to 3.6.0
...
Bumps [i18n-js](https://github.com/fnando/i18n-js ) from 3.5.1 to 3.6.0.
- [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.5.1...v3.6.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-14 19:24:49 +00:00
Transifex-Openfoodnetwork
a982fd1e2b
Updating translations for config/locales/tr.yml
2020-02-14 22:27:33 +11:00
Transifex-Openfoodnetwork
7e8b2f6be5
Updating translations for config/locales/tr.yml
2020-02-14 22:24:23 +11:00
Transifex-Openfoodnetwork
921c7bbc3a
Updating translations for config/locales/tr.yml
2020-02-14 22:21:12 +11:00
Transifex-Openfoodnetwork
eaff6b0c68
Updating translations for config/locales/nb.yml
2020-02-14 19:26:01 +11:00
Transifex-Openfoodnetwork
e1ab424481
Updating translations for config/locales/nb.yml
2020-02-14 19:22:51 +11:00
Luis Ramos
00e57c8a55
Add module definition in the recently moved service and adapt all it's usages to refer to the new namespace
2020-02-13 20:17:09 +00:00
Luis Ramos
2e74e64e22
Move Product Reset Strategy to the catalog domain
2020-02-13 20:17:09 +00:00
Luis Ramos
fc5d623465
Add new domain structure Catalog
2020-02-13 20:17:06 +00:00
Transifex-Openfoodnetwork
e59c9720fc
Updating translations for config/locales/en_GB.yml
2020-02-14 06:53:13 +11:00
dependabot-preview[bot]
b25f0007f0
Bump oauth2 from 1.4.3 to 1.4.4
...
Bumps [oauth2](https://github.com/oauth-xx/oauth2 ) from 1.4.3 to 1.4.4.
- [Release notes](https://github.com/oauth-xx/oauth2/releases )
- [Changelog](https://github.com/oauth-xx/oauth2/blob/master/CHANGELOG.md )
- [Commits](https://github.com/oauth-xx/oauth2/compare/v1.4.3...v1.4.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-13 19:19:44 +00:00
dependabot-preview[bot]
65c5cdd52f
Bump webmock from 3.8.1 to 3.8.2
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.8.1 to 3.8.2.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.8.1...v3.8.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-13 19:16:18 +00:00
Transifex-Openfoodnetwork
a2873ea553
Updating translations for config/locales/fr.yml
2020-02-14 05:05:51 +11:00
Transifex-Openfoodnetwork
3a593ff255
Updating translations for config/locales/fr.yml
2020-02-14 05:02:42 +11:00
Transifex-Openfoodnetwork
92e1193ffb
Updating translations for config/locales/en_FR.yml
2020-02-14 05:01:02 +11:00
Transifex-Openfoodnetwork
016968dcb9
Updating translations for config/locales/fr.yml
2020-02-14 04:59:33 +11:00
Luis Ramos
9d8608f210
Merge pull request #4630 from Matt-Yorkley/product_counts
...
Show counts including all variants in order cycle exchanges
2020-02-13 11:33:58 +00:00
Luis Ramos
323ca906bc
Merge pull request #4759 from pacodelaluna/order-admin-products
...
Order admin products
2020-02-13 11:33:05 +00:00
Luis Ramos
c43b34e0fa
Merge pull request #4760 from luisramos0/checkout_ctrl
...
Merge Spree::CheckoutController with CheckoutController and clean it up
2020-02-13 11:31:15 +00:00
Luis Ramos
bc7f0e0962
Update all locales with the latest Transifex translations
2020-02-13 11:19:07 +00:00
Luis Ramos
cf4f7c562a
Merge pull request #4778 from openfoodfoundation/transifex
...
Transifex
2020-02-13 11:08:01 +00:00
François Turbelin
4c7bd4d6a8
Fix mess with order
2020-02-13 06:38:13 +01:00
François Turbelin
523b266308
Put back created_at desc as default order
2020-02-13 06:38:13 +01:00
François Turbelin
212413c8b3
Avoid mutable q params
2020-02-13 06:38:13 +01:00
François Turbelin
b248dc598e
Cosmetics
2020-02-13 06:38:13 +01:00
François Turbelin
e7b74b99ba
Refactor SortingOptions JS
2020-02-13 06:38:13 +01:00
François Turbelin
89d2750fc4
Set default value at backend side
2020-02-13 06:38:13 +01:00
François Turbelin
7100111f93
Fix specs and cosmetics
2020-02-13 06:38:13 +01:00
François Turbelin
3dcb66014e
Factorize column sorter partial
2020-02-13 06:38:13 +01:00
François Turbelin
06971b7198
Add sortable name column for Admin Products
2020-02-13 06:38:13 +01:00
François Turbelin
56f9adc5b7
Filter Admin products by name asc
2020-02-13 06:38:13 +01:00
Luis Ramos
38374a9835
Merge pull request #4761 from openfoodfoundation/dependabot/bundler/unicorn-5.5.3
...
Bump unicorn from 5.5.2 to 5.5.3
2020-02-12 20:56:19 +00:00
Luis Ramos
8d6a8ee214
Merge pull request #4763 from mkllnk/rails4-form-rendering
...
Future proof form rendering in admin orders
2020-02-12 20:56:00 +00:00
blainebillings
fec653186a
Add Order Cycle Button Tooltips
2020-02-11 10:10:39 -05:00
Transifex-Openfoodnetwork
ebe7456b66
Updating translations for config/locales/tr.yml
2020-02-11 21:48:53 +11:00
Transifex-Openfoodnetwork
8187669a25
Updating translations for config/locales/tr.yml
2020-02-11 21:45:44 +11:00
Transifex-Openfoodnetwork
a6aa0df53b
Updating translations for config/locales/fr_BE.yml
2020-02-10 03:32:33 +11:00
Transifex-Openfoodnetwork
116695b1d9
Updating translations for config/locales/en_NZ.yml
2020-02-08 18:53:00 +11:00
Transifex-Openfoodnetwork
387ac40dc9
Updating translations for config/locales/en_NZ.yml
2020-02-08 18:49:51 +11:00
luisramos0
66320b5055
Remove the assets group from the gemfile, it will disappear in rails 4
2020-02-07 12:29:02 +00:00
luisramos0
858d2cc6c2
Add doc to Spree::CheckoutController to make it more obvious why this controller exists
2020-02-07 11:50:23 +00:00
luisramos0
43280da187
Dup params to avoid nasty effects of a mutated params object in the controller
2020-02-07 10:26:04 +00:00
luisramos0
3b399b899c
Extract methods in subscription_placement_job to fix rubocop complexity issues
2020-02-07 10:06:59 +00:00
luisramos0
01d69c89aa
Add some log messages to help debug problems in subscription placement and subscription confirmation processes
2020-02-07 10:06:58 +00:00
luisramos0
a2801e40a2
Improve readability of proxy_order_syncer and add some log messages
2020-02-07 10:06:58 +00:00
luisramos0
abd4f0b923
Add custom_data column to paper_trail versions table so we can track a specific list of ids in a model
...
Activate paper_trail in order_cycles and schedules and track each others ids
An alternative way of doing this would be to use a gem for paper_trail associations but this way we avoid adding a new dependency to the app
2020-02-07 10:06:58 +00:00
Luis Ramos
e1eface5f8
Merge pull request #4542 from luisramos0/logger
...
Add timestamp to log entries
2020-02-07 10:02:55 +00:00
Luis Ramos
5cd14253d0
Merge pull request #4770 from openfoodfoundation/dependabot/bundler/webmock-3.8.1
...
Bump webmock from 3.8.0 to 3.8.1
2020-02-07 09:31:19 +00:00
Maikel
be691df7ac
Merge pull request #4769 from openfoodfoundation/transifex
...
Transifex
2020-02-07 18:09:31 +11:00
Maikel Linke
7783b28ca2
Update concurrency spec after refactor
...
In order to make the spec fail if the controller was not thread safe, it
uses breakpoints. One of those breakpoints was set for a method that has
now been removed.
I changed the method that is used for the breakpoint and changed `allow`
to `expect` so that this spec will fail if we remove that method as
well. Future version of Rspec will check if a mocked method actually
exists but our version just mocks it anyway. This is one way how specs
can become invalid after refactoring.
2020-02-07 17:46:42 +11:00
Maikel
6d51856821
Merge pull request #4734 from openfoodfoundation/dependabot/bundler/oauth2-1.4.3
...
Bump oauth2 from 1.4.2 to 1.4.3
2020-02-07 16:48:42 +11:00
dependabot-preview[bot]
890704b75c
Bump webmock from 3.8.0 to 3.8.1
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.8.0 to 3.8.1.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.8.0...v3.8.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-06 19:17:54 +00:00
Transifex-Openfoodnetwork
922484b2e7
Updating translations for config/locales/en_GB.yml
2020-02-07 05:02:38 +11:00
Luis Ramos
3e7288648b
Merge pull request #4762 from openfoodfoundation/dependabot/bundler/roo-2.8.3
...
Bump roo from 2.8.2 to 2.8.3
2020-02-06 14:44:21 +00:00
luisramos0
f0f537ff8f
Fix path of spree-select2.js pointing to the file in ofn rather the file in spree_backend
2020-02-06 11:21:47 +00:00
Transifex-Openfoodnetwork
b7f920c4b6
Updating translations for config/locales/ca.yml
2020-02-06 21:12:27 +11:00
Pau Pérez Fabregat
be19d50639
Merge pull request #4768 from openfoodfoundation/transifex
...
Transifex
2020-02-06 11:11:23 +01:00
Transifex-Openfoodnetwork
0ceb8ab6c4
Updating translations for config/locales/ca.yml
2020-02-06 21:09:16 +11:00
Pau Pérez Fabregat
e387c7db83
Merge pull request #4548 from luisramos0/improve_truncate_data
...
Improve truncate data process
2020-02-06 11:01:36 +01:00
Pau Pérez Fabregat
d5df48f3c0
Merge pull request #4737 from openfoodfoundation/transifex
...
Transifex
2020-02-06 11:00:46 +01:00
Pau Pérez Fabregat
c9abdac2e0
Merge pull request #4722 from mkllnk/code-climate-rubocop
...
Bump Code Climate's Rubocop version to their latest
2020-02-06 10:32:46 +01:00
Transifex-Openfoodnetwork
ff08d9f210
Updating translations for config/locales/nb.yml
2020-02-06 09:39:52 +11:00
luisramos0
e5c9468d09
Fix rubocop issues in navigation_helper
2020-02-05 22:16:20 +00:00
luisramos0
8aed173127
Uncomment events in order edit page and remove unused spree autocomplete js code
2020-02-05 20:04:15 +00:00
luisramos0
61ecca7257
Move template loading to directive of customer search override
2020-02-05 20:04:15 +00:00
luisramos0
7eba657b2f
Add missing templates from spree_backend
2020-02-05 20:04:15 +00:00
luisramos0
784de340d1
Disable adaptive menu when running tests, this is what spree_backend was doing before
2020-02-05 20:04:15 +00:00
luisramos0
9191628f29
Bring custom form_builder initializer from spree_backend
2020-02-05 20:04:15 +00:00
luisramos0
88410b1efd
Add missing general config routes from spree_backend
2020-02-05 20:04:12 +00:00
luisramos0
afea032361
Add return_authorizations route from spree_backend
2020-02-05 16:02:43 +00:00
luisramos0
3decb4056c
Remove repeated include spree_paypal_express and add require css select2
2020-02-05 16:02:43 +00:00
luisramos0
8e9b08feca
Remove jquery-alerts from head html
2020-02-05 16:02:43 +00:00
luisramos0
694995ea5d
Prefix root_path with main_app so that ofn's route is used. The spree root path is no longer defined, we dont need it
2020-02-05 16:02:43 +00:00
luisramos0
22de7252d0
Fix route in login nav and bring reports and properties resource route from spree_backend
2020-02-05 16:02:43 +00:00
luisramos0
2acf8e5125
Remove config_locale from base controller, in OFN we dont have separate locales for frontoffice and backoffice
2020-02-05 16:02:43 +00:00
luisramos0
e1f61e645d
Remove dependency to spree_backend and add dependencies still required: jquery-ui-rails and select2-rails
2020-02-05 16:02:43 +00:00
luisramos0
687d827ceb
Add required css require for select2
2020-02-05 16:02:43 +00:00
luisramos0
2885e38113
Re-activate/re-add click events that were registered in spree_backend code before
2020-02-05 16:02:43 +00:00
luisramos0
9f3ca58b55
Add empty admin/spree_backend.js
...
This file is required by spree_paypal_express that we still need after leaving spree_backend
2020-02-05 16:02:43 +00:00
luisramos0
ffe3228848
Remove spree_backend dependencies from all.js and all.css and fix some dependencies path problems
2020-02-05 16:02:43 +00:00
luisramos0
834231eb8f
Add js code needed for the zones admin page
2020-02-05 16:02:43 +00:00
luisramos0
68f5aabd3f
Add js code needed where calculators are used: ship methods and payment methods config pages
2020-02-05 16:02:43 +00:00
luisramos0
7e7ea92833
Add js code needed in the states admin page
2020-02-05 16:02:43 +00:00
luisramos0
ebf22ceb19
Add js and css code for image settings from spree_backend
2020-02-05 16:02:43 +00:00
Luis Ramos
9313a57d19
Merge pull request #4511 from luisramos0/backend_ctrl_search
...
Bring spree_backend search controller to OFN
2020-02-05 15:54:30 +00:00
Luis Ramos
c38c7c35bc
Add spec for user default address setter
2020-02-05 14:49:17 +00:00
luisramos0
2663f74767
Add specs for new services
2020-02-05 14:49:17 +00:00
luisramos0
b41de52012
Moved checkout services into a specific folder under app/services
2020-02-05 14:49:17 +00:00
luisramos0
214eb43122
Add frozen string literal magic comment
2020-02-05 14:49:17 +00:00
luisramos0
01fc4e0513
Add Spree::CheckoutController only to redirect to CheckoutController
...
I have not managed to make the spree checkout route, that paypal express uses, go to CheckoutController directly. According to the rails docs "to: '/checkout#edit'" should do it, but it doesnt work here.
2020-02-05 14:49:17 +00:00
luisramos0
6ce50a5fa5
Extract paypal redirect logic to service class
2020-02-05 14:49:17 +00:00
luisramos0
4fbd2cfa52
Extract UserDefaultAddress logic into separate class to take more 30 lines out of CheckoutController
2020-02-05 14:49:17 +00:00
luisramos0
383b28e170
Add order and current_user to checkout_form_data_adapter where they are required
...
Also re-add order.state condition to update_result: in some tests, the order state is complete but no completion data (completed?) is present
2020-02-05 14:49:17 +00:00
luisramos0
bf55a15f81
Extract checkout params adaptation logic into a service class
2020-02-05 14:49:17 +00:00
luisramos0
eb7e6dc5b8
Remove spree checkout controller spec, it is no longer necessary
2020-02-05 14:49:17 +00:00
luisramos0
139ecfe604
Remove rubocop exceptions resolved so far in checkout controller
2020-02-05 14:49:17 +00:00
luisramos0
43a6798db2
Move methods around in checkout controller into a more logical organisation: first the filters code and then support code for the update action
2020-02-05 14:49:17 +00:00
luisramos0
06d6579486
Refactor construct_saved_card_attributes to fix rubocop issues
2020-02-05 14:49:17 +00:00
luisramos0
76df526002
Remove dead code from construct_saved_card_attributes
2020-02-05 14:49:17 +00:00
luisramos0
06569ea24c
Refactor load_order to fix rubocop issues
2020-02-05 14:49:17 +00:00
luisramos0
25431f851b
Refactor object_params to fix rubocop issues
2020-02-05 14:49:17 +00:00
luisramos0
bab2420bb3
Break up default address methods to fix rubocop issues
2020-02-05 14:49:17 +00:00
luisramos0
0b2acb3a76
Extracted two methods from checkout_workflow to fix rubocop issues
2020-02-05 14:49:17 +00:00
luisramos0
27db9e604f
Extract respond_to_update_succeeded from update_succeeded
2020-02-05 14:49:17 +00:00
luisramos0
c4e58ebb9e
Extract update_succeeded from checkout#update
2020-02-05 14:49:17 +00:00
luisramos0
9a0ee254af
Extract checkout_workflow from checkout#update
2020-02-05 14:49:17 +00:00
luisramos0
5ce3e1e0d2
Fix some rubocop issues in checkout controller
2020-02-05 14:49:17 +00:00
luisramos0
4b345d928c
Remove old code to detect Phantom Fees, no bugsnag events detected at all
2020-02-05 14:49:17 +00:00
luisramos0
52b1e6c71a
Move all logic required in Spree::CheckoutController to CheckoutController
2020-02-05 14:49:17 +00:00
Matt-Yorkley
140e0b9cb1
Refactor #exchangeLoadedVariants
2020-02-05 15:11:34 +01:00
Matt-Yorkley
b3f05d1a98
Use "Variants" instead of "Products" in order cycle exchanges UI
2020-02-05 15:11:34 +01:00
Matt-Yorkley
9644b145cc
Remove num_of_products
2020-02-05 15:11:34 +01:00
Matt-Yorkley
6f644936b0
Show counts including all variants in order cycle exchanges
2020-02-05 15:10:26 +01:00
Matt-Yorkley
b86759d7a7
Fix form rendering in admin orders
...
ActionView::Template::Error: Nil location provided. Can't build URI.
0) Account and Billing Settings updating as an admin user loads the page
Failure/Error: = form_tag false, {name: "orders_form", "ng-submit" => "fetchResults()"} do
2020-02-05 16:37:23 +11:00
luisramos0
b0f2e01c70
Delete extra inventory_units that are for some unknown reason connected to shipments of orders to delete but not to orders to delete
2020-02-05 16:30:14 +11:00
Maikel
747be81aec
Link to new release template
2020-02-05 15:21:26 +11:00
Maikel
fd124daf50
Add task to notify instance managers of upcoming changes
2020-02-05 14:58:57 +11:00
Transifex-Openfoodnetwork
ef33d27e6c
Updating translations for config/locales/en_FR.yml
2020-02-05 06:55:27 +11:00
Transifex-Openfoodnetwork
3a01e00d7b
Updating translations for config/locales/fr.yml
2020-02-05 06:51:14 +11:00
Luis Ramos
81103f3f71
Merge pull request #4742 from CSCI-462-01-2020/Issue4109
...
Edit new_resource partial
2020-02-04 19:44:16 +00:00
dependabot-preview[bot]
9d1e3f0318
Bump roo from 2.8.2 to 2.8.3
...
Bumps [roo](https://github.com/roo-rb/roo ) from 2.8.2 to 2.8.3.
- [Release notes](https://github.com/roo-rb/roo/releases )
- [Changelog](https://github.com/roo-rb/roo/blob/master/CHANGELOG.md )
- [Commits](https://github.com/roo-rb/roo/compare/v2.8.2...v2.8.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-04 19:23:42 +00:00
dependabot-preview[bot]
67adf3c801
Bump unicorn from 5.5.2 to 5.5.3
...
Bumps [unicorn](https://yhbt.net/unicorn/ ) from 5.5.2 to 5.5.3.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-02-04 19:22:39 +00:00
Luis Ramos
a8b48a561f
Merge pull request #4733 from lin-d-hop/master
...
Fixing incorrect payment and balance calculation
2020-02-04 18:11:48 +00:00
Luis Ramos
c7038f6ac9
Merge pull request #4620 from luisramos0/spree_backend_css
...
Bring basic CSS rules from spree backend
2020-02-04 18:06:15 +00:00
Luis Ramos
ea75714561
Merge pull request #4635 from luisramos0/main_app_routes
...
Replace use of spree.root_path and root_url with main_app.root_path and main_app.root_url
2020-02-04 16:02:48 +00:00
luisramos0
b7d19dd34c
Remove unused route from Spree.routes
2020-02-04 14:55:34 +00:00
luisramos0
44d1b3f00c
Remove unused search/users controller action
2020-02-04 14:55:34 +00:00
luisramos0
f8376c0aeb
Remove unused route search_customer_addresses
2020-02-04 14:55:34 +00:00
luisramos0
88464d58c2
Fix some rubocop issues and extract ransack hash to reduce repetition
2020-02-04 14:55:34 +00:00
luisramos0
962779bba1
Merge search controller with decorator
2020-02-04 14:54:51 +00:00
luisramos0
1ae73dd6ae
Add search_controller from spree_backend so that we can now merge it with the OFN's decorator
2020-02-04 14:54:51 +00:00
luisramos0
f48ab57782
Add explicit css import statements where they are needed
2020-02-04 14:52:44 +00:00
luisramos0
8b6ebfb351
Add imports for new css files from spree_backend
2020-02-04 14:52:44 +00:00
luisramos0
9c0788c3e0
Bring shared css rules from spree_backend
2020-02-04 14:52:17 +00:00
luisramos0
f61258d0b4
Bring components css from spree_backend
...
pagination and navigation rules were merged
2020-02-04 14:52:17 +00:00
luisramos0
289f62f115
Bring and require date picker css from spree_backend
2020-02-04 14:52:17 +00:00
luisramos0
c3a98d5a4f
Bring css dependencies from spree_backend
...
These dependencies are in spree_core so we dont need to bring them to ofn right now
2020-02-04 14:52:17 +00:00
Luis Ramos
d8374e9caa
Merge pull request #4614 from luisramos0/base_admin_js
...
Bring some basic js functions and dependencies from spree_backend
2020-02-04 14:48:38 +00:00
luisramos0
0648f23e94
Move css dependencies to specific css files and add some required dependencies from spree_backend
2020-02-04 14:47:51 +00:00
luisramos0
e37cb2d63f
Remove underscope from select2 css file name
2020-02-04 14:47:51 +00:00
luisramos0
ee64238bdd
Add jquery.adaptivemenu require but commeent out the activation for now because it is already called in spree_backend
...
This can be reverted when spree_backend is removed
2020-02-04 14:47:51 +00:00
luisramos0
d3130e111f
Remove on click events
...
These events can only be added to OFN when spree_backend is removed otherwise the evetns will be registered twice
2020-02-04 14:47:51 +00:00
luisramos0
93f4eee887
Make newly imported js files compatible with the karma build
2020-02-04 14:47:51 +00:00
luisramos0
408ada9097
Remove unnecessary build exception
2020-02-04 14:47:51 +00:00
luisramos0
e14ebd9503
Add required variables from spree_backend
2020-02-04 14:47:51 +00:00
luisramos0
289b99c30e
Bring and require equalize from spree_backend
2020-02-04 14:47:26 +00:00
luisramos0
f85c36a17e
Bring and require select2 from spree_backend
2020-02-04 14:47:26 +00:00
luisramos0
4715df3258
Bring and require jquery.horizontalNav.js from spree_backend
2020-02-04 14:47:26 +00:00
luisramos0
b20be101cc
Bring and require spin from spree_backend and respective progress indicator js and css
2020-02-04 14:47:26 +00:00
luisramos0
d424987587
Bring and require jquery.vAlign.js from spree_backend
2020-02-04 14:47:26 +00:00
luisramos0
a0575430dd
Require spree.js from spree_core for some basic functions like Spree.url
2020-02-04 14:46:57 +00:00
luisramos0
c1e6344b18
Merge spree js function and override
2020-02-04 14:46:57 +00:00
luisramos0
ed0198382f
Bring spree_backend admin.js.erb, rename it to base.js.erb and remove requires that are not used in ofn
2020-02-04 14:46:57 +00:00
blainebillings
577fb88843
Move Create and Cancel References to Actions Namespace
2020-02-04 09:39:01 -05:00
Pau Pérez Fabregat
2b879221b2
Merge pull request #4756 from kristinalim/fix/4489-flaky_spec_for_editing_oc
...
4489 Flaky spec when editing outgoing exchanges in OC
2020-02-04 15:38:37 +01:00
blainebillings
22db2e99f0
Merge branch 'Issue4109' of https://github.com/CSCI-462-01-2020/openfoodnetwork into Issue4109
2020-02-04 09:38:19 -05:00
blainebillings
ef4aa488c3
Moves Create and Cancel References to Actions Namespace
2020-02-04 09:34:28 -05:00
Pau Pérez Fabregat
57775f49bc
Merge pull request #4739 from openfoodfoundation/dependabot/bundler/rack-mini-profiler-1.1.6
...
Bump rack-mini-profiler from 1.1.4 to 1.1.6
2020-02-04 15:29:20 +01:00
Pau Pérez Fabregat
e8a12d9897
Merge pull request #4738 from openfoodfoundation/dependabot/bundler/oj-3.10.2
...
Bump oj from 3.10.1 to 3.10.2
2020-02-04 15:28:40 +01:00
Pau Pérez Fabregat
f3b8d5b868
Merge pull request #4741 from openfoodfoundation/dependabot/bundler/bugsnag-6.13.0
...
Bump bugsnag from 6.12.2 to 6.13.0
2020-02-04 15:28:00 +01:00
Pau Pérez Fabregat
246235b921
Merge pull request #4667 from Matt-Yorkley/rails-4-prep
...
Rails 4 prep
2020-02-04 15:20:28 +01:00
Luis Ramos
0ded41afee
Merge pull request #4513 from luisramos0/backend_ctrl_orders
...
Bring spree_backend orders controller to OFN
2020-02-04 11:51:54 +00:00
luisramos0
d32e106bf0
Add partials needed in the orders edit page
2020-02-04 11:51:13 +00:00
luisramos0
bbb3748d3c
Simplify orders events logic
2020-02-04 11:51:13 +00:00
luisramos0
08dd992344
Merge orders_helper with decorator
2020-02-04 11:51:13 +00:00
luisramos0
914244a1ee
Bring orders helper from spree_backend
2020-02-04 11:51:13 +00:00
luisramos0
e5f089610c
Bring admin orders routes from spree_backend
2020-02-04 11:51:13 +00:00
luisramos0
6e26841817
Fix load_order before filter and remove unused open and close adjustments actions
2020-02-04 11:50:44 +00:00
luisramos0
ab60c4a9dd
Remove unnecessary index action override because this is no longer a decorator
...
Remove useless todo comment
2020-02-04 11:50:44 +00:00
luisramos0
7009cd89e0
Fix rubocop issues in customer details controller and update rubocop manual todo accordingly
2020-02-04 11:50:44 +00:00
luisramos0
b93af37ea9
Merge customer details decorator with controller
2020-02-04 11:50:03 +00:00
luisramos0
76b6a85509
Merge spree/admin/orders_controller and its decorator and fix a few rubocop issues
2020-02-04 11:50:03 +00:00
luisramos0
a1d4b4ee98
Add orders_controller from spree_backend so that we can now merge it with the OFN's decorator
2020-02-04 11:50:03 +00:00
luisramos0
51bca7ce2f
Add customer_details_controller from spree_backend so that we can now merge it with the OFN's decorator
2020-02-04 11:50:03 +00:00
Luis Ramos
70147f908a
Merge pull request #4611 from luisramos0/taxonomies_js
...
Bring js code to make taxonomies admin work without spree_backend
2020-02-04 11:47:27 +00:00
Luis Ramos
c4bf4f001f
Merge pull request #4509 from luisramos0/backend_ctrl_payments
...
Bring spree_backend payments controller to OFN
2020-02-04 11:46:23 +00:00
Matt-Yorkley
7d71f21753
Add frozen_string_literal comment to new class
2020-02-04 11:11:24 +01:00
Matt-Yorkley
285c78a5e4
Remove use of #pluck and ensure subquery does not include all columns
2020-02-04 11:10:13 +01:00
luisramos0
6e78ae762a
Make it work even if preferred_enterprise_id is null
2020-02-04 10:01:18 +00:00
luisramos0
9a2ad16926
Make explicit the dependency to font-awesome css rules
2020-02-04 09:34:59 +00:00
luisramos0
afec21eb3d
Move imports to where they are needed
2020-02-04 09:34:59 +00:00
luisramos0
651ee720c6
Remove underscore from new jstree css file
2020-02-04 09:34:40 +00:00
luisramos0
2e6c5e1fad
Add dependencies from spree_backend required by jstree
2020-02-04 09:34:40 +00:00
luisramos0
87366ae7fc
Remove usage of jConfirm so that we dont have to bring dependency jquery.alerts from spree_backend
2020-02-04 09:33:58 +00:00
luisramos0
27aea0b277
Bring js code from spree_backend to make taxons admin work
2020-02-04 09:33:58 +00:00
luisramos0
d4edc9f20d
Bring jstress css from spree_backend
2020-02-04 09:33:58 +00:00
luisramos0
6c7991be75
Bring jquery.jstree from spree_backend
2020-02-04 09:33:34 +00:00
luisramos0
3f81352df5
Bring jquery.cookie from spree_backend
2020-02-04 09:33:34 +00:00
Kristina Lim
9d0e26ae28
Wait for products panel to show in outgoing exchanges feature spec
2020-02-04 16:20:47 +08:00
Luis Ramos
d80554a14a
Merge pull request #4744 from luisramos0/oc_pag_bug
...
Make pagination optional in the ExchangeProductsController
2020-02-03 17:19:06 +00:00
luisramos0
a5fe5fb448
Remove usage of deleted const DEFAULT_PAGE
...
If params[:page] is not in the request, the results will not be paginated now
2020-02-03 15:04:34 +00:00
luisramos0
4c51d60bfd
Make pagination optional in the ExchangeProductsController
2020-02-03 13:11:26 +00:00
blainebillings
9218008530
Edit new_resource Partial
2020-02-02 11:22:54 -05:00
myersca1
f36c5b8938
Edit new_resource partial
2020-02-02 11:19:10 -05:00
dependabot-preview[bot]
67199fd2d6
Bump bugsnag from 6.12.2 to 6.13.0
...
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby ) from 6.12.2 to 6.13.0.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases )
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.12.2...v6.13.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-31 19:15:09 +00:00
Transifex-Openfoodnetwork
18d17ec674
Updating translations for config/locales/fr_CA.yml
2020-02-01 04:02:53 +11:00
Transifex-Openfoodnetwork
3981ee7ec1
Updating translations for config/locales/en_CA.yml
2020-02-01 03:54:02 +11:00
Luis Ramos
a0475ee8a4
Merge pull request #4613 from luisramos0/autocomplete
...
Bring remaining variants autocomplete (and related) JS code from spree_backend
2020-01-31 16:08:50 +00:00
Luis Ramos
4cdc604f45
Merge pull request #4718 from luisramos0/variant_count
...
Make Order Cycle exchange tab summary not count inventory variants that are hidden
2020-01-31 16:03:21 +00:00
Luis Ramos
dbf44c41b2
Merge pull request #4657 from luisramos0/pi-xls
...
Remove Product import code for xls suppport
2020-01-31 12:12:25 +00:00
Maikel Linke
9535c5647f
Make pluralisation code an independent lib
...
I considered moving the code to a service but I think that this code
can be completely independent of the Open Food Network use case. It
would be easy to move to a gem. The downcasing may need reconsidering
for general use.
2020-01-31 09:48:32 +11:00
Maikel Linke
6f8bb793e1
Add unit names commonly used in French
2020-01-31 09:48:32 +11:00
Maikel Linke
2476050f29
Remove usage count comments
2020-01-31 09:48:32 +11:00
Maikel Linke
1cce106977
Use our unit name pluralization in Ruby
...
This code will be used for the shop front and reports.
2020-01-31 09:48:32 +11:00
Maikel Linke
98b55287f1
Pluralize common variant unit names
...
This adds the most popular unit names as singular and plural to our
locale for translation. The added Javascript performs a reverse lookup
to find the right singular/plural form of a unit name in that language.
2020-01-31 09:48:32 +11:00
dependabot-preview[bot]
25c4aed368
Bump rack-mini-profiler from 1.1.4 to 1.1.6
...
Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler ) from 1.1.4 to 1.1.6.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases )
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md )
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v1.1.4...v1.1.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-30 19:28:45 +00:00
dependabot-preview[bot]
c5a6ef673c
Bump oj from 3.10.1 to 3.10.2
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.1 to 3.10.2.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.10.1...v3.10.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-30 19:26:07 +00:00
Transifex-Openfoodnetwork
79ba15fe9a
Updating translations for config/locales/en_GB.yml
2020-01-31 03:53:48 +11:00
Kristina Lim
f797745848
Update all locales with the latest Transifex translations
2020-01-30 23:01:02 +08:00
Luis Ramos
25fae17677
Update Copyright to include year 2020
2020-01-30 14:44:31 +00:00
Kristina Lim
8ae6048202
Merge pull request #4720 from openfoodfoundation/transifex
...
Transifex
2020-01-30 22:40:47 +08:00
Luis Ramos
768631a90a
Merge pull request #4616 from luisramos0/orders_js
...
Bring some JS and CSS code from spree_backend related to orders admin
2020-01-30 11:37:07 +00:00
luisramos0
d472ceafcc
Add required dependencies from spree_backend
2020-01-30 11:36:09 +00:00
luisramos0
9a52a127a4
Add js code needed in the product images page
2020-01-30 11:36:09 +00:00
luisramos0
c20a41111c
Bring some css needed in payments list and product edit page and add image for the credit cards in the payments page as well
2020-01-30 11:36:09 +00:00
luisramos0
fd26500ca4
Add orders css for the orders edit page
2020-01-30 11:36:09 +00:00
luisramos0
4f0e441407
Bring and require responsive-tables js and css from spree_backend
2020-01-30 11:36:09 +00:00
Luis Ramos
37a5d1d036
Merge pull request #4628 from luisramos0/be_fontawesome
...
Bring fontawesome font and associated css from spree_backend
2020-01-30 11:21:35 +00:00
Luis Ramos
c4f7588601
Merge pull request #4608 from luisramos0/power_tip
...
Bring powertip from spree_backend, including js and css
2020-01-30 11:20:37 +00:00
Luis Ramos
6509c6f7b5
Merge pull request #4588 from luisramos0/base_helper
...
Bring base helper from spree_backend
2020-01-30 11:18:35 +00:00
Kristina Lim
5aadd444aa
Merge pull request #4721 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.4.2
...
Bump rubocop-rails from 2.4.1 to 2.4.2
2020-01-30 19:04:24 +08:00
Kristina Lim
278284583f
Merge pull request #4735 from mkllnk/4729-init-taxon-dropdown
...
Activate Foundation's dropdowns after tab switch
2020-01-30 19:00:30 +08:00
luisramos0
e192207f4e
Fix bug in before filters migration, needs to load payment for the show action
2020-01-30 10:27:26 +00:00
Maikel Linke
b63042236d
Activate Foundation's dropdowns after tab switch
...
If the dropdown doesn't exist during page load, Foundation misses it. We
need to initialise it again.
2020-01-30 17:02:23 +11:00
dependabot-preview[bot]
48a75c956f
Bump oauth2 from 1.4.2 to 1.4.3
...
Bumps [oauth2](https://github.com/oauth-xx/oauth2 ) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/oauth-xx/oauth2/releases )
- [Changelog](https://github.com/oauth-xx/oauth2/blob/master/CHANGELOG.md )
- [Commits](https://github.com/oauth-xx/oauth2/compare/v1.4.2...v1.4.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-29 19:24:24 +00:00
lin-d-hop
baf1ecb436
Fixing incorrect payment and balance calculation
...
Corrections and added specs
2020-01-29 16:06:06 +00:00
Transifex-Openfoodnetwork
32f7a74df7
Updating translations for config/locales/en_NZ.yml
2020-01-29 15:43:31 +11:00
luisramos0
3e68dc5bb2
Extract some methods from base_helper to zones_helper to make it explicit they are only used in the zones admin pages
2020-01-28 18:05:30 +00:00
luisramos0
919242d9ec
Fix rubocop issues in spree/admin/base_helper
2020-01-28 18:05:15 +00:00
luisramos0
844731061c
Add needed generic partials
2020-01-28 18:04:36 +00:00
luisramos0
109f2866ae
Merge base_helper with decorator
2020-01-28 18:04:36 +00:00
luisramos0
76eafa8415
Bring base_helper from spree_backend
2020-01-28 18:04:36 +00:00
luisramos0
947914724a
Add frozen string literal magic comment
2020-01-28 18:02:58 +00:00
luisramos0
b5004f1cbf
Add specs for ExchangeProductsRenderer#exchange_variants
2020-01-28 18:02:58 +00:00
luisramos0
4596399bc2
Extract logic from controller to renderer service
...
Re-using the filter_visible method for both products and variants
2020-01-28 18:02:58 +00:00
luisramos0
685abccb61
Make variant count consider oc config and not count variants that are hidden in the inventory of the coordinator of the OC
2020-01-28 18:02:58 +00:00
Luis Ramos
5e61ba8136
Merge pull request #4587 from luisramos0/navigation_helper
...
Bring navigation helper from spree_backend
2020-01-28 17:58:18 +00:00
luisramos0
f3447e3a96
Move dependency statement to powertip.css
2020-01-28 14:07:46 +00:00
luisramos0
3d0a31e838
Bring dependencies from spree_backend required by powertip
2020-01-28 14:07:46 +00:00
luisramos0
26bb8cc337
Bring powertip from spree_backend, including js and css
2020-01-28 14:07:45 +00:00
luisramos0
9254928656
Remove underscore from product_autocomplete css file
2020-01-28 13:53:04 +00:00
luisramos0
228997c35b
Add handlebars dependency from spree_backend
2020-01-28 13:53:04 +00:00
luisramos0
667f44336d
Remove unused split logic from variant autocomplete, the split functionality is not used in ofn because we only have one stock location
2020-01-28 13:53:04 +00:00
luisramos0
0a136ff2fb
Comment out click event registration as this will duplicate events until the spree_backend code is there
...
These can be activated when spree_backend is removed
2020-01-28 13:53:04 +00:00
luisramos0
3f3577e73c
Remove encoding tag from admin/spree/orders js files
2020-01-28 13:53:04 +00:00
luisramos0
cf1664bed3
Bring some variant autocomplete styling from spree_backend
2020-01-28 13:53:04 +00:00
luisramos0
b8aee4e857
Bring address_states as is from spre_backend
2020-01-28 13:53:04 +00:00
luisramos0
cfe3435851
Bring shipments.js as is from spree_backend
2020-01-28 13:53:04 +00:00
luisramos0
53e342ba1a
Bring variant_autocomplete from spree_backend as is
2020-01-28 13:53:04 +00:00
luisramos0
6bdb14248c
Require lodash.underscore to support _. calls in js
...
spree_backend relies on Underscore.js 1.4.4, from Jan 2013, in some auto complete functions, here we will be depending on Lo-Dash 2.4.1, from Dec 2013
2020-01-28 13:53:03 +00:00
luisramos0
8e27291b15
require handlebars extensions from spree_core to allow translations inside handlebar templates
2020-01-28 13:52:19 +00:00
Luis Ramos
a6ade31604
Merge pull request #4607 from luisramos0/legacy_browsers_support
...
Remove unused js dependencies (jquery-migrate-1.0.0 and timeago) and bring some legacy browsers support dependencies from spree_backend
2020-01-28 12:49:38 +00:00
Luis Ramos
b348552cdf
Merge pull request #4651 from mkllnk/remove-unused-presenter
...
Remove unused presenter
2020-01-28 09:52:01 +00:00
Maikel Linke
ec67736dff
Bump Code Climate's Rubocop version to their latest
...
Our used version is still higher than that.
2020-01-28 17:12:28 +11:00
Maikel
bd8af40afb
Merge pull request #4691 from Matt-Yorkley/codeclimate-scss
...
Disable two codeclimate SCSS rules
2020-01-28 11:00:46 +11:00
dependabot-preview[bot]
54d2228a03
Bump rubocop-rails from 2.4.1 to 2.4.2
...
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails ) from 2.4.1 to 2.4.2.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.4.1...v2.4.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-27 19:33:28 +00:00
Transifex-Openfoodnetwork
3b0bec3c0f
Updating translations for config/locales/en_FR.yml
2020-01-27 23:37:03 +11:00
Transifex-Openfoodnetwork
2a3e8db560
Updating translations for config/locales/fr.yml
2020-01-27 23:36:31 +11:00
Transifex-Openfoodnetwork
d6d3e5fb5a
Updating translations for config/locales/ar.yml
2020-01-27 09:51:47 +11:00
Luis Ramos
d7bb063a30
Merge pull request #4716 from CSCI-462-01-2020/Issue4412
...
Change in English locale to add "end" term
2020-01-25 10:22:29 +00:00
Luis Ramos
c7d8e96beb
Merge pull request #4699 from mkllnk/4696-rescue-checkout
...
Rescue unknown checkout errors
2020-01-24 18:11:38 +00:00
luisramos0
a6d4774a93
Bring font-awesome from spree_backend
2020-01-24 17:52:11 +00:00
luisramos0
7cd710622e
Bring fontawesome css from spree_backend
2020-01-24 17:52:11 +00:00
Pau Pérez Fabregat
529265697c
Merge pull request #4715 from openfoodfoundation/transifex
...
Transifex
2020-01-24 13:31:08 +01:00
Pau Pérez Fabregat
690f18c58c
Merge pull request #4653 from Matt-Yorkley/db2fog_region
...
Db2fog region
2020-01-24 13:30:11 +01:00
Luis Ramos
1b9c020bee
Merge pull request #4650 from tomekr/docker-rspec-fix
...
Docker rspec fix
2020-01-24 12:24:50 +00:00
Luis Ramos
af3ac703a5
Merge pull request #4717 from openfoodfoundation/dependabot/bundler/ddtrace-0.32.0
...
Bump ddtrace from 0.31.1 to 0.32.0
2020-01-24 12:23:51 +00:00
dependabot-preview[bot]
1d8fce09b6
Bump ddtrace from 0.31.1 to 0.32.0
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.31.1 to 0.32.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.31.1...v0.32.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-23 19:17:08 +00:00
luisramos0
904c85c5be
Move css import to ie hacks file where it's needed
2020-01-23 19:01:52 +00:00
Transifex-Openfoodnetwork
c129af88d4
Updating translations for config/locales/en_FR.yml
2020-01-24 05:53:03 +11:00
Transifex-Openfoodnetwork
ca1e6744ad
Updating translations for config/locales/fr.yml
2020-01-24 05:52:29 +11:00
Unknown
a101c5c507
Change in English locale to add "end"
...
The "end" term is used in the _date_range_form, but there is no entry in the English locale. Added so that it can start being translated with Transifex.
2020-01-23 12:56:07 -05:00
Transifex-Openfoodnetwork
d9672a0032
Updating translations for config/locales/en_GB.yml
2020-01-24 02:55:07 +11:00
Matt-Yorkley
7e7eb67e0a
Merge pull request #4714 from luisramos0/fix_permissions_load_problem
...
Add require to fix loading issue. Some other Permissions module was being loaded
2020-01-23 15:56:27 +01:00
luisramos0
a5f222b067
Bring css_browser_selector_dev from spree_backend and respective hacks
2020-01-23 14:45:35 +00:00
luisramos0
0ec39106b1
Bring modernizr from spree_backend
2020-01-23 14:45:35 +00:00
luisramos0
c59afd4951
Remove jquery-migrate-1.0.0, we already have jquery-migrate 1.2.1 (jquery-migrate-min) through gemfile jquery-migrate-rails
2020-01-23 14:45:35 +00:00
luisramos0
2c59b522de
Reorganize admin/all.js in meaningful groups
2020-01-23 14:45:35 +00:00
luisramos0
337fbf1be9
Remove unused JS dependency timeago, we use momentjs now
2020-01-23 14:45:35 +00:00
luisramos0
1548eaeb7e
Add frozen_string_literal magic comment
2020-01-23 14:42:19 +00:00
luisramos0
ee3c9563d8
Add all submenus entries to the main tabs list so that the main menu keeps selected when user selects the submenus
2020-01-23 14:31:25 +00:00
luisramos0
4b0ddcda01
Add require to fix loading issue. Some other Permissions module was being loaded
2020-01-23 11:42:10 +00:00
Luis Ramos
f5adf6a9d7
Merge pull request #4697 from mkllnk/4457-line-item-spec
...
Stabilise spec by not creating noise data
2020-01-23 11:35:34 +00:00
Matt-Yorkley
86231672a6
Merge pull request #4703 from openfoodfoundation/daniellemoorhead-patch-1
...
Updated shopfront message placeholder for home tab
2020-01-23 12:32:08 +01:00
Luis Ramos
e47bd019a1
Merge pull request #4656 from mkllnk/config
...
Use strings for all environment variables
2020-01-23 11:07:17 +00:00
Matt-Yorkley
0011caccc6
Update all locales with the latest Transifex translations
2020-01-23 11:45:58 +01:00
Matt-Yorkley
ad5a599ddf
Merge pull request #4710 from openfoodfoundation/transifex
...
Transifex
2020-01-23 11:37:10 +01:00
Luis Ramos
43d7609b81
Merge pull request #4707 from Matt-Yorkley/mobile-checkout-tabs
...
Remove tabs from cart and checkout
2020-01-23 10:19:50 +00:00
Transifex-Openfoodnetwork
56d17bca6a
Updating translations for config/locales/nb.yml
2020-01-23 19:43:37 +11:00
Transifex-Openfoodnetwork
7f4e53f411
Updating translations for config/locales/fr.yml
2020-01-23 19:41:23 +11:00
Transifex-Openfoodnetwork
bd16b80d5f
Updating translations for config/locales/en_FR.yml
2020-01-23 19:38:34 +11:00
Transifex-Openfoodnetwork
c8a1f9b93c
Updating translations for config/locales/fr.yml
2020-01-23 19:38:12 +11:00
Maikel
9a8cd60d5a
Merge pull request #4694 from Matt-Yorkley/rails-4-prep-routes
...
Rails 4 prep: spree routes
2020-01-23 17:42:37 +11:00
Maikel
4d11dced39
Merge pull request #4687 from openfoodfoundation/dependabot/bundler/ddtrace-0.31.1
...
Bump ddtrace from 0.31.0 to 0.31.1
2020-01-23 16:35:38 +11:00
Maikel Linke
bd67d63b63
Restore payment error feedback
2020-01-23 16:20:07 +11:00
Maikel Linke
6763012ee9
Rescue unknown checkout errors
2020-01-23 16:20:07 +11:00
Maikel
de2f09db75
Merge pull request #4698 from openfoodfoundation/transifex
...
Transifex
2020-01-23 15:59:36 +11:00
Luis Ramos
494cb00774
Merge pull request #4585 from luisramos0/backend_partial_calc_fields
...
Bring spree_backend calculator fields partial to OFN
2020-01-22 20:27:10 +00:00
Luis Ramos
d782bea458
Merge pull request #4633 from luisramos0/fix_prod_link_bug
...
Fix bug in frontoffice order details where the product image was a broken link
2020-01-22 20:25:24 +00:00
luisramos0
766303b332
Add required payment_helper from spree_backend
2020-01-22 20:22:28 +00:00
luisramos0
74226fbdf8
Fix one rubocop issue and update rubocop todo manual for the new controller
2020-01-22 20:22:28 +00:00
luisramos0
dc5374e284
Merge filter_payment_methods and load_data
2020-01-22 20:21:21 +00:00
luisramos0
f6ecf57737
Make before filters easier to understand using the fact that there are only index, create, new and fire actions in this controller
2020-01-22 20:21:21 +00:00
luisramos0
940953b043
Add missing translations for payments
2020-01-22 20:21:21 +00:00
luisramos0
fbc5887fa6
Bring payments routes from spree_backend
2020-01-22 20:21:21 +00:00
luisramos0
61ce849546
Merge spree/admin/payments_controller with its decorator and fix a few rubocop issues
2020-01-22 20:21:21 +00:00
luisramos0
afddaed9fc
Add empty but needed payments templates for check payment method
2020-01-22 20:21:21 +00:00
luisramos0
12158d73fa
Add payments_controller from spree_backend so that we can now merge it with the OFN's decorator
2020-01-22 20:21:21 +00:00
Matt-Yorkley
5f3abbf00e
Refactor BaseController
2020-01-22 12:17:23 +01:00
Matt-Yorkley
a02c58e231
Add join_table to enterprise groups relation
...
has_and_belongs_to_many relationships now require a join_table
2020-01-22 12:17:23 +01:00
Matt-Yorkley
59ebfb9bd4
Fix subquery errors triggered by #warn_invalid_order_cycles
2020-01-22 12:17:23 +01:00
Matt-Yorkley
57ca1d54bb
Fix issue with each_serializer not being called in some cases in Rails 4.
2020-01-22 12:17:23 +01:00
Matt-Yorkley
444747c8b2
Split shopping_shared/details partial into header and tabs partials and only include tabs in shop page (not cart and checkout).
2020-01-22 11:30:43 +01:00
Danni M
95f51e2db9
Updated shopfront message placeholder
...
Change required now that there is a home tab instead of a green shopfront message.
>An optional message to welcome customers and explain how to shop with you. If text is entered here it will be displayed in a home tab when customers first arrive at your shopfront.
2020-01-22 14:24:20 +11:00
Transifex-Openfoodnetwork
0463e05296
Updating translations for config/locales/pt_BR.yml
2020-01-22 10:35:12 +11:00
Transifex-Openfoodnetwork
f176e2ba91
Updating translations for config/locales/pt_BR.yml
2020-01-22 10:32:03 +11:00
luisramos0
cccff6b500
Remove unused methods from navigation helper
2020-01-21 22:51:23 +00:00
luisramos0
b4e6c5307e
Convert orders submenu partial to haml
2020-01-21 22:51:23 +00:00
luisramos0
fb4f96eb4a
Remove unused submenu entries from _tabs partial and convert hash syntax
2020-01-21 22:51:23 +00:00
luisramos0
27572cbe68
Remove alias_method klass_for_with_sym_fallback
2020-01-21 22:49:55 +00:00
luisramos0
8a912d6f02
Remove redundant method tab_with_cancan_check
...
This was introduced to work with previous versions of spree
2020-01-21 22:49:55 +00:00
luisramos0
cd7f97b01d
Fix rubocop issues in nav helper
2020-01-21 22:49:55 +00:00
luisramos0
1b18595d94
Merge navigator_helper with decorator
2020-01-21 22:49:55 +00:00
Maikel Linke
30888a9e59
Stabilise spec by not creating noise data
...
We were using a more complex order factory that created more data than
we needed. The order contained a second line item and therefor the
manifest had two items as well. Sometimes we would pick the wrong one.
2020-01-22 09:49:37 +11:00
luisramos0
8987121058
Add navigation helper from spree_backend
2020-01-21 22:48:44 +00:00
Luis Ramos
6bb4f2477c
Merge pull request #4586 from luisramos0/states_erb
...
Make states/new.js template depend on the states/new.haml template in OFN (not the states/new.erb in spree)
2020-01-21 22:47:28 +00:00
Matt-Yorkley
cca824f207
Ensure routes declared with match specify a method
2020-01-20 17:32:00 +01:00
Matt-Yorkley
147f7d4850
Separate non-report routes from reports route list for clarity
2020-01-20 17:30:46 +01:00
Matt-Yorkley
8024dcec64
Merge double Spree routes declarations into one
...
The app has a lot of problems with this in Rails 4
2020-01-20 17:27:26 +01:00
Matt-Yorkley
dfee9b6c6b
Relax two codeclimate SCSS rules
2020-01-20 15:08:20 +01:00
Luis Ramos
1c3fd26eef
Merge pull request #4655 from Matt-Yorkley/mobile-shoptabs
...
Mobile: shop tabs
2020-01-20 08:51:59 +00:00
Matt-Yorkley
f8145f8429
Update shop tab button styling in mobile
2020-01-19 15:59:37 +01:00
Matt-Yorkley
a1256f9aeb
Remove old green box styling from shopfront messages
2020-01-19 15:57:01 +01:00
dependabot-preview[bot]
094c175a64
Bump ddtrace from 0.31.0 to 0.31.1
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.31.0 to 0.31.1.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases )
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/v0.31.1/CHANGELOG.md )
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.31.0...v0.31.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-17 19:14:25 +00:00
Luis Ramos
dd9f2a063f
Merge pull request #4682 from openfoodfoundation/dependabot/bundler/mini_racer-0.2.9
...
Bump mini_racer from 0.2.4 to 0.2.9
2020-01-17 13:36:02 +00:00
Luis Ramos
4973bcb9b6
Merge pull request #4677 from openfoodfoundation/dependabot/bundler/oj-3.10.1
...
Bump oj from 3.10.0 to 3.10.1
2020-01-17 13:14:15 +00:00
Maikel
9ee701bec1
Merge pull request #4683 from openfoodfoundation/dependabot/bundler/webmock-3.8.0
...
Bump webmock from 3.7.6 to 3.8.0
2020-01-17 09:14:50 +11:00
Maikel
e2469ded9a
Merge pull request #4680 from openfoodfoundation/transifex
...
Transifex
2020-01-17 09:03:10 +11:00
dependabot-preview[bot]
eaa914a360
Bump webmock from 3.7.6 to 3.8.0
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.7.6 to 3.8.0.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.7.6...v3.8.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-16 19:19:26 +00:00
dependabot-preview[bot]
ea2fa9913d
Bump mini_racer from 0.2.4 to 0.2.9
...
Bumps [mini_racer](https://github.com/discourse/mini_racer ) from 0.2.4 to 0.2.9.
- [Release notes](https://github.com/discourse/mini_racer/releases )
- [Changelog](https://github.com/rubyjs/mini_racer/blob/master/CHANGELOG )
- [Commits](https://github.com/discourse/mini_racer/compare/v0.2.4...v0.2.9 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-16 19:15:52 +00:00
Matt-Yorkley
b69b5ea81a
Merge pull request #4678 from mkllnk/4490-tag-rules-spec
...
4490 tag rules spec
2020-01-16 14:28:37 +01:00
Luis Ramos
18b3a8122d
Merge pull request #4508 from luisramos0/backend_ctrl_prods_vars
...
Bring spree_backend products and variants controllers to OFN
2020-01-16 13:01:31 +00:00
luisramos0
1e203ae419
Remove destroy with js format in variants controller, we dont use this endpoint in OFN and it avoids having to bring additional code from spree_backend
2020-01-16 11:59:36 +00:00
luisramos0
70a24b25e2
Update rubocop manual todo and Remove some unnecessary comments
2020-01-16 11:59:36 +00:00
luisramos0
f7490ae28b
Remove unused stock and destroy actions and bring product routes from spree_backend
2020-01-16 11:58:59 +00:00
luisramos0
836abbec92
Fix rubocop issues in variant controller
2020-01-16 11:58:59 +00:00
luisramos0
d153237b69
Merge variants decorator with controller
2020-01-16 11:58:59 +00:00
luisramos0
56b6bf82bb
Fix some rubocop issues
2020-01-16 11:58:59 +00:00
luisramos0
0d44f298fe
Merge spree/admin/products_controller with its decorator
2020-01-16 11:58:59 +00:00
luisramos0
ff3611f52a
Add variants_controller from spree_backend so that we can now merge it with the OFN's decorator
2020-01-16 11:58:59 +00:00
luisramos0
7fa9b4699c
Add products_controller from spree_backend so that we can now merge it with the OFN's decorator
2020-01-16 11:58:59 +00:00
luisramos0
138248e1c9
Product import only works with csv right now. Here we remove dead code
...
This can be reverted if we start suppporting xls and ods in the future
2020-01-16 09:59:27 +00:00
Transifex-Openfoodnetwork
3dadb7f91c
Updating translations for config/locales/en_GB.yml
2020-01-16 20:12:18 +11:00
Transifex-Openfoodnetwork
dd5c867298
Updating translations for config/locales/en_GB.yml
2020-01-16 20:09:10 +11:00
Transifex-Openfoodnetwork
918a0f053d
Updating translations for config/locales/ar.yml
2020-01-16 18:25:27 +11:00
Transifex-Openfoodnetwork
2171125e85
Updating translations for config/locales/ar.yml
2020-01-16 18:22:18 +11:00
Transifex-Openfoodnetwork
5d0cb3549a
Updating translations for config/locales/ar.yml
2020-01-16 18:19:07 +11:00
Maikel Linke
12fde5b9fc
Update all locales with the latest Transifex translations
2020-01-16 15:28:57 +11:00
Maikel Linke
6b18d4a60c
Avoid false positives in specs
...
When switching from one tab to another, a `have_no_selector` check could
match because the new tab hasn't loaded yet. Now we use that check after
we verified other content on the new tab.
2020-01-16 15:10:25 +11:00
Maikel Linke
4d53f47d88
Leave tag rules spec in clean state
2020-01-16 15:10:25 +11:00
Maikel Linke
3a9aaf6764
Wait for the first enterprise tab to be loaded
2020-01-16 15:10:25 +11:00
Maikel Linke
42aa15767e
DRY navigating to Tag Rules section
2020-01-16 15:10:25 +11:00
Maikel
0da6275d41
Merge pull request #4675 from Matt-Yorkley/rails-4-prep-3
...
Rails 4 prep continued
2020-01-16 15:08:11 +11:00
Maikel
52d2d1d23c
Merge pull request #4668 from Matt-Yorkley/rails-4-prep-2
...
Rails 4 prep: admin dashboard route
2020-01-16 14:16:32 +11:00
Maikel
4dfc020eaa
Merge pull request #4666 from openfoodfoundation/transifex
...
Transifex
2020-01-16 12:10:12 +11:00
Maikel
8ef52f97e5
Merge pull request #4665 from openfoodfoundation/dependabot/bundler/selenium-webdriver-3.142.7
...
Bump selenium-webdriver from 3.142.6 to 3.142.7
2020-01-16 12:09:29 +11:00
Maikel
68a7f547b1
Merge pull request #4664 from openfoodfoundation/dependabot/bundler/test-unit-3.3.5
...
Bump test-unit from 3.3.4 to 3.3.5
2020-01-16 12:08:51 +11:00
Maikel
7a0f2d47a3
Merge pull request #4660 from openfoodfoundation/dependabot/bundler/activerecord-import-1.0.4
...
Bump activerecord-import from 1.0.3 to 1.0.4
2020-01-16 12:06:15 +11:00
Luis Ramos
4affd01b7b
Merge pull request #4627 from luisramos0/mini_racer
...
Update libv8 and keep it only in Gemfile.lock as a dependency of mini_racer
2020-01-15 22:25:25 +00:00
Luis Ramos
0432c73f19
Merge pull request #4510 from luisramos0/backend_ctrl_resource
...
Bring spree_backend resource controller to OFN
2020-01-15 22:22:24 +00:00
dependabot-preview[bot]
6163661610
Bump oj from 3.10.0 to 3.10.1
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.10.0 to 3.10.1.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.10.0...v3.10.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-15 19:15:31 +00:00
Matt-Yorkley
103902c006
Replace deprecated arguments in #find_by
...
Failure/Error: enterprise = Enterprise.find_by(name: enterprise_name, select: 'id, is_primary_producer')
ActiveRecord::StatementInvalid:
PG::UndefinedColumn: ERROR: column enterprises.select does not exist
LINE 1: ...HERE "enterprises"."name" = 'User Enterprise' AND "enterpris...
: SELECT "enterprises".* FROM "enterprises" WHERE "enterprises"."name" = 'User Enterprise' AND "enterprises"."select" = 'id, is_primary_producer' LIMIT 1
# ./app/models/product_import/spreadsheet_data.rb:48:in `block in create_enterprises_index'
# ./app/models/product_import/spreadsheet_data.rb:43:in `each'
2020-01-15 16:39:33 +01:00
Matt-Yorkley
d2933e35f1
Explicitly require Spree::Admin::BaseHelper
...
NameError: undefined method `preference_field_tag' for module `Spree::Admin::BaseHelper'
/home/runner/openfoodnetwork/vendor/bundle/ruby/2.3.0/gems/activesupport-4.0.13/lib/active_support/core_ext/module/aliasing.rb:32:in `alias_method'
/home/runner/openfoodnetwork/vendor/bundle/ruby/2.3.0/gems/activesupport-4.0.13/lib/active_support/core_ext/module/aliasing.rb:32:in `alias_method_chain'
/home/runner/openfoodnetwork/app/helpers/spree/admin/base_helper_decorator.rb:11:in `<module:BaseHelper>'
/home/runner/openfoodnetwork/app/helpers/spree/admin/base_helper_decorator.rb:3:in `<module:Admin>'
2020-01-15 13:07:50 +01:00
Matt-Yorkley
0b5e341ae7
Explicitly require Spree::Admin::NavigationHelper
...
NameError: undefined method `klass_for' for module `Spree::Admin::NavigationHelper'
/home/runner/openfoodnetwork/vendor/bundle/ruby/2.3.0/gems/activesupport-4.0.13/lib/active_support/core_ext/module/aliasing.rb:32:in `alias_method'
/home/runner/openfoodnetwork/vendor/bundle/ruby/2.3.0/gems/activesupport-4.0.13/lib/active_support/core_ext/module/aliasing.rb:32:in `alias_method_chain'
/home/runner/openfoodnetwork/app/helpers/spree/admin/navigation_helper_decorator.rb:18:in `<module:NavigationHelper>'
2020-01-15 13:07:46 +01:00
Matt-Yorkley
7d36c3b5aa
Make some private methods public in orders_and_fulfillments_report.rb
...
Fixes errors for "call to private method ..."
2020-01-15 13:05:36 +01:00
Matt-Yorkley
d511763733
Replace deprecated #in? method
2020-01-15 12:57:38 +01:00
Matt-Yorkley
a059c11d0f
Update post/delete calls in credit_cards_controller_spec.rb
...
ActionController::UrlGenerationError:
No route matches {:action=>"new_from_token", :cc_type=>"visa", :controller=>"spree/credit_cards", :exp_month=>12, :exp_year=>2020, :format=>:json, :last4=>4242, :token=>"tok_234bd2c22"}
# ./spec/controllers/spree/credit_cards_controller_spec.rb:36:in `block (5 levels) in <top (required)>'
# ./spec/controllers/spree/credit_cards_controller_spec.rb:36:in `block (4 levels) in <top (required)>'
2020-01-15 12:57:38 +01:00
Matt-Yorkley
cecc19ae1d
Add recommended paper_trail config
...
DEPRECATION WARNING: PaperTrail.track_associations has not been set. As of PaperTrail 5, it defaults to false. Tracking associations is an experimental feature so we recommend setting PaperTrail.config.track_associations = false in your config/initializers/paper_trail.rb . (called from block (3 levels) in <top (required)> at /home/user/Github/openfoodnetwork/spec/controllers/admin/column_preferences_controller_spec.rb:10)
2020-01-15 12:57:38 +01:00
Matt-Yorkley
d4311a848e
Fix default_scope deprecated syntax
2020-01-15 12:57:38 +01:00
Transifex-Openfoodnetwork
d64573f7fd
Updating translations for config/locales/nb.yml
2020-01-15 22:29:37 +11:00
Transifex-Openfoodnetwork
a9fe6ec1b5
Updating translations for config/locales/nb.yml
2020-01-15 22:26:30 +11:00
Transifex-Openfoodnetwork
f14bbc5ed9
Updating translations for config/locales/nb.yml
2020-01-15 22:23:20 +11:00
Matt-Yorkley
5ba8efec2c
Fix enterprise group spec
...
EnterpriseGroup.by_position now returns an ActiveRecord::Relation in Rails 4, so in this test case it doesn't respond as an array
2020-01-15 11:19:14 +01:00
Luis Ramos
3bf38b7c08
Merge pull request #4549 from luisramos0/arelize_order_permissions
...
Use arel in order permissions visible orders and editable orders so that we dont have queries with gigantic IN clauses
2020-01-14 14:24:34 +00:00
Transifex-Openfoodnetwork
a591e0736f
Updating translations for config/locales/en_CA.yml
2020-01-14 23:41:38 +11:00
Luis Ramos
3080eb9dfd
Merge pull request #4578 from kshlyk/remove_soft_delete_from_product_and_variant_api
...
Removing duplicate API method soft_delete for both products and variants
2020-01-14 11:32:10 +00:00
Transifex-Openfoodnetwork
ed98a16eec
Updating translations for config/locales/fr.yml
2020-01-14 20:18:13 +11:00
Transifex-Openfoodnetwork
7a924bd9ca
Updating translations for config/locales/fr.yml
2020-01-14 20:15:05 +11:00
Transifex-Openfoodnetwork
7639e19184
Updating translations for config/locales/en_FR.yml
2020-01-14 20:13:12 +11:00
Transifex-Openfoodnetwork
71aff7e1d2
Updating translations for config/locales/fr.yml
2020-01-14 20:11:56 +11:00
dependabot-preview[bot]
2506667bca
Bump selenium-webdriver from 3.142.6 to 3.142.7
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.142.6 to 3.142.7.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-13 19:37:48 +00:00
Luis Ramos
f87a553230
Merge pull request #4648 from openfoodfoundation/dependabot/bundler/rubocop-0.79.0
...
Bump rubocop from 0.68.1 to 0.79.0
2020-01-13 19:35:50 +00:00
Luis Ramos
3171b60d6f
Merge pull request #4580 from Matt-Yorkley/order_capture
...
Use asynchronous requests for order capture and ship actions
2020-01-13 17:14:40 +00:00
Matt-Yorkley
94afc70ea7
Refactor conditionals in contact tab view
2020-01-13 17:14:22 +01:00
Matt-Yorkley
d14d6fe865
Refactor open order cycle checks
2020-01-13 17:11:27 +01:00
Matt-Yorkley
0546acd6f9
Refactor #shop_tabs use and remove #first_visible_tab
2020-01-13 17:05:28 +01:00
Matt-Yorkley
aedaec8365
Improve layout of orders closed message
2020-01-13 17:05:28 +01:00
Matt-Yorkley
d508e7772c
Fix angular templates bug
...
Angular controller data was being partially preserved when switching back and forth between tab templates, causing the ProductsCtrl to hold duplicate datasets when it is re-initialized after going from the shop tab to another tab, then back again.
2020-01-13 17:05:28 +01:00
Matt-Yorkley
43eef0c8c6
Adjust layout for fullwidth enterprise image
2020-01-13 17:05:28 +01:00
Matt-Yorkley
e658893e70
Fix ancient display bug where the order cycle selection popover shows over the top of the floating navigtion bar
2020-01-13 17:05:28 +01:00
Matt-Yorkley
e7d88f0df9
Move "orders closed" message to "shop" tab and adjust "home" tab message display logic
2020-01-13 17:05:28 +01:00
Matt-Yorkley
56223bb960
Improve about tab mobile and tablet display
2020-01-13 17:05:28 +01:00
Matt-Yorkley
17cf099f99
Always keep one shop tab open (don't toggle closed)
2020-01-13 17:05:28 +01:00
Matt-Yorkley
49aacf879f
Change row nesting to fix product list layout display issues
2020-01-13 17:05:28 +01:00
Matt-Yorkley
c8c4f3e746
Improve mobile display
2020-01-13 17:05:28 +01:00
Matt-Yorkley
219f6ad78e
Select first visible tab on page load if none are specified in the URL
2020-01-13 17:05:27 +01:00
Matt-Yorkley
48f329a716
Rework layout and CSS
2020-01-13 17:05:26 +01:00
Luis Ramos
516398fbd6
Merge pull request #4638 from luisramos0/fix_cart_s2
...
Replace adjustment.open with adjustment.fire_events(open) to avoid method name conflict
2020-01-13 14:16:56 +00:00
Luis Ramos
4a1b74c136
Merge pull request #4634 from luisramos0/remove_dead_code
...
Remove some dead code
2020-01-13 11:09:04 +00:00
luisramos0
5fccd5fe58
Add rubocop exception for application controller class length and fix one line length issue
2020-01-12 19:42:07 +00:00
Matt-Yorkley
b9edea7c0e
Rename 'admin/overview#index' route from :admin to :admin_dashboard
...
Fixes issues with route declarations in Rails 4
2020-01-12 13:11:33 +01:00
Transifex-Openfoodnetwork
b9053f9fd2
Updating translations for config/locales/en_NZ.yml
2020-01-12 18:37:55 +11:00
dependabot-preview[bot]
f297cff8c7
Bump test-unit from 3.3.4 to 3.3.5
...
Bumps [test-unit](https://github.com/test-unit/test-unit ) from 3.3.4 to 3.3.5.
- [Release notes](https://github.com/test-unit/test-unit/releases )
- [Commits](https://github.com/test-unit/test-unit/compare/3.3.4...3.3.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-10 19:17:47 +00:00
Luis Ramos
7563d38b4b
Merge pull request #4658 from openfoodfoundation/dependabot/bundler/ddtrace-0.31.0
...
Bump ddtrace from 0.30.0 to 0.31.0
2020-01-10 10:52:04 +00:00
Luis Ramos
83523a676f
Merge pull request #4659 from openfoodfoundation/dependabot/bundler/webdrivers-4.2.0
...
Bump webdrivers from 4.1.3 to 4.2.0
2020-01-10 10:51:10 +00:00
Maikel Linke
abcfb5ce8d
Update Rubocop config for new version
...
- A couple of cops moved into a different namespace.
- The target ruby version doesn't have to be specified, it's read from
.ruby-version which has been updated to Ruby 2.3.
- Some files were missing in the todo lists.
2020-01-10 08:59:44 +11:00
Maikel Linke
8ee6d1c320
Add rubocop-rails gem
...
The rails cops used to be in the rubocop gem itself but moved into their
own gem recently. Our style guide refers to these cops though.
2020-01-10 08:59:44 +11:00
dependabot-preview[bot]
1bc19ad6a4
Bump rubocop from 0.68.1 to 0.79.0
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.68.1 to 0.79.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.68.1...v0.79.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-10 08:59:44 +11:00
Maikel
191b8064ed
Merge pull request #4629 from openfoodfoundation/dependabot/bundler/unicorn-5.5.2
...
Bump unicorn from 5.5.1 to 5.5.2
2020-01-10 08:29:17 +11:00
dependabot-preview[bot]
e28274db14
Bump activerecord-import from 1.0.3 to 1.0.4
...
Bumps [activerecord-import](https://github.com/zdennis/activerecord-import ) from 1.0.3 to 1.0.4.
- [Release notes](https://github.com/zdennis/activerecord-import/releases )
- [Changelog](https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md )
- [Commits](https://github.com/zdennis/activerecord-import/compare/v1.0.3...v1.0.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-09 19:16:47 +00:00
Luis Ramos
02dec1d6cd
Merge pull request #4649 from tomekr/4623-remove-additional-footeer-links
...
Remove duplicate footer links
2020-01-09 18:04:30 +00:00
Luis Ramos
df04c837a5
Merge pull request #4631 from Matt-Yorkley/oc_buttons
...
Increase space for buttons in savebar layout
2020-01-09 17:56:01 +00:00
Luis Ramos
7a6c085b63
Merge pull request #4625 from openfoodfoundation/dependabot/bundler/roo-2.8.2
...
Bump roo from 2.7.1 to 2.8.2
2020-01-09 17:55:24 +00:00
dependabot-preview[bot]
a4317b70f4
Bump webdrivers from 4.1.3 to 4.2.0
...
Bumps [webdrivers](https://github.com/titusfortner/webdrivers ) from 4.1.3 to 4.2.0.
- [Release notes](https://github.com/titusfortner/webdrivers/releases )
- [Changelog](https://github.com/titusfortner/webdrivers/blob/master/CHANGELOG.md )
- [Commits](https://github.com/titusfortner/webdrivers/compare/v4.1.3...v4.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-08 19:16:43 +00:00
dependabot-preview[bot]
cb90fb052d
Bump ddtrace from 0.30.0 to 0.31.0
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.30.0 to 0.31.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.30.0...v0.31.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-01-08 19:15:48 +00:00
Matt-Yorkley
14bcba081d
Adapt shopfront_helper to show/hide panels and display new tabs
2020-01-08 14:50:27 +01:00
Matt-Yorkley
fa0b365b28
Move "shop messages" and product list from main view into new "Home" and "Shop" tabs
2020-01-08 13:26:21 +01:00
Matt-Yorkley
673c587c3b
Move tab templates to their own directory for clarity
2020-01-08 13:26:21 +01:00
Luis Ramos
18e5f9ba64
Merge pull request #4647 from jeduardo824/remove-groups-tab
...
remove group link from shop menu when there are no groups
2020-01-08 11:44:51 +00:00
Luis Ramos
e9a5b889de
Merge pull request #4606 from cyrillefr/lone-hub-checked-by-default-4428
...
Select by default single Hub/Shop option on creation of payment/shipping method
2020-01-08 11:44:16 +00:00
Luis Ramos
cc57b0c200
Merge pull request #4609 from openfoodfoundation/dependabot/bundler/excon-0.71.1
...
[Security] Bump excon from 0.62.0 to 0.71.1
2020-01-08 09:49:13 +00:00
Maikel
a8040e986d
Merge pull request #4626 from openfoodfoundation/dependabot/bundler/i18n-js-3.5.1
...
Bump i18n-js from 3.5.0 to 3.5.1
2020-01-08 17:58:53 +11:00
Maikel
2269f824c0
Merge pull request #4637 from openfoodfoundation/transifex
...
Transifex
2020-01-08 17:56:37 +11:00
Maikel Linke
bec73adc89
Restore file logging for custom format logger
...
The new custom logger was directed to stdout instead of a file.
2020-01-08 15:06:19 +11:00
luisramos0
23ec66e338
Add timestamp to Rails logger in staging and prod so that info in logs can be accurately compared with data in the DB
2020-01-08 15:05:55 +11:00
Maikel Linke
b14193b6b7
Use strings for all environment variables
...
Figaro complained:
WARNING: Use strings for Figaro configuration. 25 was converted to "25".
WARNING: Use strings for Figaro configuration. 4 was converted to "4".
Those numbers have been converted to strings in our example config.
2020-01-08 12:14:23 +11:00
Eduardo
c45a3c2303
remove group tabs from shop view when there are no groups
2020-01-07 11:24:46 -03:00
Matt-Yorkley
e06449aee3
Allow specifying an alternate region for db2fog backups
2020-01-07 12:29:42 +01:00
Matt-Yorkley
f4f05922ae
Update outdated link to gem documentation
2020-01-07 12:26:24 +01:00
Maikel Linke
3204d0b37c
Remove unused presenter
...
The usage of this presenter got removed seven years ago:
c5d031a6d7
2020-01-07 17:30:42 +11:00
Tomek Rabczak
8df0e2c66e
Move db:test:prepare task after db:reset is run
2020-01-06 16:37:52 -06:00
Tomek Rabczak
0ec0d3fd81
Install Chrome and Chromedriver
2020-01-06 16:37:23 -06:00
Tomek Rabczak
8a0ffe1890
Add imagemagick and unzip packages
2020-01-06 16:37:02 -06:00
Tomek Rabczak
1327d80446
fixup: Revert non en.yml locale changes as they are generated via transifex
2020-01-06 16:33:36 -06:00
Tomek Rabczak
43a3ac0a7b
Remove no longer used locales
2020-01-06 13:56:35 -06:00
Tomek Rabczak
b948312de7
Remove additional footer links
2020-01-06 13:47:54 -06:00
Transifex-Openfoodnetwork
7063de4734
Updating translations for config/locales/fr_CA.yml
2020-01-04 06:22:08 +11:00
Transifex-Openfoodnetwork
56c1a9cca2
Updating translations for config/locales/fr_CA.yml
2020-01-04 06:19:02 +11:00
Transifex-Openfoodnetwork
9555bfcc93
Updating translations for config/locales/fr.yml
2020-01-04 06:17:34 +11:00
Transifex-Openfoodnetwork
e455a47135
Updating translations for config/locales/fr.yml
2020-01-04 06:14:27 +11:00
Transifex-Openfoodnetwork
e15e71a3a7
Updating translations for config/locales/en_CA.yml
2020-01-04 06:07:34 +11:00
Matt-Yorkley
91d959b7d6
Remove "previous" button from order cycle savebar
2020-01-03 16:25:26 +01:00
luisramos0
108f57a705
Replace adjustment.open with adjustment.fire_events(open) to avoid method name conflict
2020-01-02 16:58:11 +00:00
Transifex-Openfoodnetwork
af42159e09
Updating translations for config/locales/en_GB.yml
2020-01-03 01:37:14 +11:00
Transifex-Openfoodnetwork
8e55c39ca0
Updating translations for config/locales/en_GB.yml
2020-01-03 01:34:04 +11:00
luisramos0
6cfb060184
Update all locales with the latest Transifex translations
2020-01-02 10:37:13 +00:00
Luis Ramos
0cfb7269c8
Merge pull request #4596 from openfoodfoundation/transifex
...
Transifex
2020-01-02 10:34:20 +00:00
luisramos0
cbec495620
Fix some rubocop issues in order_and_distributor_report
2019-12-29 19:01:44 +00:00
luisramos0
55eea21bb0
Adapt order_and_distributor_report to the new editable_orders query
2019-12-29 19:01:44 +00:00
luisramos0
f63c7cf54f
Extract visible_orders_where_values to a private method
2019-12-29 19:01:44 +00:00
luisramos0
13633e8bea
Use arel in order permissions visible orders and editable orders so that we dont have queries with gigantic IN clauses
...
The | operators here were converting the relations to long lists of IDs, in our current particular issue, an IN clause with 100k order_ids
2019-12-29 19:01:44 +00:00
luisramos0
4658b7a533
Fix rubocop issues in app/controllers/application_controller
2019-12-28 19:10:02 +00:00
luisramos0
d0f33e7c8a
Avoid code in devise that is not needed and simply return the root path
...
This fixes a broken spec with error "No route matches {:controller=>"home"}"
2019-12-28 18:47:14 +00:00
luisramos0
55bb328d48
Prefix all calls to root_url with main_app
2019-12-28 18:46:50 +00:00
luisramos0
a8a6fce385
Prefix root_path with main_app so that ofn's route is used. The spree root path will no longer be defined when spree_backend is dropped
2019-12-28 18:45:57 +00:00
luisramos0
60677a2414
Make login nav use main_app router
2019-12-28 18:41:16 +00:00
luisramos0
093edb66d3
Remove unused view
...
This was introduced in 2013 and removed in 2014, see log below:
git log -Saddress_form_simple
commit 510333288c
Author: Maikel Linke <mkllnk@web.de >
Date: Sun Mar 2 13:05:15 2014 +1100
first steps of new design
commit 2e1de9a6d3
Author: Rohan Mitchell <rohan@rohanmitchell.com >
Date: Fri Aug 23 13:12:36 2013 +1000
Fix admin create order - remove override on spree address form, update to spree patched to fix respond_override (spree issue #2210 ), fix nil state error
2019-12-28 18:25:28 +00:00
luisramos0
fb25ddd219
Remove reference to user banners, this code is not used in OFN.
2019-12-28 18:13:04 +00:00
luisramos0
1295d33fa7
Fix bug in frontoffice order details where the product image was a link to nowhere
2019-12-28 17:54:28 +00:00
luisramos0
d54850f097
Move ActionCallBacks out of the spree namespace
2019-12-27 17:04:40 +00:00
luisramos0
f8451a2511
Bring needed action_callbacks from spree_backend
2019-12-27 17:04:31 +00:00
luisramos0
1a88549954
Update rubocop todo lists
2019-12-27 17:04:23 +00:00
luisramos0
f79182253a
Fix some rubocop issues
2019-12-27 17:03:39 +00:00
luisramos0
8cfd7c610b
Use nested module instead of class Spree::Admin::
2019-12-27 17:03:39 +00:00
luisramos0
486b5e9edc
Merge resource_decorator into resource controller
2019-12-27 17:03:39 +00:00
luisramos0
8fe3abfd45
Add resource_controller from spree_backend so that we can now merge it with the OFN's decorator
2019-12-27 17:03:39 +00:00
Luis Ramos
0e7dafea46
Merge pull request #4560 from kshlyk/fix_billing_addres_in_pdf_invoice
...
Billing address in pdf invoice fixed
2019-12-27 16:45:06 +00:00
Matt-Yorkley
4c9cc7460a
Increase space for buttons in savebar layout
2019-12-27 17:08:37 +01:00
dependabot-preview[bot]
c9e3f58aed
Bump unicorn from 5.5.1 to 5.5.2
...
Bumps [unicorn](https://bogomips.org/unicorn/ ) from 5.5.1 to 5.5.2.
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-26 19:16:30 +00:00
Luis Ramos
4136306abf
Updating mini_racer and libv8 at the same time
2019-12-26 11:01:09 +00:00
Luis Ramos
9f1eaf0b66
Merge pull request #4512 from luisramos0/backend_ctrl_base
...
Bring spree_backend base controller to OFN
2019-12-24 12:01:07 +00:00
dependabot-preview[bot]
4771612adb
Bump i18n-js from 3.5.0 to 3.5.1
...
Bumps [i18n-js](https://github.com/fnando/i18n-js ) from 3.5.0 to 3.5.1.
- [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.5.0...v3.5.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-23 19:21:17 +00:00
dependabot-preview[bot]
7ce3dfe365
Bump roo from 2.7.1 to 2.8.2
...
Bumps [roo](https://github.com/roo-rb/roo ) from 2.7.1 to 2.8.2.
- [Release notes](https://github.com/roo-rb/roo/releases )
- [Changelog](https://github.com/roo-rb/roo/blob/master/CHANGELOG.md )
- [Commits](https://github.com/roo-rb/roo/compare/v2.7.1...v2.8.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-23 19:17:19 +00:00
Luis Ramos
6f13707b9d
Merge pull request #4556 from openfoodfoundation/dependabot/bundler/stripe-5.11.0
...
Bump stripe from 4.24.0 to 5.11.0
2019-12-23 16:19:05 +00:00
Luis Ramos
64cb104434
Merge pull request #4577 from openfoodfoundation/dependabot/bundler/oj-3.10.0
...
Bump oj from 3.7.12 to 3.10.0
2019-12-23 16:14:33 +00:00
Luis Ramos
1606f9900f
Merge pull request #4507 from luisramos0/backend_ctrl_reports
...
Bring spree_backend reports controller to OFN
2019-12-23 16:14:07 +00:00
Luis Ramos
9f0e8b0b2e
Merge pull request #4558 from openfoodfoundation/dependabot/bundler/mini_racer-0.2.4
...
Bump mini_racer from 0.1.15 to 0.2.4
2019-12-23 16:13:10 +00:00
Luis Ramos
d796e96470
Merge pull request #4575 from Matt-Yorkley/admin_orders
...
Fix route on "continue" button on admin adjustments page
2019-12-23 16:12:28 +00:00
Luis Ramos
ba7f78ef60
Merge pull request #4515 from luisramos0/backend_ctrl_adjustments
...
Bring spree_backend adjustments controller to OFN
2019-12-23 16:05:04 +00:00
Maikel
988e146240
Merge pull request #4564 from openfoodfoundation/dependabot/bundler/rack-mini-profiler-1.1.4
...
Bump rack-mini-profiler from 1.0.0 to 1.1.4
2019-12-20 17:42:04 +11:00
cyrillefr
e6d9ec7bd7
Small fixes for default single Hub/Shop options issue
...
- removed mode variable
- reverted html template accordingly
- added a more specific helper
- fixed some short variable names
2019-12-19 21:08:34 +01:00
Transifex-Openfoodnetwork
3acc53a389
Updating translations for config/locales/ar.yml
2019-12-20 04:33:09 +11:00
Transifex-Openfoodnetwork
9c9fc999de
Updating translations for config/locales/ar.yml
2019-12-20 04:30:00 +11:00
Transifex-Openfoodnetwork
d824c84ce6
Updating translations for config/locales/fr.yml
2019-12-19 19:14:24 +11:00
Transifex-Openfoodnetwork
1a301f3dbb
Updating translations for config/locales/fr.yml
2019-12-19 19:11:16 +11:00
Transifex-Openfoodnetwork
fad4f3b22a
Updating translations for config/locales/en_FR.yml
2019-12-19 19:08:18 +11:00
Transifex-Openfoodnetwork
6080c99850
Updating translations for config/locales/fr.yml
2019-12-19 19:08:07 +11:00
Transifex-Openfoodnetwork
2944acff8a
Updating translations for config/locales/nb.yml
2019-12-19 09:52:35 +11:00
dependabot-preview[bot]
2068a59b72
[Security] Bump excon from 0.62.0 to 0.71.1
...
Bumps [excon](https://github.com/excon/excon ) from 0.62.0 to 0.71.1. **This update includes a security fix.**
- [Release notes](https://github.com/excon/excon/releases )
- [Changelog](https://github.com/excon/excon/blob/master/changelog.txt )
- [Commits](https://github.com/excon/excon/compare/v0.62.0...v0.71.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-18 19:33:23 +00:00
Luis Ramos
3063439ed1
Merge pull request #4541 from Matt-Yorkley/new_fee_errors
...
Handle validation messages when saving new fees
2019-12-18 13:35:45 +00:00
Matt-Yorkley
6bed05c721
Add missing feature test for order "Ship" button
2019-12-18 14:15:48 +01:00
Matt-Yorkley
a3ee6674ea
Use asynchronous requests for order capture and ship actions
2019-12-18 14:15:46 +01:00
cyrillefr
e59077e63e
Select by default single Hub/Shop option on creation of payment/shipping method
...
- added a helper
- added mode(new/edit) in payment/shipping views
- updated checkbox creation
- added tests
2019-12-18 10:45:00 +01:00
Transifex-Openfoodnetwork
f9f8d85841
Updating translations for config/locales/fr.yml
2019-12-18 04:37:36 +11:00
Transifex-Openfoodnetwork
0042690e18
Updating translations for config/locales/en_FR.yml
2019-12-18 04:35:31 +11:00
Transifex-Openfoodnetwork
5f1111b52b
Updating translations for config/locales/fr.yml
2019-12-18 04:34:28 +11:00
Luis Ramos
25ded0d23c
Merge pull request #4471 from luisramos0/paginate_exc_prods
...
Paginate Exchange Products API endpoint
2019-12-17 15:25:15 +00:00
Luis Ramos
a5458150ca
Merge pull request #4455 from luisramos0/oc_prods
...
In the OC edit page, load products only when each products tab is opened by user
2019-12-17 13:40:19 +00:00
Pau Pérez Fabregat
96eebbabf3
Merge pull request #4590 from luisramos0/capybara
...
Upgrade capybara and webdrivers
2019-12-17 10:55:59 +01:00
luisramos0
c58e6fa964
Upgrade capybara
2019-12-16 15:25:45 +00:00
luisramos0
fbe8f5195c
Upgrade webdrivers to latest
2019-12-16 15:25:36 +00:00
luisramos0
9648693329
Fix a problem in states/new template where erb instead of haml was referenced
2019-12-15 21:42:52 +00:00
luisramos0
9df9061ec1
Bring missing translation from spree and use root namespace for translations instead of the spre namespace
2019-12-15 21:39:26 +00:00
luisramos0
67526df420
Convert calculator fields partial to haml
2019-12-15 21:32:31 +00:00
luisramos0
766f8ab407
Add partial needed in payment and shipping methods
2019-12-15 21:24:50 +00:00
luisramos0
f587bbb7d5
Remove unnecessary helper
2019-12-15 21:03:53 +00:00
luisramos0
2793693a7c
Improve if clause readability
2019-12-15 21:03:53 +00:00
luisramos0
07e2317369
Replace deprecated URI.unescape with CGI.unescape
2019-12-15 21:03:53 +00:00
luisramos0
042162eda8
Delete unused method
2019-12-15 21:03:53 +00:00
luisramos0
795f13d73a
Remove spree alerts feature that would check spree website for security alerts
...
This is not something we need running such an old version of spree
2019-12-15 21:03:53 +00:00
luisramos0
f1814f1b67
Fix most rubocop issues in spree/admin/base_controller
2019-12-15 21:03:53 +00:00
luisramos0
4ab7b78cb8
Merge base_controller with its decorator
2019-12-15 21:03:53 +00:00
luisramos0
11631c3a33
Add base_controller from spree_backend so that we can now merge it with the OFN's decorator
2019-12-15 21:03:53 +00:00
Konstantin Shlyk
0212381362
fix for api/variants_controller_spec
2019-12-14 21:43:38 +03:00
Konstantin Shlyk
e6ca6bacac
soft_delete api method deleted for products and variants
2019-12-14 01:05:35 +03:00
dependabot-preview[bot]
59df45b8cf
Bump oj from 3.7.12 to 3.10.0
...
Bumps [oj](https://github.com/ohler55/oj ) from 3.7.12 to 3.10.0.
- [Release notes](https://github.com/ohler55/oj/releases )
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ohler55/oj/compare/v3.7.12...v3.10.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-13 19:17:46 +00:00
Luis Ramos
5892e85869
Merge pull request #4559 from openfoodfoundation/dependabot/bundler/selenium-webdriver-3.142.6
...
Bump selenium-webdriver from 3.141.0 to 3.142.6
2019-12-13 18:05:03 +00:00
luisramos0
c59326743b
Remove sales total report
2019-12-13 16:44:46 +00:00
luisramos0
cb3397fd1a
Convert reports index and sales_total views from erb to haml
2019-12-13 16:44:46 +00:00
luisramos0
2bd4de3e29
Add sales total report view
2019-12-13 16:44:46 +00:00
luisramos0
b2c5be775e
Fix some rubocop issues
2019-12-13 16:44:46 +00:00
luisramos0
d22212ccfa
Merge spree/admin/reports_controller with its decorator
2019-12-13 16:44:44 +00:00
luisramos0
dd600cd163
Add reports_controller from spree_backend so that we can now merge it with the OFN's decorator
2019-12-13 15:20:03 +00:00
Matt-Yorkley
f189ca8004
Fix route on "continue" button on admin adjustments page
2019-12-13 13:51:41 +01:00
Luis Ramos
db7146014c
Rename exchange products file names to increase clarity
2019-12-13 12:24:19 +00:00
Luis Ramos
c6af55d9ae
Restructure exchange products panels so that OC simple form does not include header and footer (product count and pagination) of the non-simple OC form
2019-12-13 12:24:16 +00:00
Maikel
0f588dbe0b
Merge pull request #4561 from openfoodfoundation/transifex
...
Transifex
2019-12-13 17:02:32 +11:00
dependabot-preview[bot]
9c14d8ff36
Bump rack-mini-profiler from 1.0.0 to 1.1.4
...
Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler ) from 1.0.0 to 1.1.4.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases )
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md )
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v1.0.0...v1.1.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-12 19:14:17 +00:00
luisramos0
a104bf8efd
Add feature spec to validate load all and select all exchange products
2019-12-12 18:49:11 +00:00
luisramos0
a039ef13f4
Add spec for exchange products controller pagination
2019-12-12 18:49:11 +00:00
luisramos0
7ad8951375
DRY exchange products templates by extracting header and footer content to partial templates
2019-12-12 18:49:11 +00:00
luisramos0
99e59595b4
Add spinner when loading all products in an exchange
2019-12-12 18:48:36 +00:00
luisramos0
3264355f12
Add some basic test coverage to exchange_products_controller and exchange_products_renderer
2019-12-12 18:48:36 +00:00
luisramos0
7e3b6e2b5d
Fix select all checkbox state in both incoming and outgoing exchanges by using the total count of variants to see if all variants are selected or not, even if not all variants are loaded
2019-12-12 18:48:36 +00:00
luisramos0
a9598c5d97
Only show load more and load all if not all products are loaded already
2019-12-12 18:48:36 +00:00
luisramos0
3e5b7ebbf1
Show exchange products list only after first page of products is loaded
2019-12-12 18:48:36 +00:00
luisramos0
1a9c3007b0
Make select all work again in incoming exchanges by loading alll products before triggering the select all process
2019-12-12 18:48:35 +00:00
luisramos0
2f7fd1482a
Add link to load all products at the top of the list of products and include summary of number of products loaded already
2019-12-12 18:48:35 +00:00
luisramos0
0416521772
Add load all prouducts button to list of exchange products
2019-12-12 18:48:35 +00:00
luisramos0
cfe3f72d0e
Add load more button to list of exchange products
2019-12-12 18:48:35 +00:00
luisramos0
00478cc57c
Add count variants endpoint and use it instead of loading exchange products
2019-12-12 18:48:35 +00:00
luisramos0
d5e42ee1e5
Paginate exchange products results
...
This commit breaks the OC page when there are more than 100 products in an exchange
2019-12-12 18:48:35 +00:00
luisramos0
9451f1b66d
Remove funky panel open listener code and initialize the panel data with a ng-init in the panel template
2019-12-12 18:44:45 +00:00
luisramos0
ff584f9be9
Adapt exchange products routes to make api/exchanges/products (without exchange_id) also go to exchange_products#index
2019-12-12 18:44:45 +00:00
luisramos0
a589ba38da
Rename exchanges_products_controller to better exchange_products_controller
2019-12-12 18:44:45 +00:00
luisramos0
a4a2f98b6e
Rename Product service to more appropriate ExchangeProduct
2019-12-12 18:44:45 +00:00
luisramos0
f5ddbfbac3
Make Product service more simple, there's no need to keep the data structure, that is already kept in the controller
2019-12-12 18:44:45 +00:00
luisramos0
a66a4c3edb
Remove unnecessary passing of scopes around in controllers
2019-12-12 18:44:45 +00:00
luisramos0
8179252924
Replace the use of this with
2019-12-12 18:44:45 +00:00
luisramos0
0bec492208
Fix some rubocop issues
2019-12-12 18:44:45 +00:00
luisramos0
5cf50f0adf
Convert the manipulation of arrays into active record relations: let the DB do the matching job
2019-12-12 18:44:45 +00:00
luisramos0
197fb36524
Extract ExchangeProductsRenderer from ExchangesProductsController
2019-12-12 18:44:45 +00:00
luisramos0
62e6f09d94
Make exchange products more simple
2019-12-12 18:44:45 +00:00
luisramos0
79b2460664
Make simple create and edit OC load exchange products on init
...
Simple create makes a new type of call to exchange products with no exchange_id and no prder_cycle_id, it simply lists supplied products for a given enterprise
2019-12-12 18:44:44 +00:00
luisramos0
66f3656bb5
Register products panel listeners after OrderCycle is loaded instead of using recurrent timeouts
...
Also, use this same approach for the case where a new distributor or new supplier is added to the list of exchanges
2019-12-12 18:44:44 +00:00
luisramos0
6b087adab8
Add route to process requests to exchanges/products without exchange id
...
This is needed when products for an exchange that is not yet saved are requested
2019-12-12 18:44:44 +00:00
luisramos0
3653b88da6
Make exchanges_products_controller more independent of the exchange field
2019-12-12 18:44:44 +00:00
luisramos0
3223bf930d
Make total number of products in exchange work again.
...
Currently we are just loading the products from the server and count them.
This can be improved easily in two ways:
- we can switch this to a specific product count call to the server so that we dont load all products all the time
- or we paginate the products result and fetch the total_number from the payload of the first page.
2019-12-12 18:44:44 +00:00
luisramos0
2b3bc6d1ff
Remove supplied products from enterprise serializer and from UI side
...
This list of products s now loaded in a specific call to ExchangeProducts and for each specific exchange
2019-12-12 18:44:44 +00:00
luisramos0
24d7672abb
Use new exchange products endpoint for outgoing exchanges and make the exchange products panel work for outgoing exchanges
2019-12-12 18:44:44 +00:00
luisramos0
89628c27f3
Move exchange products endpoint to api namespace and make it work for outgoing exchanges
2019-12-12 18:44:44 +00:00
luisramos0
9adbdc377d
Add new admin/exchange/products endpoint that replaces Enterprise/for_order_cycle#supplied_products
2019-12-12 18:44:44 +00:00
luisramos0
883cd81058
Load enterprise supplied products when the exchange products panel is opened for the first time
2019-12-12 18:44:44 +00:00
Transifex-Openfoodnetwork
0d7d029255
Updating translations for config/locales/en_GB.yml
2019-12-13 02:07:44 +11:00
Kristina Lim
ce31a059bf
Merge pull request #4553 from openfoodfoundation/transifex
...
Transifex
2019-12-12 22:46:22 +08:00
Luis Ramos
17bac20c65
Merge pull request #4550 from luisramos0/fix_of_report
...
Remove eager loding of shipping_methods and shipping_rates from customer_totals so that report runs faster
2019-12-12 14:15:19 +00:00
Pau Pérez Fabregat
066243057f
Merge pull request #4545 from coopdevs/fix-db-backups
...
Make whenever properly read the S3 bucket
2019-12-12 11:39:54 +01:00
Transifex-Openfoodnetwork
ea40547fd7
Updating translations for config/locales/fr_CA.yml
2019-12-12 10:22:26 +11:00
Transifex-Openfoodnetwork
0ebc6d4b1e
Updating translations for config/locales/en_CA.yml
2019-12-12 09:28:07 +11:00
Transifex-Openfoodnetwork
62c2e4709a
Updating translations for config/locales/en_CA.yml
2019-12-12 09:25:01 +11:00
Konstantin Shlyk
c5229dd763
billing address in pdf invoice fixed
2019-12-11 23:10:51 +03:00
dependabot-preview[bot]
99d4190814
Bump selenium-webdriver from 3.141.0 to 3.142.6
...
Bumps [selenium-webdriver](https://github.com/SeleniumHQ/selenium ) from 3.141.0 to 3.142.6.
- [Release notes](https://github.com/SeleniumHQ/selenium/releases )
- [Changelog](https://github.com/SeleniumHQ/selenium/blob/master/rb/CHANGES )
- [Commits](https://github.com/SeleniumHQ/selenium/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-11 19:35:45 +00:00
dependabot-preview[bot]
f086c02e13
Bump mini_racer from 0.1.15 to 0.2.4
...
Bumps [mini_racer](https://github.com/discourse/mini_racer ) from 0.1.15 to 0.2.4.
- [Release notes](https://github.com/discourse/mini_racer/releases )
- [Changelog](https://github.com/rubyjs/mini_racer/blob/master/CHANGELOG )
- [Commits](https://github.com/discourse/mini_racer/compare/v0.1.15...v0.2.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-11 19:35:03 +00:00
dependabot-preview[bot]
b726f961fc
Bump stripe from 4.24.0 to 5.11.0
...
Bumps [stripe](https://github.com/stripe/stripe-ruby ) from 4.24.0 to 5.11.0.
- [Release notes](https://github.com/stripe/stripe-ruby/releases )
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stripe/stripe-ruby/compare/v4.24.0...v5.11.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-11 19:33:30 +00:00
Transifex-Openfoodnetwork
4c17cf0087
Updating translations for config/locales/fr.yml
2019-12-12 04:29:14 +11:00
Transifex-Openfoodnetwork
9fe143cf94
Updating translations for config/locales/en_FR.yml
2019-12-12 04:26:13 +11:00
Transifex-Openfoodnetwork
e2d783c385
Updating translations for config/locales/fr.yml
2019-12-12 04:26:05 +11:00
Transifex-Openfoodnetwork
81cb162884
Updating translations for config/locales/nb.yml
2019-12-12 03:34:25 +11:00
Transifex-Openfoodnetwork
c7b6dd2677
Updating translations for config/locales/nb.yml
2019-12-12 03:31:14 +11:00
Transifex-Openfoodnetwork
d1fd73fd2b
Updating translations for config/locales/ar.yml
2019-12-12 03:16:38 +11:00
Transifex-Openfoodnetwork
b0221d264e
Updating translations for config/locales/ar.yml
2019-12-12 03:13:31 +11:00
Transifex-Openfoodnetwork
0f64badc74
Updating translations for config/locales/ar.yml
2019-12-12 03:10:21 +11:00
Luis Ramos
7ccfdc8d21
Merge pull request #4546 from kshlyk/fix_cart_link_on_mobile
...
Cart link in header on mobile leads to cart page instead of checkout …
2019-12-11 13:45:56 +00:00
Luis Ramos
4799293996
Merge pull request #4518 from Matt-Yorkley/ruby-2.3.7
...
Bump Ruby to 2.3.7
2019-12-11 13:29:01 +00:00
Luis Ramos
58a93c27ae
Merge pull request #4539 from luisramos0/subs_s3
...
Make weight calculator work for SubscriptionLineItems
2019-12-11 11:20:53 +00:00
luisramos0
0202b59634
Remove eager loding of shipping_methods and shipping_rates from customer_totals so that report runs faster
...
Something makes the query run much slower with these includes
2019-12-10 21:18:17 +00:00
Luis Ramos
9f351607d1
Merge pull request #4538 from mkllnk/4537-paginated-product-order
...
Make product order deterministic
2019-12-10 18:00:45 +00:00
Maikel
c45e3c9cca
Merge pull request #4543 from openfoodfoundation/transifex
...
Transifex
2019-12-10 20:10:23 +11:00
Luis Ramos
71bf3f5f71
Merge pull request #4514 from luisramos0/backend_ctrl_overview
...
Bring spree_backend overview controller to OFN
2019-12-09 23:36:32 +00:00
Konstantin Shlyk
ef142de5f2
Cart link in header on mobile leads to cart page instead of checkout page
2019-12-09 22:58:00 +03:00
luisramos0
f64e8bf50e
Make user aware of server side errors when saving subscription products and unit test products_panel_controller
2019-12-09 17:49:38 +00:00
Pau Perez
e8d68e3b89
Make whenever properly read the S3 bucket
...
For unknown reasons the magic
[Figaro](https://github.com/laserlemon/figaro ) does to turn keys in
`config/application.yml` into ENV vars that can be read through Ruby's
`ENV[]` is not working in `config/schedule.rb`.
As a result, the `db2fog` tasks are not translated into cron entries
which led to not having automatic backups.
2019-12-09 17:16:11 +01:00
luisramos0
1b29d474d0
Add specs to cover case where updating subscriptions products quantity fails
2019-12-09 15:11:32 +00:00
Luis Ramos
baae58ecb6
Merge pull request #4288 from luisramos0/oc_serializer_spec
...
Add spec for api/admin/order_cycle_serializer
2019-12-09 11:16:04 +00:00
Pau Pérez Fabregat
6411871ecb
Merge pull request #4540 from openfoodfoundation/dependabot/bundler/ddtrace-0.30.0
...
Bump ddtrace from 0.29.1 to 0.30.0
2019-12-09 09:48:27 +01:00
Transifex-Openfoodnetwork
22833ae79b
Updating translations for config/locales/it.yml
2019-12-09 19:28:13 +11:00
Transifex-Openfoodnetwork
ac20b0e7fb
Updating translations for config/locales/it.yml
2019-12-09 19:25:06 +11:00
luisramos0
e9e6aa77d8
Make weight calculator work for SubscriptionLineItems by making it test if line_item responds to final_weight_volume field (final_weight_volume_present?)
...
We also add logic to weight_per_variant so that we use variant.unit_value if final_weight_volume is not available but variant_unit is weight
Adapt some test case to test unit_value (in grams) instead of weight (in kgs)
2019-12-08 17:36:21 +00:00
Matt-Yorkley
29e30c388e
Make error message translatable
2019-12-07 15:48:46 +01:00
Matt-Yorkley
54a40fe79c
Handle validation messages when saving new fees
2019-12-07 14:51:17 +01:00
dependabot-preview[bot]
7840118dea
Bump ddtrace from 0.29.1 to 0.30.0
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.29.1 to 0.30.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.29.1...v0.30.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-12-06 19:18:08 +00:00
luisramos0
5e27bd6d6d
Add for now very basic spec to api/admin/order_cycle_serializer
2019-12-06 16:41:54 +00:00
Maikel Linke
d4512904ea
Make product order deterministic
...
When products are sorted by name and two products have the same name,
their order is undefined. With pagination, two pages can have a
different order of products with the same name which then means that two
pages can return the same product.
Sorting by product id makes sure that the result is always in the same
order, for every page.
2019-12-05 15:37:10 +11:00
Maikel
52dc288470
Merge pull request #4530 from openfoodfoundation/transifex
...
Transifex
2019-12-05 11:01:30 +11:00
Luis Ramos
302de04e73
Merge pull request #4526 from kristinalim/fix/3149-fix_tool_tips_in_orders_list
...
3149 Fix tooltips in orders list
2019-12-04 10:38:28 +00:00
Transifex-Openfoodnetwork
41767936d6
Updating translations for config/locales/ca.yml
2019-12-03 22:50:13 +11:00
Transifex-Openfoodnetwork
0ccf30202e
Updating translations for config/locales/ca.yml
2019-12-03 22:47:06 +11:00
Transifex-Openfoodnetwork
00f36e4686
Updating translations for config/locales/ca.yml
2019-12-03 22:43:57 +11:00
Maikel
4d77f30bc0
Merge pull request #4506 from openfoodfoundation/dependabot/bundler/ddtrace-0.29.1
...
Bump ddtrace from 0.29.0 to 0.29.1
2019-12-03 20:39:58 +11:00
Maikel
f38b1b95f0
Merge pull request #4525 from kristinalim/fix/4489-flaky_spec_for_editing_oc
...
4489 Improve waiting in feature spec for edit Order Cycle page
2019-12-03 20:36:37 +11:00
Luis Ramos
97ef93b840
Merge pull request #4516 from openfoodfoundation/transifex
...
Transifex
2019-12-02 17:50:26 +00:00
Luis Ramos
6db15a0a20
Merge pull request #4524 from Matt-Yorkley/packing_reports
...
Packing reports performance
2019-12-02 17:32:52 +00:00
Luis Ramos
c8395a487a
Merge pull request #4523 from luisramos0/permissions_improve
...
Replace pluck with select in permissions to avoid extra queries and extract Permissions::Orders from Permissions
2019-12-02 16:31:04 +00:00
Kristina Lim
852adfd436
Improve waiting in feature spec for order cycle page
2019-12-02 20:06:43 +08:00
luisramos0
1e948735fb
Fix major performance problem by inverting the logic, instead of looking for line_items that are hidden, it looks for line items that are not editable using a merge statement that performs much better
...
Also, remove unnecessary if clause, merge will return an empty relation if no items are found, no need to test for empty.
The test report runs in a little over one minute instead of 8minutes
2019-11-30 22:38:03 +00:00
luisramos0
0ef4247914
Convert Report::LineItems to class and memoize orders so it's only executed once (this improves the report in 3secs for the case I am testing)
2019-11-29 21:51:54 +00:00
Kristina Lim
2673a6efee
Fix Angular tracking of row in orders list
...
The tooltip content for the order in index n in page x was being used
for the order in index n in page y.
This was because ng-repeat was tracking the items/rows by index.
As far as ng-repeat is aware, rows with the same index in any page
were the same items/rows, so it didn't bother relinking the ofn-with-tip
directive.
2019-11-30 03:53:20 +08:00
Kristina Lim
6ffe7f1a99
Set width and enable wrapping for tooltips
2019-11-30 03:53:16 +08:00
Matt-Yorkley
6d1fb63a21
Eager-load option_values on line_item objects instead of variants in packing reports.
2019-11-29 20:16:48 +01:00
Matt-Yorkley
9bcd303f4f
Remove shipping_category N+1 from packing reports
2019-11-29 20:16:48 +01:00
Matt-Yorkley
38c327dae0
Improve N+1 issues around #suppliers_of_products_distributed_by
...
There's still some real mess here with repeating queries, but resolving it is out of scope for this quick PR
2019-11-29 20:16:03 +01:00
Matt-Yorkley
51177b833e
Remove customer_code N+1 from packing reports
2019-11-29 17:09:12 +01:00
luisramos0
cc3368704a
Fix rubocop issues in reports_controller_decorator and in report line_items
2019-11-29 13:54:30 +00:00
Pau Pérez Fabregat
2d53fbbe8c
Merge pull request #4520 from kristinalim/fix/4238-flaky_spec_in_api_taxons_index
...
4238 Do not assume order in spec for taxons list
2019-11-29 13:23:51 +01:00
luisramos0
3959f16d65
Switch some more references from Permissions to Permissions::Order
2019-11-29 12:22:50 +00:00
Pau Pérez Fabregat
fb28826d92
Merge pull request #4522 from kristinalim/fix/4239-flaky_spec_in_bulk_product_clone
...
4239 Do one thing at a time in feature spec for product cloning
2019-11-29 13:22:42 +01:00
luisramos0
beaa8ffa27
Use more specific selector to avoid ambigous column error
2019-11-29 11:45:22 +00:00
luisramos0
da6d035a1d
Rename some reports permissions to order_permissions
2019-11-29 11:23:17 +00:00
luisramos0
5cb77c443b
Fix rubocop issues
2019-11-29 10:53:40 +00:00
luisramos0
8d16f496f4
Move Permissions::Order specs to its specific spec file
2019-11-29 10:49:59 +00:00
luisramos0
82b274e522
Make selector more specific to avoid sql error 'ambiguos column'
2019-11-29 10:49:58 +00:00
luisramos0
484cdd1e07
Make managed_and_related_enterprises public so they can be used by other permissions classes
2019-11-29 10:49:27 +00:00
luisramos0
bb2e6324bd
Rename order permissions to just order
2019-11-29 10:49:27 +00:00
luisramos0
89056e13ed
Extract order permissions to a separate class
2019-11-29 10:48:58 +00:00
luisramos0
df0458743b
Replace pluck with select in permissions to avoid extra queries
2019-11-28 23:37:49 +00:00
luisramos0
ba1ad0a6dd
Rename decorator to controller so that the rubocop exception for the index action keeps being seen by code climate
2019-11-28 16:47:02 +00:00
luisramos0
4e7b397c5a
Bring orders adjustments route from spree_backend
2019-11-28 16:26:22 +00:00
luisramos0
842e191c5f
Remove toggle_state action that is not used in OFN
2019-11-28 16:20:35 +00:00
Kristina Lim
1476859c83
Do one thing at a time in feature spec for product cloning
2019-11-28 22:05:17 +08:00
Kristina Lim
c6fb7dafec
Do not assume order in test for taxons list
2019-11-28 20:33:42 +08:00
Transifex-Openfoodnetwork
80069731ed
Updating translations for config/locales/en_NZ.yml
2019-11-28 20:52:48 +11:00
Matt-Yorkley
feaa928674
Bump Ruby to 2.3.7 🎉
2019-11-28 10:42:13 +01:00
Maikel Linke
dfa3d40665
Create release task template recognised by Github
2019-11-28 15:58:14 +11:00
Maikel
00c2b95a0e
Add issue template for release tasks
2019-11-28 15:53:34 +11:00
Maikel Linke
4a82a26830
Update all locales with the latest Transifex translations
2019-11-28 15:17:38 +11:00
Transifex-Openfoodnetwork
f1831fc6bb
Updating translations for config/locales/en_AU.yml
2019-11-28 13:47:28 +11:00
Transifex-Openfoodnetwork
4c91a5571a
Updating translations for config/locales/en_AU.yml
2019-11-28 13:47:08 +11:00
Transifex-Openfoodnetwork
ccb7a305bc
Updating translations for config/locales/de_DE.yml
2019-11-28 13:45:01 +11:00
Transifex-Openfoodnetwork
0c87afefce
Updating translations for config/locales/de_DE.yml
2019-11-28 13:41:53 +11:00
Maikel
d546817f0a
Merge pull request #4486 from openfoodfoundation/transifex
...
Transifex
2019-11-28 10:36:06 +11:00
Luis Ramos
e0e833b2f3
Merge pull request #4454 from luisramos0/sort_products
...
Sort products alphabetically in OC edit page
2019-11-27 22:27:42 +00:00
luisramos0
c8d359a0da
Merge spree/admin/overview_controller with its decorator
2019-11-27 22:08:46 +00:00
luisramos0
210757641c
Add overview_controller from spree_backend so that we can now merge it with the OFN's decorator
2019-11-27 22:08:06 +00:00
luisramos0
68bf599a1a
Merge spree/admin/adjustments_controller with decorator
2019-11-27 21:59:15 +00:00
luisramos0
a10966b66b
Add adjustments_controller from spree_backend so that we can now merge it with the OFN's decorator
2019-11-27 21:59:15 +00:00
dependabot-preview[bot]
08003f2003
Bump ddtrace from 0.29.0 to 0.29.1
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.29.0 to 0.29.1.
- [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.29.0...v0.29.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-27 19:17:20 +00:00
Luis Ramos
7cc034c2bc
Merge pull request #4136 from mkllnk/4018-synchronise-checkout
...
Lock variants during checkout to avoid race condition
2019-11-27 15:40:28 +00:00
luisramos0
15bcde36cb
Remove order by filter on outgoing exchanges list of products
...
The products are now coming from the server already sorted
2019-11-26 17:59:30 +00:00
Transifex-Openfoodnetwork
6e69960ee9
Updating translations for config/locales/nb.yml
2019-11-25 22:54:56 +11:00
Transifex-Openfoodnetwork
a7a03b04a9
Updating translations for config/locales/nb.yml
2019-11-25 22:51:50 +11:00
Pau Pérez Fabregat
5759dcee48
Merge pull request #4463 from jonleighton/docker-ruby-version
...
Use .ruby-version when building Docker container
2019-11-25 10:43:55 +01:00
Pau Pérez Fabregat
a9672011a5
Merge pull request #4479 from openfoodfoundation/dependabot/bundler/ddtrace-0.29.0
...
Bump ddtrace from 0.28.0 to 0.29.0
2019-11-25 09:42:48 +01:00
Pau Pérez Fabregat
808aa188ab
Merge pull request #4478 from openfoodfoundation/dependabot/bundler/rspec-retry-0.6.2
...
Bump rspec-retry from 0.6.1 to 0.6.2
2019-11-25 09:42:06 +01:00
Transifex-Openfoodnetwork
ad7fc61228
Updating translations for config/locales/en_GB.yml
2019-11-24 05:29:07 +11:00
Transifex-Openfoodnetwork
3e32e5c16e
Updating translations for config/locales/ar.yml
2019-11-24 03:48:31 +11:00
Transifex-Openfoodnetwork
f67a2120f4
Updating translations for config/locales/ar.yml
2019-11-24 03:45:25 +11:00
Matt-Yorkley
a4ee562387
Update all locales with the latest Transifex translations
2019-11-23 12:57:35 +01:00
Matt-Yorkley
165f4f9201
Merge pull request #4485 from openfoodfoundation/transifex
...
Transifex
2019-11-23 12:48:27 +01:00
Matt-Yorkley
0d1740ba4a
Merge pull request #4430 from Matt-Yorkley/variant_option_types
...
Variant option_values
2019-11-23 12:37:34 +01:00
Matt-Yorkley
cbb3f202ca
Eager-load option_values in OpenFoodNetwork::ScopeVariantsForSearch
2019-11-23 10:58:18 +01:00
Matt-Yorkley
ff076fd7be
Eager-load option_values in Api::ProductsController
2019-11-23 10:58:18 +01:00
Matt-Yorkley
d30192207b
Eager-load option_values in ProducerMailer
2019-11-23 10:58:18 +01:00
Matt-Yorkley
19afc1a6da
Eager-load option_values in Api::VariantsController
2019-11-23 10:58:18 +01:00
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
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
Jon Leighton
172a79acc7
Use .ruby-version when building Docker container
...
The Ruby version was updated, but the Dockerfile wasn’t. This meant that
the Docker environment was broken. This change should prevent similar
breakage in the future by making .ruby-version the source of truth about
the correct version.
2019-11-14 15:44:49 +11:00
Maikel
7c9cdccb49
Merge pull request #4460 from openfoodfoundation/transifex
...
Transifex
2019-11-13 10:29:22 +11:00
dependabot-preview[bot]
179ec6a3e9
Bump i18n-js from 3.4.2 to 3.5.0
...
Bumps [i18n-js](https://github.com/fnando/i18n-js ) from 3.4.2 to 3.5.0.
- [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.2...v3.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-12 19:34:42 +00: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
luisramos0
f1c055805f
Use $timeout instead of setTimeout which makes it possible to remove apply()
2019-11-12 12:06:44 +00:00
luisramos0
5cadb0d16f
Make ready for field show with red borders immediatly after exchange is added to the list
2019-11-12 12:06:44 +00:00
luisramos0
6875e9a41e
Make view a bit simpler by removing unnecessary string interpolation
2019-11-12 12:05:40 +00:00
luisramos0
b6f1d6e395
Make OC edit page steps clickable when editing an OC
2019-11-12 12:05:40 +00:00
luisramos0
6e51be095b
Add order to supplied products in enterprise serializer so that products in exchanges are sorted alphabetically
2019-11-12 12:04:42 +00:00
luisramos0
1c7237869a
Refactor products_scope to make it more simple
2019-11-12 12:04:42 +00:00
luisramos0
14433e7764
Fix some rubocop issues in admin/order_cycles_controller
2019-11-12 12:02:36 +00:00
luisramos0
5fdb86ae43
Make simple create redirect to OC list but normal create to jump to incoming settings
2019-11-12 12:00:48 +00:00
luisramos0
6615469f8b
Fix 3 more specs in OC edit pages
2019-11-12 12:00:48 +00:00
luisramos0
d281837dd9
Remove useless spec now that we have 3 steps in OC edit process
2019-11-12 12:00:48 +00:00
luisramos0
7c63e59ae9
Add OC imcoming and outgoing abilities to managers, this fixes a few OC feature specs
2019-11-12 12:00:48 +00:00
luisramos0
7c19fe418e
Adapt OC specs to new page flow with 3 steps (these specs are not green yet)
2019-11-12 12:00:48 +00:00
luisramos0
46d0023018
Adapt OC spec to new page flow with 3 steps
2019-11-12 12:00:48 +00:00
luisramos0
43cf249184
Make NoDistributors warning only appear on simple_create and simple_edit and outgoing settings
2019-11-12 12:00:48 +00:00
luisramos0
537dbd3dc0
Fix angular specs by moving specs to the same place as the code was moved previously
...
Quite a few copy pasted specs were also removed
2019-11-12 12:00:48 +00:00
luisramos0
7c54781d90
Restructure OC page controllers so that methods related to exchanges are only loaded on the incoming and outgoing settings pages
2019-11-12 12:00:48 +00:00
luisramos0
3b4241c70d
Remove more copy pasted code by adding new AdminOrderCycleCtrl with common code from create and edit OC controllers
2019-11-12 12:00:48 +00:00
luisramos0
a290e83501
Move more copy pasted code to basic OC controller
2019-11-12 12:00:48 +00:00
luisramos0
6e0019227b
Remove some serious copy/paste party of the past... by extending from new AdminOrderCycleBasicCtrl where we put all the basic methods for the OC create/edit/simple_create/simple_edit controllers
2019-11-12 12:00:48 +00:00
luisramos0
7845b6c6fb
Use only AdminOrderCycleIncomingCtrl in incoming view and make AdminOrderCycleIncomingCtrl extend AdminEditOrderCycleCtrl
...
Same for AdminOrderCycleOutgoingCtrl
2019-11-12 12:00:48 +00:00
luisramos0
e03e3ae50a
Fix the simple edit OC and the new OC page flows
2019-11-12 12:00:48 +00:00
luisramos0
305d7b1125
Adapted navigation between OC edit pages by adding new previous and next buttons
2019-11-12 12:00:48 +00:00
luisramos0
5ef751d409
Add wizard to OC new and edit pages
2019-11-12 12:00:48 +00:00
luisramos0
683232dd10
Improve page titles and fix broken translation
2019-11-12 12:00:48 +00:00
luisramos0
5f1360e226
Move incoming and outgoing parts of the (not simple) OC new and edit pages to separate routes and views to make this page a multi step page
2019-11-12 12:00:48 +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
Matt-Yorkley
5e99ecd9cc
Merge pull request #4446 from luisramos0/remove_listen
...
Remove unused dependency listen
2019-11-10 10:03:19 +00:00
Matt-Yorkley
c94713c1ef
Merge pull request #4451 from openfoodfoundation/dependabot/bundler/rack-mini-profiler-1.0.0
...
Bump rack-mini-profiler from 0.10.7 to 1.0.0
2019-11-09 19:28:54 +00:00
Maikel
6864c0d3c3
Merge pull request #4448 from luisramos0/rubo_kanp
...
Update rubocop todo lists and regenrate knapsack report
2019-11-09 10:59:14 +11:00
Maikel
5591525160
Merge pull request #4445 from openfoodfoundation/dependabot/bundler/test-unit-3.3.4
...
Bump test-unit from 3.3.3 to 3.3.4
2019-11-09 10:40:41 +11:00
luisramos0
4d00b79d8d
Add new knapsack report so build jobs are more balanced
2019-11-08 20:43:49 +00:00
dependabot-preview[bot]
e3007db324
Bump rack-mini-profiler from 0.10.7 to 1.0.0
...
Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler ) from 0.10.7 to 1.0.0.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases )
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md )
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v0.10.7...v1.0.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-08 19:18:25 +00:00
luisramos0
de1d7f2877
Remove references to prototype (inexistent in OFN) in model properties
2019-11-08 17:49:35 +00:00
luisramos0
215f2897f3
Bring Property model from spree core
2019-11-08 17:48:49 +00:00
luisramos0
2d240f23a8
Converted erb properties views to haml and added lazy lookups for translations
2019-11-08 17:31:43 +00:00
luisramos0
f8b0ad29df
Bring properties views from spree_backend
2019-11-08 17:18:26 +00:00
luisramos0
af1eff9427
Bring properties and product_properties controllers from spree_backend
2019-11-08 17:18:04 +00:00
luisramos0
05ddebd78e
Update rubocop todo lists with payment_methods_controler exceptions
2019-11-08 17:05:51 +00:00
Luis Ramos
fd6639c7d1
Merge pull request #4415 from lin-d-hop/delivery-report
...
Update end date on delivery report
2019-11-08 16:58:27 +00:00
Luis Ramos
314ecf6d90
Merge pull request #4372 from luisramos0/images
...
Move Images from spree_backend to OFN
2019-11-08 16:21:33 +00:00
Luis Ramos
ea8eb0ee14
Merge pull request #4371 from luisramos0/payment_methods
...
Move Payment methods from spree_backend to OFN
2019-11-08 14:26:21 +00:00
luisramos0
9bb940ae43
Remove unused dependency listen, it was used in guard but guard was deleted
2019-11-08 12:49:06 +00:00
Luis Ramos
9e713e449f
Merge pull request #4441 from openfoodfoundation/dependabot/bundler/rubocop-0.68.1
...
Bump rubocop from 0.57.2 to 0.68.1
2019-11-08 12:35:11 +00:00
Matt-Yorkley
34f4bbe06c
Eager-load variant associations in admin ProductsController
2019-11-08 10:44:47 +00:00
Maikel Linke
babe2247a5
Put new violations on the todo list
2019-11-08 19:08:36 +11:00
Maikel Linke
3295aedeee
Update Rubocop config for new version
2019-11-08 19:08:36 +11:00
dependabot-preview[bot]
eaaf082572
Bump rubocop from 0.57.2 to 0.68.1
...
Bumps [rubocop](https://github.com/rubocop-hq/rubocop ) from 0.57.2 to 0.68.1.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases )
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.57.2...v0.68.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-08 19:08:36 +11:00
Maikel Linke
f8803888f2
Update Rubocop config to pass local run
2019-11-08 19:08:36 +11:00
Maikel
032fbc7348
Merge pull request #4440 from openfoodfoundation/transifex
...
Transifex
2019-11-08 17:44:02 +11:00
Matt-Yorkley
b64633d2d8
Merge pull request #4434 from coopdevs/remove-duplicate-feature-spec
...
Don't test existence of a field used in next spec
2019-11-08 00:43:57 +00:00
Transifex-Openfoodnetwork
bc46b2bccb
Updating translations for config/locales/en_FR.yml
2019-11-08 07:28:30 +11:00
Transifex-Openfoodnetwork
fc8bd530e6
Updating translations for config/locales/en_GB.yml
2019-11-08 07:13:52 +11:00
Transifex-Openfoodnetwork
8e6079ad5b
Updating translations for config/locales/en_GB.yml
2019-11-08 07:10:42 +11:00
dependabot-preview[bot]
f29922312d
Bump test-unit from 3.3.3 to 3.3.4
...
Bumps [test-unit](https://github.com/test-unit/test-unit ) from 3.3.3 to 3.3.4.
- [Release notes](https://github.com/test-unit/test-unit/releases )
- [Commits](https://github.com/test-unit/test-unit/compare/3.3.3...3.3.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-07 19:20:30 +00:00
dependabot-preview[bot]
1b8863b63d
Bump wkhtmltopdf-binary from 0.12.4 to 0.12.5
...
Bumps [wkhtmltopdf-binary](https://github.com/zakird/wkhtmltopdf_binary_gem ) from 0.12.4 to 0.12.5.
- [Release notes](https://github.com/zakird/wkhtmltopdf_binary_gem/releases )
- [Changelog](https://github.com/zakird/wkhtmltopdf_binary_gem/blob/master/CHANGELOG )
- [Commits](https://github.com/zakird/wkhtmltopdf_binary_gem/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-07 19:19:47 +00:00
dependabot-preview[bot]
5def2f6f5f
Bump roadie-rails from 1.1.1 to 1.3.0
...
Bumps [roadie-rails](https://github.com/Mange/roadie-rails ) from 1.1.1 to 1.3.0.
- [Release notes](https://github.com/Mange/roadie-rails/releases )
- [Changelog](https://github.com/Mange/roadie-rails/blob/master/Changelog.md )
- [Commits](https://github.com/Mange/roadie-rails/compare/v1.1.1...v1.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-07 19:18:56 +00:00
Transifex-Openfoodnetwork
b5e69c883b
Updating translations for config/locales/fr.yml
2019-11-07 23:50:03 +11:00
Transifex-Openfoodnetwork
5f0ad3fd71
Updating translations for config/locales/fr.yml
2019-11-07 23:46:53 +11:00
Pau Perez
a6ba956355
Update all locales with the latest Transifex translations
2019-11-07 12:47:10 +01:00
Luis Ramos
76cffe4c7f
Merge pull request #4301 from Matt-Yorkley/ruby-2.2.10
...
Use Ruby 2.2.10
2019-11-07 10:17:54 +00:00
Pau Perez
5095df251e
Don't test existence of a field used in next spec
...
If the next example doesn't find the quick_search field it will fail so
no need to duplicate it with the consequent costly test setup.
2019-11-06 18:28:59 +01:00
Pau Pérez Fabregat
26477a8d4b
Merge pull request #4421 from openfoodfoundation/transifex
...
Transifex
2019-11-06 18:04:23 +01:00
Luis Ramos
52ab6c52bf
Merge pull request #4057 from luisramos0/remove_spree_api_2
...
Remove dependency to spree_api - step 2 - routes and views
2019-11-06 13:23:32 +00:00
Luis Ramos
413e93fe40
Merge pull request #4431 from Matt-Yorkley/fix_migration_clash
...
Fix migration mismatch
2019-11-06 09:49:15 +00:00
Matt-Yorkley
9e1b2eb4ca
Fix migration mismatch
...
It looks like this was probably changed whilst resolving a merge conflict somewhere. The number doesn't match the last migration file, and it's breaking the ofn-install CI build (as well as migrations on fresh servers).
2019-11-05 22:58:14 +00:00
Luis Ramos
1ceae6cf8d
Merge pull request #4225 from HugsDaniel/4106-edit-product-missing-translations
...
Add missing translations on product edit page
2019-11-05 19:30:08 +00:00
Transifex-Openfoodnetwork
5183d93601
Updating translations for config/locales/en_DE.yml
2019-11-05 23:45:05 +11:00
Luis Ramos
247854b7fe
Merge pull request #4423 from openfoodfoundation/dependabot/bundler/i18n-js-3.4.1
...
Bump i18n-js from 3.4.0 to 3.4.1
2019-11-04 11:47:13 +00:00
dependabot-preview[bot]
85bd803785
Bump i18n-js from 3.4.0 to 3.4.1
...
Bumps [i18n-js](https://github.com/fnando/i18n-js ) from 3.4.0 to 3.4.1.
- [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.0...v3.4.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-11-01 19:39:31 +00:00
luisramos0
75dfde2552
In the Edit OC page, the list of supplied products should only include checkboxes for normal variants: removed html to display product checkbox and also master variants
...
Two rules we can use to make this more simple: all products have variants (at least what is called the standard variant) and master variants cannot be added to OCs
2019-11-01 17:18:48 +00:00
luisramos0
10f0906689
Remove obsolete view, this code is now in app/assets/javascripts/templates/admin/panels/exchange_supplied_products.html.haml
2019-11-01 17:18:48 +00:00
Transifex-Openfoodnetwork
c6543edc85
Updating translations for config/locales/en_GB.yml
2019-11-02 01:42:11 +11:00
Transifex-Openfoodnetwork
a91d0973d4
Updating translations for config/locales/en_GB.yml
2019-11-02 01:39:02 +11:00
Kristina Lim
61c581ae52
Update all locales with the latest Transifex translations
2019-11-01 20:38:13 +08:00
Luis Ramos
db8e2891d4
Merge pull request #4417 from Matt-Yorkley/shopfront_patchination
...
Ensure variants returned in #variant_relation are DISTINCT
2019-11-01 12:16:01 +00:00
Luis Ramos
a947d8df6c
Merge pull request #4397 from luisramos0/delete_option_types_page
...
Remove option types menu entry
2019-11-01 12:14:59 +00:00
Maikel
818d41ffac
Merge pull request #4418 from AndrewCleve/readme-grammar-fix
...
Improve readability of README.md
2019-11-01 16:48:12 +11:00
Maikel
14f67053c8
Merge pull request #4400 from coopdevs/task-to-remove-enterprise-limit
...
Task to remove limit of ent. that can be created
2019-11-01 15:57:12 +11:00
luisramos0
76e32b126f
Add a few more missing translation keys for product images and variants display as and display name
2019-11-01 10:40:02 +11:00
luisramos0
c234cfb890
Add missing translation in the new variant page
2019-11-01 10:40:02 +11:00
luisramos0
38bda1697d
Add missing translations in the product variants list page
2019-11-01 10:40:02 +11:00
luisramos0
5fb9ebc594
Add missing translations for variants edit page
2019-11-01 10:40:02 +11:00
luisramos0
acbd4b076d
Move product page tabs to a separate translations key namespace
2019-11-01 10:40:01 +11:00
luisramos0
123f7aa68e
Use root translation keys for basic actions
2019-11-01 10:39:09 +11:00
luisramos0
2c4af84a81
Move product seo translation keys to specific namespace
2019-11-01 10:39:09 +11:00
luisramos0
34ed16ff30
Add missing translation keys to product properties list
2019-11-01 10:39:09 +11:00
Hugo Daniel
0b20b80219
Add missing translations on product edit page
2019-11-01 10:38:06 +11:00
Luis Ramos
bef745378e
Merge pull request #4395 from luisramos0/delete_prototypes
...
Delete prototypes tables and all references in pages
2019-10-31 20:06:38 +00:00
lin-d-hop
472aef0904
Fixing spec
2019-10-31 18:28:13 +00:00
luisramos0
a6cb5903d6
Delete prototypes tables and all references in pages
2019-10-31 13:23:42 +00:00
Luis Ramos
d1b36aded0
Merge pull request #4359 from daningenthron/daningenthron/required-fields-new-order-cycle
...
Add asterisks to required fields in New Order Cycle form
2019-10-31 12:50:48 +00:00
Luis Ramos
9c3c74aa93
Merge pull request #4394 from luisramos0/fix_product_sub_menu
...
Merge duplicated product_sub_menu partials
2019-10-31 12:48:27 +00:00
Matt-Yorkley
67a5a1cdc2
Fix incorrectly ordered entries with duplicate product names in OC and custom taxon ordering applied
2019-10-31 12:14:14 +00:00
Matt-Yorkley
9723e2cd49
Add failing spec for taxon ordering issue
2019-10-31 12:07:16 +00:00
Pau Pérez Fabregat
4af014df6b
Merge pull request #4342 from JacksonBates/edit-button-new-window
...
makes edit button action open a new tab
2019-10-31 11:45:11 +01:00
Pau Pérez Fabregat
be6c64db75
Merge pull request #4354 from agustinariq/3832-WYSIWYG-highlight-links
...
#3832 - Added color to links in WYSIWYG editor
2019-10-31 11:44:11 +01:00
AndrewCleve
1aebc30128
Improve readability of README.md
...
Made minor changes to grammar to improve consistency and readability.
2019-10-30 19:43:38 -07:00
lin-d-hop
c1f427b0e3
Modifications for variable consistency etc
2019-10-30 19:06:49 +00:00
Matt-Yorkley
f8209ac7d5
Ensure results in #products_relation are DISTINCT
2019-10-30 19:04:28 +00:00
Matt-Yorkley
6d50176e6b
Ensure results in #variants_relation are DISTINCT
2019-10-30 17:13:52 +00:00
Pau Pérez Fabregat
d6d2c19dc7
Merge pull request #4398 from Matt-Yorkley/db_indexes
...
Add order_cycle_id and distributor_id indexes to spree_orders table
2019-10-30 16:36:23 +01:00
Pau Pérez Fabregat
f897478736
Merge pull request #4402 from coopdevs/task-to-remove-unused-enterprise
...
Task to remove an unused enterprise
2019-10-30 16:34:28 +01:00
Pau Pérez Fabregat
064b86da5d
Merge pull request #4407 from luisramos0/fix_sample_data
...
Add tax category to sample products
2019-10-30 15:37:53 +01:00
Pau Pérez Fabregat
f7b58300f9
Merge pull request #4362 from openfoodfoundation/dependabot/bundler/activerecord-import-1.0.3
...
Bump activerecord-import from 1.0.2 to 1.0.3
2019-10-30 15:13:47 +01:00
luisramos0
0fe4edfbf5
Make product_tag_rules_filterer_spec a bit more flexible and not test for the order of the elements
2019-10-30 11:06:25 +00:00
luisramos0
f45eb35eb1
Make user_registrations_controller_spec keep I18n.locale as it was before the spec, so that other specs wont fail
2019-10-30 10:43:46 +00:00
Luis Ramos
1a0e99dce2
Merge pull request #4414 from openfoodfoundation/dependabot/bundler/fuubar-2.5.0
...
Bump fuubar from 2.4.1 to 2.5.0
2019-10-30 10:12:19 +00:00
lin-d-hop
c477f8c230
Update end date on delivery report to ensure all of todays orders are included
2019-10-29 19:47:38 +00:00
dependabot-preview[bot]
d7caf91de1
Bump fuubar from 2.4.1 to 2.5.0
...
Bumps [fuubar](https://github.com/thekompanee/fuubar ) from 2.4.1 to 2.5.0.
- [Release notes](https://github.com/thekompanee/fuubar/releases )
- [Changelog](https://github.com/thekompanee/fuubar/blob/master/CHANGELOG.md )
- [Commits](https://github.com/thekompanee/fuubar/compare/releases/v2.4.1...releases/v2.5.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-29 19:30:45 +00:00
Luis Ramos
1e2ab27cda
Merge pull request #4327 from kristinalim/feature/4315-prefill_dates_in_orders_and_fulfillment_report
...
4315 Set default date range for Orders and Fulfillment report
2019-10-29 11:11:59 +00:00
Luis Ramos
3e7bd7dc19
Merge pull request #4376 from luisramos0/ghosts
...
Remove product from Order Cycles if product supplier changes
2019-10-28 21:17:48 +00:00
luisramos0
c60261a847
Make taxonomies edit page use api route instead of spree_api route that is now gone.
2019-10-28 16:01:23 +00:00
luisramos0
11fea650d6
Remove inexistent routes api/enterprises/managed and api/enterprises/acessible
...
The :managed endpoint was delete here 1d92d6cc33
2019-10-28 16:01:23 +00:00
luisramos0
92f1fa3b52
Remove dead route api/orders/managed
2019-10-28 16:01:23 +00:00
luisramos0
ad52022927
Add feature spec to cover api api generation in admin user edit form
2019-10-28 16:01:22 +00:00
luisramos0
9cffe48c70
Do not use Spree.t in spree admin users
2019-10-28 16:01:22 +00:00
luisramos0
d006ded439
Convert spree admin users api fields partial from erb to haml
2019-10-28 16:01:22 +00:00
luisramos0
b2e5ff46a8
Bring missing admin user edit form api_fields partial from spree_api and insert into the form (there was a deface override in spree_api injecting it before)
2019-10-28 16:01:22 +00:00
luisramos0
f46e0a2a31
Remove outdated comment, action managed has already been removed
2019-10-28 16:01:22 +00:00
luisramos0
dd66df6379
Remove dead routes api/order_cycles, these endpoints were removed in PR 4059 because they were unused, implemented in rabl and not correctly named for the future
2019-10-28 16:01:22 +00:00
luisramos0
d7b9dc1190
Fix some rubocop issues
2019-10-28 16:00:36 +00:00
luisramos0
5b6efaf687
Delete now unused rabl template authorise_api
2019-10-28 16:00:36 +00:00
luisramos0
8aab9bacbe
Delete now irrelevant authorize_api endpoint and logic
...
OFN API is now authenticating all users, if no session and no key is provided an anonymous user will be created so that user can access public endpoints, authorization is then done at each individual endpoint. This makes this spree api auth call irrelevant
2019-10-28 16:00:36 +00:00
luisramos0
66fdbe4379
Remove spree_api dependency. Spree_api will keep being a dependency until we remove spree_backend as a dependency but now ofn works without spree_api
2019-10-28 16:00:36 +00:00
luisramos0
abcc22c34b
Merge Spree::Api::BaseController with Api::BaseController. All api controllers inherit from Api::BaseController now. We can probably simplify this controller even more now
2019-10-28 16:00:36 +00:00
luisramos0
0d34b607c3
Move spree/api/base_controller#find_product to api/product_controller where it is used exclusively
...
Also, product_scope stops being an override
2019-10-28 16:00:36 +00:00
luisramos0
f840179573
Remove .json from Spree.routes.orders_api. This path is only used to compose the order shipments path and thus cannot have the .json
2019-10-28 16:00:36 +00:00
luisramos0
b5a521476b
Remove unused method from api/base_controller
2019-10-28 16:00:36 +00:00
luisramos0
7c64777a50
Remove requires_authentication check from api/base_controller. OFN api does not require auth, it always generates an anonymous user for public endpoints
2019-10-28 16:00:36 +00:00
luisramos0
c98b4b276b
Adapt spree/admin/shared/_routes.html.erb to new location of the api/taxons routes AND move spree/api/orders route to ofn api/orders route
2019-10-28 16:00:36 +00:00
luisramos0
f1138709aa
Add spree_api translation keys, mostly from api standard errors and api fields in admin/users
2019-10-28 16:00:36 +00:00
luisramos0
b29983ac60
Add AMS versions of the error responses in api/base_controller and cover not_found case with a unit test
2019-10-28 16:00:36 +00:00
luisramos0
91188c5724
Adapt api/base_controller_spec from spree/api/base_controller_spec
2019-10-28 16:00:36 +00:00
luisramos0
bf291ec318
Move spree/api/base_controller_spec to api/base_controller_spec
2019-10-28 16:00:36 +00:00
luisramos0
5846593637
Remove dependency to spree_api rabl responders, we should only use AMS from now on
2019-10-28 16:00:36 +00:00
Luis Ramos
688dad2334
Merge pull request #4384 from chaserx/4378_display_customer_name_on_orders_table
...
adds the full_name of the customer ordering beneath email
2019-10-28 15:52:54 +00:00
Luis Ramos
6d419d60ae
Merge pull request #4405 from openfoodfoundation/dependabot/bundler/bugsnag-6.12.2
...
Bump bugsnag from 6.12.1 to 6.12.2
2019-10-28 11:37:30 +00:00
luisramos0
0dc8ae1561
Merging find_product and find_variant into one single method
...
This fixes rubocop issue, class has too many lines
2019-10-27 20:09:42 +00:00
luisramos0
f396f6bebd
Add tax category to sample products
2019-10-27 19:59:35 +00:00
luisramos0
07fcc8f361
Refactor ExchangeVariantDeleter.new.delete out of update_product_only_attributes into correct place update_product
...
Also extracted find_product from update_attributes and find_variant out of create_or_update_variant to make code simpler
2019-10-27 19:13:57 +00:00
Pau Pérez Fabregat
237cd5438b
Merge pull request #4373 from openfoodfoundation/dependabot/bundler/i18n-js-3.4.0
...
Bump i18n-js from 3.3.0 to 3.4.0
2019-10-25 13:47:25 +02:00
Pau Pérez Fabregat
4e366d0f2e
Merge pull request #4390 from Matt-Yorkley/3831_flaky_spec
...
Fix flaky product import spec
2019-10-25 13:42:54 +02:00
dependabot-preview[bot]
fb3af77d0b
Bump bugsnag from 6.12.1 to 6.12.2
...
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby ) from 6.12.1 to 6.12.2.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases )
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.12.1...v6.12.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-24 19:19:06 +00:00
Luis Ramos
1fa6e4bea8
Merge pull request #4385 from chaserx/4304_fixes_missing_translation
...
adds missing :spree to i18n scopes
2019-10-24 17:06:50 +01:00
Luis Ramos
498a2b7462
Merge pull request #4386 from andrewjprice/missing-translations-inventory-page
...
Missing translations inventory page
2019-10-24 17:06:43 +01:00
Pau Perez
80edfe469c
Task to remove limit of ent. that can be created
...
It does so by updating a user's enterprise_limit attribute to the
maximum integer the database supports.
This is used at least in Katuma to remove the limitation of the number
of enterprises a user can create. This is the agreement the community
reached for the pricing plans.
Eventually, this logic could be triggered with a button from the UI but
for now this is for internal usage only.
2019-10-24 15:53:43 +02:00
Pau Perez
b2616d317f
Task to remove an unused enterprise
...
Note this task is still rather naive and only covers the simple case
where an enterprise was created but never used and thus, does not have
any associated entities like orders.
This is enough for the case I have at hand where a hub's manager created
an enterprise while he wanted to create a user account #ux. He ended up
with an enterprise named after him and now he asked us to clean that up.
2019-10-24 15:23:54 +02:00
Matt-Yorkley
0ac0bdc381
Update all locales with the latest Transifex translations
2019-10-23 21:20:11 +01:00
Matt-Yorkley
1a756cbc6b
Merge pull request #4387 from openfoodfoundation/transifex
...
Transifex
2019-10-23 21:17:20 +01:00
Matt-Yorkley
34466c8218
Add order_cycle_id and distributor_id indexes to spree_orders table
2019-10-23 18:29:34 +01:00
Matt-Yorkley
00e869f40c
Merge pull request #4393 from mkllnk/4392-rescue-network-fails
...
Avoid asking the cloud if an image exists
2019-10-23 16:55:49 +01:00
luisramos0
42cd9a5152
Remove menu entry option types because this page is not really usable
...
We keep the underlying data structures because option types and option values are used internally to keep units in OFN: weight, volume and items, but otherwise, custom option types are no longer possible in OFN
2019-10-23 12:57:47 +01:00
luisramos0
cc342387cc
Make all calls to content_for use dash not equals when setting content_for
2019-10-23 12:42:29 +01:00
luisramos0
6715f872e3
Merge duplicated product_sub_menu partials and make all references point to the one located in the spree folder (we keep this one because we still have some views in spree backend referencing this partial
2019-10-23 12:26:18 +01:00
Transifex-Openfoodnetwork
e849c4867b
Updating translations for config/locales/nb.yml
2019-10-23 18:58:07 +11:00
Maikel Linke
ada34d27ca
Avoid asking the cloud if an image exists
...
https://github.com/openfoodfoundation/openfoodnetwork/issues/4392
Amazon's DNS is failing at the moment and some users can't access the
admin panel because of this error.
While `exists?` asks the storage server if the file is actually there,
`file?` just checks if we have the file name stored in the database
and the file should be there. It's much faster and less error prone.
2019-10-23 11:36:20 +11:00
Dan Ingenthron
40c329ba68
Distinguish between simple create form and full interface in OC feature spec
2019-10-22 17:41:38 -05:00
Dan Ingenthron
3c7af90dfa
Revert I18n change and reflect correct required fields on OC form
2019-10-22 17:41:38 -05:00
Dan Ingenthron
241e581779
Add required fields to order cycle spec
2019-10-22 17:41:38 -05:00
Dan Ingenthron
85dede84cc
Update order cycle forms & en.yml to include asterisks
2019-10-22 17:41:37 -05:00
Transifex-Openfoodnetwork
0288dfc992
Updating translations for config/locales/ar.yml
2019-10-23 07:18:46 +11:00
luisramos0
3372339907
Fix default stock translation by using t filter instead of t function
2019-10-22 17:29:04 +01:00
Matt-Yorkley
f7bb609546
Fix flaky product import spec
2019-10-22 12:02:11 +01:00
Luis Ramos
02c0b89fa0
Merge pull request #4345 from Matt-Yorkley/shopfront_pagination
...
Shopfront pagination
2019-10-21 16:02:12 +01:00
luisramos0
f57c9d4a25
Fix rubocop issue in product_set.update_product_only_attributes: method has too many lines
2019-10-21 15:20:53 +01:00
luisramos0
783c3c9e90
Add spec to product set to cover case where product and variants attributes are both provided and the product supplier is not, in that case, ExchangeVariantDeleter would not execute and update_product_only_attributes would return nil cancelling update_product_variants from being executed. Now, update_product_only_attributes always returns true if product.save suceeeds, no matter what ExchangeVariantDeleter returns
2019-10-21 14:45:27 +01:00
luisramos0
44753d0320
Add spec coverage for case in product_set where variants_attributes are used
2019-10-21 13:27:21 +01:00
luisramos0
dd7d5803ba
Add new context to spec so that some basic setup can be shared with new specs that will be added, it's mostly indentation here
2019-10-21 13:01:39 +01:00
Luis Ramos
c9e23154d8
Merge pull request #4352 from tkusuki/fix-translation-in-enterprise-welcome-email
...
Add missing translation in non English enterprise welcome email
2019-10-21 11:41:53 +01:00
Rachel Arnould
279b633513
Add welcome board to the contributing page
2019-10-21 12:19:01 +02:00
Transifex-Openfoodnetwork
9d0ac79983
Updating translations for config/locales/pt_BR.yml
2019-10-21 11:29:14 +11:00
Andrew
deb17f47a7
Add default_stock to en.yml and _products_variants
2019-10-19 16:33:31 -07:00
Chase Southard
61ee0f04a6
adds missing :spree to i18n scopes
2019-10-19 13:55:11 -04:00
Chase Southard
353804a3fa
adds the full_name of the customer ordering beneath email
2019-10-19 12:32:59 -04:00
Andrew
598426a5e9
Add Save Changes button translation
2019-10-18 22:18:54 -07:00
Matt-Yorkley
7b0c55e15a
Ensure producer properties are included in properties results
2019-10-18 21:15:13 +01:00
Matt-Yorkley
cbe2477d04
Fix property filters and improve test coverage
2019-10-18 21:15:13 +01:00
Matt-Yorkley
c730958fe4
Restrict search params passed to ProductsRenderer
2019-10-18 21:15:13 +01:00
Matt-Yorkley
37e5e1923c
Improve filter buttons UX
2019-10-18 21:15:13 +01:00
Matt-Yorkley
542c1bf684
#slice :params in controller and rename to :args in service context
2019-10-18 21:15:13 +01:00
Matt-Yorkley
06c896b93b
Add spec for Api::ProductSerializer
2019-10-18 21:15:13 +01:00
Matt-Yorkley
6433d69d02
Add comments on scoping ProductsRenderer results
2019-10-18 21:15:13 +01:00
Matt-Yorkley
bf8c632fce
Refactor ProductsCtrl request params
2019-10-18 21:15:13 +01:00
Matt-Yorkley
b3c89a9d6c
Move OpenFoodNetwork::ProductsRenderer (lib) to ProductsRenderer (service) and refactor
2019-10-18 21:15:13 +01:00
Matt-Yorkley
d45403f1d4
Add specs for Api::OrderCyclesController
2019-10-18 21:15:13 +01:00
Matt-Yorkley
f2affe80cd
Reduce assignment branching and complexity for ProductsRenderer#products
2019-10-18 21:15:13 +01:00
Matt-Yorkley
573a69477f
Fix filters not updating on OC change
2019-10-18 21:15:13 +01:00
Matt-Yorkley
c6ce516129
Fix prices not updating with new exchange fees when changing OC
2019-10-18 21:15:13 +01:00
Matt-Yorkley
2539b84b33
Fix product.meta_keywords not searchable
2019-10-18 21:15:13 +01:00
Matt-Yorkley
dd6d0d25da
Fix problematic feature specs
2019-10-18 21:15:13 +01:00
Matt-Yorkley
c54cff10d4
Adjust API endpoint params
2019-10-18 21:15:13 +01:00
Matt-Yorkley
ab330e882e
Remove product cache
2019-10-18 21:15:11 +01:00
luisramos0
a50ae3f8ce
Clarify the API of product_set class by making all other methods to private
2019-10-18 10:37:23 +01:00
luisramos0
9f3b4100c3
Improve code by incorporating code review feedback
2019-10-18 10:26:03 +01:00
luisramos0
b625ea0c61
Extract to class ExchangeVariantDeleter
2019-10-17 19:13:45 +01:00
luisramos0
8857404ddf
Remove product variants from all Order Cycles if supplier is changed
2019-10-17 19:12:24 +01:00
luisramos0
49f98422fd
Remove product from Order Cycles if supplier changes as with a new supplier the rules/permissions to add a product to an Order Cycle may be different
2019-10-17 17:47:15 +01:00
Maikel Linke
20cabe6f12
Update from Transifex
2019-10-17 17:11:10 +11:00
Maikel
fe849b8dfd
Merge pull request #4367 from openfoodfoundation/transifex
...
Transifex
2019-10-17 17:07:23 +11:00
Luis Ramos
167b44c30f
Merge pull request #4365 from kristinalim/fix/4308-eager_load_associations_in_orders_and_fulfillment_reports
...
4308 Eager-load associations in Orders and Fulfillment reports
2019-10-16 21:39:30 +01:00
Luis Ramos
ad247e2116
Merge pull request #4268 from luisramos0/add_order_endpoint
...
Add api/orders/{order_number} API endpoint
2019-10-16 21:22:27 +01:00
Luis Ramos
e46875376e
Merge pull request #4168 from mkllnk/4160-product-report-filters
...
4160 Fix product report filters
2019-10-16 14:47:55 +01:00
Jackson Bates
4d49dc3689
adds line breaks to methods for readability
2019-10-16 23:01:38 +11:00
Luis Ramos
d7223c508a
Merge pull request #4289 from luisramos0/spree_be_config_general
...
Move general_settings, mail_methods and image_settings from spree_backend to OFN
2019-10-16 12:08:36 +01:00
Kristina Lim
a91a23aa39
Eager-load associations for Orders and Fulfillment report subtypes
2019-10-16 19:06:35 +08:00
luisramos0
04bf5a8742
Convert images views from erb to haml
2019-10-16 11:58:08 +01:00
Jackson Bates
8d30dc997f
adds better description to specs and refactors editProductUrl and confirm_unsaved_changes
2019-10-16 21:55:52 +11:00
luisramos0
6bc0d505e4
Fix some rubocop issues
2019-10-16 10:40:16 +01:00
luisramos0
9a0f1adfd2
Reorganize/simplify before filters
2019-10-16 10:40:09 +01:00
Luis Ramos
370f66e36b
Merge pull request #4364 from kristinalim/refactor/4308-refactor_orders_and_fulfillment_report_types
...
4308 Refactor Orders and Fulfillment report subtypes
2019-10-16 10:30:24 +01:00
Luis Ramos
f7cdcf02e0
Merge pull request #4343 from openfoodfoundation/dependabot/bundler/oauth2-1.4.2
...
Bump oauth2 from 1.4.1 to 1.4.2
2019-10-16 10:29:25 +01:00
luisramos0
1eafb1a3fe
Bring specs from spree_backend to payment methods controller spec
2019-10-15 18:49:35 +01:00
luisramos0
cf40bfa58e
Simbolize keys in opts hash in xero report so that opts access works again
2019-10-15 18:05:40 +01:00
Matt-Yorkley
8e03f402b1
Use Ruby 2.2.10
2019-10-15 14:59:24 +01:00
Pau Pérez Fabregat
1ee43fb495
Merge pull request #4358 from openfoodfoundation/dependabot/bundler/rspec-rails-3.9.0
...
Bump rspec-rails from 3.8.2 to 3.9.0
2019-10-15 10:25:23 +02:00
dependabot-preview[bot]
5a84a3688b
Bump i18n-js from 3.3.0 to 3.4.0
...
Bumps [i18n-js](https://github.com/fnando/i18n-js ) from 3.3.0 to 3.4.0.
- [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.3.0...v3.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-15 04:57:00 +00:00
Transifex-Openfoodnetwork
e139d24639
Updating translations for config/locales/en_CA.yml
2019-10-15 12:06:18 +11:00
luisramos0
ec3c3aa644
Bring images views from spree_backend
2019-10-15 00:02:40 +01:00
luisramos0
0f128f43f9
Merge images controller decorator with the controller brought from spree_backend
2019-10-15 00:02:16 +01:00
luisramos0
ea9f3ad6a0
Bring images controller from spree_backend so we can merge it with ofn's decorator
2019-10-15 00:00:54 +01:00
luisramos0
e48ac64d37
Prepare spec to integrate some specs coming from spree_backend
2019-10-14 23:17:43 +01:00
luisramos0
1c257cca3f
Merge payment methods controller brought from spree_backend with its decorator that was in OFN
2019-10-14 23:14:09 +01:00
luisramos0
c51e4d657a
Bring payment method controller from spree_backend
2019-10-14 23:09:23 +01:00
Luis Ramos
0dfe749496
Merge pull request #4356 from kristinalim/fix/4256-set_dalli_value_max_size
...
4256 Configure dalli store value max bytes from env variable
2019-10-14 18:41:00 +01:00
Luis Ramos
d6eade6fa3
Merge pull request #4363 from jonleighton/fix-docker-setup
...
Fix error during first run of docker-compose
2019-10-14 13:38:04 +01:00
Luis Ramos
109aed684e
Merge pull request #4344 from openfoodfoundation/dependabot/bundler/ddtrace-0.28.0
...
Bump ddtrace from 0.27.0 to 0.28.0
2019-10-14 12:39:52 +01:00
Luis Ramos
35d76ac991
Merge pull request #4298 from luisramos0/variant_edit
...
Make unit description visible in the variant edit page even for products which variant_unit is items
2019-10-13 19:54:41 +01:00
Luis Ramos
1ab9e9d7a5
Merge pull request #4299 from luisramos0/drop_order_ship_method_id
...
Remove unused field orders.shipping_method_id
2019-10-13 19:54:13 +01:00
Luis Ramos
e5e716e150
Merge pull request #4336 from openfoodfoundation/dependabot/bundler/rubyzip-1.3.0
...
[Security] Bump rubyzip from 1.2.2 to 1.3.0
2019-10-13 19:53:48 +01:00
Luis Ramos
b6510c3ab6
Merge pull request #4262 from daningenthron/daningenthron/default-shipping-category
...
Prefill shipping category forms with default values
2019-10-13 19:52:43 +01:00
Transifex-Openfoodnetwork
a158a986c6
Updating translations for config/locales/en_US.yml
2019-10-11 13:06:17 +11:00
Kristina Lim
c7643db66f
Remove unnecessary Orders and Fulfillment lines in .rubocop_manual_todo.yml
2019-10-10 21:05:06 +08:00
Kristina Lim
eb8c22aa06
Disable violated cops in Order and Fulfillment report subtypes
2019-10-10 21:01:46 +08:00
Kristina Lim
d0656485d7
Make report_klass in OrdersAndFulfillmentsReport compact
2019-10-10 21:01:46 +08:00
Kristina Lim
640cc1b6d3
Address Metrics/LineLength in Orders and Fulfillments reports
2019-10-10 21:01:45 +08:00
Kristina Lim
d65d17a9f3
Freeze report type string in Order and Fulfillment reports
2019-10-10 21:01:45 +08:00
Kristina Lim
bbea00e431
Delegate methods in Orders and Fulfillment report to report object
2019-10-10 21:01:45 +08:00
Kristina Lim
3cecba70e8
Refactor and memoize report object in Orders and Fulfillment report
2019-10-10 21:01:44 +08:00
Kristina Lim
8bbff09066
Refactor report class in Orders and Fulfillment report
2019-10-10 21:01:44 +08:00
Kristina Lim
a7a89d7ccb
Add attr reader for report type in Orders and Fulfillment report
2019-10-10 21:01:44 +08:00
Kristina Lim
3ccf76ff5f
Add smoke test for Customer Totals report
2019-10-10 21:01:34 +08:00
Kristina Lim
6004208496
Move specific logic for Customer Totals report to class
2019-10-10 20:05:35 +08:00
Kristina Lim
3ce9c712cf
Add smoke test for Distributor Totals by Supplier report
2019-10-10 20:05:35 +08:00
Kristina Lim
bfb0032fd2
Move specific logic for Distributor Totals by Supplier report to class
2019-10-10 20:05:29 +08:00
Kristina Lim
fe37516ead
Add smoke test for Supplier Totals by Distributor report
2019-10-10 19:58:49 +08:00
Kristina Lim
289b75e143
Move specific logic for Supplier Totals by Distributor report to class
2019-10-10 19:57:41 +08:00
Kristina Lim
09f0f8c33f
Move "order_cycle_supplier_totals" report type to constant
2019-10-10 19:54:29 +08:00
Kristina Lim
8bc1718978
Add smoke test for Supplier Totals report
2019-10-10 19:50:28 +08:00
Kristina Lim
cbfce69a6d
Move specific logic for Supplier Totals report to class
2019-10-10 19:48:59 +08:00
Kristina Lim
4e0ecdd44c
Rename params in OrdersAndFulfillmentsReport to options
2019-10-10 15:57:51 +08:00
Jon Leighton
23ab9a4bed
Fix error during first run of docker-compose
...
Prior to this commit, the db container would create a database named
“ofn” (the same as $POSTGRES_USER).
Then, when the web container started, it would run `rake db:reset`. This
would load the Rails environment, which ends up requiring some model
files, which eventually end up trying to connect to the
“open_food_network_dev” database, which doesn’t exist. Therefore setting
up the database fails, and it’s impossible to boot the web container.
As a side note, I’m not convinced that bootstrapping the database as
part of the container’s command is the best strategy (if for no other
reason that this will wipe my database every time I run `docker-compose
up`). But this commit doesn’t change that.
What it does is add the $POSTGRES_DB environment variable so that the db
container creates the “open_food_network_dev” database (which is blank).
Then, when `rake db:reset` runs, it’ll successfully connect to this
(empty) database while loading the environment, before deleting and recreating it.
Note that I had to manually delete the `openfoodnetwork_postgres` volume
in order to reset my local state, after making this change.
2019-10-10 12:17:22 +11:00
Maikel Linke
f623446e3e
Avoid additional query in inventory reports
2019-10-10 11:11:14 +11:00
Maikel Linke
6944fe1e46
Make order cycle filter chainable with other filters
2019-10-10 10:06:36 +11:00
Maikel Linke
7c9e3d7f06
Spec combination of all variant filters
2019-10-10 10:06:36 +11:00
dependabot-preview[bot]
614dc5d255
Bump activerecord-import from 1.0.2 to 1.0.3
...
Bumps [activerecord-import](https://github.com/zdennis/activerecord-import ) from 1.0.2 to 1.0.3.
- [Release notes](https://github.com/zdennis/activerecord-import/releases )
- [Changelog](https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md )
- [Commits](https://github.com/zdennis/activerecord-import/compare/v1.0.2...v1.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-09 21:47:12 +00:00
Matt-Yorkley
da7456e6e0
Remove old shop/products route, action, and spec
2019-10-09 17:27:00 +01:00
Matt-Yorkley
f134cd9473
Extract tag_rule filtering into separate service
2019-10-09 17:26:58 +01:00
Dan Ingenthron
bdcadf9fc6
Update changes to reflect new non-Spree shipping method controller
2019-10-08 18:37:16 -05:00
Dan Ingenthron
9b7139fd45
Add default shipping category during object creation; revert forms
2019-10-08 18:37:16 -05:00
Dan Ingenthron
543e275d2e
Add custom shipping category to pass package spec
2019-10-08 18:37:16 -05:00
Dan Ingenthron
560fa6b949
Update shipping category factory with default
2019-10-08 18:37:16 -05:00
Dan Ingenthron
dbf34da87b
Rubocop fixes
2019-10-08 18:37:16 -05:00
Dan Ingenthron
d6022062e1
Use default for create product spec; auto-fill field
2019-10-08 18:37:16 -05:00
Dan Ingenthron
b082d3301b
Add prechecked category to shipping method spec
2019-10-08 18:37:16 -05:00
Dan Ingenthron
48cd542138
Service spec
2019-10-08 18:37:15 -05:00
Dan Ingenthron
e2d341c9c2
Add default category to seeds
2019-10-08 18:37:15 -05:00
Dan Ingenthron
89873a2640
Add and auto-check default category in shipping method create
2019-10-08 18:37:15 -05:00
Dan Ingenthron
b4be2cc2d4
Add default shipping category service and update create product form
2019-10-08 18:37:15 -05:00
Dan Ingenthron
35f89a9750
Update spec to prefill shipping category in Create form
2019-10-08 18:37:15 -05:00
Dan Ingenthron
592a53b6f5
Remove blank option from shipping category dropdown
2019-10-08 18:37:15 -05:00
dependabot-preview[bot]
eab9d42eb0
Bump rspec-rails from 3.8.2 to 3.9.0
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 3.8.2 to 3.9.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/master/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v3.8.2...v3.9.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-08 20:56:10 +00:00
Kristina Lim
cf05369ca9
Configure dalli store value max bytes from env variable
2019-10-08 17:58:43 +08:00
Matt-Yorkley
e96252f2ed
Add tag_rules logic to main query before pagination
2019-10-08 10:11:24 +01:00
Matt-Yorkley
06e1f56ae9
Extract filter list fetching into a separate endpoint
2019-10-08 10:11:24 +01:00
Matt-Yorkley
fe0de98821
Add pagination in Angular and views
2019-10-08 10:11:22 +01:00
luisramos0
5077b0e625
Update all locales with the latest Transifex translations
2019-10-08 10:02:54 +01:00
Luis Ramos
1299c0b5eb
Merge pull request #4339 from openfoodfoundation/transifex
...
Transifex
2019-10-08 09:40:54 +01:00
luisramos0
a2bc61cb4d
Remove unused field orders.shipping_method_id
2019-10-08 09:09:19 +01:00
Pau Pérez Fabregat
057572a445
Merge pull request #4321 from luisramos0/fix_pt_br
...
Delete old pt-BR translations file (it's now correctly called pt_BR)
2019-10-08 08:49:12 +02:00
Pau Pérez Fabregat
3403ab4162
Merge pull request #4340 from openfoodfoundation/sigmundpetersen-patch-1
...
Delete ISSUE_TEMPLATE.md
2019-10-08 08:48:47 +02:00
Thais Kusuki
d997b8f5ee
Change translations from enterprise_mailer to lazy lookup
2019-10-07 23:29:11 -03:00
agustina
cf3f321632
Added color to links in WYSIWYG editor
2019-10-07 12:15:37 -03:00
Luis Ramos
9a036d18b7
Merge pull request #4271 from luisramos0/no_obsolete_master
...
Remove logic related to master variants in Exchanges and migrate data
2019-10-07 15:22:53 +01:00
luisramos0
f2b57057cd
Add migration to delete all master variants from exchanges and replace them with standard variants
2019-10-07 14:53:44 +01:00
luisramos0
95bc8fa984
Remove logic from OrderCycleDistributedProducts related to obsolete master variants in OCs, this is a condition that will never happen now since we ensure products always have a standard variants
...
A migration will be added as well to clean up any very old master variants available in order cycles
2019-10-07 14:53:44 +01:00
Luis Ramos
54c44c33eb
Merge pull request #4324 from Matt-Yorkley/reports_memoize
...
Reports memoization
2019-10-07 13:20:03 +01:00
Luis Ramos
8a732568e7
Merge pull request #4325 from kristinalim/feature/4312-remove_find_variant_in_orders_and_fulfillment_report
...
4312 Use association instead of OrderAndFulfillmentsReport#find_variant
2019-10-07 11:38:37 +01:00
Thais Kusuki
797a3ad091
Add missing translation in non English enterprise welcome email
2019-10-05 12:50:12 -03:00
Pau Pérez Fabregat
f4523f0305
Merge pull request #4350 from luisramos0/docker
...
Update ruby version in dockerfile and in getting started
2019-10-04 16:21:22 +02:00
Transifex-Openfoodnetwork
56a7a49ea2
Updating translations for config/locales/es.yml
2019-10-04 21:23:11 +10:00
Transifex-Openfoodnetwork
7d1ae3bf67
Updating translations for config/locales/es.yml
2019-10-04 21:20:03 +10:00
Transifex-Openfoodnetwork
b9aa4e11da
Updating translations for config/locales/ca.yml
2019-10-04 21:19:57 +10:00
Matt-Yorkley
01d1e8243c
Add pagination to ProductsRenderer
2019-10-04 10:38:43 +01:00
Matt-Yorkley
a1a5c3b7fe
Add new Angular OrderCycleResource
2019-10-04 10:38:41 +01:00
Matt-Yorkley
bc826f73a1
Add temporary placeholder for API endpoint
2019-10-03 18:11:40 +01:00
Luis Ramos
96428c11c6
Merge pull request #4334 from Matt-Yorkley/products_renderer
...
Products renderer
2019-10-03 13:47:04 +01:00
Luis Ramos
c15660da0e
Merge pull request #4269 from luisramos0/spree_be_config
...
Move shipping_methods and shipping categories from spree_backend to OFN
2019-10-03 13:45:17 +01:00
Jackson Bates
7c264af0c2
updates specs for new edit button behaviour
2019-10-03 22:32:43 +10:00
Transifex-Openfoodnetwork
9ea05b0794
Updating translations for config/locales/de_DE.yml
2019-10-03 20:48:44 +10:00
luisramos0
c5b939c8ee
Update ruby version in dockerfile and in getting started
2019-10-02 23:45:23 +01:00
luisramos0
c5a17bcde0
Fix rubocop issues in feature specs related to configuration
2019-10-02 21:26:10 +01:00
luisramos0
b712ec7f13
Transpec feature specs brought from spre_backend
2019-10-02 21:26:09 +01:00
luisramos0
32a7f13dd2
Bring feature specs for configuration pages from spree_backend
2019-10-02 21:26:09 +01:00
luisramos0
713769b497
Fix rubocop issues in mail_methods_controller_spec
2019-10-02 21:26:09 +01:00
luisramos0
495de37620
Fix more rubocop issues in image_settings_controller_spec
2019-10-02 21:26:09 +01:00
luisramos0
05d24cf11a
Transpec image_setting_controller_spec
2019-10-02 21:26:09 +01:00
luisramos0
edd84530af
Fix simle rubocopo issues in image_settings ctrl spec
2019-10-02 21:26:09 +01:00
luisramos0
6677543de0
bring 2 specs from spree_backend to cover image_settings page and mail_methods page
2019-10-02 21:26:09 +01:00
luisramos0
30aa31252b
Fix simple rubocop issues in helpers
2019-10-02 21:26:09 +01:00
luisramos0
b83d74a609
Bring general_settings_helper from spree_backend
2019-10-02 21:26:09 +01:00
luisramos0
d31b50be3d
Bring spree/admin configuration routes to ofn
2019-10-02 21:26:09 +01:00
luisramos0
42e3f2f2f4
Convert spree/admin/mail_methods from erb to haml
2019-10-02 21:25:23 +01:00
luisramos0
96737da128
Add spree_backend mail methods views that are missing in ofn
2019-10-02 21:25:23 +01:00
luisramos0
7f9f0d840c
Merge decorators into controllers and remove decorators
2019-10-02 21:25:23 +01:00
luisramos0
686840e262
Fix basic rubocop issues in recently added controllers from spree_backend
2019-10-02 21:25:23 +01:00
luisramos0
2377b833ee
Bring general settings and image settings controllers that are overrides in ofn to ofn so we can merge them with their decorators in a second step
2019-10-02 21:25:23 +01:00
luisramos0
3f3c33bce6
Fix basic rubocop issues in newly added controller
2019-10-02 21:25:23 +01:00
luisramos0
e35eff95bb
Add mail_methods controller from spree_backend related to config
2019-10-02 21:25:23 +01:00
Luis Ramos
e6408161db
Merge pull request #4291 from luisramos0/spree_be_config_taxons
...
Move taxons and taxonomies from spree_backend to OFN
2019-10-02 21:13:12 +01:00
Luis Ramos
4540b32d3a
Merge branch 'master' into spree_be_config_taxons
2019-10-02 15:35:15 +01:00
Luis Ramos
9f8d2fddbc
Merge pull request #4292 from luisramos0/spree_be_config_tax
...
Move tax_rates, tax categories and tax settings from spree_backend to OFN
2019-10-02 15:33:32 +01:00
Luis Ramos
14047c620a
Merge branch 'master' into spree_be_config_tax
2019-10-02 15:31:25 +01:00
Luis Ramos
2be1c231f7
Merge pull request #4290 from luisramos0/spree_be_config_zones
...
Move zones, countries and states from spree_backend to OFN
2019-10-02 14:30:59 +01:00
Luis Ramos
c34646724c
Merge pull request #4254 from luisramos0/swagger
...
Update API swagger docs to reflect current API state
2019-10-02 10:31:13 +01:00
Luis Ramos
b731635270
Merge pull request #4303 from luisramos0/missing_translation
...
Add missing translation for order.shipment.state "on hand" (with a space between on and hand)
2019-10-02 10:27:33 +01:00
Transifex-Openfoodnetwork
c9a62fad4c
Updating translations for config/locales/nb.yml
2019-10-02 16:50:07 +10:00
Transifex-Openfoodnetwork
70169d477c
Updating translations for config/locales/nb.yml
2019-10-02 16:47:01 +10:00
Transifex-Openfoodnetwork
d95646ea98
Updating translations for config/locales/en_NZ.yml
2019-10-02 14:29:29 +10:00
Transifex-Openfoodnetwork
d50bf928e1
Updating translations for config/locales/de_DE.yml
2019-10-02 10:58:44 +10:00
Luis Ramos
3f7aff4b8b
Merge pull request #4305 from luisramos0/new_product_translations
...
Make translations in new product page relative and specific to the page
2019-10-01 22:38:49 +01:00
dependabot-preview[bot]
de9476a8a5
Bump ddtrace from 0.27.0 to 0.28.0
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.27.0 to 0.28.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.27.0...v0.28.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-01 21:12:18 +00:00
Sigmund Petersen
5fded022d4
Update README.md
...
Slack invite link changed
2019-10-01 23:09:47 +02:00
dependabot-preview[bot]
bce41a2247
Bump oauth2 from 1.4.1 to 1.4.2
...
Bumps [oauth2](https://github.com/oauth-xx/oauth2 ) from 1.4.1 to 1.4.2.
- [Release notes](https://github.com/oauth-xx/oauth2/releases )
- [Changelog](https://github.com/oauth-xx/oauth2/blob/master/CHANGELOG.md )
- [Commits](https://github.com/oauth-xx/oauth2/compare/v1.4.1...v1.4.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-01 21:04:45 +00:00
Pau Pérez Fabregat
1f644f4020
Merge pull request #4281 from Matt-Yorkley/memcached-apm
...
Add memcached APM
2019-10-01 18:46:22 +02:00
Matt-Yorkley
cc11d4e5f0
Remove unused user parameter from OrdersAndFulfillmentsReport
2019-10-01 15:59:51 +01:00
Pau Pérez Fabregat
5ecac77aa5
Merge branch 'master' into memcached-apm
2019-10-01 16:58:01 +02:00
Matt-Yorkley
a5d2579c69
Pluck line_item ids instead of all line_items
2019-10-01 15:51:45 +01:00
Matt-Yorkley
112adb11db
Pass permissions object into OrdersAndFulfillMentsReport
2019-10-01 15:51:43 +01:00
Transifex-Openfoodnetwork
5fdc11bdc7
Updating translations for config/locales/fr.yml
2019-10-01 23:59:19 +10:00
Matt-Yorkley
c038b485b1
Rename service and methods to remove use of "shop" term
2019-10-01 14:43:47 +01:00
Jackson Bates
4c4bdd78e7
makes edit button action open a new tab
2019-10-01 22:13:28 +10:00
Luis Ramos
19eb93012c
Merge pull request #4326 from kristinalim/feature/4310-remove_shipments_count
...
4310 Do not count order shipments in Order#shipping_method
2019-10-01 11:17:42 +01:00
Luis Ramos
d998ec8453
Merge pull request #4331 from openfoodfoundation/dependabot/bundler/uglifier-4.2.0
...
Bump uglifier from 4.1.20 to 4.2.0
2019-10-01 11:11:35 +01:00
Luis Ramos
0c93665030
Merge pull request #4335 from Matt-Yorkley/remove_deprecations
...
Remove deprecation warnings from VariantStock methods
2019-10-01 10:59:57 +01:00
Luis Ramos
c4d298d732
Merge branch 'master' into remove_deprecations
2019-10-01 10:57:10 +01:00
dependabot-preview[bot]
36883bc051
[Security] Bump rubyzip from 1.2.2 to 1.3.0
...
Bumps [rubyzip](https://github.com/rubyzip/rubyzip ) from 1.2.2 to 1.3.0. **This update includes a security fix.**
- [Release notes](https://github.com/rubyzip/rubyzip/releases )
- [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md )
- [Commits](https://github.com/rubyzip/rubyzip/compare/v1.2.2...v1.3.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-10-01 09:55:53 +00:00
Luis Ramos
8c252fc160
Merge pull request #4341 from openfoodfoundation/dependabot/bundler/webmock-3.7.6
...
Bump webmock from 3.7.5 to 3.7.6
2019-10-01 10:53:54 +01:00
Pau Pérez Fabregat
c2f8803d72
Merge pull request #4297 from luisramos0/inv_levels
...
Remove all usages of Spree Config track_inventory_levels
2019-10-01 10:35:20 +02:00
dependabot-preview[bot]
07967275d8
Bump webmock from 3.7.5 to 3.7.6
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.7.5 to 3.7.6.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.7.5...v3.7.6 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-30 22:02:54 +00:00
Sigmund Petersen
c7db1b7fc0
Delete ISSUE_TEMPLATE.md
...
This ISSUE_TEMPLATE.md file is the old way of handling templates on Github. OFN is now using the new method for handling templates, so this file can be removed.
This template still comes up as 'Default template' when opening an issue from the Zenhub board. This gives 2 almost equal template choices which is confusing.
2019-09-30 21:18:51 +02:00
Rachel Arnould
fa57d71a23
Merge pull request #4332 from openfoodfoundation/RachL-patch-2
...
Update story template
2019-09-30 20:06:12 +02:00
Rachel Arnould
be5e7bd18d
Merge pull request #4330 from openfoodfoundation/RachL-patch-1
...
Update bug template
2019-09-30 20:05:51 +02:00
Transifex-Openfoodnetwork
5cfc2613ac
Updating translations for config/locales/en_GB.yml
2019-10-01 04:01:28 +10:00
Transifex-Openfoodnetwork
903eb23122
Updating translations for config/locales/en_GB.yml
2019-10-01 03:58:19 +10:00
Luis Ramos
d162e8c087
Merge pull request #4300 from daningenthron/daningenthron/add-a-new-card
...
Translation: "Add new credit card"
2019-09-30 13:27:25 +01:00
Luis Ramos
75a56c2be5
Merge pull request #4293 from jasonk357/4031-change-user-email-alert
...
Improve user email change flash alert message
2019-09-30 13:19:40 +01:00
Luis Ramos
07a5963554
Merge pull request #4311 from mkllnk/rails3-deprecations
...
Replace deprecated validates_presence_of
2019-09-30 13:19:25 +01:00
luisramos0
a6888cf0be
Update all locales with the latest Transifex translations
2019-09-30 13:15:45 +01:00
Luis Ramos
ef35db6db2
Merge pull request #4296 from luisramos0/subs_line_items
...
Make subscription line items handle soft deleted variants
2019-09-30 13:07:10 +01:00
Rachel Arnould
375d4fbffd
Add workaround item
2019-09-30 11:02:36 +02:00
Matt-Yorkley
6153789055
Eager-load serialized objects in variant query
2019-09-29 20:44:48 +01:00
Matt-Yorkley
032741c54f
Refactor ProductsRenderer variants queries
...
This removes another N+1 and allows pagination applied to the inital query to also affect the returned variants
2019-09-29 17:41:58 +01:00
Matt-Yorkley
e9acf6e0de
Refactor #load_products and memoize
2019-09-29 14:30:04 +01:00
Matt-Yorkley
d5e90c3c6c
Extract #load_products logic into a new service
2019-09-29 00:10:47 +01:00
Kristina Lim
bb56e9a5b9
Set default date range for Orders and Fulfillment report
2019-09-28 02:39:41 +08:00
Matt-Yorkley
7e7429446d
Remove deprecation warnings from VariantStock methods
2019-09-27 17:28:16 +01:00
Matt-Yorkley
535e389fb4
Query variant stock including overrides
...
This allows the results to be properly filtered and paginated whilst showing the correct stock, and removes a big N+1
2019-09-27 17:25:52 +01:00
Matt-Yorkley
cecebb82f4
Move distributed products relation out from OrderCycleDistributedProducts
2019-09-27 17:25:50 +01:00
Pau Pérez Fabregat
49665ae360
Merge pull request #4167 from luisramos0/last_dedeface
...
Move app_wrapper deface to spree/layouts/admin view
2019-09-27 09:21:28 +02:00
Pau Pérez Fabregat
7e5c194515
Merge pull request #4295 from coopdevs/enable-datadog-analytics
...
Enable trace & search analytics in Datadog
2019-09-27 09:17:03 +02:00
Matt-Yorkley
fe0b3172c7
Move scoper to method
2019-09-27 01:52:45 +01:00
Matt-Yorkley
5b27ed6b9f
Remove unnecessary #deleted? check
...
It should be included in te default product scope
2019-09-27 01:52:29 +01:00
Matt-Yorkley
bef4741e31
Enable analytics in all APM services
2019-09-26 22:38:20 +01:00
Rachel Arnould
d604328bfb
Update story template
2019-09-26 21:25:01 +02:00
dependabot-preview[bot]
2af3de51c7
Bump uglifier from 4.1.20 to 4.2.0
...
Bumps [uglifier](https://github.com/lautis/uglifier ) from 4.1.20 to 4.2.0.
- [Release notes](https://github.com/lautis/uglifier/releases )
- [Changelog](https://github.com/lautis/uglifier/blob/master/CHANGELOG.md )
- [Commits](https://github.com/lautis/uglifier/compare/v4.1.20...v4.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-26 19:21:05 +00:00
Rachel Arnould
d0c77a8dc4
Update bug template
2019-09-26 21:20:50 +02:00
Kristina Lim
8fc4ca6f65
Do not use OrderAndFulfillmentsReport#find_variant
2019-09-26 11:45:05 +08:00
Kristina Lim
721a0d3a98
Do not count order shipments in Order#shipping_method
2019-09-26 11:01:06 +08:00
JASON KNOEPFLER
c46fe7b675
encapsulate new unconfirmed email logic
2019-09-25 19:41:33 -07:00
luisramos0
bb372984e1
Deleting old pt-BR translations file, it's now called pt_BR with underscore
2019-09-25 11:26:06 +01:00
Luis Ramos
2489a2f5f5
Merge pull request #4294 from openfoodfoundation/transifex
...
Transifex
2019-09-25 11:22:58 +01:00
Transifex-Openfoodnetwork
a6698230fe
Updating translations for config/locales/en_NZ.yml
2019-09-25 20:13:57 +10:00
luisramos0
50731e929e
Remove some attributes from test as they are already verified subsequently
2019-09-25 09:54:33 +01:00
luisramos0
baa09b88f7
Fix issue with nil current_order where shipping_method serializer requires a current_order to calculate the shipping fees
2019-09-25 09:52:10 +01:00
Luis Ramos
2f3509bf9b
Merge pull request #4287 from luisramos0/mini_racer
...
Replace therubyracer with mini_racer.
2019-09-24 19:48:50 +01:00
Dan Ingenthron
e8f9ace8e6
Correct translation key on add card link
2019-09-24 13:42:31 -05:00
Luis Ramos
04270b6cec
Merge pull request #4286 from luisramos0/transpec
...
Finish transpec
2019-09-24 19:33:26 +01:00
Matt-Yorkley
1155931ea9
Merge pull request #4280 from luisramos0/knapsack
...
Update knapsack report
2019-09-24 19:26:27 +01:00
Maikel Linke
efd450606e
Replace deprecated validates_presence_of
...
This syntax has been deprecated in Rails 3:
https://guides.rubyonrails.org/3_0_release_notes.html#patches-and-deprecations
2019-09-24 19:16:05 +10:00
luisramos0
2f60a85593
Improve spec/controllers/api/orders_controller_spec, make it more readable
2019-09-23 23:50:42 +01:00
luisramos0
78cf35807a
Improve preloading of order query to avoid N+1 queries
2019-09-23 23:50:39 +01:00
luisramos0
f3bc038c05
Make translations in new product page relative and specific to the page
2019-09-23 17:02:30 +01:00
luisramos0
7817a40a35
Add missing translation for shipment state on hand with space between on and hand
2019-09-23 16:33:59 +01:00
Transifex-Openfoodnetwork
a18f6f5b8f
Updating translations for config/locales/fr_CA.yml
2019-09-24 01:01:41 +10:00
Transifex-Openfoodnetwork
403653381c
Updating translations for config/locales/en_CA.yml
2019-09-24 00:59:20 +10:00
luisramos0
eb85dccac1
Remove single letter variable names
2019-09-22 21:07:32 +01:00
luisramos0
f32454b404
Add feature spec to validate unit_description is editable for products with unit items, regression for #3649
2019-09-22 21:02:32 +01:00
luisramos0
591efecde6
Make unit description field visible in the variant edit page even for products which variant_unit is items
2019-09-22 16:42:03 +01:00
luisramos0
24afa21885
Revert "Change products controller to clear variants unit description if variant_unit is items"
...
This reverts commit 1a4e83d633 .
2019-09-22 16:31:26 +01:00
luisramos0
cd6d34663e
Remove all usages of Spree Config track_inventory_levels, this is always true in OFN since v2.0.0
2019-09-22 15:25:24 +01:00
luisramos0
c66e5fe1e9
Make subscription line items handle soft deleted variants
...
This ensures subscription list page works. The variant can be removed from the subscription by the user in the edit subscription page
2019-09-22 14:59:59 +01:00
JASON KNOEPFLER
4ec8fcd3a6
Assign flash message var from conditional return
2019-09-21 08:10:58 -07:00
Pau Perez
88893a2968
Enable trace & search analytics in Datadog
...
This will enrich the quality of the reported traces for all web
frameworks in our stack. That means not only memcached as we did in
https://github.com/openfoodfoundation/openfoodnetwork/pull/4266 but
PostgreSQL and Rails too.
After enabling, the Trace Search & Analytics page populates which allows
us to search traces and add APM queries to dashboards.
2019-09-21 14:09:27 +02:00
JASON KNOEPFLER
62599e8dfc
Edit user email feature spec
2019-09-20 15:28:25 -07:00
Transifex-Openfoodnetwork
b97c428f72
Updating translations for config/locales/pt_BR.yml
2019-09-21 04:00:00 +10:00
Transifex-Openfoodnetwork
42b074f02e
Updating translations for config/locales/pt_BR.yml
2019-09-21 03:56:52 +10:00
JASON KNOEPFLER
07e0951490
Change users#update email change flash alert
2019-09-20 10:35:25 -07:00
luisramos0
fc433ff8f0
Refactor ship methods controller destroy action: remove single action before_filter
2019-09-20 16:29:36 +01:00
luisramos0
8e33437fbb
MErge ship method controller decorator with the controller that came from spree
2019-09-20 15:59:24 +01:00
luisramos0
a5103c737d
Fix rubocop issues in ship methods controller from spree
2019-09-20 15:58:05 +01:00
luisramos0
37c8f42244
Bring shipping methods and categories controllers from spree_backend
2019-09-20 15:56:24 +01:00
luisramos0
0e8765636b
Bring tax_settings from spree_backend to ofn
2019-09-20 15:46:33 +01:00
luisramos0
6855e5c8f4
Fix rubocop issues in feature spec
2019-09-20 15:43:55 +01:00
luisramos0
a96b56239c
Transpec feature specs brought from spre_backend
2019-09-20 15:43:55 +01:00
luisramos0
4f9eee2682
Fix feature specs added from spree_backend in the configuration area
2019-09-20 15:43:55 +01:00
luisramos0
44761315c2
Bring feature specs for configuration pages from spree_backend
2019-09-20 15:43:55 +01:00
luisramos0
0d18b1a032
Bring spree/admin configuration routes to ofn
2019-09-20 15:43:55 +01:00
luisramos0
cc0dabcd1e
Convert spree/admin/tax_rates from erb to haml
2019-09-20 15:36:58 +01:00
luisramos0
e79c672263
Convert spree/admin/tax_categories from erb to haml
2019-09-20 15:36:54 +01:00
luisramos0
bc6f7934e0
Add spree_backend views related to admin/configuration menu that are missing in ofn
2019-09-20 15:35:49 +01:00
luisramos0
89029f46f9
Fix basic rubocop issues in newly added controller
2019-09-20 15:32:34 +01:00
luisramos0
144369e55f
Add tax related controllers from spree_backend related to config
2019-09-20 15:31:30 +01:00
luisramos0
3833cbbf73
Fix rubocop issues in feature spec
2019-09-20 15:24:26 +01:00
luisramos0
5b703a02cd
Transpec feature spec brought from spree_backend
2019-09-20 15:24:26 +01:00
luisramos0
1d4aebd3f9
Fix feature spec added from spree_backend
2019-09-20 15:24:15 +01:00
luisramos0
845a764320
Bring taxonomies feature spec from spree_backend
2019-09-20 15:24:06 +01:00
luisramos0
c66579a22f
Fix simple rubocop issues in helper
2019-09-20 15:24:06 +01:00
luisramos0
9291bf5c82
Bring taxons_helper from spree
2019-09-20 15:24:06 +01:00
luisramos0
4781ab93ef
Bring spree/admin configuration routes to ofn
2019-09-20 15:24:06 +01:00
luisramos0
def9ab7c47
Convert spree/admin/taxons from erb to haml
2019-09-20 15:24:06 +01:00
luisramos0
2a68d34fb0
Convert spree/admin/taxonomies from erb to haml
2019-09-20 15:24:06 +01:00
luisramos0
2ce56aef2c
Add spree_backend views related to admin/configuration taxonomies that are missing in ofn
2019-09-20 15:23:45 +01:00
luisramos0
20f965731d
Fix basic rubocop issues in recently added controller from spree_backend
2019-09-20 15:14:34 +01:00
luisramos0
8378dce752
Bring taxons config controller that is overriden in ofn to ofn so we can merge them with their decorator in a second step
2019-09-20 15:13:45 +01:00
luisramos0
d7a4e3a896
Add taxonomies controller from spree_backend
2019-09-20 15:12:38 +01:00
luisramos0
7d9de0ca70
Fix rubocop issues in feature specs
2019-09-20 15:07:34 +01:00
luisramos0
f9c6f09cd4
Transpec feature specs brought from spre_backend
2019-09-20 15:06:02 +01:00
luisramos0
4a83eca832
Fix feature specs added from spree_backend in the configuration area
2019-09-20 15:05:21 +01:00
luisramos0
4954db64b3
Bring feature specs for configuration pages from spree_backend
2019-09-20 15:04:45 +01:00
luisramos0
b2c4b97d94
Bring spree/admin configuration routes to ofn
2019-09-20 15:02:01 +01:00
luisramos0
32c1eecece
Convert spree/admin/zones from erb to haml
2019-09-20 15:01:06 +01:00
luisramos0
6d8c7a4bee
Fix minor detail in states and countries views
2019-09-20 14:57:48 +01:00
luisramos0
bd2045cad7
Convert spree/admin/states from erb to haml
2019-09-20 14:55:36 +01:00
luisramos0
e1c3d2442a
Convert spree/admin/countries from erb to haml
2019-09-20 14:55:10 +01:00
luisramos0
3df65d0463
Add spree_backend views related to admin/configuration menu that are missing in ofn
2019-09-20 14:54:55 +01:00
luisramos0
822a17f732
Fix basic rubocop issues in newly added controllers
2019-09-20 14:50:38 +01:00
luisramos0
ffde0307e2
Add controllers from spree_backend related to config
2019-09-20 14:50:01 +01:00
luisramos0
9e57807dc2
Replace therubyracer with mini_racer.
...
This is being replaced to increase the reliability and speed of asset compilation.
2019-09-20 11:22:07 +01:00
luisramos0
052bac196b
Fix problem in spec/features/consumer/shopping/shopping_spec introduced with transpec
2019-09-20 10:33:40 +01:00
luisramos0
00e789b95b
Force use of expect over should in spec expectations
2019-09-20 10:29:56 +01:00
luisramos0
a004822019
Transpec spec/features/consumer/shopping/shopping_spec
2019-09-20 10:16:08 +01:00
luisramos0
49f7b4c8e2
Transpec spec/features/consumer/shopping/cart_spec.rb
2019-09-20 10:11:02 +01:00
luisramos0
8b503b51ca
Fix typo in spec name
2019-09-20 10:03:52 +01:00
luisramos0
4e431ecf18
Transpec spec/features/consumer/shopping/products_spec.rb
2019-09-20 10:02:27 +01:00
luisramos0
81f8b127db
Transpec spec/features/consumer/authentication_spec.rb and spec/features/consumer/producers_spec.rb
2019-09-20 09:53:23 +01:00
luisramos0
f9f81086fd
Transpec features/consumer/shopping/variant_overrides_spec
2019-09-20 09:02:43 +01:00
Luis Ramos
9807b432f9
Merge pull request #4272 from openfoodfoundation/dependabot/bundler/webmock-3.7.5
...
Bump webmock from 3.7.4 to 3.7.5
2019-09-20 08:42:12 +01:00
luisramos0
6b0f3cd4f3
Transpec spec/performance/shop_controller_spec
2019-09-19 20:36:33 +01:00
luisramos0
3c412b7b7d
Transpec spec/controllers/api/taxonomies_controller_spec, spec/controllers/api/taxons_controller_spec and spec/models/enterprise_spec
2019-09-19 20:34:30 +01:00
luisramos0
c4e6c0af2b
Transpec features/consumer/registration_spec
2019-09-19 20:18:24 +01:00
Matt-Yorkley
e6387197ec
Add memcached APM
2019-09-19 19:48:16 +01:00
Luis Ramos
746c4f03f6
Merge pull request #4261 from jasonk357/3979-malformed-referer-error
...
Guard against malformed request referer
2019-09-19 17:29:18 +01:00
Kristina Lim
3535c4d564
Merge pull request #4240 from Matt-Yorkley/backorder_to_the_future_2
...
Disentangle on_demand and backordered
2019-09-20 00:05:27 +08:00
luisramos0
37abdb7727
Update knapsack report
2019-09-19 16:58:06 +01:00
luisramos0
bdb3dd5aaf
Fix long lines in app/serializers
2019-09-19 16:32:09 +01:00
luisramos0
25fbab2e37
Use memoized order method
2019-09-19 16:32:09 +01:00
luisramos0
4d37aaac64
Use have_http_status and remove check for error message, that's something for the base_controller test to test
2019-09-19 16:32:09 +01:00
luisramos0
19e28cb14a
Make spec/controllers/api/orders_controller_spec more simple assuming adjustments will always come in the same order
2019-09-19 16:32:09 +01:00
luisramos0
a44a251d96
Remove duplicated attributes tag from all serializers to create consistency
2019-09-19 16:32:09 +01:00
luisramos0
2921ee19e1
Add api/order/{order_number} ednpoint and its new order detailed serializer
2019-09-19 16:32:09 +01:00
luisramos0
6796d91a07
Add some basic attributes to address and order serializers that will be used in the order show api endpoint
2019-09-19 16:32:09 +01:00
luisramos0
69afcf7510
Improve readability in order permissions
2019-09-19 16:32:09 +01:00
dependabot-preview[bot]
47056e3cc1
Bump webmock from 3.7.4 to 3.7.5
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.7.4 to 3.7.5.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.7.4...v3.7.5 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-19 13:10:20 +00:00
Kristina Lim
311ee92e84
Update all locales with the latest Transifex translations
2019-09-19 17:08:17 +08:00
Kristina Lim
241e97d938
Merge pull request #4241 from openfoodfoundation/transifex
...
Transifex
2019-09-19 16:58:57 +08:00
Pau Pérez Fabregat
85b1ba8eae
Merge pull request #4263 from coopdevs/index-frequent-spree-orders-query
...
Index spree_orders on various columns
2019-09-19 10:12:54 +02:00
Pau Pérez Fabregat
baa4783141
Merge pull request #4260 from jasonk357/4184-delivery-report-default-range
...
Add default date range to Delivery Report
2019-09-19 09:58:06 +02:00
Transifex-Openfoodnetwork
ce40fcaf7b
Updating translations for config/locales/fr.yml
2019-09-19 07:44:00 +10:00
Luis Ramos
40438de7fe
Merge pull request #4250 from Matt-Yorkley/ruby-2.1.9
...
Bump Ruby version from 2.1.5 to 2.1.9
2019-09-18 11:39:15 +01:00
Luis Ramos
29dcd96fca
Merge pull request #4265 from openfoodfoundation/dependabot/bundler/simplecov-0.17.1
...
Bump simplecov from 0.17.0 to 0.17.1
2019-09-18 10:25:54 +01:00
Pau Pérez Fabregat
7fd6a7e654
Merge pull request #4270 from openfoodfoundation/dependabot/bundler/webmock-3.7.4
...
Bump webmock from 3.7.3 to 3.7.4
2019-09-18 10:11:11 +02:00
dependabot-preview[bot]
8f2a80f199
Bump webmock from 3.7.3 to 3.7.4
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.7.3 to 3.7.4.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.7.3...v3.7.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-17 19:21:37 +00:00
Pau Perez
ea41405209
Index spree_orders on various columns
...
The following query
```sql
SELECT spree_orders . *
FROM spree_orders
WHERE spree_orders . user_id = ?
AND spree_orders . completed_at IS ?
AND spree_orders . created_by_id = ?
ORDER BY created_at DESC LIMIT ?
```
performs quite badly even though LIMIT is always 1 because:
* ORDER BY requires sorting by a column which is not indexed therefore
a sequential scan is performed.
* Although `completed_at` is indexed, `user_id` and `created_by_id` are
not causing a sequential scan.
To make it worse this query is executed very often in the following
controllers among others also related to checkout:
* CartController#populate
* EnterprisesController#Shop
* LineItemsController#bought
* ShopController#products
* ShopController#order_cycle
In some cases this query alone accounts for 66.8% of the total time
of the endpoint.
Results
See by yourself. We move from 56.643ms to 0.077ms. Pretty neat.
```
openfoodnetwork=> explain analyze SELECT "spree_orders".* FROM "spree_orders" WHERE "spree_orders"."user_id" = 1 AND "spree_orders"."completed_at" IS NULL AND "spree_orders"."created_by_id" = 1 ORDER BY created_at DESC LIMIT 1;
QUERY PLAN
--------------------------------------------------------------------------------------------------------------------------
Limit (cost=11753.03..11753.04 rows=1 width=195) (actual time=56.580..56.580 rows=0 loops=1)
-> Sort (cost=11753.03..11753.04 rows=1 width=195) (actual time=56.578..56.578 rows=0 loops=1)
Sort Key: created_at DESC
Sort Method: quicksort Memory: 25kB
-> Seq Scan on spree_orders (cost=0.00..11753.02 rows=1 width=195) (actual time=56.571..56.571 rows=0 loops=1)
Filter: ((completed_at IS NULL) AND (user_id = 1) AND (created_by_id = 1))
Rows Removed by Filter: 256135
Planning time: 0.252 ms
Execution time: 56.643 ms
(9 rows)
openfoodnetwork=> CREATE INDEX ON spree_orders (completed_at, user_id, created_by_id, created_at);
CREATE INDEX
openfoodnetwork=> explain analyze SELECT "spree_orders".* FROM "spree_orders" WHERE "spree_orders"."user_id" = 1 AND "spree_orders"."completed_at" IS NULL AND "spree_orders"."created_by_id" = 1 ORDER BY created_at DESC LIMIT 1;
mit (cost=8.45..8.46 rows=1 width=195) (actual time=0.030..0.030 rows=0 loops=1)
-> Sort (cost=8.45..8.46 rows=1 width=195) (actual time=0.029..0.029 rows=0 loops=1)
Sort Key: created_at DESC
Sort Method: quicksort Memory: 25kB
-> Index Scan using spree_orders_completed_at_user_id_created_by_id_created_at_idx on spree_orders (cost=0.42..8.44 rows=1 width=195) (actual time=0.021..0.021 rows=0 loops=1)
Index Cond: ((completed_at IS NULL) AND (user_id = 1) AND (created_by_id = 1))
Planning time: 0.199 ms
Execution time: 0.077 ms
```
2019-09-17 17:02:14 +02:00
luisramos0
2683efdd3c
Add missing update to db/schema by running db:migrate
...
This was missed in PR 4242
2019-09-17 15:27:56 +01:00
Luis Ramos
ed1c154b78
Merge pull request #4252 from luisramos0/remove_clear_ship_address
...
On checkout of pickup orders, set ship_address to shipping_address_from_distributor instead of empty Spree::Address.default
2019-09-17 13:18:20 +01:00
Pau Pérez Fabregat
4aba2730f7
Merge pull request #4230 from openfoodfoundation/dependabot/bundler/ddtrace-0.27.0
...
Bump ddtrace from 0.26.0 to 0.27.0
2019-09-17 13:11:12 +02:00
Pau Pérez Fabregat
07ae51560e
Merge pull request #4259 from openfoodfoundation/dependabot/bundler/webmock-3.7.3
...
Bump webmock from 3.7.2 to 3.7.3
2019-09-17 09:32:21 +02:00
dependabot-preview[bot]
3c5c842bbf
Bump simplecov from 0.17.0 to 0.17.1
...
Bumps [simplecov](https://github.com/colszowka/simplecov ) from 0.17.0 to 0.17.1.
- [Release notes](https://github.com/colszowka/simplecov/releases )
- [Changelog](https://github.com/colszowka/simplecov/blob/master/CHANGELOG.md )
- [Commits](https://github.com/colszowka/simplecov/compare/v0.17.0...v0.17.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-16 21:08:17 +00:00
Luis Ramos
e7e4508555
Merge pull request #4242 from Matt-Yorkley/another_cartastrophe
...
Soft-delete price objects
2019-09-16 17:18:39 +01:00
Luis Ramos
9a3b5d0700
Merge pull request #4257 from daningenthron/daningenthron/payment-method-translation
...
Fix typo on 'no payment methods' translation keys
2019-09-16 13:18:46 +01:00
Luis Ramos
46353be9a3
Merge pull request #4237 from coopdevs/unobfuscate-bulk-management-action
...
Add implicit #bulk_management including filter
2019-09-15 12:15:11 +01:00
JASON KNOEPFLER
91a52ead58
Guard against malformed request referer
2019-09-14 09:13:44 -07:00
JASON KNOEPFLER
0f55049eda
OrderCycleManagementReport sets default date range before querying for orders
2019-09-13 17:15:57 -07:00
Luis Ramos
83f1a7a9a9
Merge pull request #4258 from coopdevs/fix-test-example-name
...
Fix test example name
2019-09-13 23:04:45 +01:00
dependabot-preview[bot]
fac118fce2
Bump webmock from 3.7.2 to 3.7.3
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.7.2 to 3.7.3.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.7.2...v3.7.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-13 19:19:34 +00:00
Dan Ingenthron
5270cdaa32
Fixed typo on 'no payment methods' translation keys
...
Modified to remove edits to translation files. These will be updated via Transifex webhook.
2019-09-13 13:43:13 -05:00
luisramos0
caebcdf184
Add correct schemas for EnterpriseShopfront and Variant (not Api::Admin::VariantSerializer but Api::VariantSerializer)
2019-09-13 15:33:54 +01:00
luisramos0
c66a659e8e
Fix /products payloads: product, variants and variant overrides
2019-09-13 14:55:18 +01:00
luisramos0
b8b107dd2d
Fix api_key header name
2019-09-13 14:27:39 +01:00
Luis Ramos
ecf336fe51
Merge pull request #4244 from luisramos0/fix_truncate_data
...
Adapt db truncate task to ofn v2 by removing db tables from v1
2019-09-13 13:09:07 +01:00
Matt-Yorkley
a3efd13d46
Update existing Spree::InventoryItem records: change backordered state to on_hand.
2019-09-13 13:05:15 +01:00
Matt-Yorkley
2ff0169016
Replace hard-deleted prices with empty (0.00) price records
2019-09-13 12:55:24 +01:00
Pau Perez
08d37bbed7
Fix test example name
...
The name wasn't reflecting the method being tested.
2019-09-13 12:55:34 +02:00
Transifex-Openfoodnetwork
b71443ccd8
Updating translations for config/locales/ca.yml
2019-09-13 20:45:12 +10:00
Transifex-Openfoodnetwork
8fd3d9e03c
Updating translations for config/locales/es.yml
2019-09-13 20:42:43 +10:00
Transifex-Openfoodnetwork
787727872f
Updating translations for config/locales/ca.yml
2019-09-13 20:42:04 +10:00
Pau Pérez Fabregat
5bf72ae780
Merge pull request #4234 from coopdevs/remove-hidden-integrity-check
...
Remove integrity check for deleted variants in OCs
2019-09-13 11:27:41 +02:00
Pau Pérez Fabregat
290d00f17d
Merge pull request #4232 from coopdevs/remove-guard
...
Remove Guard and Guard-related gems
2019-09-13 11:25:29 +02:00
Pau Perez
3d7bbbbb19
Remove unused Guardfile
2019-09-13 08:25:54 +02:00
luisramos0
3d32987227
Fix taxonomies to represent the endpoints in OFN
2019-09-12 19:52:13 +01:00
luisramos0
902e51e580
Add api/customers endpoints
2019-09-12 19:11:53 +01:00
luisramos0
743cb3b33a
Add update product image endpoint and delete enterprise fees endpoint
2019-09-12 18:02:06 +01:00
luisramos0
74e49787f4
Add the remaining missing enterprises endpoints
2019-09-12 15:16:35 +01:00
luisramos0
afa8f97627
Add post and put on enterprises and fix details in shipments endpoints
2019-09-12 13:42:40 +01:00
luisramos0
6e677fecce
Remove now inexistent endpoints /new
2019-09-12 13:19:43 +01:00
luisramos0
889a3e6d9d
Improve file layout and move Order model to correct place
2019-09-12 13:15:40 +01:00
luisramos0
664be47ac3
Add endpoints for /orders/shipments
2019-09-12 13:08:39 +01:00
Sigmund Petersen
fd77f48aca
Merge pull request #4253 from openfoodfoundation/RachL-patch-1
...
Update Slack invite link
2019-09-12 09:17:37 +02:00
Rachel Arnould
9a31b99de6
Update missing second link
2019-09-11 15:52:44 +02:00
luisramos0
0e4b5ad9ec
Remove now gone orders/{order_number} endpoint and its models, may be readded in the near future but the models may be different as these docs refer to the now gone spree_api order rabl representation
2019-09-11 11:35:01 +01:00
luisramos0
5634f4af18
Move orders endpoints above in the file as they are the most important endpoints
2019-09-11 11:34:57 +01:00
luisramos0
0dede39617
Make list of /products/{product_id}/variants endpoints correct according to current code
2019-09-11 11:15:55 +01:00
Transifex-Openfoodnetwork
d98e302047
Updating translations for config/locales/nb.yml
2019-09-11 19:47:09 +10:00
luisramos0
377b4a3755
Do not add ng-controller if main_ng_ctrl_name is not set
2019-09-11 10:36:19 +01:00
luisramos0
0c809b2911
Remove now unused override app_wrapper
2019-09-11 10:35:39 +01:00
luisramos0
33472014f1
Do not add main_ng_app_name if it is not defined
2019-09-11 10:32:30 +01:00
luisramos0
d038c27f1f
Fix app_wrapper_attr code by making the content_for tag be only the name of the ng-app and ng-ctrller
2019-09-11 10:32:30 +01:00
luisramos0
3d718d9738
Move admin layout body contents to a separate partial
2019-09-11 10:32:29 +01:00
Luis Ramos
500ef901fd
Merge pull request #4164 from luisramos0/little_de_deface
...
Remove some unused deface overrides and move some others to their views
2019-09-11 10:26:56 +01:00
Matt-Yorkley
a15db65e69
Reload tested variant and price objects
2019-09-11 04:32:19 +01:00
Matt-Yorkley
64a501ee20
Don't index new deleted_at column for spree_prices
2019-09-11 04:29:02 +01:00
Matt-Yorkley
95fcff8bb1
Add migration to remove broken variants from open carts
2019-09-11 04:29:00 +01:00
luisramos0
a2e6b84db2
List the actual actions available in the api/products endpoint
2019-09-10 17:22:52 +01:00
luisramos0
d319f97733
Remove now unexisting endpoints zones, states and countries
2019-09-10 12:36:34 +01:00
Luis Ramos
c0bf7e2e75
Merge pull request #4236 from mkllnk/4222-checkout-paypal-error-handling
...
4233 Add missing Spree route for Paypal
2019-09-10 12:24:21 +01:00
Luis Ramos
1d177a164b
Merge pull request #4247 from mkllnk/4243-inventory-pagination
...
4243 Restore old pagination API for inventory products
2019-09-10 11:35:04 +01:00
Rachel Arnould
d846c31db9
Update Slack invite link
...
Updated Slack invite link in README
2019-09-10 09:51:59 +02:00
Maikel Linke
efd01f8c9e
Move new inventory spec to existing variant overrides spec
...
I decided to not share the same data setup with the other parts of the
spec because we don't need as much data and it's slow to create.
2019-09-10 10:05:23 +10:00
luisramos0
fb65c64c68
Keep the ship_address clearing logic (this time reusing the OrderUpdate method) thus making the restart_checkout process work for these cases (because order.ship_address is not empty)
...
OrderUpdater#shipping_address_from_distributor uses order.address_from_distributor to set order.ship_address when order is not delivery: this will clear the ship address as it was done previously without setting an empty address like Spree::Address.default
2019-09-09 22:05:20 +01:00
Transifex-Openfoodnetwork
b8d8ee4edc
Updating translations for config/locales/en_GB.yml
2019-09-10 05:14:09 +10:00
Luis Ramos
936784404e
Merge pull request #4112 from luisramos0/convert_shipments_rabl
...
Convert spree/api/shipments views from rabl to ams
2019-09-09 18:34:02 +01:00
Matt-Yorkley
11ea852211
Add migration to reset negative stock levels to zero
2019-09-09 17:49:58 +01:00
Matt-Yorkley
4656c35f71
Don't change on_demand variant's stock when updating shipments
2019-09-09 17:49:58 +01:00
Matt-Yorkley
254315b79e
Don't mark on_demand items and shipments as "backordered"
2019-09-09 17:49:56 +01:00
luisramos0
cc7461e692
Remove clear_ship_address from checkout_controller because it is setting an empty address on order.ship_address which is breaking the reset_checkout process in some cases.
...
This logic is already repeated in the before_save hook in the OrderUpdater where the distributor address is put into the ship_address on order.finalize
In cases the order is not to be finalized we keep the ship_address sent from the client as we may need it to make the order workflow work properly
2019-09-09 17:48:17 +01:00
luisramos0
c4d5eec7fd
Covering restart_checkout code with more tests to clarify behaviour with different order.ship_address objects
...
The edge case here is when ship_address is present but empty, on the checkout_controller we are going to move from using an empty ship_address to using a non-empty one. We keep the original case where this spec was testing with a nil order.ship_address
2019-09-09 17:48:04 +01:00
Luis Ramos
2dc85463ce
Merge pull request #4226 from HugsDaniel/4090-missing-translations-order
...
Add missing translations for orders
2019-09-09 15:16:47 +01:00
Matt-Yorkley
aa3bd93ad0
Bump Ruby version to 2.1.9
2019-09-09 12:22:20 +01:00
Maikel Linke
24c8bb95cb
Restore old pagination API for products
...
It's still used by the inventory page. This is an easy fix that I can
deploy without risk. A rewrite of the inventory pagination should
follow.
2019-09-09 14:53:04 +10:00
Maikel Linke
2e361baeaa
Ignore block length cop for feature and scenario
...
They are typically long and that's okay, same with `describe` and `it`.
2019-09-09 14:53:04 +10:00
luisramos0
a98a0bd264
Adapt db truncate task to ofn v2 by removing db tables from v1
2019-09-08 14:05:49 +01:00
luisramos0
b4de8ef899
Make enterprises/index_spec a bit more resilient
2019-09-08 12:17:36 +01:00
luisramos0
f0586af1c7
Re-organized api/orders resource routes
2019-09-08 12:17:36 +01:00
luisramos0
e9b5551c0f
Adpat shipment controller to move out of Spree namespace
2019-09-08 12:17:36 +01:00
luisramos0
7cec24f1d4
Move shipments route, controller and ctrl spec from spree/api to api
2019-09-08 12:17:36 +01:00
luisramos0
26f5ece7c0
Add a few relevant attributes to shipment serializer and fix some details in shipment controller spec
2019-09-08 12:15:33 +01:00
luisramos0
a21a4aba5d
Convert spree/api/shipments from rabl to AMS and adapt its spec
2019-09-08 12:15:33 +01:00
Matt-Yorkley
f413ce2a27
Soft-delete price objects
2019-09-06 17:50:19 +01:00
Transifex-Openfoodnetwork
5847b1a51e
Updating translations for config/locales/en_ZA.yml
2019-09-07 01:50:35 +10:00
Transifex-Openfoodnetwork
f51ebc63c3
Updating translations for config/locales/en_AU.yml
2019-09-07 01:47:27 +10:00
Pau Pérez Fabregat
908e1dfcaf
Merge pull request #4202 from coopdevs/remove-skylight
...
Remove Skylight
2019-09-06 17:09:14 +02:00
Matt-Yorkley
5bc2c96248
Add specs for existing on_demand behaviour
2019-09-06 15:47:59 +01:00
Pau Perez
ab8c7bad76
Remove Skylight
...
Since we adopted Skylight to get response times across endpoints and
instances, we failed to get accurate numbers. Our Rails version is not
supported and thus Skylight fails to provide data for the slowest
endpoints, the ones we care about the most. Even with a supported one we
could potentially hit any limits on tracing and have the same problem.
Recently, we started paying for Datadog's APM and the experience,
although it's still early, has been better. It makes it possible to
correlate between services and other metrics which helps spotting the
underlying issues.
Therefore, having two agents running on the server consumes system
resources so we better get rid of Skylight's one.
2019-09-06 16:25:33 +02:00
Pau Perez
55883a0efc
Add implicit #bulk_management including filter
...
OFN it's hard enough. No need to abuse implicitness making things very
hard to follow.
I've spent around 20min trying to find out where this controller action
was implemented until I realized Rails renders the matching view if no
controller action is defined.
Making it git-greppable makes it a bit easier next time.
2019-09-06 16:02:44 +02:00
Pau Pérez Fabregat
2e519957ec
Merge pull request #4231 from openfoodfoundation/dependabot/bundler/webmock-3.7.2
...
Bump webmock from 3.7.1 to 3.7.2
2019-09-06 13:31:55 +02:00
Pau Pérez Fabregat
cd5b3c7393
Merge pull request #4229 from openfoodfoundation/dependabot/bundler/bugsnag-6.12.1
...
Bump bugsnag from 6.12.0 to 6.12.1
2019-09-06 13:08:47 +02:00
Maikel Linke
eb9f02f3bd
Add missing Spree route for Paypal
2019-09-06 19:07:41 +10:00
Maikel Linke
a1f3e8205f
Add spec for failing Paypal checkout
...
https://github.com/openfoodfoundation/openfoodnetwork/issues/4233
2019-09-06 19:05:59 +10:00
Pau Perez
410e23085e
Remove integrity check for deleted variants in OCs
...
We have no way to see the output of this weird RSpec integrity check
thus, it's pointless. It only adds unnecessary load the server.
However, the issue it checks seems to still be happening although
not very often. UK's server has 70 occurrences the last one being from
early 2019 while FR's server returns 10.
2019-09-06 10:30:26 +02:00
Pau Perez
e2b3ee7b3f
Remove Guard and Guard-related gems
...
Guard and the other Guard-related gems should be removed from our
Gemfile. We think is not worth the extra dependencies given the effort
it requires to keep them up-to-date.
This came up in a PR that was upgrading Guard: #4213 .
2019-09-06 10:11:17 +02:00
Maikel Linke
242767dc73
Give variables meaningful names in checkout spec
2019-09-06 12:27:15 +10:00
Maikel Linke
8e8c77c5bd
Convert specs to RSpec 3.8.0 syntax with Transpec
...
This conversion is done by Transpec 3.4.0 with the following command:
transpec spec/features/consumer/shopping/checkout_spec.rb
* 43 conversions
from: obj.should
to: expect(obj).to
* 8 conversions
from: obj.should_not
to: expect(obj).not_to
* 3 conversions
from: == expected
to: eq(expected)
For more details: https://github.com/yujinakayama/transpec#supported-conversions
2019-09-06 11:32:44 +10:00
Luis Ramos
e3ce2a7486
Merge pull request #4104 from luisramos0/convert_taxons_to_ams
...
Convert spree/api/taxons views from rabl to AMS
2019-09-06 00:04:10 +01:00
dependabot-preview[bot]
8524f49589
Bump webmock from 3.7.1 to 3.7.2
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.7.1 to 3.7.2.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.7.1...v3.7.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-05 19:17:24 +00:00
dependabot-preview[bot]
36f9cd9cbf
Bump ddtrace from 0.26.0 to 0.27.0
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.26.0 to 0.27.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.26.0...v0.27.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-05 19:16:35 +00:00
dependabot-preview[bot]
0fab4a3a8e
Bump bugsnag from 6.12.0 to 6.12.1
...
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby ) from 6.12.0 to 6.12.1.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases )
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.12.0...v6.12.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-05 19:15:41 +00:00
Luis Ramos
722884d8d8
Merge pull request #3895 from luisramos0/fees_based_on_final_weight
...
Make weight calculator use line_item.final_weight_volume rather than variant.weight
2019-09-05 19:24:56 +01:00
Pau Pérez Fabregat
23740ef908
Merge pull request #4227 from openfoodfoundation/2.4.0-minus-pr-4204
...
Revert PR #4204
2019-09-05 17:19:15 +02:00
Pau Pérez Fabregat
ba04208999
Merge pull request #4224 from kristinalim/feature/4210-fetch_and_scope_variants_once_in_products_renderer
...
4210 Fetch and scope variants for shop in ProductsRenderer only once
2019-09-05 17:12:31 +02:00
Kristina Lim
590ce67f38
Fetch and scope variants for shop in ProductsRenderer only once
2019-09-05 22:42:50 +08:00
Matt-Yorkley
e11ea929c3
Merge pull request #4223 from Matt-Yorkley/integrity
...
Lower integrity checker job interval
2019-09-05 15:36:12 +01:00
Hugo Daniel
f88d54b862
Add missing translations for orders
2019-09-05 15:13:10 +02:00
Matt-Yorkley
fc9f61ecf8
Revert PR #4204
...
Temporarily reverting these changes for a quick release
2019-09-05 13:23:59 +01:00
Matt-Yorkley
6d283ac839
Lower integrity checker job interval from hourly to daily
2019-09-05 12:54:37 +01:00
Luis Ramos
725807f66d
Merge pull request #4155 from coopdevs/fix-styling-in-stripe-tests
...
Fix Rubocop violations in Stripe connect tests
2019-09-03 15:58:34 +01:00
Pau Pérez Fabregat
149df6569c
Merge pull request #4212 from openfoodfoundation/dependabot/bundler/webmock-3.7.1
...
Bump webmock from 3.6.2 to 3.7.1
2019-09-03 11:16:01 +02:00
Pau Pérez Fabregat
7daa7032aa
Merge pull request #4215 from openfoodfoundation/transifex
...
Transifex
2019-09-03 11:11:51 +02:00
Pau Pérez Fabregat
8b7119beea
Merge pull request #4200 from openfoodfoundation/dependabot/bundler/bugsnag-6.12.0
...
Bump bugsnag from 6.11.1 to 6.12.0
2019-09-03 11:02:51 +02:00
Transifex-Openfoodnetwork
201e87bf12
Updating translations for config/locales/en_US.yml
2019-09-03 12:29:10 +10:00
Transifex-Openfoodnetwork
0fffd6b4e3
Updating translations for config/locales/en_US.yml
2019-09-03 12:26:02 +10:00
Matt-Yorkley
c516d40d4a
Update all locales with the latest Transifex translations
2019-09-02 22:24:53 +01:00
Luis Ramos
07d4528276
Merge pull request #4174 from openfoodfoundation/dependabot/bundler/delayed_job_active_record-4.1.4
...
Bump delayed_job_active_record from 4.1.3 to 4.1.4
2019-09-02 22:24:04 +01:00
Luis Ramos
4ace780431
Merge pull request #4187 from openfoodfoundation/dependabot/bundler/knapsack-1.18.0
...
Bump knapsack from 1.17.2 to 1.18.0
2019-09-02 22:23:15 +01:00
dependabot-preview[bot]
b69c3fd826
Bump webmock from 3.6.2 to 3.7.1
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.6.2 to 3.7.1.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.6.2...v3.7.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-02 19:23:28 +00:00
dependabot-preview[bot]
51df8de64f
Bump knapsack from 1.17.2 to 1.18.0
...
Bumps [knapsack](https://github.com/ArturT/knapsack ) from 1.17.2 to 1.18.0.
- [Release notes](https://github.com/ArturT/knapsack/releases )
- [Changelog](https://github.com/ArturT/knapsack/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ArturT/knapsack/compare/v1.17.2...v1.18.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-09-02 16:16:32 +00:00
Matt-Yorkley
d4a5829858
Merge pull request #4081 from Matt-Yorkley/products_pagination
...
Bulk Edit Products pagination
2019-09-02 17:14:14 +01:00
Matt-Yorkley
ff5fe66994
Fix route after big API refactor merge resolution
2019-09-02 16:29:03 +01:00
Matt-Yorkley
37e50a68e4
Fix timezone date parsing from Angular form fields
2019-09-02 16:29:00 +01:00
Matt-Yorkley
a72c662b97
Update per_page dropdown UX
2019-09-02 14:35:00 +01:00
Matt-Yorkley
ff2db0c5f8
Update spec routes, namespacing, and test content
...
Resolving new issues after a big merge
2019-09-02 14:35:00 +01:00
Matt-Yorkley
e9c60a33b9
Hide search in dropdown for per_page options
2019-09-02 14:35:00 +01:00
Matt-Yorkley
8e059d3c69
Define a limit on paginated queries with no supplied value for per_page
2019-09-02 14:35:00 +01:00
Matt-Yorkley
806ba94a2e
Clarify dependency on kaminari gem
2019-09-02 14:35:00 +01:00
Matt-Yorkley
4bec583bff
Refactor import_date_scope
2019-09-02 14:35:00 +01:00
Matt-Yorkley
90256f9c28
Add defaults and pages tests
2019-09-02 14:35:00 +01:00
Matt-Yorkley
eb284c1742
Use constants for defaults
2019-09-02 14:35:00 +01:00
Matt-Yorkley
b614e17f48
Add test coverage for #bulk_products endpoint and test all filtering functions
2019-09-02 14:34:54 +01:00
Pau Perez
1a450733a3
Use ApiHelper to DRY calls to JSON.parse in spec
2019-09-02 15:32:56 +02:00
Pau Perez
ffde7a38df
Add spacing to increase readability
2019-09-02 15:32:56 +02:00
Pau Perez
8b4b0621db
Fix Rubocop violations in Stripe connect tests
2019-09-02 15:32:56 +02:00
Matt-Yorkley
5259eaae5f
Merge pull request #4204 from Matt-Yorkley/cartastrophe
...
Cartastrophe averted :)
2019-09-02 12:26:08 +01:00
Matt-Yorkley
b0ad0fccfa
Add some defaults to avoid returning zero values when not supplied in query
2019-09-02 12:00:32 +01:00
Matt-Yorkley
2a83ad8689
Improve UX and consistency in orders pagination and page changing
2019-09-02 11:59:13 +01:00
Matt-Yorkley
c127110192
Make import_date query modification conditional
2019-09-02 11:59:13 +01:00
Matt-Yorkley
0470725112
Refactor pagination data hash
2019-09-02 11:57:32 +01:00
Matt-Yorkley
0623bab084
Don't respond to a successful update by querying 500 arbitrary products
2019-09-02 11:56:00 +01:00
Matt-Yorkley
4a0df684c7
Adjust specs
2019-09-02 11:56:00 +01:00
Matt-Yorkley
7dccb5ba90
Changing per_page should also reset the query
2019-09-02 11:56:00 +01:00
Matt-Yorkley
5a4be24df0
Add "filter results" button
2019-09-02 11:56:00 +01:00
Matt-Yorkley
5cb5967977
Fix cleared filters submitting "0" as value in queries
2019-09-02 11:56:00 +01:00
Matt-Yorkley
aeb8d30dae
Fix server-side import_date filtering
2019-09-02 11:56:00 +01:00
Matt-Yorkley
1822fd97a6
Tidy up filters
2019-09-02 11:54:28 +01:00
Matt-Yorkley
4ff3e9fe10
Update Angular loading conditionals
2019-09-02 11:54:28 +01:00
Matt-Yorkley
a63994440d
Add pagination to UI
2019-09-02 11:54:28 +01:00
Matt-Yorkley
f6d0de1454
Improve pagination data in bulk products
2019-09-02 11:54:28 +01:00
Matt-Yorkley
9b0e27a9d1
Add new ProductResource
2019-09-02 11:46:42 +01:00
Matt-Yorkley
415d88f302
Fix indentation in bulk product controller
2019-09-02 11:46:42 +01:00
Pau Pérez Fabregat
f9c98ea9a1
Merge pull request #4199 from openfoodfoundation/transifex
...
Transifex
2019-09-02 12:33:12 +02:00
Pau Pérez Fabregat
369a5a8a2f
Merge pull request #4101 from luisramos0/remove_variants_rabl
...
Convert spree/api/products and spree/api/variants views from rabl to AMS
2019-09-02 12:14:26 +02:00
Matt-Yorkley
62341c6381
Unit test access to associated objects after soft-delete
2019-08-31 10:06:47 +01:00
Luis Ramos
fa1becb791
Merge pull request #4063 from luisramos0/dead_code
...
Remove dead code under views/spree/shared
2019-08-30 22:39:01 +01:00
Matt-Yorkley
50a1704994
Make prices soft-deletable
2019-08-30 20:11:32 +01:00
Matt-Yorkley
302538c370
Add failing spec for cart issue
2019-08-30 15:32:45 +01:00
Maikel
0f80b6ce12
Merge pull request #4197 from kristinalim/fix/4195-fix_invalid_date_in_firefox
...
4195 Specify API date format when converting date to string in JS
2019-08-30 08:36:17 +10:00
dependabot-preview[bot]
69fb8b2afe
Bump bugsnag from 6.11.1 to 6.12.0
...
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby ) from 6.11.1 to 6.12.0.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases )
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.11.1...v6.12.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-29 19:17:20 +00:00
Transifex-Openfoodnetwork
1df8fc903e
Updating translations for config/locales/en_ZA.yml
2019-08-30 04:22:54 +10:00
Transifex-Openfoodnetwork
9a2dcb89af
Updating translations for config/locales/en_ZA.yml
2019-08-30 04:22:46 +10:00
Transifex-Openfoodnetwork
1661591f6c
Updating translations for config/locales/ca.yml
2019-08-29 23:12:46 +10:00
Transifex-Openfoodnetwork
6dde720039
Updating translations for config/locales/es.yml
2019-08-29 23:10:30 +10:00
Transifex-Openfoodnetwork
a54b725d6d
Updating translations for config/locales/ca.yml
2019-08-29 23:09:39 +10:00
Luis Ramos
265e76e8ca
Merge pull request #4074 from HugsDaniel/defacepocalypse
...
[Defacepocalypse] De-deface product properties index
2019-08-28 22:18:18 +01:00
luisramos0
192bff4fed
Move taxons and taxonomies api routes to api out of spree routes
2019-08-28 22:06:56 +01:00
luisramos0
92a270165e
Add missing api taxonomies controller only for the required jstree action
2019-08-28 22:06:56 +01:00
luisramos0
9f5c9916ba
Add back required api actions (create, update and destroy) and add AMS serializers for the jstree action
2019-08-28 22:06:56 +01:00
luisramos0
d08de4bdf9
Add extra fields to taxon serializer to be used in the api
2019-08-28 22:06:56 +01:00
luisramos0
45bdb85bf3
Add missing method and skip_authorization_check to taxons controller
2019-08-28 22:06:56 +01:00
luisramos0
ece0652ca3
Adapt spree/admin/shared/_routes.html.erb to new location of the api/taxons routes
2019-08-28 22:06:56 +01:00
luisramos0
7a652fd67b
Adapt api/taxons controller to new namespace outside Spree: remove Spree module and add Spree namespace to Taxons and Taxonomy classes
2019-08-28 22:06:56 +01:00
luisramos0
4ca8feeef1
Move api/taxons route and controller out of spree namespace into /api and move the ctrl spec as well
2019-08-28 22:06:56 +01:00
luisramos0
367932a767
Make spree/api/taxons_controller use AMS serializer instead of rabl
2019-08-28 22:06:56 +01:00
luisramos0
e591658f48
Keep only used api/taxons index action, delete all others as not required right now
2019-08-28 22:06:56 +01:00
Kristina Lim
1516069888
Specify API date format when converting date to string in JS
2019-08-29 02:44:14 +08:00
Luis Ramos
cd263b761c
Merge pull request #4055 from luisramos0/remove_spree_api
...
Remove dependency to spree_api - step 1 - controllers and routes
2019-08-28 15:34:08 +01:00
Maikel
c952ad16ad
Merge pull request #4163 from luisramos0/swagger
...
Add swagger.yaml to codebase
2019-08-28 14:46:51 +10:00
Maikel
ca09c58f26
Merge pull request #3985 from jonleighton/string-to-text
...
Convert several fields from string to text
2019-08-28 11:53:49 +10:00
Maikel Linke
e876a25d59
Fix flaky proxy order spec
2019-08-28 10:48:57 +10:00
Maikel Linke
2a780151be
Update all locales with the latest Transifex translations
2019-08-28 09:54:31 +10:00
Maikel
9d2009d2af
Merge pull request #4188 from openfoodfoundation/transifex
...
Transifex
2019-08-28 09:43:02 +10:00
Maikel
f887533dda
Merge pull request #4157 from mkllnk/4138-update-products
...
4138 Avoid infinite loop when updating products
2019-08-28 09:42:28 +10:00
Transifex-Openfoodnetwork
bef3f154d6
Updating translations for config/locales/fr_CA.yml
2019-08-28 09:12:59 +10:00
Transifex-Openfoodnetwork
6fb775d5ed
Updating translations for config/locales/en_CA.yml
2019-08-28 09:05:39 +10:00
Transifex-Openfoodnetwork
b5a8563725
Updating translations for config/locales/en_GB.yml
2019-08-27 23:28:34 +10:00
Transifex-Openfoodnetwork
1a9ade6de9
Updating translations for config/locales/en_GB.yml
2019-08-27 23:25:26 +10:00
Maikel Linke
48df853ff5
Skip cascading callbacks when touching distributors
2019-08-27 10:44:19 +10:00
Maikel Linke
2137a2addb
Add spec for current bug
...
https://github.com/openfoodfoundation/openfoodnetwork/issues/4138
2019-08-27 10:44:19 +10:00
Transifex-Openfoodnetwork
e6a7239716
Updating translations for config/locales/en_AU.yml
2019-08-27 10:09:05 +10:00
Transifex-Openfoodnetwork
25bed92f2e
Updating translations for config/locales/en_AU.yml
2019-08-27 10:08:32 +10:00
Maikel
909cd407dd
Merge pull request #4149 from openfoodfoundation/transifex
...
Transifex
2019-08-27 09:58:31 +10:00
Luis Ramos
f2d25748b1
Merge pull request #4078 from HugsDaniel/defacepocalypse-variants
...
[Defacepocalypse] De-deface variants
2019-08-25 22:51:15 +01:00
Luis Ramos
6396e6e970
Merge pull request #4152 from openfoodfoundation/dependabot/bundler/stripe-4.24.0
...
Bump stripe from 4.19.0 to 4.24.0
2019-08-25 22:49:47 +01:00
Luis Ramos
e52f813dae
Merge pull request #4159 from luisramos0/fix_prod_set
...
Add bugsnag notifications to both product_set and products_controller when stock update fails
2019-08-25 22:49:06 +01:00
Luis Ramos
9ab2eec30c
Merge pull request #4185 from kristinalim/fix/4176-fix_saving_of_shipping_method
...
4176 Fix saving of shipping method when automatically advancing subscription order state
2019-08-25 22:48:39 +01:00
Luis Ramos
f96b37dae3
Merge pull request #4162 from luisramos0/checkout_cache
...
Checkout is not refreshing products cache
2019-08-25 21:52:55 +01:00
Kristina Lim
5b68b2f707
Fix ship method when advancing subscription order
2019-08-22 21:32:41 +08:00
Kristina Lim
ff634bd870
Test ship method when advancing subscription order
2019-08-22 21:30:21 +08:00
Hugo Daniel
7d21d88dc9
Force hide the select2 close cross
2019-08-22 10:32:07 +02:00
dependabot-preview[bot]
31b62d6296
Bump delayed_job_active_record from 4.1.3 to 4.1.4
...
Bumps [delayed_job_active_record](https://github.com/collectiveidea/delayed_job_active_record ) from 4.1.3 to 4.1.4.
- [Release notes](https://github.com/collectiveidea/delayed_job_active_record/releases )
- [Commits](https://github.com/collectiveidea/delayed_job_active_record/compare/v4.1.3...v4.1.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-20 19:14:59 +00:00
Transifex-Openfoodnetwork
5e68604f11
Updating translations for config/locales/nb.yml
2019-08-20 17:42:09 +10:00
Transifex-Openfoodnetwork
c4edd3a683
Updating translations for config/locales/fr.yml
2019-08-20 17:41:25 +10:00
Transifex-Openfoodnetwork
574781e901
Updating translations for config/locales/nb.yml
2019-08-20 17:39:01 +10:00
Transifex-Openfoodnetwork
8ea4f933da
Updating translations for config/locales/fr.yml
2019-08-20 17:38:12 +10:00
Transifex-Openfoodnetwork
1e9820f291
Updating translations for config/locales/fr.yml
2019-08-20 17:35:05 +10:00
Luis Ramos
34ed86cf2d
Merge pull request #4132 from Matt-Yorkley/import_launch
...
Product Import beta
2019-08-19 17:17:16 +01:00
luisramos0
8a4e5b445f
Delete unused frontend auth toekn script override and move the backend one to the head partial
2019-08-18 21:53:56 +01:00
luisramos0
2394eda2ac
Remove unused sidebar override
2019-08-18 21:47:21 +01:00
luisramos0
f97a3a030a
Remove unused nav_bar sessions route and override
2019-08-18 21:44:22 +01:00
luisramos0
ec645f8fa8
Remove unused login override of nav_bar
2019-08-18 21:43:18 +01:00
luisramos0
56a54db602
Remove admin login_nav override and move it to admin layout file
2019-08-18 21:39:19 +01:00
luisramos0
4c3d15b42b
Remove users menu entry override and file and add it directly to the tabs view together with all the other entries
2019-08-18 21:36:50 +01:00
luisramos0
5f4429646d
Move override to the view that is now in our code base (from spree_auth_devise originally)
2019-08-18 21:33:23 +01:00
luisramos0
f37db456f8
Delete dead overrides of spree frontend code
2019-08-18 21:32:53 +01:00
Kevin Christianson
2dfcedad56
Add swagger.yaml
2019-08-18 18:26:44 +01:00
Kristina Lim
706168f2f0
Refresh variant cache when changing stock movements
2019-08-18 16:22:12 +08:00
Kristina Lim
3ecb5c0c75
Flush background jobs in failing spec
2019-08-18 18:16:28 +10:00
luisramos0
249a3c4e18
Make product set raise error and inform the user something went wrong and keep bugsnag notification so we can get more information about what's going on
2019-08-17 19:19:46 +01:00
luisramos0
2b8ebba233
Fix some rubocop issues in product_set and admin/products_controller
2019-08-17 19:15:32 +01:00
luisramos0
758394464b
Add bugsnag notification to products_controller create and update when on_hand or on_demand update fails with exception
2019-08-17 19:15:32 +01:00
luisramos0
d3c624ae10
Add bugsnag notification to product_set create_variant when on_hand or on_demand update fails with exception
2019-08-17 19:15:31 +01:00
luisramos0
163c65849e
Make product set a bit more robust by not failing to update on_hand when variant is not valid. This will make the overall set update work
2019-08-17 19:14:25 +01:00
luisramos0
99ff714913
Enable cache on checkout spec to test cache after checkout
2019-08-16 20:17:14 +01:00
luisramos0
c2f302450f
Add spec to checkout to validate product is removed from shopfront just after all available quantity is checked out
2019-08-16 19:35:57 +01:00
luisramos0
9186bcd455
Dry out some code in checkout_spec
2019-08-16 19:35:08 +01:00
Transifex-Openfoodnetwork
3d074b530f
Updating translations for config/locales/nb.yml
2019-08-15 19:16:43 +10:00
Transifex-Openfoodnetwork
20783db373
Updating translations for config/locales/en_GB.yml
2019-08-15 19:14:53 +10:00
Luis Ramos
d5b37a5171
Merge pull request #4079 from HugsDaniel/defacepocalypse-payments
...
[Defacepocalypse] De-deface payments
2019-08-14 19:30:33 +01:00
luisramos0
b9ddb39edc
Re-add taxons jstree action to make taxonomies config page work again
2019-08-14 16:31:34 +01:00
Luis Ramos
3efe2f878d
Merge pull request #4156 from coopdevs/fix-styling-in-paypal-tests
...
Fix Rubocop violations in PayPal tests
2019-08-14 15:59:14 +01:00
Luis Ramos
064fee79b3
Merge pull request #4151 from Matt-Yorkley/datadog_apm
...
Enable (optional) APM with Datadog
2019-08-14 15:58:48 +01:00
Luis Ramos
d13f182801
Merge pull request #4154 from Matt-Yorkley/fix_deployments2
...
Adjust user creation syntax
2019-08-14 15:56:32 +01:00
Luis Ramos
ee34935223
Fix a typo in docker.md
2019-08-14 13:55:58 +01:00
Pau Perez
0b7ce0d6db
Fix Rubocop violations in PayPal tests
2019-08-14 13:33:53 +02:00
Matt-Yorkley
9dd02044a5
Fix "can't modify frozen string" error in validation callbacks
2019-08-14 10:24:30 +01:00
Matt-Yorkley
d8a7190f43
Adjust user creation syntax
...
#skip_confirmation! can't be chained...
2019-08-14 09:22:11 +01:00
Matt-Yorkley
e5e0fcc887
Enable DelayedJob APM
2019-08-14 08:20:47 +01:00
Pau Pérez Fabregat
53496ff9eb
Merge branch 'master' into transifex
2019-08-14 09:08:40 +02:00
Pau Pérez Fabregat
6635a89af7
Merge pull request #4153 from Matt-Yorkley/fix_deployments
...
Fix deployments
2019-08-14 08:59:23 +02:00
Transifex-Openfoodnetwork
c1248857b8
Updating translations for config/locales/en_CA.yml
2019-08-14 09:15:20 +10:00
Matt-Yorkley
8c95399292
Don't prompt if admin user already exists
2019-08-13 21:02:12 +01:00
Matt-Yorkley
14c1abb861
Skip confirmation email on initial admin user creation
2019-08-13 21:00:30 +01:00
dependabot-preview[bot]
e2d61f5e89
Bump stripe from 4.19.0 to 4.24.0
...
Bumps [stripe](https://github.com/stripe/stripe-ruby ) from 4.19.0 to 4.24.0.
- [Release notes](https://github.com/stripe/stripe-ruby/releases )
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stripe/stripe-ruby/compare/v4.19.0...v4.24.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-13 19:18:17 +00:00
Transifex-Openfoodnetwork
5a1ef04c67
Updating translations for config/locales/en_ZA.yml
2019-08-14 04:57:27 +10:00
Transifex-Openfoodnetwork
e9e73ef0e4
Updating translations for config/locales/en_ZA.yml
2019-08-14 04:43:50 +10:00
Matt-Yorkley
be844253eb
Enable (optional) Rails APM with Datadog
2019-08-13 18:57:49 +01:00
Transifex-Openfoodnetwork
001e3688da
Updating translations for config/locales/en_GB.yml
2019-08-14 03:28:13 +10:00
luisramos0
b4ffd4dcc2
Update all locales with the latest Transifex translations
2019-08-13 18:25:23 +01:00
Transifex-Openfoodnetwork
e5a9606449
Updating translations for config/locales/en_GB.yml
2019-08-14 03:25:02 +10:00
Pau Pérez Fabregat
9eabbb8dab
Merge pull request #4140 from openfoodfoundation/transifex
...
Transifex
2019-08-13 12:00:48 +02:00
Hugo Daniel
1217811402
Refactor and remove empty lines
2019-08-13 11:03:04 +02:00
Pau Pérez Fabregat
d4f2fcb98a
Merge pull request #4126 from Matt-Yorkley/cart_dropdown
...
Cart dropdown now closes when clicking outside it.
2019-08-13 10:57:56 +02:00
Matt-Yorkley
0b2417849c
Merge pull request #4142 from mkllnk/seed-user
...
Seed user
2019-08-13 08:42:07 +01:00
Matt-Yorkley
3e8369c8f5
Merge pull request #4123 from Matt-Yorkley/navigation-css
...
Navigation css
2019-08-13 08:41:47 +01:00
Maikel Linke
cbaedcec92
Fix seeding of default user without asking
2019-08-13 09:47:54 +10:00
Hugo Daniel
bf2c1a0c1d
Add ng directive for setting on demand
2019-08-09 14:42:39 +02:00
Matt-Yorkley
0284eebf35
Fix cart dropdown positioning
2019-08-09 11:50:33 +01:00
Maikel Linke
e4ba515109
Seed admin user without asking by default
2019-08-09 14:16:01 +10:00
Maikel Linke
af1f6f6c6d
Skip confirmation when creating first admin user
2019-08-09 14:16:01 +10:00
Maikel Linke
b0e8ee42c1
Restore spree_auth_devise user seeding
2019-08-09 13:48:50 +10:00
Maikel
86aeb6a3c7
Merge pull request #4135 from coopdevs/remove-bugherd-tests
...
Remove bugherd specs
2019-08-09 12:53:23 +10:00
Matt-Yorkley
5d83414e9b
Disable rubocop for spree tabs helper
2019-08-08 20:09:35 +01:00
Transifex-Openfoodnetwork
9820d7de38
Updating translations for config/locales/ca.yml
2019-08-09 02:36:02 +10:00
Pau Pérez Fabregat
910eca810a
Merge pull request #4124 from Matt-Yorkley/order_email
...
Add SKU to order confirmation email
2019-08-08 18:35:20 +02:00
Transifex-Openfoodnetwork
6feaddf747
Updating translations for config/locales/es.yml
2019-08-09 02:33:35 +10:00
Transifex-Openfoodnetwork
10f6fb91f6
Updating translations for config/locales/ca.yml
2019-08-09 02:32:54 +10:00
Pau Pérez Fabregat
c7bd4b94b8
Merge pull request #4137 from openfoodfoundation/transifex
...
Transifex
2019-08-08 18:31:47 +02:00
Transifex-Openfoodnetwork
dd223a21f2
Updating translations for config/locales/nb.yml
2019-08-08 20:58:24 +10:00
Transifex-Openfoodnetwork
549366ff15
Updating translations for config/locales/fr.yml
2019-08-08 20:52:28 +10:00
Transifex-Openfoodnetwork
e92f60fb1c
Updating translations for config/locales/fr.yml
2019-08-08 20:49:20 +10:00
Pau Pérez Fabregat
92b05c76a3
Merge pull request #4068 from luisramos0/replace_oc_rabl
...
Convert order_cycle.rabl to Api::OrderCycleSerializer
2019-08-08 12:23:09 +02:00
Hugo Daniel
fa6fa0be64
Add missing translation
2019-08-08 11:11:32 +02:00
Kristina Lim
752efac7cf
Merge pull request #4051 from luisramos0/subs_unpause
...
Sync subscription (create/update orders) when subscription is unpaused
2019-08-08 01:09:09 +08:00
Pau Perez
2b1f1f748b
Remove bugherd specs
...
I don't think these are worth the time it takes to execute them every
time but most importantly I believe we are not using Bugherd anymore.
2019-08-07 16:49:32 +02:00
Pau Pérez Fabregat
798cd9e778
Merge pull request #4114 from kristinalim/fix/4103-add_specs
...
4103 Add specs for referencing of shipments to deleted variants
2019-08-07 12:52:11 +02:00
Matt-Yorkley
2f5b0a5afb
Remove product import FeatureFlag
2019-08-07 09:59:55 +01:00
Maikel
de2d4a5870
Merge pull request #4125 from Matt-Yorkley/variant_overrides
...
Variant overrides with on_demand
2019-08-07 10:25:32 +10:00
Matt-Yorkley
b3728568a8
Enable product import for non-superadmin users
...
This class_eval hack for premissions on the #tab method was really hard to find, and is obviously quite ugly, but refactoring it is maybe outside of the scope here...
2019-08-06 18:59:12 +01:00
Matt-Yorkley
6ba98b4b2c
Add beta notice to Product Import
2019-08-06 17:02:38 +01:00
Matt-Yorkley
d3d6921a0f
Use light grey colour with transparency.
2019-08-06 08:23:38 +01:00
Maikel
68393f1444
Merge pull request #4037 from luisramos0/subs_stock
...
Subscriptions - When editing subscriptions, check stock levels when changing orders in current OC
2019-08-06 15:16:00 +10:00
Maikel
229e6fa0a3
Merge pull request #4073 from luisramos0/kill_more_rabl
...
Replace update_prod_image.rabl with ImageSerializer in api/product_image_controller
2019-08-06 15:00:33 +10:00
Matt-Yorkley
8a069787d1
Cart dropdown now closes when clicking outside it.
2019-08-05 21:48:37 +01:00
Matt-Yorkley
29ed38a6cc
Add unit tests for overriding #move
2019-08-05 17:01:56 +01:00
Matt-Yorkley
4c7d3a491a
Don't decrement variant stock if override is on_demand
2019-08-05 17:01:56 +01:00
Matt-Yorkley
b0f90cf43c
Add test for variant override with :on_demand
2019-08-05 17:01:54 +01:00
Pau Pérez Fabregat
02ec0634b3
Merge pull request #4120 from openfoodfoundation/dependabot/bundler/webmock-3.6.2
...
Bump webmock from 3.6.0 to 3.6.2
2019-08-05 15:13:31 +02:00
Pau Pérez Fabregat
64d21969f0
Merge pull request #4064 from luisramos0/convert_search_Rabl
...
Replace views/admin/variants/search.rabl with Api::Admin::VariantSerializer
2019-08-05 15:07:10 +02:00
Pau Pérez Fabregat
0995adeb59
Merge pull request #4085 from openfoodfoundation/dependabot/bundler/devise-encryptable-0.2.0
...
Bump devise-encryptable from 0.1.2 to 0.2.0
2019-08-05 15:01:46 +02:00
Pau Pérez Fabregat
073a3fe2b4
Merge pull request #4119 from openfoodfoundation/transifex
...
Transifex
2019-08-05 13:18:12 +02:00
Matt-Yorkley
c07df6a5a6
Fix table column alignments
2019-08-04 20:45:00 +01:00
Matt-Yorkley
a7d109833d
Add SKU to order confirmation email
2019-08-04 20:43:55 +01:00
Matt-Yorkley
0364a14073
Add navigation bottom border on mobile view
2019-08-04 16:56:43 +01:00
Matt-Yorkley
ddc8d33356
Update border colour on navigation bar
2019-08-04 16:56:03 +01:00
luisramos0
006c6e6b7b
Add comment to explain method in weight calculator
2019-08-02 21:02:33 +01:00
luisramos0
41aa4ff479
Improve code readability and fix rubocop complexity issue in weight calculator
2019-08-02 20:54:41 +01:00
luisramos0
0e8f167ab9
Fix spec in weight calculator tests
2019-08-02 20:44:11 +01:00
Kristina Lim
cd81dfaead
Move deleted variant to let block in feature spec
2019-08-02 21:52:36 +08:00
Kristina Lim
25073ada84
Move order to a let block in feature spec
2019-08-02 21:52:33 +08:00
Kristina Lim
15b6f9dd5e
Add specs testing edit order page still okay when variant deleted
...
Note that the wrapping example group also loads the edit order page
before this "before" block. This will be fixed in the next commit.
2019-08-02 21:45:39 +08:00
Kristina Lim
0377e02dc1
Add specs testing that shipments see deleted variants
2019-08-02 21:45:38 +08:00
dependabot-preview[bot]
f679708a4e
Bump webmock from 3.6.0 to 3.6.2
...
Bumps [webmock](https://github.com/bblimke/webmock ) from 3.6.0 to 3.6.2.
- [Release notes](https://github.com/bblimke/webmock/releases )
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md )
- [Commits](https://github.com/bblimke/webmock/compare/v3.6.0...v3.6.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-08-01 19:15:26 +00:00
Transifex-Openfoodnetwork
0f748a3333
Updating translations for config/locales/en_GB.yml
2019-08-02 04:32:50 +10:00
Transifex-Openfoodnetwork
bdedaa06d8
Updating translations for config/locales/en_GB.yml
2019-08-02 04:29:40 +10:00
Pau Pérez Fabregat
6a41d9be87
Merge pull request #4092 from coopdevs/remove-admin-products-N+1
...
Remove N+1 while fetching distributors of OCs
2019-08-01 19:50:49 +02:00
luisramos0
4aa6c673ff
Adapt api products and variants controllers to new namespace outside of Spree
2019-08-01 18:34:19 +01:00
luisramos0
aa3c1aa0fe
Remove Spree module declaration from these files as they were moved out of the spree namespace
2019-08-01 14:30:11 +01:00
luisramos0
31bac9641f
Move api products and variants routes and ctrl out of spree namespace
2019-08-01 14:28:55 +01:00
Hugo Daniel
60bdde6349
Convert variants/new from erb to haml and import new.js.erb
2019-08-01 11:23:44 +02:00
Hugo Daniel
5faf33fabe
Import variants/new.html.erb from spree_backend
2019-08-01 10:50:13 +02:00
Hugo Daniel
f3b1a5dd35
Convert variants/edit from erb to haml
2019-08-01 10:45:04 +02:00
Hugo Daniel
07ccbf7f98
Import variants/edit.html.erb from spree_backend
2019-07-31 16:55:47 +02:00
Hugo Daniel
a3af6617a9
Convert payments/show from erb to haml
2019-07-31 16:20:32 +02:00
Hugo Daniel
9f7fb654c8
Import payments/show.html.erb from spree_backend
2019-07-31 16:16:26 +02:00
Hugo Daniel
b4a6686eac
Convert payments/_list from erb to haml
2019-07-31 16:15:38 +02:00
Hugo Daniel
ac13ff114c
Import payments/_list.html.erb from spree_backend
2019-07-31 16:09:48 +02:00
Hugo Daniel
af9187947f
Convert erb to haml
2019-07-31 16:02:48 +02:00
luisramos0
b7f7038934
Remove api/enterprises rabl template, it was only used as a member in the now removed rabl variants/products templates
2019-07-31 14:36:36 +01:00
Hugo Daniel
f0fdbf7cf4
Import payments/index from spree_backend
2019-07-31 14:33:38 +02:00
Hugo Daniel
74ab31c0e6
Import gateway.html.erb and convert to haml
2019-07-31 14:28:15 +02:00
luisramos0
6c054e6078
Add bulk_products and overridable to skip_authorization_check so these endpoints work with AMS
2019-07-31 12:18:27 +01:00
luisramos0
18974c68e1
Remove orphan price check from price model
...
This is a quick fix. This check is breaking product deletion in some situations and orphan Prices are not really a problem in the DB
2019-07-31 11:24:55 +01:00
luisramos0
78ab852141
Make spree/api/products_controller work with AMS
2019-07-31 11:23:43 +01:00
luisramos0
4497173213
Adapt spree/api/products_controller_spec to AMS serializer
2019-07-31 11:23:18 +01:00
luisramos0
4d74d246e8
Remove spree/api/products_controller index and new actions, not used
2019-07-31 10:32:45 +01:00
luisramos0
cc51537e93
Convert spree/api/products_controller from rabl to ams
2019-07-31 09:50:34 +01:00
luisramos0
07aececdcf
Remove unused route api/products managed
2019-07-31 09:50:31 +01:00
luisramos0
c3fbf9cdf9
Remove unused pagination from index and respective specs, fix spec for search by sku by adding sku to the serializer and adapt a few specs to pass with AMS attrivbutes,
2019-07-31 09:40:19 +01:00
luisramos0
180598c603
Convert spree/api/variants_controller to AMS by changing base_controller, using render json instad of respond with, deleting rabl templates and adapting specs
...
Delete unused pagination spec
2019-07-31 09:40:19 +01:00
luisramos0
69a5527e24
Update/regenarate .rubocop_todo.yml
2019-07-31 09:36:48 +01:00
luisramos0
e4a6b3880f
Fix some more simple rubocop issues
2019-07-31 09:36:48 +01:00
luisramos0
96ce4deb45
Transpec spec/support/api_helper.rb
2019-07-31 09:36:48 +01:00
luisramos0
a3c179bd3f
Fix some more simple rubocop issues
2019-07-31 09:36:48 +01:00
luisramos0
a57504ba1f
Bring api_helper.image from spree_api to support spree/api/products_controller_spec
2019-07-31 09:36:48 +01:00
luisramos0
25451eed6b
Bring api spec helpers from spree_api into ofn/api_helper
2019-07-31 09:36:48 +01:00
luisramos0
50765563f8
Bring spree/api_helpers from spree_api
2019-07-31 09:35:46 +01:00
luisramos0
2ae75ce13e
Add ControllerSetup from spree_api as it is used in spree/api/base_controller
2019-07-31 09:35:46 +01:00
luisramos0
18aa16650d
Remove dependency to Spree::ApiConfiguration, overall requires_authentication? is true, exceptions will be endpoint specific
2019-07-31 09:35:46 +01:00
luisramos0
314ed50e0f
Fix a rubocop issue in spree/api/products_controller
2019-07-31 09:34:20 +01:00
luisramos0
7346a49982
Move routes in ofn api namespace to separate routes file
2019-07-31 09:34:20 +01:00
luisramos0
5182286218
Add necessary spree api routes related to api keys for users and bring respective implementations from spree_api
2019-07-31 09:34:20 +01:00
luisramos0
a267848394
Remove unused api routes from views/spree/admin/shared/routes view
2019-07-31 09:32:33 +01:00
luisramos0
104bd31f9b
Add necessary spree api routes: taxons, variants and shipments
2019-07-31 09:32:33 +01:00
luisramos0
8bc9985edb
Transpec and fix rubocop issues in spree/api/variants_controller_spec
2019-07-31 09:32:33 +01:00
luisramos0
6dfc927730
Make spree/api/variant_controllers_spec pass
2019-07-31 09:32:33 +01:00
luisramos0
3771e26eba
Bring tests from spree/api/variants_controller_spec from spree_api
2019-07-31 09:32:33 +01:00
luisramos0
fd21d35aee
Transpec and fix rubocop issues in spree/api/shipments_controller_spec
2019-07-31 09:32:33 +01:00
luisramos0
1417b924d2
Bring and adapt tests from spree/api/shipments_controller_spec and mix them with exiting tests in OFN
2019-07-31 09:32:33 +01:00
luisramos0
2912c1b87d
Transpec and fix rubocop issues in spree/api/product_controller_spec
2019-07-31 09:32:33 +01:00
luisramos0
e746a0db7d
Bring tests from spree/api/products_controller_spec and add them to existing ones on the ofn side
...
Adapt these tests to have a green build
2019-07-31 09:32:33 +01:00
luisramos0
84a2886003
Improve auth code in spree/api/taxons_controller_spec
2019-07-31 09:32:33 +01:00
luisramos0
c668677b8a
Bring spree/api/taxons_controller_spec from spree_api, adapt it, transpec it and fix rubocop issues
2019-07-31 09:32:33 +01:00
luisramos0
2490cbfccb
Transpec and fix rubocop issues in spree/api/base_controller_spec
2019-07-31 09:32:33 +01:00
luisramos0
20a46a791c
Bring and adapt spree/api/base_controller_spec from spree_api
2019-07-31 09:32:33 +01:00
luisramos0
0e4fe08ac4
Fix logical problem in spree/api/base_controller and in spree/checkout_controller
...
See this stack overflow post for more info: https://stackoverflow.com/questions/39629976/ruby-return-vs-and-return
2019-07-31 09:32:33 +01:00
luisramos0
cf0f716534
Fix easy rubocop issues in spree/api/taxons_controller
2019-07-31 09:32:33 +01:00
luisramos0
b70cfa5968
Bring spree/api/taxons controller from spree_api as it is needed in OFN admin
2019-07-31 09:32:33 +01:00
luisramos0
f77beb50ff
Fix class scope in spree/api/products_controller, should not use Spree namespace here
...
Also, add missing dependency to spree/admin/products_controller_decorator
2019-07-31 09:32:33 +01:00
luisramos0
a941280982
Fix easy rubocop issues in spree/api/base_controller
2019-07-31 09:32:33 +01:00
luisramos0
9d40ee49e6
Bring spree/api/base_controller from spree_api
2019-07-31 09:32:33 +01:00
luisramos0
6abbdecb97
Fix the easy rubocop issues in the new spree api controllers
2019-07-31 09:32:33 +01:00
luisramos0
660ce92c27
Merge spree api controllers and its decorators
2019-07-31 09:32:33 +01:00
luisramos0
c5bcef6ae4
Delete unused spree/api/line_items_controller_decorator.rb
2019-07-31 09:32:33 +01:00
luisramos0
d26a0b6b73
Bring from spree_api the api controllers that are overriden in OFN so that we can merge the original and the override afterwards
2019-07-31 09:32:33 +01:00
luisramos0
9400516b56
Fix broken (was always green) bulk_product_update_spec updating image spec where the old src url was not stored and the expect command was wrong with !=
2019-07-30 20:37:26 +01:00
luisramos0
6ebfb02d0e
Update ImageSerializer with missing image size urls: mini/thumb_url, product/image_url that is used in the product image modal
2019-07-30 20:15:21 +01:00
luisramos0
11a77043eb
Switch from Spree::Api::BaseController to Api::BaseController so that AMS is activated
2019-07-30 12:20:14 +01:00
luisramos0
58b43c7bc9
Remove update_product_image.v1.rabl and switch controller from respond_with to render json to switch from rabl to AMS
2019-07-30 12:19:42 +01:00
luisramos0
be41271038
Make spelling coherent, as we have serializers with Z we get rid of the few serialisers with S we have
2019-07-29 19:57:12 +01:00
luisramos0
04e13e1136
Change css styling from id to class to make rubocop happy. Keeping id name as it may be needed in spree autocomplete css or js code
2019-07-29 19:46:12 +01:00
luisramos0
8868b7eb12
Fix rubocop issue: use nested class/module definition
2019-07-29 19:05:39 +01:00
Pau Perez
c85d00fcb8
Remove N+1 while fetching distributors of OCs
...
What used to be done as
```sql
SELECT "order_cycles".* FROM "order_cycles"
WHERE (order_cycles.orders_open_at <= '2019-07-29 17:45:20.137294'
AND order_cycles.orders_close_at >= '2019-07-29 17:45:20.137333')
SELECT DISTINCT "enterprises".* FROM "enterprises"
INNER JOIN "exchanges" ON "enterprises"."id" = "exchanges"."receiver_id"
WHERE "exchanges"."order_cycle_id" = 1
AND "exchanges"."incoming" = 'f'
(...)
SELECT DISTINCT "enterprises".* FROM "enterprises"
INNER JOIN "exchanges" ON "enterprises"."id" = "exchanges"."receiver_id"
WHERE "exchanges"."order_cycle_id" = 4
AND "exchanges"."incoming" = 'f'
```
it became
```sql
SELECT "order_cycles".* FROM "order_cycles"
WHERE (order_cycles.orders_open_at <= '2019-07-29 17:45:20.137294'
AND order_cycles.orders_close_at >= '2019-07-29 17:45:20.137333')
SELECT "exchanges".* FROM "exchanges"
WHERE "exchanges"."incoming" = 'f'
AND "exchanges"."order_cycle_id" IN (1, 2, 3, 4)
SELECT "enterprises".* FROM "enterprises"
WHERE "enterprises"."id" IN (3, 4, 5, 6)
```
I haven't got any perf numbers yet but each of the N+1 queries took as
long as the single `enterprises` query on my dev machine.
This should have a noticeable perf impact since the changed method
belongs to the `BaseController` seems to be executed in all HTML
requests as it gets called by
```ruby
before_filter :warn_invalid_order_cycles, if: :html_request?
```
2019-07-29 20:02:47 +02:00
luisramos0
2c6dab9c85
Add spec for Api::OrderCycleSerializer
2019-07-29 18:56:49 +01:00
luisramos0
c45194473b
Add spec to cover inject_current_order_cycle
2019-07-29 18:14:00 +01:00
luisramos0
3c0e6eeee2
Make inject_current_order_cycle render {} instad of null if current_order_cycle is null
2019-07-29 18:13:29 +01:00
luisramos0
ca5a5bf301
Convert oc.rabl to oc serializer and use it in both haml file and controller
2019-07-29 18:13:29 +01:00
dependabot-preview[bot]
8c7a7348f4
Bump devise-encryptable from 0.1.2 to 0.2.0
...
Bumps [devise-encryptable](https://github.com/plataformatec/devise-encryptable ) from 0.1.2 to 0.2.0.
- [Release notes](https://github.com/plataformatec/devise-encryptable/releases )
- [Changelog](https://github.com/plataformatec/devise-encryptable/blob/master/Changelog.md )
- [Commits](https://github.com/plataformatec/devise-encryptable/compare/v0.1.2...v0.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2019-07-26 23:12:41 +00:00
Hugo Daniel
3c2b6f4ed1
Remove data-hooks
2019-07-25 14:38:09 +02:00
Hugo Daniel
ec6f6056a8
Remove data-hooks
2019-07-25 14:34:06 +02:00
Hugo Daniel
c464b21d76
Remove data-hooks
2019-07-25 14:27:53 +02:00
Hugo Daniel
c83d249147
Impor missing partials from spree to ofn and convert to haml
2019-07-25 14:23:24 +02:00
Hugo Daniel
aae5ae9f1e
De-deface payments/new
2019-07-25 13:27:41 +02:00
Hugo Daniel
888e0e0bb4
Convert erb partials to haml
2019-07-25 13:22:55 +02:00
Hugo Daniel
a0b0fb05a6
Import payments/new from spree_backend to ofn
2019-07-25 13:22:32 +02:00
Hugo Daniel
a11562e4dd
Fix incorrect indentation in variants table
2019-07-25 12:05:50 +02:00
Hugo Daniel
2d872c25bf
Use Haml javascript tag to make autocomplete work
2019-07-25 11:20:51 +02:00
Hugo Daniel
986837d601
Import variants/_form.html.erb from spree_backend to ofn and de-deface it
2019-07-25 11:07:35 +02:00
Hugo Daniel
353d6fbc5f
Import variants/index from spree_backend to ofn and convert to Haml
2019-07-24 16:57:11 +02:00
Hugo Daniel
0a88738faa
Replace old ruby syntax with new
2019-07-24 14:37:00 +02:00
Hugo Daniel
4d6af57f79
De-deface product_properties/index
2019-07-24 13:17:45 +02:00
Hugo Daniel
110fd3ecdf
Convert erb to haml
2019-07-24 13:12:58 +02:00
Hugo Daniel
1cb065f829
Import product_properties/index.html.erb from spree_backend to ofn
2019-07-24 13:09:04 +02:00
Hugo Daniel
1cfa499b0e
De-deface _product_propery_fields
2019-07-24 13:01:50 +02:00
Hugo Daniel
3fc0d4a666
Convert _product_properties_fields from ERB to Haml
2019-07-24 12:40:24 +02:00
Hugo Daniel
de6c96d138
Import product_properties/_product_properties_fields.html.erb from Spree to OFN
2019-07-24 12:38:29 +02:00
luisramos0
ffb8edef0b
Fix rubocop css issues
2019-07-23 22:37:10 +01:00
luisramos0
7a8b5e89be
Add specs to cover the most important new fields in api/admin/variant_serializer
2019-07-23 22:11:00 +01:00
luisramos0
90690cd238
Move api/admin/variant_serializer_spec to the correct folder under /spec
2019-07-23 22:03:40 +01:00
luisramos0
90c621ac07
Improve translations, css and add button aligment in subscriptions_line_items variant autocomplete
2019-07-23 21:38:29 +01:00
luisramos0
2d5eccbf97
Add :in_stock, :stock_location_id, :stock_location_name to admin variant serializer, these are needed for the variant_autocomplete js code from spree
2019-07-23 21:38:29 +01:00
luisramos0
7e6259da31
Replace admin/variants/search rabl template with existing admin variant serializer with a few added attributes
...
This commit fixes a bug as the image of the variatn was not being rendered, we need to fetch the image of the product, not the image of the variant.
2019-07-23 21:37:45 +01:00
luisramos0
11974689ef
Remove dead code under views/spree/shared
2019-07-23 16:42:00 +01:00
Kristina Lim
e1fce8304d
Update weight calculator and add specs
2019-07-23 23:24:00 +08:00
Kristina Lim
0d6ba90ea1
Round off fee from Calculator::Weight to nearest cent
2019-07-24 00:42:42 +10:00
luisramos0
5739a82c19
Remove unused admin variants search rabl template
2019-07-23 12:30:00 +01:00
luisramos0
3d6fd10e59
Add warning about creation of orders when unpausing a subscription
2019-07-17 12:14:36 +01:00
luisramos0
81482683cf
Extract method in subs controller
2019-07-17 12:08:51 +01:00
luisramos0
57f1742f24
Save subscription form on subs unpause so that proxy orders and orders are synced
2019-07-17 12:08:48 +01:00
luisramos0
3b467dbae8
Adapt line_item_syncer to the case where item is not added to the completed order because of insufficient stock and the subscription quantity is updated for that item afterwards
2019-07-16 12:08:08 +01:00
luisramos0
306390440a
Revert "Swith line_item_syncer.create_new_items from deleting line item in the case of stock issue, to simply set the quantity to zero. This makes things easier later as the line item is already present if the user tries to change quantity of the subscription_line_item"
...
This reverts commit d153e58933 .
2019-07-16 11:00:21 +01:00
luisramos0
267131626e
Fix typo and add test case to cover out of stock case
2019-07-16 10:58:25 +01:00
luisramos0
02099ebdae
Remove details about stock in line_item_syncer so that we avoid confusing the user with stock numbers, this way the user will know what is the problem and can check stock levels and the order for more details
2019-07-14 21:40:57 +01:00
luisramos0
d153e58933
Swith line_item_syncer.create_new_items from deleting line item in the case of stock issue, to simply set the quantity to zero. This makes things easier later as the line item is already present if the user tries to change quantity of the subscription_line_item
2019-07-14 20:59:42 +01:00
luisramos0
c2a59a374c
Fix rubocop issues by simplifying method
2019-07-14 17:21:15 +01:00
luisramos0
2a1011921b
Reuse line_item_syncer.add_order_update_issue in line_item_syncer.update_item_quantities to add stock info to the update_quantity order issues
2019-07-14 16:43:46 +01:00
luisramos0
df27ee0d3e
Refactor line_item_syncer.add_order_update_issue out of line_item_syncer.create_new_items
2019-07-14 16:06:09 +01:00
luisramos0
c2851015ce
Fix deleting created item (destroy doesnt work before save) and add order_update_issue with message so that user can understand what happened
2019-07-14 15:58:00 +01:00
luisramos0
d0c246c345
Fix some rubocop issues
2019-07-14 12:28:32 +01:00
luisramos0
6aed9ba549
Make line_item_syncer delete new line items if stock is insufficient
2019-07-13 22:57:13 +01:00
luisramos0
4f2bc33ec3
Change line_item_syncer to verify stock if order is already complete, this will happen for orders in the current OC when a subscription is changed
2019-07-13 20:56:34 +01:00
luisramos0
0f3404ca27
Rename order_syncer.future_and_undated_orders to explicitly include completed orders from current OC: orders_in_order_cycles_not_closed
2019-07-12 22:20:09 +01:00
Jon Leighton
4398ea12b8
Convert several fields from string to text
...
See discussion here:
https://github.com/openfoodfoundation/openfoodnetwork/pull/3751#issuecomment-503416955
Fixes #3192 .
I have also done a pass over the schema to identify other fields which
would benefit from being a text rather than a string. However, I ignored
all `spree_*` tables because I didn’t want to mess up the ‘default’
Spree schema.
2019-07-09 13:11:30 +10:00
luisramos0
160b535e2f
Make weight calculator compute 0 for variants with unit different from weight
2019-06-18 15:21:13 +01:00
luisramos0
e8eeb3d5dc
Further improve weight calculator code
2019-06-18 13:28:16 +01:00
luisramos0
4551149532
Improve code of weight calculator
2019-05-31 19:55:39 +01:00
luisramos0
82955b9fe5
Make weight calculator use line_item.final_weight_volume rather than variant.weight for cases where the final weight is set manually in the BOM
2019-05-31 19:55:17 +01:00