raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-27 06:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,919 Commits 15 Branches 460 Tags
f550d1e9f37a2bf398b3426d258bb03504fda2ce
Commit Graph

20919 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luis Ramos
2f93a06dd5 Run rubocop -a on files brought from spree_core 2020-09-01 09:46:41 +01:00
Luis Ramos
c151195e3a Merge decorator with original class and delete dead code 2020-09-01 09:46:41 +01:00
Luis Ramos
7ec00cf40a Bring base files from spree_core 2020-09-01 09:45:11 +01:00
Luis Ramos
bf81b5a305 Remove unnecessary setup code in spec, propagate_all_variants is always true in OFN 2020-09-01 09:42:24 +01:00
Luis Ramos
d87d5d3537 Fix stock_movement and stock_location specs brought from spree_core 
propagate_all_variants is always true in OFN
 2020-09-01 09:42:24 +01:00
Luis Ramos
e0ea25b7a3 track_inventory_levels is always true in OFN 2020-09-01 09:42:24 +01:00
Luis Ramos
8f19ad0646 Delete dead code 2020-09-01 09:42:24 +01:00
Luis Ramos
e89eb8f76c Fix simepl rubocop issues 2020-09-01 09:42:24 +01:00
Luis Ramos
0b053c18af Merge decoorator with original file from spree 2020-09-01 09:42:24 +01:00
Luis Ramos
d13bd86e4c Bring stocck movement and stock location from spree 2020-09-01 09:42:24 +01:00
Pau Pérez Fabregat
c56962b949 Merge pull request #5966 from openfoodfoundation/dependabot/bundler/bugsnag-6.17.0 
Bump bugsnag from 6.16.0 to 6.17.0
 2020-09-01 09:55:11 +02:00
Luis Ramos
208be3ede6 Fix rubocop issues 2020-08-31 20:00:08 +01:00
Luis Ramos
de061b4c54 Make it a keyword argument so it's easier to read 2020-08-31 18:47:24 +01:00
Luis Ramos
c7a5dd65cf Ensure all specs that change stripe_connect_enable set the value back to what it was before, which should be the default value false 
This will speed up specs as it ensures the stripe is always disabled and its JS script is not loaded
 2020-08-31 18:38:50 +01:00
Luis Ramos
d9a228e5ec Replace before and after hook with an around hook 2020-08-31 17:47:41 +01:00
Luis Ramos
8a75fe777c Refactor enterprises controller to reduce code duplication 2020-08-31 17:40:34 +01:00
Luis Ramos
66587ccc00 Allow user to remove terms and conditions file 2020-08-31 17:40:34 +01:00
Luis Ramos
24cdd0c467 Refactor enterprise controller to reduce code duplication 2020-08-31 17:40:34 +01:00
Luis Ramos
a3e9226878 Add option to remove existing terms and conditions file 2020-08-31 17:40:34 +01:00
Luis Ramos
0974c4b2ac Move enterprise images translations to the correct place using lazylookup on the server and to main js: namespace for js translations 2020-08-31 17:40:34 +01:00
Luis Ramos
5a10a2861e Reduce the size of the terms and conditions message on the checkout page 2020-08-31 17:40:34 +01:00
Luis Ramos
aedc12e0e3 Add top padding to terms file upload input in enterprises form 2020-08-31 17:40:34 +01:00
Luis Ramos
fc4cc65e07 Merge typography files in css admin 2020-08-31 17:40:34 +01:00
Luis Ramos
07cee32f04 Move enterprisse_console to pages/enterprise_form 2020-08-31 17:40:34 +01:00
Luis Ramos
42d5344179 Fix checkout spec by fixing wrong default value 2020-08-31 17:40:34 +01:00
Luis Ramos
12d18b2825 Add specs to checkout_spec to validate terms and conditions link 2020-08-31 17:40:34 +01:00
Luis Ramos
ad111e837e Add spec to test terms and conditions link on checkout page 2020-08-31 17:40:34 +01:00
Luis Ramos
746533d3f6 Improve spec titles 2020-08-31 17:40:34 +01:00
Luis Ramos
4ef4a58532 Merge two describe sections with same before method and call it what it is: guest checkout 2020-08-31 17:40:34 +01:00
Luis Ramos
685a5465f1 Simplify checkout stripe spec 2020-08-31 17:40:34 +01:00
Luis Ramos
70e9ef93bb Extract stripe spec from checkout spec so we can expand stripe tests in checkout 2020-08-31 17:40:34 +01:00
Luis Ramos
86ad31eb5c Reuse checkout form filling code from CheckoutHelper in checkout paypal spec 2020-08-31 17:40:34 +01:00
Luis Ramos
edfd0fd95c Move checkout helpers to checkout_helper 2020-08-31 17:40:34 +01:00
Luis Ramos
d1f5828d13 Rename checkout_workflow to checkout_helper 2020-08-31 17:40:34 +01:00
Luis Ramos
785f8ada4d Refactor checkout_spec by removing unnecessary initial describe section 2020-08-31 17:40:34 +01:00
Luis Ramos
b9511d4f07 Show terms and conditions on checkout if enterprise has an associated PDF file 2020-08-31 17:40:34 +01:00
Luis Ramos
16a475d8af Fix some rubocop issues 2020-08-31 17:40:34 +01:00
Luis Ramos
1a734aacf8 Allow user to upload terms and conditions PDF file to an enterprise 2020-08-31 17:40:34 +01:00
Luis Ramos
cfdfd82d9a Replace api controller test helpers with easier existing alternatives 2020-08-31 17:05:51 +01:00
Luis Ramos
b872bf49c5 Replace usage of helper method with a more simple approach 2020-08-31 16:56:48 +01:00
Luis Ramos
3df5a0644f Make sample data vegetarian 2020-08-31 10:57:07 +01:00
Pau Perez
6bb37a3942 Check taxon's attribute instead of object identity 
We don't care about the Ruby object instance but the actual DB record it
represents.
 2020-08-31 11:05:12 +02:00
Maikel
a029a86f0d Merge pull request #5893 from arku/chore/resend-button-removal 
Remove resend button on the orders edit page
 2020-08-31 11:18:05 +10:00
François Turbelin
d5800642e7 Map DFC SuppliedProduct with OFN Variant 2020-08-30 23:11:59 +02:00
Luis Ramos
c9758b8b0b Merge pull request #5957 from coopdevs/improve-stripe-connection-spec 
Improve StripeAccountsController#connect spec
 2020-08-30 22:02:22 +01:00
Arun Kumar Mohan
bf07da6267 Fix the order resend message translation 2020-08-29 20:47:28 -05:00
Arun Kumar Mohan
bb9ab57699 Remove resend button on the orders edit page 2020-08-29 20:47:28 -05:00
dependabot-preview[bot]
7e274868fa Bump bugsnag from 6.16.0 to 6.17.0 
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby) from 6.16.0 to 6.17.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.16.0...v6.17.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-08-28 15:16:12 +00:00
Pau Pérez Fabregat
7cb49ac9a8 Merge pull request #5866 from luisramos0/ctry_zone 
[Bye bye Spree] Bring models country, zone and zone_member from spree_core
 2020-08-28 13:23:59 +02:00
Cillian O'Ruanaidh
9efee1b0be In bulk coop report service spec just check array has the same elements but don't check the order. 
The #table_items methos seems to return line items in different order sometimes making this test a bit flaky. The test passed on Semaphore previously and is passing in development. I don't think the order matters so using :match_array instead of :eq.
 2020-08-28 12:20:47 +01:00