Jean-Baptiste Bellet
2e0191e603
Improve UX: same as enterprise logo and promo image
2023-06-01 17:16:22 +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
1128fd9c02
Visual tweak to ship/capture buttons and success feedback
2023-06-01 12:13:12 +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
6b98e2b3cb
Merge pull request #10911 from jibees/10901-white-label-customized-logo-on-small-screens-doesnt-use-the-customized-url
...
[White Label] Small width screens : use the white label link if exists for logo in nav bar
2023-06-01 08:16:53 +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
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
Jean-Baptiste Bellet
ac30e8b9da
Use the white label link if exists, otherwise, use the main_app.root_path
2023-05-31 10:46:23 +02:00
Jean-Baptiste Bellet
6b29f7e3c5
Sanitize content with a new TrixScrubber
...
specifically made for trix editor with its allowed tags
2023-05-26 15:19:27 +02:00
Jean-Baptiste Bellet
f26ecdf4f9
Don't need to pass the order through the nested view
2023-05-26 15:19:27 +02: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
31fa9c2c04
Add admin_style_v3 feature toggle
2023-05-26 15:10:27 +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
Jean-Baptiste Bellet
e434eb17f0
Use full width since we use a WYSIWYG editor with toolbar
2023-05-25 09:19:51 +02:00
Jean-Baptiste Bellet
bb211bfc84
Allow HTML via trix editor for custom tab content
...
+ update spec as well
2023-05-25 09:19:51 +02:00
Jean-Baptiste Bellet
6e677f15ec
Can delete custom tab if uncheck the checkbox
2023-05-25 09:19:51 +02:00
Jean-Baptiste Bellet
f0665b0862
Add custom tab on shop
2023-05-25 09:19:51 +02:00
Jean-Baptiste Bellet
916b2313ab
Some links does not include _panel suffix. Add if needed.
...
Yep. Sounds like a hack.
+ Use the right URL anchor with `_panel` in href for each tab
+ update specs
2023-05-25 09:19:51 +02:00
Jean-Baptiste Bellet
fc21fdb485
Customize default tab: could be either shop or home
2023-05-25 09:19:51 +02:00
Jean-Baptiste Bellet
6b1d1ddbce
On order cycle change, go to shop panel
2023-05-25 09:19:51 +02:00
Jean-Baptiste Bellet
bb6b1e59f9
Use tabs_and_panels_controller.js instead of PageSelectionCtrl
...
Prefer StimulusJS over Angular
2023-05-25 09:19:51 +02:00
Jean-Baptiste Bellet
925b0e0308
Add a form in admin to create/update a custom tab for an enterprise
2023-05-25 09:19:51 +02: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
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
Jean-Baptiste Bellet
0d98ec8f4c
In admin, add form to set hide_groups_tab attribute
...
+ add specs
2023-05-22 10:29:56 +02:00
Matt-Yorkley
7c5067ff42
Update "special instructions" note tooltip and add missing test coverage
2023-05-21 14:06:14 +01:00
Matt-Yorkley
dcdcdb4fc0
Align filter buttons centrally
2023-05-21 00:15:32 +01:00
Matt-Yorkley
52450028a1
Fix checkbox alignment
2023-05-21 00:15:32 +01:00
Matt-Yorkley
d50ac4bf45
Reinstate dropdown-with-prepend
2023-05-21 00:15:32 +01:00
Matt-Yorkley
4ddde65a04
Reimplement saving and restoring submitted search filters between page loads
2023-05-21 00:15:32 +01:00
Matt-Yorkley
d64a9afece
Replace angular ofn-with-tip directive on capture/ship buttons
2023-05-21 00:15:32 +01:00
Matt-Yorkley
c3cf79f5ef
Delete angular ordersCtrl
2023-05-21 00:15:32 +01:00
Matt-Yorkley
95f1643cec
Combine related reflex actions
2023-05-21 00:15:32 +01:00
Matt-Yorkley
bee46720f4
Combine bulk action controllers and pass reflex as an argument
2023-05-21 00:15:32 +01:00
Matt-Yorkley
5930d0c1f5
Make bulk actions more generic
2023-05-21 00:15:32 +01:00
Matt-Yorkley
55d9deb5bd
Update order cancelling bulk action
2023-05-21 00:15:32 +01:00
Matt-Yorkley
134f1ab151
Replace angular bulkInvoiceCtrl
2023-05-21 00:15:32 +01:00
Matt-Yorkley
25aecfa5b9
Add reflex for shipping orders
2023-05-21 00:15:32 +01:00
Matt-Yorkley
e58a37f65b
Add reflex for capturing orders
2023-05-21 00:15:32 +01:00
Matt-Yorkley
73b41154cc
Update admin flashes
2023-05-21 00:15:32 +01:00
Matt-Yorkley
048df6230b
Remove angular from admin orders index page
2023-05-21 00:15:32 +01:00
Matt-Yorkley
5ad68f25e3
Handle old jquery_ujs buttons
2023-05-21 00:15:30 +01:00
Matt-Yorkley
48a8f57262
Prep admin JS
2023-05-20 19:47:41 +01:00
Matt-Yorkley
f181b35a90
Add minimal admin js setup
2023-05-20 19:47:41 +01:00
Matt-Yorkley
c4bc0a7bbd
Rename select-all-controller
2023-05-20 19:47:41 +01: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
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
