raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-30 21:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,934 Commits 18 Branches 452 Tags
17eb8d5cd851663bf8ecb016f737a58fe103b283
Commit Graph

1789 Commits

Author SHA1 Message Date
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
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
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
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
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
cyrillefr
ba68f4b252 Fix 'Ship Order': requested changes 
- deletes local variables in view
- factor logic in helper
 2024-05-07 19:15:00 +02:00
cyrillefr
901c29c97b Fix Ship Order menu choice not working 
- Front End ShipOrderComponent was missed for the menu to work
 - updated spec to test for a specific case
 2024-05-07 19:15:00 +02:00
filipefurtad0
bfd4b730f2 Combines keys taxon_edit and taxonomy_edit 2024-04-15 15:07:52 +01:00
filipefurtad0
acc036b1d7 Removes missing payement message 
I've checked staging, and I could not find this message, nor the entry in the en.yml file - I think we're not rendering this message currently, hence, the removal.
 2024-04-15 15:05:53 +01:00
Konrad
b3dd51d6ac Merge pull request #12324 from chahmedejaz/task/12314-fix-rubocop-rails-helper-instance-variable 
Fix Rubocop Rails/HelperInstanceVariable
 2024-04-10 20:17:06 +02:00
Konrad
e88335a923 Merge pull request #12303 from arunguleria/12295-translation-fixes-on-return-authorizaton 
12295-Translation fixes for return authorization status
 2024-04-10 14:10:08 +02:00
Matt-Yorkley
65731f6c52 Update serializers and views for admin products index 2024-04-02 09:27:36 +11:00
Matt-Yorkley
b30944471d Update admin forms 2024-04-02 09:27:36 +11:00
Ahmed Ejaz
05f373f541 12314 - add order parameter in OrdersHelper methods 2024-04-01 06:41:41 +05:00
Matt-Yorkley
c01bab5f27 Wrap commonly-repeated calls to Spree::Config to reduce unnecessary cache reads 
These config values are relatively static but in some cases they can be called many times in the same request (like rendering a report or a large list of line_items in BOM). These values will now only get fetched from Redis/Postgres once at most per request/job.
 2024-03-26 13:39:16 +00:00
Arun
0ab3c3d875 Merge branch 'master' into 12295-translation-fixes-on-return-authorizaton 2024-03-22 18:16:57 +05:30
Arun Guleria
03630f27af 12295-Translation fixes for return authorization status 2024-03-22 17:16:35 +05:30
Filipe
9abaf90907 Merge pull request #12233 from dacook/buu/unit-scale-basic-12005 
[BUU] Unit Scale - basic implementation
 2024-03-07 17:20:45 +00:00
Filipe
de9446f5f3 Merge pull request #12167 from mkllnk/haml-up 
Update Haml syntax and gem to version 6
 2024-03-07 15:36:29 +00:00
Rachel Arnould
cd9bef4f7b Merge pull request #12172 from abdellani/12067-fix-invoice-render-multiple-tax-rates 
fix invoice render multiple tax rates
 2024-03-07 10:53:52 +01:00
David Cook
e8bd8389b5 Remove unused parameters 
They're being silently discarded. I checked, and those classes weren't needed anyway. (theres' no conditions to even show an error in the second case, but nevermind..)
 2024-03-06 13:41:22 +11:00
Filipe
af9f07f496 Merge pull request #12194 from cyrillefr/Replace-dropdown_controller-with-generic-toggle-control_controller 
Re-implement dropdown controller with html details element
 2024-03-05 16:28:29 +00:00
Gaetan Craig-Riou
8fb3f9a8b8 Remove "ujs-navigate": "false" from link 
It somehow was causing a double loading of the page meaning flash
messages were lost. I suspect it's related to turbo/turbo link, but
I am not sure.
 2024-02-28 15:13:40 +11:00
cyrillefr
428b9b273c Replace old dropdown controller by new one 
- menu items line are unchanged only beggining of file modified
 2024-02-25 16:43:57 +01: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
Mohamed ABDELLANI
56fe7f5e21 fix tax rates listing in invoices 2024-02-19 12:32:11 +01:00
Konrad
a30da1f656 Merge pull request #12093 from cillian/generate-invoice-button-warning 
Display a warning when clicking the generate invoice button if an ABN is required but not present
 2024-01-31 21:52:15 +01:00
Konrad
d24924b8f4 Merge pull request #12075 from cyrillefr/Actions-dropdown-should-not-open-automatically-after-shipping-the-order 
Actions dropdown should stay closed after shipping order
 2024-01-31 20:49:49 +01:00
Cillian O'Ruanaidh
f960dec0eb Display a warning when clicking the generate invoice button if an ABN is required but not present 2024-01-26 14:28:42 +00:00
cyrillefr
b8743d853f Actions dropdown should stay closed after shipping order 
- added hidden css class for it to stay closed.
 2024-01-24 08:35:55 +01:00
Gaetan Craig-Riou
96a010033d Fix admin view to use dfc_id 
This was missed in a previous refactor
 2024-01-22 10:12:39 +11:00
Gaetan Craig-Riou
652c7a563c Add dfc_name field on Spree::Taxons 
This will let us map OFN product taxons to DFC product types
 2024-01-22 10:02:10 +11:00