luisramos0
cdee7c0422
Merge branch 'master' into 2-0-stable-dec-10th
2018-12-10 16:41:29 +00:00
Luis Ramos
1bc51dea40
Merge pull request #3195 from mkllnk/2938-fix-create-order
...
[Spree Upgrade] 2938 Fix Create Order in Admin - missing translation
2018-12-10 13:20:02 +00:00
Pau Pérez Fabregat
b8a61257da
Merge pull request #3188 from luisramos0/2-0-ctrl-specs
...
[Spree Upgrade] Fix line_item_controller spec by adpating to new spree 2 factories
2018-12-10 12:31:26 +01:00
Maikel Linke
cac4fa4816
Use I18n.t instead of Spree's JS t function
2018-12-07 23:38:05 +11:00
Maikel
046ba14da4
Merge pull request #3191 from openfoodfoundation/dependabot/bundler/knapsack-1.17.1
...
Bump knapsack from 1.16.0 to 1.17.1
2018-12-07 15:18:25 +11:00
dependabot[bot]
6ae2df7b92
Bump knapsack from 1.16.0 to 1.17.1
...
Bumps [knapsack](https://github.com/ArturT/knapsack ) from 1.16.0 to 1.17.1.
- [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.16.0...v1.17.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-12-06 19:16:09 +00:00
Maikel
da6dc20fcf
Merge pull request #3165 from coopdevs/fix-send-confirmation-instructions-specs
...
[Spree Upgrade] Fix send confirmation instructions specs
2018-12-06 16:24:40 +11:00
Maikel
883e9bbdd8
Merge pull request #3166 from luisramos0/2-0-orders-tab-without-shipments
...
[Spree Upgrade] Remove shipments option from orders tab (gone in spree 2)
2018-12-06 15:39:14 +11:00
Maikel
1b94b10bb0
Merge pull request #3171 from luisramos0/2-0-var-over-hide
...
[Spree Upgrade] Remove hide class from the hide button in the inventory list
2018-12-06 15:21:34 +11:00
Maikel
3a3c9f3847
Merge pull request #3177 from coopdevs/dont-clean-db-twice-in-feature-specs
...
Do not clean DB twice on feature specs
2018-12-06 12:36:34 +11:00
luisramos0
7df869bd35
Fix line_item_controller spec by adpating to new spree 2 factories
2018-12-05 22:22:15 +00:00
Pau Pérez Fabregat
1052d98255
Merge pull request #3175 from haseleyi/patch-1
...
Fix link to Mac setup guide in Getting Started
2018-12-05 12:52:08 +01:00
luisramos0
460e010408
Removed shipments from orders tab. This option is removed in spree 2
2018-12-05 11:38:16 +00:00
Pau Pérez Fabregat
72a4b4f8e2
Merge pull request #3158 from luisramos0/2-0-vos-scoping
...
[Spree Upgrade] Scopes variants on order completion and on changes to completed orders
2018-12-05 12:12:49 +01:00
Pau Perez
6af8544c52
Restore perform_deliveries value in tests
2018-12-05 10:20:13 +01:00
Pau Perez
25eb297215
Perform delivery when checking deliveries in specs
2018-12-05 10:05:39 +01:00
Pau Perez
064d9cf183
Do not hide flaky tests under endless retries
...
If it fails, needs fixing, not hiding the problem and making the test
suite longer.
2018-12-05 10:05:39 +01:00
Pau Perez
5845f80af0
Remove commented out code
...
Because git keeps it for you.
2018-12-05 10:05:39 +01:00
Pau Perez
6594529cda
Fix manager invitation controller spec
2018-12-05 10:05:39 +01:00
Pau Perez
25567d6bd6
Do not clean DB twice on feature specs
...
It turns out that we were executing `DatabaseCleaner.clean` on two
`after(:each)` blocks. One for all specs and another one for `js: true`
specs. As a result feature specs were hitting both which slows them down
considerably.
On my machine this changes consistently saves 2sec on
`spec/features/consumer/shops_spec.rb` but chances are it has an
accumulative effect when run on the whole test suite.
2018-12-05 09:58:14 +01:00
Pau Pérez Fabregat
3b56212290
Merge pull request #3151 from coopdevs/remove-frontoffice-enterprises-n+1
...
Remove frontoffice enterprises n+1
2018-12-05 08:12:19 +01:00
Pau Pérez Fabregat
e5a267f4c2
Merge pull request #2735 from luisramos0/cookies_colors
...
Moved definition of colors in the cookies modal and banner colors to common darkswarm/base/colors
2018-12-05 08:06:58 +01:00
Isaac Haseley
76e5d281bf
Fix link for Mac setup guide
2018-12-04 20:37:23 -08:00
Maikel
609a4fde4d
Merge pull request #3173 from openfoodfoundation/transifex
...
Transifex
2018-12-05 11:55:29 +11:00
Maikel
a2c8bea147
Merge pull request #3147 from luisramos0/2-0-vos
...
[Spree Upgrade] Adapt variant overrides to spree 2
2018-12-05 10:50:20 +11:00
Transifex-Openfoodnetwork
18a5f53330
Updating translations for config/locales/fr.yml
2018-12-05 09:17:00 +11:00
Pau Pérez Fabregat
24415226bf
Merge pull request #3168 from luisramos0/google-maps-comment-specs
...
Temporarily xit 2 broken specs (shops and producers search by url)
2018-12-04 19:13:40 +01:00
Transifex-Openfoodnetwork
9bedc69df8
Updating translations for config/locales/en_GB.yml
2018-12-05 04:52:44 +11:00
luisramos0
02d0b7e88c
Improve comment on VariantStock#move
2018-12-04 15:25:38 +00:00
Pau Pérez Fabregat
30e7d32cea
Merge pull request #3157 from coopdevs/fix-producer-mailer-specs
...
[Spree Upgrade] Specify :mailer type in specs
2018-12-04 15:21:17 +01:00
luisramos0
7dc208fb8c
Temporarily move 2 broken specs to pending (shops and producers search by url) due to google maps api changes
2018-12-04 13:20:20 +00:00
luisramos0
7f7e7ea65e
Remove hide class from the hide button in the inventory list
...
The hide button should not be hidden. The hide css class was no active in v1 but it is in v2, so we need to remove it
2018-12-04 10:55:55 +00:00
Maikel Linke
66585e93a8
Update all locales with the latest Transifex translations
2018-12-04 14:48:03 +11:00
Maikel
60c8147391
Merge pull request #3164 from luisramos0/2-0-stable-dec-3rd
...
[Spree Upgrade] Merging master into 2-0-stable (first run in Dec2018)
2018-12-04 13:38:02 +11:00
Maikel
214235d8dd
Merge pull request #3152 from coopdevs/fix-product-spec
...
[Spree Upgrade] Fix product spec
2018-12-04 12:07:33 +11:00
luisramos0
3776b891ce
Merge branch 'master' into 2-0-stable-dec-3rd
2018-12-03 15:30:16 +00:00
Pau Perez
46bf4c9eea
Specify :mailer type in specs
...
According to RSpec docs we need to specify type: :mailer for mails to
work. Check it out:
https://relishapp.com/rspec/rspec-rails/v/3-8/docs/mailer-specs .
This fixes all specs in producer_mailer_spec.rb.
2018-12-03 15:41:58 +01:00
Maikel
f859b7d3de
Merge pull request #3153 from coopdevs/fix-missing-translations-in-password-edit
...
[Spree Upgrade] Add missing translations causing a test failure
2018-11-30 15:48:42 +11:00
luisramos0
d962358f15
Fix rubocop and transpec models/variant_override and its spec
2018-11-30 00:43:55 +00:00
luisramos0
0577011f5b
Refactor variant override model and its spec: simplify move_stock and remove unused methods
2018-11-30 00:22:04 +00:00
luisramos0
782530d93b
Scope variants in shipment manifest as they are fetched from DB
2018-11-29 20:43:15 +00:00
luisramos0
a18d289292
Scope variants on line_item before save hook update_inventory
2018-11-29 20:43:10 +00:00
luisramos0
6156aca467
Delegate stock_location.move to variant, and override it in the variant overrides scope
2018-11-29 19:32:52 +00:00
luisramos0
1c5d94472f
Make colors.css relative reference to branding.css an absolute reference so that colors can be imported in engines
2018-11-29 18:39:58 +00:00
Pau Pérez Fabregat
08297863be
Merge pull request #3047 from mllocs/feature/expand-all-steps-in-checkout-page
...
Expand all steps in the checkout page by default
2018-11-29 16:28:42 +01:00
Pau Pérez Fabregat
9f17acd63c
Merge pull request #3136 from kevinchristianson/dashboard-translation
...
Add missing translation for 'Has Shopfront' in single-enterprise dashboard
2018-11-29 16:27:05 +01:00
luisramos0
93e1310deb
Fixed bug in cookies css, import colors, not branding
2018-11-29 11:47:51 +00:00
luisramos0
cdc5899791
Moved cookies policy modal and cookies banner colors to darkswarm/base/colors.scss
2018-11-29 11:47:51 +00:00
Luis Ramos
2284bfb604
Merge pull request #3150 from luisramos0/new-knapsack-report
...
[Spree Upgrade] New up to date knapsack report for 2-0-stable branch
2018-11-29 11:13:51 +00:00
Pau Pérez Fabregat
949efd88ce
Merge pull request #3154 from mkllnk/update-db-schema
...
Update schema for latest migration
2018-11-29 11:34:43 +01:00
