raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-30 21:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,629 Commits 18 Branches 452 Tags
a57504ba1fef7c828c5d286a5fb9797240ea297e
Commit Graph

12629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kristina Lim
34c34b94d1 Describe method countOnHandPlaceholder for VOs 2018-12-05 17:40:30 +08:00
Kristina Lim
cff4eb0005 Improve and simplify VO count on hand suggestions 
Set variant override count_on_hand in UI to variant count_on_hand value
if on_demand is changed and both specify limited stock.
 2018-12-05 17:40:30 +08:00
Kristina Lim
4f2d96d763 Use correct placeholders for VO count_on_hand 2018-12-05 17:40:29 +08:00
Kristina Lim
f5dc03e118 Style disabled text fields in admin pages 2018-12-05 17:40:29 +08:00
Kristina Lim
09b9f968b7 Make VO count on hand readonly unless limited stock 2018-12-05 17:40:29 +08:00
Kristina Lim
cc003c99d5 Ensure in UI compatible VO count and on demand 2018-12-05 17:40:28 +08:00
Kristina Lim
a32bb0445f Change translation for variant override use_producer_settings 2018-12-05 17:40:28 +08:00
Kristina Lim
7ae555cd9c Translate variant override on_demand yes and no 2018-12-05 17:40:27 +08:00
Kristina Lim
4b3198a2b4 Allow reset of "on demand" for variant overrides 
Change the UI control for "on demand" in the Inventory page from a
checkbox to a SELECT field with three options: nil, true, and false.

This resolves the following issues:
* There is no way to tell between nil and false - both are represented
by an unticked checkbox.
* There is no way to go back to nil.
 2018-12-05 17:40:24 +08: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
haseleyi
94d12217de Fix untranslated buttons at image step of registration modal 2018-12-04 21:30:42 -08: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
haseleyi
e863c3dec8 Fix broken link in register call partial 2018-12-04 10:23:46 -08: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)
v1.23.1 		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
luisramos0
258287b88d Add tests to cover CheckoutController#update with shipping_method_id 2018-11-30 17:04:46 +00:00
luisramos0
e23c4dda68 Add order_shipping_method specs to cover select_shipping_method 2018-11-30 12:58:27 +00:00
luisramos0
7a8c65b3ea In the checkout controller update process, grab shipping_method_id from form data and inject it in the order when the order workflow gets to delivery (which is when the order gets shipments created) 2018-11-30 10:46:31 +00:00
luisramos0
c032401eb0 Refactor checkout controller update method 2018-11-30 10:45:42 +00:00
Hugo Daniel
24dab58de7 Lazy load translations and add keys 2018-11-30 10:49:36 +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
Hugo Daniel
aa948552e1 Import payment_methods edit view and apply overrides 2018-11-29 14:58:14 +01:00
Hugo Daniel
34bc79c7f6 Import payment_methods form partial and apply overrides 2018-11-29 14:58:06 +01:00