raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-16 04:24:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,934 Commits 15 Branches 457 Tags
17eb8d5cd851663bf8ecb016f737a58fe103b283
Commit Graph

11504 Commits

Author SHA1 Message Date
Jean-Baptiste Bellet
74fd1814e4 Create a trixeditor controller and broadcast a change event on form 
Therefore, AngularJS can set form as dirty

+ add associated spec
 2023-06-09 08:03:17 +02:00
Maikel Linke
828b2f6f44 Replace too long list of arguments with keywords 
Rubocop was complaining about too many arguments. But
`ApplicationJob#perform` needs all arguments handled in one call. While
we could allow the `perform` method generally to have more arguments,
there could be other methods called `perform` which should still be
scrutinised. Instead, it seems acceptable to me to have more arguments
as long as they are clearly named as keyword arguments. Rails uses this
a lot to document all options including their default values, for
example in Active Storage. It's better then bundling several arguments
in an undocumented hash just to reduce the number of given arguments.

And once we upgraded to Ruby 3.1, we can clean the method calls up as
well. `call(user: user)` becomes `call(user:)` without repetition.
 2023-06-09 14:44:54 +10:00
Matt-Yorkley
7caf4b03d4 Improve flakyness on report specs 2023-06-09 14:44:53 +10:00
Matt-Yorkley
b230b37284 Update report email spec 2023-06-09 14:44:53 +10:00
Maikel Linke
6803e0a8f9 Fix error on summarising total_units 2023-06-09 09:55:33 +10:00
Maikel Linke
71e4d2c6ed Spec total_units report column 
Current reports don't deal with invalid legacy data.
 2023-06-09 09:55:33 +10:00
Maikel Linke
00e171a8f1 Reduce indentation in report spec 
Specs should also test from the outside instead of declaring modules and
test from within those modules.
 2023-06-09 09:55:33 +10:00
Filipe
ca03e1596b Merge pull request #10952 from Matt-Yorkley/full-name 
Improve nil-safety in variant naming methods
 2023-06-08 16:26:28 +01:00
Matt-Yorkley
f4261b85b8 Merge pull request #10940 from Matt-Yorkley/order-tidyup 
Order class tidyup
 2023-06-08 15:06:59 +01:00
Filipe
7974e1eaa6 Merge pull request #10936 from abdellani/fix-order-progressing-automatically-on-BOO 
fix Viewing an order in state "confirmation" changes the state to "complete"
 2023-06-08 14:50:04 +01:00
Jean-Baptiste Bellet
d1d050e6a4 Limit size to 20 char for the custom tab title 2023-06-08 11:27:07 +02:00
David Cook
e2ba18f828 Set sentence case tab names in Ruby instead of CSS 
I chose .capitalize instead of .humanize, because the latter has extra features which may not be desired.
 2023-06-08 11:24:44 +02:00
Neal Chambers
3432e30465 Fix Style/UnlessGuard 2023-06-08 15:20:04 +10:00
Neal Chambers
12aa4f9970 Fix Layout/IndentationStyle 2023-06-08 15:20:04 +10:00
Maikel Linke
4ecbbae55e Adapt large browser window as default 
We were really close to that anyway. It simplifies the code a bit.
 2023-06-08 13:51:29 +10:00
Maikel Linke
7cf68cd33b Ensure that specs restore default window size 2023-06-08 13:51:25 +10:00
Maikel Linke
241b307762 Fix typos 2023-06-08 11:34:05 +10:00
Matt-Yorkley
bed2fe69f6 Update regression tests 2023-06-07 16:39:37 +01:00
Matt-Yorkley
b58b555e38 Improve flaky spec 2023-06-07 13:01:37 +01:00
Matt-Yorkley
968bf882c4 Fix flaky spec 2023-06-07 13:01:37 +01:00
Matt-Yorkley
daf243996b Improve flaky spec 2023-06-07 13:01:37 +01:00
Matt-Yorkley
7a7ab17db4 Improve customer tests 2023-06-07 13:01:37 +01:00
Matt-Yorkley
6daf29400f Improve distribution and line items tests 2023-06-07 13:01:37 +01:00
Matt-Yorkley
bb73d70e57 Improve nil-safety in variant naming methods 2023-06-07 12:17:50 +01:00
Filipe
2d28a57c6f Merge pull request #10922 from jibees/10903-white-label-make-logo-url-link-more-tolerant-in-terms-of-format-and-add-example 
[White Label] Make logo url link more tolerant in terms of format
 2023-06-07 10:00:31 +01:00
Maikel Linke
1ebacf96ad Ignore accidental spaces around whitelabel URL 2023-06-07 13:12:06 +10:00
Matt-Yorkley
e88843c733 Ensure order number is generated nicely on new records 2023-06-07 00:58:43 +01:00
Matt-Yorkley
67c3e09dba Use RESTful routes for orders controller actions 2023-06-07 00:35:47 +01:00
Jean-Baptiste Bellet
7dc8c4b891 Hide OFN navigation also on small width screens 2023-06-06 14:55:41 +02:00
Jean-Baptiste Bellet
a8b85a65e9 Add context for visiting a path 2023-06-06 14:44:05 +02:00
Jean-Baptiste Bellet
5c3e07db52 Test that OFN navigation is on mobile views as well 2023-06-06 14:44:05 +02:00
Jean-Baptiste Bellet
daaeca88e8 Add some helpers to test mobile views 2023-06-06 12:00:16 +02:00
Mohamed ABDELLANI
77554e21fc move advance_to_payment on order's details page from edit to update 2023-06-06 10:23:01 +01:00
Matt-Yorkley
a62e51c0d0 Remove Order #refresh_shipment_rates method 2023-06-05 23:54:04 +01:00
Matt-Yorkley
3dd4e7ef03 Delegate order updater method 2023-06-05 23:54:04 +01:00
Matt-Yorkley
17b10d10c0 Make Order #deliver_order_confirmation_email method private 2023-06-05 21:30:43 +01:00
Jean-Baptiste Bellet
5938577bd1 Update custom_tab_spec.rb 2023-06-05 15:43:11 +02:00
Jean-Baptiste Bellet
1594d1c718 Validate custom tab title 2023-06-05 15:41:33 +02:00
Jean-Baptiste Bellet
abe63e5b04 Add context for visiting a path 2023-06-05 12:08:43 +02:00
Jean-Baptiste Bellet
40111910b6 Validates white_label_logo_link on enterprise model 2023-06-05 11:24:07 +02:00
Jean-Baptiste Bellet
4edb159ef8 Avoid flaky spec by matching the array 
Context: https://github.com/openfoodfoundation/openfoodnetwork/actions/runs/5081492387/jobs/9129944001?pr=10896
 2023-06-05 10:05:09 +02:00
Jean-Baptiste Bellet
ccb183d60b Sort by order_date desc for line_items in BOM 
+ update spec to have different order time
 2023-06-05 10:05:09 +02:00
Maikel Linke
38bd31d0e3 Style Layout/TrailingWhitespace 2023-06-05 10:42:21 +10:00
Jean-Baptiste Bellet
880ba85791 Add http to white label logo link if this do not start with http 2023-06-01 17:37:05 +02:00
Jean-Baptiste Bellet
ced8f8aa58 Use shared_examples as we will test many URLs later on 
"It's a Surprise Tool That Will Help Us Later"
 2023-06-01 17:37:05 +02:00
Filipe
12159edaca Merge pull request #10833 from Matt-Yorkley/order-angular 
Remove Angular from admin orders index page
 2023-06-01 13:57:39 +01:00
Matt-Yorkley
7f5d1be792 Guard against unsaved variant's product in OptionValueNamer for product import 2023-06-01 10:12:19 +01:00
Matt-Yorkley
a20277c3a7 Completely remove option_values and option_types from the codebase 2023-06-01 10:12:19 +01:00
Matt-Yorkley
3e5ecba738 Remove unhelpful Helper 2023-06-01 10:11:20 +01:00
Filipe
2d4d8e26f5 Merge pull request #10875 from jibees/10561-allow-user-to-create-custom-tab-in-shop-navigation 
[White Label] Allow user to create custom tab in shop navigation
 2023-06-01 07:21:25 +01:00