raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-04 22:16:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 18 Branches 452 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

12632 Commits

Author SHA1 Message Date
Jean-Baptiste Bellet
f42f513f8c Display white_label_logo image when hide_ofn_navigation is set to true 
for both desktop and mobile view
 2023-04-20 08:45:03 +02:00
Jean-Baptiste Bellet
54342254b6 Do not show white label logo is hide_ofn_navigation is not checked 
They are both strongly linked
 2023-04-20 08:45:03 +02:00
Jean-Baptiste Bellet
470761da86 Add a simple CheckboxDisplay controller that show/hide content 
depending on the checkbox state (checked or not)
 2023-04-20 08:45:03 +02:00
Jean-Baptiste Bellet
6fdf9fa038 Add/Remove white label logo in enterprise preferences panel 2023-04-20 08:45:03 +02:00
Jean-Baptiste Bellet
e3001cc8c4 Add white_label_logo to enterprise model as attachment 
Co-Authored-By: Maikel <maikel@email.org.au>
 2023-04-20 08:45:03 +02:00
Maikel Linke
9b3cfe80ff Remove useless clearing of test emails 
They are cleared by the test environment anyway.
 2023-04-20 13:35:40 +10:00
Maikel Linke
04d33adaf2 Remove duplicate declaration of test mail delivery 
Our test environment sets the mail delivery method already. We don't
have to do it in individual spec files.
 2023-04-20 13:28:59 +10:00
Maikel Linke
915bd19d7b Remove useless email test setup 
We always deliver emails these days.
 2023-04-20 12:18:04 +10:00
Maikel Linke
9998025687 Remove useless test header setup for emails 
Once upon a time we needed a helper to set the `from` header of emails.
This is now set in the ApplicationMailer and not necessary any more.
 2023-04-20 12:15:34 +10:00
Maikel
89cb3b7c14 Merge pull request #10707 from mkllnk/mailer-previews 
Fix ShipmentMailer preview autoload path
 2023-04-20 11:30:25 +10:00
Filipe
3e0b358370 Merge pull request #10461 from vviekk/9978 
Updating price, on_hand, on_demand validations for product import
 2023-04-19 16:09:49 +01:00
Filipe
f206b7ed9e Merge pull request #10661 from mkllnk/report-download 
[Hidden] Provide download link for reports generated in the background
 2023-04-19 11:53:14 +01:00
saunmanoj888
97f51d24b8 Validate image on creating product from products/new 2023-04-19 16:11:46 +10:00
saunmanoj888
c3d274c84f Fix corrupt and invalid image upload issue 2023-04-19 16:11:46 +10:00
Maikel
0b03152f3b Merge pull request #10697 from mkllnk/rubocop-config-update 
Update Rubocop config and replace deprecated TimeWithZone#to_s with argument
 2023-04-19 11:23:34 +10:00
Neal Chambers
4e32bfd70b Rename Inversable Method Names 2023-04-18 22:58:06 +09:00
Konrad
2fa86492d1 Merge pull request #10653 from openfoodfoundation/10645-pagination-in-bom-not-aggregating-results-when-clicking-a-productvariant 
BOM: When selecting a specific variant, trigger a new search that avoid pagination issues
 2023-04-18 14:49:14 +02:00
Jean-Baptiste Bellet
722c660697 Do not show any links to other steps when no distribution set 
distribution means tuple: distributor + order cycle
 2023-04-18 14:36:47 +02:00
Jean-Baptiste Bellet
ac666a6fce Validate presence of distributor and order_cycle in set_distribution step 2023-04-18 14:36:47 +02:00
David Cook
43e51cb592 Simplify login spec helpers, avoid long lines 
Follow on from 5c6d9a092e
 2023-04-18 10:01:23 +10:00
David Cook
6570891349 Fix linter issues 
Although I don't think the size was an issue here, small hashes can easily fit on one line.
 2023-04-18 09:50:08 +10:00
David Cook
0f3e2ae572 Use browser validation for calculator values 
They're all numbers, so we can reliably validate in the browser, removing the need for additional validation logic.
They will still be validated server-side, and in the unlikely even that there is an error, the generic 'Calculator is invalid' message will appear, with the relevant fields highlighted red. I think that's fine.
 2023-04-18 09:50:08 +10:00
David Cook
f0110d20a2 Move config to base helper 
This config is relevant for all specs, including system specs.
 2023-04-18 09:50:08 +10:00
David Cook
353acfd6ae Validate associated calculator with built in error handling 
Except that pesky generic message was appearing. I still don't know how to control that so just deleted it.
 2023-04-18 09:39:39 +10:00
David Cook
e43a018dc7 [wip] Copy each calculator error 
But we still have the duplicate problem.
Wait a minute, it copies them in the same format that I am copying them. So.. I don't need to copy them at all!

Now I see that we just needed the right format in the translation file.
 2023-04-18 09:39:39 +10:00
David Cook
f6fac018ea [wip] Use a custom message format for associated errors 
This is much simpler. Multiple messages get combined onto one line though, which is not perfect.

And.. it still seems to duplicate the errors. Weird, it's fine on my frontend though.
 2023-04-18 09:39:39 +10:00
David Cook
ce1bd12760 Consolidate specs 
It takes time to set up this test case. Given that there's no interactions in the expectations, we should save time to generate it only once.
 2023-04-18 09:39:39 +10:00
James Wu
2a7cb50fa9 Keep and display submitted data on new payment method page 2023-04-18 09:39:39 +10:00
James Wu
29ddc68d20 Fix duplicate validation error message 2023-04-18 09:39:39 +10:00
James Wu
f5e2edb028 fixup! Modify Calculator validation error messages [wip] 
DC: the error message has now become "Amount Invalid input".
 2023-04-18 09:39:39 +10:00
James Wu
7af26e6579 Add errors for invalid input with number localization enabled 2023-04-18 09:39:39 +10:00
James Wu
824d4adf21 Rename spec file 2023-04-18 09:39:39 +10:00
James Wu
ae5f2cc19d Fix error saving data on new Calculator 2023-04-18 09:39:39 +10:00
James Wu
41ce4fbc16 Fix cache issue with invalid form data 2023-04-18 09:39:39 +10:00
James Wu
48753df5f0 Improve input validation and error notification 2023-04-18 09:39:39 +10:00
James Wu
1f3e66316b Modify Calculator validation error messages 2023-04-18 09:39:39 +10:00
James Wu
6b1426d0c6 Add numericality validation for PriceSack 2023-04-18 09:39:39 +10:00
James Wu
c68987c0f2 Add numericality validation for PerItem 2023-04-18 09:39:39 +10:00
James Wu
2cb25e6366 Add numericality validation for FlexiRate 2023-04-18 09:39:39 +10:00
James Wu
073f46e590 Add numericality validation for FlatRate 2023-04-18 09:39:39 +10:00
James Wu
23beea8a13 Add numericality validation for FlatPercentPerItem 2023-04-18 09:39:39 +10:00
James Wu
096e388fdf Add numericality validation for FlatPercentItemTotal 2023-04-18 09:39:39 +10:00
James Wu
7b51f45b4d Fix spelling in test description 2023-04-18 09:39:39 +10:00
James Wu
b9b2fa7c94 Fix error converting String to BigDecimal 2023-04-18 09:39:39 +10:00
Filipe
871b2f8816 Merge pull request #10696 from mkllnk/login-as-admin 
Simplify login test helpers
 2023-04-17 12:14:06 +01:00
Jean-Baptiste Bellet
11a7aa9f96 When clicking on "Clear Filters" button, to not reset variant selection 
+ add some specs to cover that particular case
 2023-04-17 11:08:17 +02:00
Jean-Baptiste Bellet
c0203e7091 Refactor by putting two specs into a shared_example 
"It's a Surprise Tool That Will Help Us Later"
 2023-04-17 11:06:23 +02:00
Maikel
44cc5cc665 Merge pull request #10677 from mkllnk/spec-helpers 
Simplify spec helpers
 2023-04-17 16:16:29 +10:00
Maikel Linke
6c8e383ab8 Fix ShipmentMailer preview autoload path 
The Zeitwerk autoloader requires class names and file names to match. In
this case, the class had a Spree namespace without being in a spree
folder. The preview couldn't be displayed. Now it can be displayed.
 2023-04-17 15:18:22 +10:00
Maikel Linke
5c6d9a092e Simplify login spec helpers, avoid long lines 
The `login_as_admin_and_visit` helper was used a lot but isn't really
shorter than:

    login_as_admin
    visit path_visit

Calling those methods separately reduces line length. It also removes
the potential impression that it may be more efficient to use the
helper. Now we have less indirection if one of the calls fails and see
the failing spec line straight away.
 2023-04-17 11:08:32 +10:00