raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-19 04:49:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
32,339 Commits 17 Branches 457 Tags
a11873559b7d002a2527e5bfd1663c67bdacda74
Commit Graph

2574 Commits

Author SHA1 Message Date
Gaetan Craig-Riou
7e84d41e8c Simplify modal opening by just rendering the modal in turbo stream 2024-09-11 14:20:41 +10:00
Gaetan Craig-Riou
8de7c304fe Add AdminTooltipComponent 
I left the stimulus controller separated as it is generic enough
 2024-09-10 13:29:40 +10:00
Gaetan Craig-Riou
b6695ba9a2 Add product preview on product edit page 
Plus translation
 2024-09-10 13:29:40 +10:00
Ahmed Ejaz
983addff0d 12777: use unit_to_display method for variant unit 
- This method prioritize display_as and after that considers options_text
 2024-09-05 10:49:45 +02:00
wandji20
94b98867d8 Revert use of searchableDropdownComponent for product unit 2024-08-23 09:57:37 +01:00
wandji20
35ef1b9c7f Refactor new product dropdown to use SeachableDropdown component [OFN-12744] 2024-08-23 09:57:37 +01:00
wandji20
d61acd2cc1 Unify error messages and display on new product form [OFN-12744] 2024-08-23 09:57:37 +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
059dceb304 Merge pull request #12735 from chahmedejaz/bugfix/12698-fix-products-stateful-navigataion 
Fix 'Back to products list' stateful navigation
 2024-08-15 10:43:13 +02:00
wandji20
58872a7017 Include mail stylsheet tag in invoice pdf files and mailer layout [OFN-12214] 2024-08-13 18:23:18 +01:00
wandji20
fa004d0897 Remove wicked pdf stylsheet include tag in order report pdf [OFN-12214] 2024-08-13 17:11:29 +01:00
Ahmed Ejaz
b14cd08990 12698 - keep old UI URL as it is 2024-08-13 14:23:39 +05:00
wandji20
1e71db9315 Remove permalinmk from taxons [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
Rachel Arnould
81711e4c43 Merge pull request #12721 from dacook/connected-apps-settings-12549 
New settings screen to activate each connected app type
 2024-08-08 16:56:33 +02:00
Konrad
cb42e7e119 Merge pull request #12671 from wandji20/wb-OFN-12591 
Ensure product category error message is shown when creating new product [OFN-12591]
 2024-08-06 14:09:59 +02:00
David Cook
5d732d80a6 Add connected apps settings screen 
I considered adding a request spec, but figured it still doesnt' test the form, so better to use a full system spec.
 2024-08-06 11:26:03 +02:00
Ahmed Ejaz
c101c4e42f 12698 - fix 'go back to products' stateful navigation 2024-08-05 13:51:59 +05:00
wandji20
287f65ec8e Ensure product category error message is shown when creating new product [OFN-12591] 2024-08-01 08:58:54 +01:00
Cillian O'Ruanaidh
3507405dae Make Item column wider and tax and quantity columns narrower in invoice PDF 2024-07-26 15:36:42 +01:00
Filipe
c25fe6ae57 Merge pull request #12654 from wandji20/wb-OFN-112509 
Use public contact email at the bottom of order confirmation email [OFN-12509]
 2024-07-25 20:14:47 +01:00
wandji20
0b46c41ffd Update reply email for order confirmation mail [OFN-12509] 2024-07-23 08:54:06 +01:00
wandji20
4fe3f60009 Use public contact email at the bottom of order confirmation email [OFN-12509] 2024-07-23 08:35:30 +01:00
Ahmed Ejaz
a6efad73a8 12551 - add no-cache policy for Turbo cache control 2024-07-22 13:45:01 +05:00
David Cook
e62b640372 Poll to check when invoice file finished 
The BulkInvoiceJob already sends a notification via WebSockets once complete, but sometimes that fails. So this is added on top, just in case.
 2024-07-05 08:58:10 +10:00
Gaetan Craig-Riou
34aba72dea Fix order summary mailer view 2024-07-03 11:21:28 +10:00
Gaetan Craig-Riou
ee88e2fdfa Fix product system spec 2024-07-03 11:11:03 +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
Gaetan Craig-Riou
2ab9ccf73d Bulk edit product, move supplier dropdown to variant 2024-07-03 11:05:00 +10:00
Gaetan Craig-Riou
25371ee9d0 Fix admin pages 
- move supplier to variant row on Bulk Edit product page
- add supplier dropdow on add/update variant page
 2024-07-03 10:17:49 +10:00
Gaetan Craig-Riou
80c4d9d03b Fix invoice template 2024-07-03 10:17:49 +10:00
David Cook
2676891322 Merge pull request #12546 from dacook/buu/change-columns-11055 
[BUU] Change product columns to be shown
 2024-06-19 09:25:47 +10:00
Rachel Arnould
0c6cc9b822 Merge pull request #12558 from cyrillefr/BUUUploadingCorruptProductImagesFailsSilently 
BUU Display error messages when file not valid
 2024-06-18 12:12:51 +02:00
David Cook
b8f8d6d042 Show/hide columns with CSS selectors instead 
Well, that made the JS way simpler.

Adds a lot of classes though. Maybe we could do it based on column index instead, but this will do for now.
table.hide-col0 { td:nth-child(0) { display: none; } }
 2024-06-18 15:35:53 +10:00
cyrillefr
01612843b4 BUU Display error messages when file not valid 
- implements a turbo response in controller
- display error messages on modal -> able for user to re upload
- removes a pending in spec that now tests error message
 2024-06-10 14:32:08 +02:00
cyrillefr
073dfc4ab6 Update and Recalculate Fees after Order Adjusted in Backend 
- when update on adjustment in payment, recalculation of
  correct adjustment was not done
- the corresponding spec
- an id to easy the finding of the change of fees in the spec
 2024-05-31 16:39:02 +02:00
Filipe
5455e68620 Merge pull request #12504 from dacook/buu/edit-image-turbo-12399 
[BUU] Remove StimulusReflex from Image Edit
 2024-05-23 17:32:59 +01:00
David Cook
55ac816a87 Show success message 
Phew, that was really easy.
And now the existing feature spec still Just Works.
 2024-05-23 11:55:56 +10:00
David Cook
05f0b93548 Use requestSubmit to allow JS events 
Yay, now it works. Not sure the best way to show loading yet.
- currently the Turbo loading indicator shows which is better than nothing (blue bar at top)
- ideally we could show a small spinner over the image thumbnail. need to write some stimulus to hook into turbo lifecycle I guess.
- or we could activate the frame-level loading overlay. refactor loading_controller a bit so that it's applied on the container, then hopefully  we can just call  change->loading#showLoading. the turbo_stream response could dectivate it.
 2024-05-23 11:55:33 +10:00
David Cook
665273ce2f [wip] Attempt to update edited image in-place with Turbo Stream 
but it doesn't quite work.

Maybe we can force it with JS (https://www.writesoftwarewell.com/process-turbo-stream-javascript/)
 2024-05-23 11:55:29 +10:00
Filipe
1130bf8cbe Merge pull request #12460 from mkllnk/enterprise-data-purge 
Clean up unused enterprise fields
 2024-05-22 21:29:54 +01:00
David Cook
3fcc9ac1fa Move product image edit modal to Turbo Stream 
Didn't even need to touch the controller, because data-turbo-stream tells it to render the turbo_stream format ✨

But you might notice that it doesn't redirect to the right return_url yet. Let's see if we can use more Turbo to avoid the page refresh..

TODO: also handle empty images
 2024-05-22 17:08:58 +10:00
David Cook
b2078c2906 Merge pull request #12486 from dacook/tax-category-12480 
Show any tax category errors when saving variants
 2024-05-22 09:30:19 +10:00
David Cook
3e1e7d3a10 Show error messages and highlight for bulk editing 
The validation message is on "tax_category", so labels and error messages can use that to show the error state.
But the select field has to be "tax_category_id" to work.
 2024-05-16 14:19:58 +10:00
David Cook
412c110c65 Associate label with checkbox 
Now you can click on the text to tick/untick the box. I've been wanting to do that for ages.
 2024-05-16 10:37:22 +10:00
Maikel Linke
135128cf41 Remove obsolete Enterprise#next_collection_at 
This was actually shown in one place and represents a user-facing
change. But you weren't able to edit the field which means that only
very old enterprises would have had this field set and were not able to
change it anymore.

I searched au-prod and found the following values in the database:

- "Friday 31st January"
- "From 4pm, Monday 30 September"
- "From 5pm-7pm Monday"
- "Saturday 27 April 12noon"
- "January 31st/February 1st"
- "Saturday 1st February"

They seem specific to a certain order cycle and have no value as
fallback any more. Seems safe to remove.
 2024-05-16 07:57:02 +10:00
Filipe
b67eba2130 Merge pull request #12454 from arunguleria/12372-Add-MissingTranslations 
12372-[Admin] Missing translations  page titles
 2024-05-15 20:39:22 +01:00
Filipe
59e04cc549 Merge pull request #12376 from cyrillefr/MakeShipOrderButtonWorksOnPageOrderDetails 
Fix Ship Order menu choice not working
 2024-05-15 17:57:25 +01:00
Arun Guleria
c84be2f396 12372-Add missing translation page titles 2024-05-09 15:12:03 +05:30
Ahmed Ejaz
86f88792c2 11058: add sortable products by name 2024-05-08 12:56:41 +05:00