drummer83
2baf6c18b2
Add new partial for greeting, intro text and logo (if present) to use in ALL emails
...
Adjust maximum size of logo and improve responsive behaviour on small screens (display logo centered and above text)
2024-09-21 13:20:37 +02:00
drummer83
ac7090817c
Improve email footer of all emails
...
Use wrap style full width background like header
Move 'Powered by...' message to footer and rephrase to suit all recipients (not shoppers only)
Always show link to openfoodnetwork.org instead of email (if present) because email will be available via icon in the row below now
Add social media buttons of instance to email footer
Make footer text and icons dark gray (as instance name in email header)
2024-09-21 12:46:29 +02:00
drummer83
129ce66194
Header: Improve logo, resizing and styles
...
User the sites main logo instead of footer logo to allow for better contrast on gray background (dark text on gray instead of white text on gray)
Limit the max width and max height of the logo and resize the logo accordingly instead of forcing it to squeeze into a fixed size
Update specs
2024-09-21 12:46:29 +02:00
Gaetan Craig-Riou
67f037280a
Add comment in shop view file
...
It wasn't possible to directly reuse the shopfront views because they
are still using angular.
2024-09-11 14:50:37 +10:00
wandji20
867e17301f
Support passing oc confirmation params for oc list [OFN-12775]
2024-08-22 22:17:12 +01:00
Konrad
25b1620707
Merge pull request #12743 from wandji20/wb-OFN-12214
...
(Fix) chore(deps): bump wicked_pdf from 2.6.3 to 2.8.0 [OFN-12214]
2024-08-22 17:34:20 +02:00
Konrad
503148b13b
Merge pull request #12653 from wandji20/wb-OFN-11613
...
Add warning modal to order cycle with attached schedule general setting form [OFN-11613]
2024-08-14 18:14:33 +02:00
wandji20
7392079d4d
Move mail related styles to asset pipeline [OFN-12214]
2024-08-13 17:11:29 +01:00
wandji20
82b742608d
Remove jquery/js.tree plugin [OFN-11636]
2024-08-12 18:47:16 +01:00
wandji20
a85cfab506
Remove awesome nested set gem and dependencies [OFN-11636]
2024-08-12 18:47:16 +01:00
wandji20
ad3e772944
Refactor and update order cycle form controller [OFN-11613]
2024-08-12 09:05:48 +01:00
wandji20
6a438a07fe
Add stimulus controler to monitor order cycle status message data attribute change and trigger warning modal [OFN-11613]
2024-08-12 09:05:48 +01:00
wandji20
ea238829a8
Revert front end validation and implement backend validation for changes in datetime order cycle values [OFN-11613]
2024-08-12 09:05:48 +01:00
wandji20
0de8a90b14
Add warning modal to order cycle with attached schedule general setting form [OFN-11613]
2024-08-12 09:05:48 +01:00
Konrad
1a72b5b227
Merge pull request #12563 from abdulazizali77/bugfix/11326-incoming-exchange-per-item-calculator
...
Display only per_item fees for oc incoming exchange #11326
2024-08-02 03:11:27 +02:00
wandji20
2709479bf2
Require varian t category when creating new product variant [OFN-12666]
2024-07-30 12:07:50 +01:00
Abdul Aziz Ali
ac8caf7710
Revert to use .order_cycle_id #11326
2024-07-28 17:57:56 +08:00
Abdul Aziz Ali
8a1e61fd60
Fix incoming_controller_spec. Remove .order_cycle_id usage #11326
2024-07-27 17:54:39 +08:00
Abdul Aziz Ali
baf38b6b30
Only set per_item flag in order_cycle incoming controller #11326
2024-07-27 16:12:26 +08:00
Gaetan Craig-Riou
9632f42a40
Fix producer property filtering
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
3704b18952
Fix property filtering in shopping system spec
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
6538c7adca
Fix shopping system spec
2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
add6d15fc4
Fix bulk order management system spec
2024-07-03 11:16:53 +10:00
Gaetan Craig-Riou
b156f722f1
Fix variant override spec
2024-07-03 11:15:10 +10:00
Gaetan Craig-Riou
9f612270c7
Fix bulk update product page old style
...
and related product pages
2024-07-03 11:05:01 +10:00
David Cook
e516e7f335
Tweak checkbox dropdown styles
...
Use the new design for checkboxes and fix alignment.
Removes redesigned-input, which is a small regression on the old design, but I think it's acceptable bcause we're going to shut it down soon.
2024-06-12 14:58:09 +10:00
Abdul Aziz Ali
e537bda9b7
Display only per_item fees for oc incoming exchange #11326
...
Add per_item param to EnterpriseFee angular service and rails controller
2024-06-12 08:29:34 +08:00
David Cook
d34e7dbf9f
Specify accepted format on client side
...
I don't know why, but even though the client sends http accept header for json, rails is treating it as html. This was being overridden in the route, but I want to support multiple formats next. So, we explicitly choose the format by adding it to the request path.
2024-06-05 09:45:30 +10:00
Cillian O'Ruanaidh
826d9eb36d
Get registration location map working with OSM
2024-05-17 19:56:52 +01:00
Matt-Yorkley
fb09a7f1e6
Fix product filtering
2024-04-02 09:27:37 +11:00
Matt-Yorkley
65731f6c52
Update serializers and views for admin products index
2024-04-02 09:27:36 +11:00
David Cook
45b4e6c87c
Add comments
...
To save me or someone else having to figure it out again.
2024-03-27 14:33:32 +11:00
Maikel Linke
ba51641271
Symbolise hash keys in HAML files
...
This was done by the haml-up script.
2024-02-22 15:01:14 +11:00
Maikel Linke
c097f2b622
Upgrade HAML syntax with script
2024-02-22 15:01:13 +11:00
binarygit
99f4c4705f
Remove redundant function
2024-01-14 15:06:02 +05:45
David Cook
263f68f927
Merge pull request #11915 from murjax/cleanse-stripe-js-errors-11886
...
Cleanse JS errors from DOM on Stripe failure
2023-12-28 13:11:36 +11:00
Dusan Orlovic
120e299653
Use activate instead of changeActivePanel/ChangeActiveTab
...
Remove shop-tabs controllers since we can listen on `"data-action":
"orderCycleSelected@window->tabs-and-panels#activateDefaultPanel"`
Test for cases:
* activate by clicking on tab
* activateDefaultPanel on orderCycleSelected event
* activateFromWindowLocationOrDefaultPanelTarget to activate tab based
on achor in URL
2023-12-16 10:00:17 +01:00
Rachel Arnould
329ad1ddb2
Merge pull request #11874 from dacook/buu-success-message-11517
...
[BUU] Flash message redesign
2023-12-13 11:59:19 +01:00
Ryan Murphy
b84707edd9
Cleanse JS errors from DOM on Stripe failure
2023-12-11 07:46:42 -05:00
David Cook
7d299affd3
Move hiding logic to stimulus controller
...
This ensures morphed flashes hide like other flashes (eg in bulk order actions). I wanted to write a spec to prove it, but Capybara doesn't support mocking setTimeout and I didn't want to use sleep.
I've made it optional because this controller is shared with the shop frontend ([supposedly](5ef34347a3 ), although angular seems to override it).
2023-12-06 10:11:19 +11:00
Dung Bui
8a3aababa1
group specs into one it block, added fullname with comma reversed ransacker
2023-12-04 08:45:19 +07:00
Dung Bui
600226cb52
add fullname reversed search
2023-12-03 14:15:41 +07:00
Dung Bui
febda2ce12
add search by fullname with comma
2023-12-03 14:10:12 +07:00
Filipe
ebd1151054
Merge pull request #11730 from murjax/payment-save-flash-9048
...
Fix Stripe payment flash rendering issue
2023-11-17 11:51:42 +00:00
Filipe
c9084db933
Merge pull request #11761 from binarygit/open-external-links-in-new-page
...
Open external links in product description in a new page
2023-11-17 10:30:03 +00:00
binarygit
f52c7e8a5d
Rename richtext controller and write specs
2023-11-13 21:31:41 +05:45
binarygit
e78fe663d2
Open external links in product description in a new page
2023-11-13 21:31:41 +05:45
Mohamed ABDELLANI
72d854487a
update VariantUnitManager#compatibleUnitScales to return units that are selected
2023-11-13 09:29:31 +01:00
Mohamed ABDELLANI
2733e45e16
update the list of the unit on VariantUnitManager
2023-11-13 09:29:31 +01:00
Maikel Linke
71c50e1fcf
Update warning message for item quantity
2023-11-09 10:56:41 +11:00