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
22,538 Commits 18 Branches 452 Tags
70634dc0c19acb9ddd77cf1e82c8396b83eb08cd
Commit Graph

1033 Commits

Author SHA1 Message Date
Luis Azcuaga
e8fd89a6d2 Run rubocop over existing todo 2021-10-25 21:28:28 -05:00
jibees
2e846ce1e0 Merge pull request #8347 from achauve/8227-fix-opening-product-description-links-in-new-tabs 
Fix: product edition doesn't break description links
 2021-10-22 09:13:02 +02:00
Adrien Chauve
1a185ade03 Add links to external site in product view test 2021-10-18 11:29:33 +02:00
Jean-Baptiste Bellet
ae45a2dd9d Move registration_spec as system spec 2021-10-15 14:40:00 +02:00
Filipe
8aa7ef2e39 Merge pull request #8336 from jibees/8335-fix-flaky-embedded_shopfronts_spec 
Move embedded_shopfronts_spec as system spec
 2021-10-12 14:32:08 +01:00
Jean-Baptiste Bellet
059163c49d Move embedded_shopfronts_spec as system spec 2021-10-12 14:28:54 +02:00
Jean-Baptiste Bellet
d53ae3370d Move orders_spec.rb as system spec 2021-10-12 14:27:38 +02:00
Maikel
ccc73eb829 Merge pull request #8316 from jibees/5937-resolve-flaky-spec-on-shopping_spec 
resolve flaky spec on shopping spec
 2021-10-12 14:27:37 +11:00
Matt-Yorkley
3fe237b25d Merge pull request #8319 from filipefurtad0/account_folder_into_system_spec 
Updates and moves consumer/account folder into system
 2021-10-12 02:33:36 +02:00
Maikel
dcc8dc7ead Merge pull request #8318 from filipefurtad0/fix_flaky_checkout_auth_spec 
Fix flaky checkout auth spec
 2021-10-11 17:18:03 +11:00
filipefurtad0
75f773fafc Updates/moves consumer/account/settings_spec into system 2021-10-08 14:36:54 +01:00
filipefurtad0
acc0cc08c3 Updates/moves consumer/account/payments_spec into system 2021-10-08 14:31:03 +01:00
filipefurtad0
97a79a77e1 Updates/moves consumer/account/cards_spec into system 2021-10-08 14:29:41 +01:00
filipefurtad0
0d87aea9f5 Updates and moves checkout_auth_spec into system 2021-10-08 14:05:38 +01:00
filipefurtad0
8f777b4d38 Updates authentication_spec.rb into system spec 2021-10-08 10:26:14 +01:00
Jean-Baptiste Bellet
3d87485cd3 Move shopping_spec.rb as a system spec 
- Move the file to `spec/system/`
 - Replace `require 'spec_helper'` by `require 'system_helper'`
 - replace `feature` with `describe`
 2021-10-08 11:06:54 +02:00
Andy Brett
e4be521632 Merge pull request #8203 from YasuhiroYoshida/adjust-visibility-of-enterprises-on-hub 
Change visibilities of hubs on group page
 2021-10-07 08:00:37 -07:00
filipefurtad0
6025d43f0d Updates checkout_spec into system 2021-10-06 13:34:59 +11:00
filipefurtad0
6f694e2cab Standardise spec block naming 
The `feature` and `scenario` names are aliases only available in feature
specs and not needed. It's confusing to have different names and we can
easily move feature specs to system specs when using standard names.
 2021-09-28 08:24:05 +10:00
Maikel
a3c31f7d86 Revert "Kill stripe connect" 2021-09-20 08:39:34 +10:00
Yasuhiro Yoshida
8090945c34 Change visibilities of hubs on group page 
Issue:
https://github.com/openfoodfoundation/openfoodnetwork/issues/5106

Hubs on group page for consumers are displayed unconditionally.
But they should only appear under the following conditions: Visible.

In addition, those that are active should only be filled with red color
when they have open order cycles.

This commit apply these rules and changes the visibility of each hub on
"Our Hubs" tab of group page for consumers accordingly.
 2021-09-17 17:12:08 +03:00
Matt-Yorkley
0c879dc4c9 Fix order_path issue in cart page 
The order_path route wasn't being inferred correctly from this Spree controller, causing errors to be thrown in the cart page if the number of editable orders was precisely one:

ActionView::Template::Error: undefined method `order_path'
 2021-09-15 10:54:59 +01:00
Luis Ramos
f90e34bb47 Adapt specs to use stripe_sca_payment_method factory and delete stripe_connect_payment_method 2021-09-10 14:43:34 +05:30
Jean-Baptiste Bellet
1b7c36664e Add missing i18n key for Devise 
and update tests as well:
 - from feature to system
 - Add the reset password scenario
 - Add some errors scenario to the reset password scenario: token expired, token invalid, and not the same password
 2021-09-01 17:16:29 +02:00
Matt-Yorkley
2595cb85f7 Merge pull request #8001 from Matt-Yorkley/terms-and-conditionals 
Fix platform terms of service checkbox
 2021-08-05 14:17:48 +02:00
Matt-Yorkley
b7a75188d8 Simplify checkbox selectors used in checkout specs 2021-07-30 17:29:21 +01:00
Matt-Yorkley
bd041a2e09 Use puma in the test suite and remove server errors hack 2021-07-28 12:43:05 +01:00
Andy Brett
ac0c1f3c70 Merge pull request #7823 from apricot12/Migrate_Kaminari_to_Pagy_for_pagination 
Migrate kaminari to pagy for pagination
 2021-07-14 10:11:11 -07:00
Andy Brett
a58e0fe217 Merge pull request #7926 from luisramos0/rubocop_fix 
Update Rubocop todo files
 2021-07-14 10:05:54 -07:00
Matt-Yorkley
447165f8a1 Update #expect calls to count products correctly 2021-07-14 13:19:02 +01:00
Nihal Mohammed
1ac2e1a8a6 Try reverting shopping_spec 2021-07-14 13:19:02 +01:00
Nihal Mohammed
2acc339341 Update shoppign spec 2021-07-14 13:19:02 +01:00
Nihal Mohammed
894a11c9c1 Update shopping spec to fix CI error 2021-07-14 13:18:01 +01:00
Luis Ramos
1fb162bb4c Result of running rubocop -a, safe auto correct 2021-07-13 23:06:56 +01:00
Jean-Baptiste Bellet
1a8a12fb0c Filter language to not display the current lang in the dropdown 
No need to set a lang that is actually already set
 2021-07-08 09:15:09 +02:00
Jean-Baptiste Bellet
aa982fe8df Create a new method to change the lang of the app 
- The old method (link to `?locale=#{l.to_s}`) was not functional for path that already has query params in current path (such as `/user/spree_user/password/edit?reset_password_token=`) ;
 - This seems that the best way to handle this, is to create a new route, new method that effectively set the lang (not the locale actually...) and then redirect_back (ie. using the HTTP_REFERER, with a fallback to `/`)

s
 2021-07-06 10:09:37 +02:00
Pau Pérez Fabregat
db993652c4 Merge branch 'master' into payment-states 2021-06-18 12:20:26 +02:00
Luis Ramos
e52937c113 Use rubocop auto correct to add frozen string literal to all files 
This is an unsafe auto corection, we will need to trust our build here
 2021-06-17 23:07:26 +01:00
Andy Brett
2699e17b63 update specs to create payment in requires_authorization state 2021-06-17 14:23:59 -07:00
Luis Ramos
23627c5453 Run rubocop -a (safe corrections) removing all exceptions so all possible fixes are applied 
9290 issues fixed
 2021-06-17 22:19:26 +01:00
Pau Pérez Fabregat
a8efbffca6 Merge pull request #7429 from Matt-Yorkley/adjustments-taxrate 
[Adjustments] TaxRate changes
 2021-06-17 11:51:01 +02:00
Matt-Yorkley
690cbe3ad3 Merge pull request #7468 from mkllnk/6328-tos-tracking 
6328 tos tracking
 2021-06-10 19:48:13 +02:00
Maikel
6caae9e886 Merge pull request #7694 from coopdevs/split-confirm-order-job 
Split ConfirmOrderJob to avoid blocking DJ worker
 2021-06-09 14:11:10 +10:00
Maikel Linke
af314cbbdf Allow fast checkout without re-accepting old terms 
We did that for the shop's terms already and now do it for the platform
terms as well.
 2021-06-09 14:06:54 +10:00
Maikel Linke
23999c96bf Unify all links to platform Terms of service 
DRY code and have more consistency. We always use "Terms of service" now
and not "Terms of Service" or "Terms and conditions". The latter is used
for the shop's terms, not the platform terms.
 2021-06-09 14:06:54 +10:00
Jean-Baptiste Bellet
e3f56556cf Remove feature toggle around unit_price and enable it 2021-06-07 20:53:45 +02:00
Matt-Yorkley
19f32b7825 Update checkout tax display test setup 2021-06-06 20:16:03 +01:00
Matt-Yorkley
efcf71fd2b Use OrderContents in cart spec test setups 2021-06-04 17:26:49 +01:00
Andy Brett
b3e08b47b9 set Stripe api key directly instead of using allow 2021-06-01 22:33:12 +01:00
Pau Perez
74a8b3038a Split ConfirmOrderJob to avoid blocking a worker 
This unties this two email notifications so that they are picked up by
a DJ worker independently. This should avoid the blocking the worker experiences (remember we
still have a single one in all instances) when waiting between the two
deliveries. See the flamegraph:
https://app.datadoghq.com/apm/traces?end=1622015605459&paused=true&query=env%3Aproduction%20service%3Adelayed_job%20operation_name%3Adelayed_job%20resource_name%3AConfirmOrderJob%20%40duration%3A%3E%3D5s&start=1622009898303&streamTraces=true&trace=AQAAAXmngbg_woqc_QAAAABBWG1uZ2IwVkFBRHVDbWJkN25QTUVuY28&traceID=2916038355421570548&spanID=2005781139590273685.

Overall, both operations may take longer but other jobs can be processed
in between. Also, if any of the two fails, the other won't be affected.
 2021-06-01 11:43:00 +02:00