raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-13 23:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 19 Branches 453 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

6861 Commits

Author SHA1 Message Date
Ahmed Ejaz
93fb3fd7d9 add enterprise producers_to_edit_orders setting 2025-04-13 21:35:55 +05:00
Filipe
9f988f7a02 Merge pull request #13216 from drummer83/email_header 
Email header: Improve logo, resizing and styles
 2025-04-09 12:00:09 +01:00
Konrad
db3a8a6b30 Header: Improve logo, resizing and styles 
Use the site's main logo instead of footer logo to allow for better contrast on gray background (dark text on gray instead of white text on gray)

The table's background color is defined in the parent table already

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
 2025-04-01 18:11:13 +02:00
David Cook
4402854a2a AddEnableProducersToEditOrdersToEnterprises 
With system spec for setting the preference. The enterprise edit page seems under-tested..
 2025-03-31 16:16:27 +11:00
David Cook
02db30202b Use rails form helper methods 
This helps ensure the labels are attached to the radio buttons, so you can click on the words to select the option.
 2025-03-31 16:16:27 +11:00
Filipe
37ef5d5b02 Merge pull request #13214 from chahmedejaz/task/13179-expand-notes-edit-order 
Fix expand notes field when editing order
 2025-03-28 16:43:29 +00:00
Maikel Linke
c60718feea List absent products in import preview 2025-03-27 13:36:48 +11:00
Maikel Linke
11be8360e3 Prettier and localised display of import stats 2025-03-27 13:36:47 +11:00
Maikel Linke
a6c08fe2ad Reset stock for absent products in DFC catalog 2025-03-27 13:36:47 +11:00
Filipe
9fa42cae47 Merge pull request #13143 from mkllnk/admin-in-same-tab 
Open admin dashboard in same tab by default
 2025-03-25 17:10:51 +00:00
Ahmed Ejaz
806965b2cd add textarea field plus the preformatted tag to display paragraph formatting in the notes 2025-03-24 00:43:07 +05:00
Maikel Linke
dc749092b4 Simplify authorisation required email 2025-03-20 09:58:46 +11:00
Ahmed Ejaz
86f5385aec 13179: fix notes field length issue 
- notes field was a children of label element
- due to this its size was bound by the label element
- now this commit makes it a sibling, making it occupy the width of column width
 2025-03-16 16:00:56 +05:00
David Cook
b5065de7d9 Update app/views/checkout/_tabs.html.haml 
Co-authored-by: Gaetan Craig-Riou <40413322+rioug@users.noreply.github.com>
 2025-03-12 10:01:45 +11:00
Maikel Linke
64a8b5845a Add feature toggle open_in_same_tab for admin dashboard 
This allows us to test what users actually want.
 2025-03-11 16:38:51 +11:00
David Cook
55cbe51592 Prevent Turbo pre-fetch which changes cart state 2025-03-11 16:19:34 +11:00
Maikel Linke
caf40e7301 Open admin dashboard in same tab by default 2025-03-11 16:13:27 +11:00
Konrad
6d67a913d9 Merge pull request #13147 from dacook/cleanup 
Speed up super admin dashboard
 2025-03-04 18:09:20 +01:00
Konrad
fcc9e3dc8b Merge pull request #13171 from cyrillefr/EnterpriseFeesPageTrueInsteadOfBlankOption 
Remove true as select default first option
 2025-03-04 18:07:24 +01:00
David Cook
9adf3a22af Show only first 25 enterprises 
I thought about reducing it further, but maybe people are used to having a large list. Let's see how this performs
 2025-03-03 14:46:24 +01:00
David Cook
b9aada47e0 Remove superfluous %div from haml ID elements 
Div is the default element in HAML, so we don't need to specify it.
 2025-03-03 14:46:24 +01:00
David Cook
5a1190cdda Remove superfluous %div from haml elements with class 
Div is the default element in HAML, so we don't need to specify it. https://haml.info/docs/yardoc/file.REFERENCE.html#implicit-div-elements
 2025-03-03 14:46:24 +01:00
Filipe
feccef0b36 Merge pull request #13157 from drummer83/email_styled_password 
Create styled email for reset password instructions
 2025-02-27 16:53:04 -06:00
Filipe
cf3213cf96 Merge pull request #13168 from dacook/dfc-product-import-select-all-12301 
[DFC Orders] Select/deselect all on DFC Product Import
 2025-02-27 16:43:37 -06:00
cyrillefr
96d6718e6d Remove true as select default first option 2025-02-21 14:20:59 +01:00
Filipe
9baed8536c Merge pull request #13121 from rioug/13054-out-of-stock-autoremove 
Autoremove/update item from the cart if stock changed during checkout
 2025-02-20 22:35:40 -06:00
Konrad
48688311d1 Merge pull request #13165 from chahmedejaz/bugfix/unable-to-view-images-in-dev-env 
Fix base urls for assets in development
 2025-02-20 07:56:09 +01:00
David Cook
4cb1b0a48e Add total count of selected items 
I noticed there's a controller for that too, so might as well make use of it. The orders page has it at the top, because that's where the bulk action menu is. But on this page, the action is the import button so I put it there.
 2025-02-20 12:15:53 +11:00
David Cook
57fb855147 Ensure label reaches to edge of table cell 
Best viewed with whitespace ignored
 2025-02-20 12:15:49 +11:00
David Cook
b370b207b5 Automatically bind toggleCheckbox action 2025-02-20 12:14:49 +11:00
David Cook
b92c046119 Automatically bind toggleAll action 
We are already specifying the element's role ('all') in the HTML. Its behaviour should be predefined; there's no need to also specify in the HTML.

The eventhandler doesn't need to be cleand up on disconnect, because they are removed along with the DOM object.
 2025-02-20 11:24:21 +11:00
David Cook
c2e54104d0 Add select/deselect all checkbox 
There's A Controller For That.
(But I think it makes the HTML ugly..)
 2025-02-20 10:56:53 +11:00
Ahmed Ejaz
216348d361 fix base urls for assets in development 2025-02-19 05:09:19 +05:00
Gaetan Craig-Riou
db0547543e Use the new OutOfStockModalComponent 
It will now redirect to the shop page if the out of stock check results
in an empty order
 2025-02-18 10:47:10 +11:00
drummer83
e98fa485b5 Quick beautification of test email 2025-02-16 19:50:18 +01:00
drummer83
4dc0f0e5be Create styled email for reset password instructions 2025-02-16 19:12:56 +01:00
Filipe
e7ef5984d5 Merge pull request #13125 from dacook/dfc-product-import-list-12301 
[DFC Orders] List products to import on screen
 2025-02-13 22:34:32 -06:00
cyrillefr
0aecb6873a Requested changes 
- 2 new methods for reading either current/desired on hand/on demand
  depending on variant state. Goal is to get rid of send method in View
- referring in on_hand/on_demand is in fact irrelevant. In the piece of
  code, only desired on_hand/on_demand can be called as we are only in
  new variant (non persisted) mode
- View does not use send method anymore, replaced by current_or_desired
- refactor of the spec -> 2 examples in one to get more speed.
 2025-02-12 16:01:21 +01:00
cyrillefr
6d6164c8f6 Keep stock selection when error on saving 
- added 2 not to be persisted attributes aimed at dealing with the UI
- added them to the permitted list
- updated view to switch mode about on_hand/on_demand
  that is: from an already persisted variant or not
    - Not persisted deals with on_*_desired not to be persisted fields
    - Persisted mode deals with regular on_* fields
- the corresponding spec for both on_hand/on_demand
 2025-02-12 16:01:21 +01:00
Gaetan Craig-Riou
ce47f9e700 Fix typo in translation code 2025-02-10 14:58:53 +11:00
David Cook
4624d49e5e Add translations 2025-02-10 10:33:09 +11:00
David Cook
9f7000009d Only import selected products 2025-02-06 17:10:01 +11:00
David Cook
447ff3cffd Show list of products to import 
If there's a matching product in OFN already, a link will appear.
 2025-02-06 16:28:15 +11:00
David Cook
c3b23a9fba Move import to new action 
Making way for a review step.
 2025-02-06 13:50:26 +11:00
David Cook
8acefed857 Swap input positions 
Makes it clearer where things are going from, and to. I will re-use this order on the next screen.
 2025-02-06 13:50:26 +11:00
Gaetan Craig-Riou
8db2445203 Add comment to make sure both out of stock modal get updated. 
There is no easy way to share template between AngularJS and Rails. The
modal in `edit.html.haml` is a copy of app/assets/javascripts/templates/out_of_stock.html.haml,
so we need to update both if either of them is updated.
 2025-02-04 15:42:05 +11:00
Gaetan Craig-Riou
69abdca3ef Fix insufficient stock modal styling 2025-02-04 15:42:05 +11:00
Gaetan Craig-Riou
e548e74ebe Update out stock modal 
It replicates the modal used by the cart :
app/assets/javascripts/templates/out_of_stock.html.haml
 2025-02-04 15:39:47 +11:00
Gaetan Craig-Riou
c73c2dd8a8 Add basic out of stock modal 2025-02-04 15:39:47 +11:00
Filipe
32c4b4557b Merge pull request #13086 from rioug/fix-tax-rate-refund 
Remove tax rate refund code path
 2025-01-30 21:54:30 -06:00