raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-07 03:01:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,334 Commits 18 Branches 455 Tags
add725b6c0be984cbbe991ff0faeb20e5d375d02
Commit Graph

14468 Commits

Author SHA1 Message Date
Filipe
5f429c77f8 Merge pull request #10791 from dacook/10630-new-brand-colours 
[admin_v3] New brand colours in admin interface
 2023-05-31 16:03:18 +01:00
David Cook
14345ef1fa Change warning orange to Mojo 
> That way we only have one orangy/red colour and we start simplifying things.
 2023-05-26 15:11:23 +10:00
David Cook
0df7c45a61 Change warning red to Mojo 
Some templates still had this colour hardcoded. They are using angular so I didn't spend time updating them.
 2023-05-26 15:11:23 +10:00
David Cook
dcf857cafb Move warning colour definition to CSS 
This also changes the orange to red, but that's part of the plan.
 2023-05-26 15:11:23 +10:00
David Cook
e674c53535 Change error red color to Mojo 
color-5 is used for error messages.
 2023-05-26 15:11:23 +10:00
David Cook
719a704985 Change blue colour as per design 
https://github.com/openfoodfoundation/openfoodnetwork/issues/10630#issue-1644928392
 2023-05-26 15:11:23 +10:00
David Cook
60ec24b92b Use variables for spree-blue 
Aka 'Havelock Blue', which is going to be changing.
 2023-05-26 15:11:23 +10:00
David Cook
e928e74ae6 Use different palette for admin styles v3 
Note that mail.css is still referring to the old palette.
 2023-05-26 15:10:49 +10:00
David Cook
31fa9c2c04 Add admin_style_v3 feature toggle 2023-05-26 15:10:27 +10:00
David Cook
01b3901b08 Add admin_style_v3 
Individual files may be copied in order to replace the old files.

NOTE: these may need manually re-syncing. If any of the copied files have changed on master in the meantime, we'll need to manaully review to consider bringing those changes to the new design.
 2023-05-26 15:10:27 +10:00
David Cook
9051318147 Move colour palette to new file 
This seemed like a good separation which will probably help with the upcoming changes.

Co-authored-by: jibees <jb.bellet@gmail.com>
 2023-05-26 15:09:59 +10:00
Jean-Baptiste Bellet
eea1db4c4a Hide OFN logo and use the customized logo if activated 2023-05-25 15:17:04 +02:00
Filipe
8b7ca292af Merge pull request #10884 from openfoodfoundation/10882-cookie-banner-is-displayed-on-every-page-even-after-accepting 
Do not show cookies banner once user accept it
 2023-05-25 10:36:27 +01:00
Maikel Linke
86c35fe2dc Remove dead reference to removed model 2023-05-25 16:13:33 +10:00
Filipe
6d032002f1 Merge pull request #10750 from jibees/10560-allow-hide-of-groups-tab-in-shop-navigation 
White Label: allow hide of groups tab in shop navigation
 2023-05-24 21:11:04 +01:00
Jean-Baptiste Bellet
3cd53cbd41 Adds some keys to this cached element, due to cookie banner 
Once the user accept the cookie, we should not show the cookie banner element. This is handled via `app/helpers/footer_links_helper.rb#cookies_policy_link` and boolean:

```
!Web::CookiesConsent.new(cookies, request.host).exists? && Spree::Config.cookies_consent_banner_toggle
```
 2023-05-24 10:45:06 +02:00
Maikel
8c11bf3033 Merge pull request #10839 from mkllnk/valid-email 
Validate user's email address
 2023-05-24 10:37:00 +10:00
Konrad
0854287b92 Merge pull request #10744 from jibees/10556-remove-ofn-header-banner-in-order-confirmation-emails 
White Label: remove OFN banner from order confirmation emails when `hide_ofn_navigation` is activated for the shop
 2023-05-24 01:14:16 +02:00
Maikel Linke
ef3422bf58 Update syntax and clarify use of outdated gem 2023-05-23 08:23:58 +02:00
Maikel Linke
90cbac7176 Validate email domains 
The gem checks the DNS system for a valid domain entry.
 2023-05-23 08:23:58 +02:00
Maikel Linke
ffc45f77cf Validate user email syntax on change 
We probably have invalid entries in the database and we don't want these
records to suddenly become invalid. People would not be able to log in.
 2023-05-23 08:23:58 +02:00
Jean-Baptiste Bellet
0bec7562a0 When hide_groups_tab is set to false, do not display group in shopfront 
Co-Authored-By: Maikel <maikel@email.org.au>
 2023-05-22 10:29:57 +02:00
Jean-Baptiste Bellet
0d98ec8f4c In admin, add form to set hide_groups_tab attribute 
+ add specs
 2023-05-22 10:29:56 +02:00
Konrad
fed7c3da51 Merge pull request #10761 from rioug/vouchers-any-amount 
[Vouchers] Flat rate of any amount
 2023-05-19 17:39:33 +02:00
Maikel
0d403f4087 Merge pull request #10814 from Matt-Yorkley/serializer-eager-loading 
Improve eager-loading on admin products page
 2023-05-19 14:31:25 +10:00
Maikel
f943b411c5 Merge pull request #10823 from abdellani/fix-file-name-used-as-parameter 
[Security] Validate product import file path
 2023-05-19 14:28:09 +10:00
Filipe
3d1b0816ed Merge pull request #10512 from abdellani/fix-tax-not-charged-when-tax-category-set-to-inherit-from-product 
Prevent saving the enterprise fee when a per order calculator is selected along with 'Inherit from product'
 2023-05-18 13:43:14 +01:00
Konrad
39bb1f6f41 Merge pull request #10832 from Matt-Yorkley/cloning 
Clone all ExchangeVariant objects in bulk
 2023-05-18 14:32:30 +02:00
David Cook
360a241402 Style fix 2023-05-18 10:07:52 +10:00
Filipe
0d23b63bbd Merge pull request #10779 from dacook/10634-remove-admin_style_v2 
10634 Remove admin_style_v2 feature
 2023-05-17 15:37:05 +01:00
David Cook
c0c123a92a Remove localized number logic from weight calculator 
Follow-on from a46eef291c
 2023-05-17 14:10:58 +02:00
saunmanoj888
aee7645e29 Fix searching issue with full name on bulk order management 2023-05-17 13:14:10 +02:00
Matt-Yorkley
e1b0a03819 Scope orders before bulk actions 2023-05-17 12:03:40 +02:00
Jean-Baptiste Bellet
2336981ca0 Do not display OFN banner on order confirmation email if white label 2023-05-17 11:35:18 +02:00
Jean-Baptiste Bellet
f7d06fe0e8 Do not display OFN banner on subscription confirmation email if white label 
+ add specs that test for the presence of the footer logo which is in the header (I know it's a bit contradictory)
 2023-05-17 11:34:35 +02:00
Mohamed ABDELLANI
fcb8550cb1 extract file path sanitizer to an independent class 2023-05-17 15:09:48 +10:00
Mohamed ABDELLANI
4d5ba6a7e6 add file path validation 2023-05-17 15:09:48 +10:00
Konrad
4a66b62fa7 Merge pull request #10825 from jibees/10824-remove-feature-toggle-on-white-label-feature 
Activate white label feature
 2023-05-16 13:50:58 +02:00
Gaetan Craig-Riou
abf2105df7 Admin::VoucherController check enterprise permission 2023-05-16 16:20:04 +10:00
Gaetan Craig-Riou
b585f77be4 Make enterprise mandatory for a voucher 
It should have already been the case...
 2023-05-16 16:20:04 +10:00
Gaetan Craig-Riou
b427e420ce Update admin pages to allow entering an amount 2023-05-16 16:20:04 +10:00
Gaetan Craig-Riou
15eee8175e Add amount to voucher 
Change value to amount to be more consistent
 2023-05-16 16:19:59 +10:00
Maikel
10c918be75 Merge pull request #10732 from mkllnk/report-email 
[Hidden] Notify about completed report with download link via email
 2023-05-16 10:25:23 +10:00
Maikel
a979f7c8df Merge pull request #10587 from rioug/10432-vouchers-bare-minimum-checkout 
10432 vouchers bare minimum checkout
 2023-05-16 09:19:06 +10:00
Maikel Linke
08aff56e20 Expire report files after 1 week, maximum for S3 
We didn't see this in tests which use disk storage. But AWS S3 has a
maximum of one week for URL expiry.
 2023-05-15 19:41:45 +02:00
Maikel Linke
299bc253a4 Expire report download links in a month, not 5mins 2023-05-15 19:41:45 +02:00
Maikel Linke
860fe85af9 Add report download link to email notification 
I added a system spec to verify that the download link can be generated
within the mailer in a background job. ActiveStorage is a bit particular
when it comes to genererating URLs and depending on the situation it may
generate a redirect URL, a proxy URL or link directly to the storage.
But we want a redirect URL here.
 2023-05-15 19:41:45 +02:00
Maikel Linke
cf5a8a26ce Notify only about slow reports 
It would be annoying to get an email for reports which display on the
screen immediately.
 2023-05-15 19:41:45 +02:00
Maikel Linke
1f4af7f990 Send (dummy) email when background report is done 
I'll fill it out in future commits.
 2023-05-15 19:41:45 +02:00
Jean-Baptiste Bellet
aaa9bac4dd Remove white_label feature toggle 
White label is now activated for everyone.

+ add mock for `spec/controllers/spree/orders_controller_spec.rb`
 2023-05-15 17:10:50 +02:00