raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-21 00:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,630 Commits 18 Branches 454 Tags
29f9d1e374dfa3afb2cf4c3e2cdaecbeaafa55ef
Commit Graph

6285 Commits

Author SHA1 Message Date
Maikel Linke
0813f43b49 Better wording for OIDC connection 2024-02-22 10:15:07 +11:00
Maikel Linke
6d9c5a9c66 Allow user to get new OIDC refresh token 
The refresh token is usually valid for a year but it can be revoked at
any time. When we try to use it and it's expired, we should remove it
from the account record and notify the user. They can then refresh the
authorisation.
 2024-02-22 10:15:07 +11:00
Maikel Linke
a89b22e397 Allow user to disconnect OIDC account 
This makes testing much easier. But probably also good for users to
revoke any access via OIDC apps. It also enables users to then connect
to a different account, or just renew the current connection.
 2024-02-22 10:15:07 +11:00
Maikel Linke
07a8617143 Store OIDC account data in new model 2024-02-22 10:15:07 +11:00
Konrad
2477a63f36 Merge pull request #12103 from basilawwad/selecting-OC-should-redirect-to-shop 
Modify default hash tabs controller to redirect users to shopping panel when an OC is selected.
 2024-02-19 21:51:19 +01:00
Rachel Arnould
39b83eae19 Merge pull request #12133 from dacook/buu/new-variant-11066 
[BUU] Create a new variant inline
 2024-02-16 14:32:17 +01:00
basilawwad
08111f9a2c added shop target and activateshoppanel function 
Remove Pending Message

Update shopping_spec.rb

Update shopping_spec.rb
 2024-02-16 09:27:21 +03:00
David Cook
915a5ce66b Listen for changes on added fields 
Finally, we can add new variants!

Requires updated stimulus-rails-nested-form
 2024-02-16 08:51:49 +11:00
isidzukuri
ae9229ec7a Merge branch 'master' into 12003_improve_error_messageg_when_no_products_are_changed 2024-02-15 09:36:53 +02:00
isidzukuri
c0e820e447 Improve error message by not displaying the first part of the second sentence if no changes were counted 2024-02-15 09:14:52 +02:00
David Cook
1df0eca4d1 Click button to add form 
Now we can fill out the form, but in most cases we can't submit it because it's not marked as 'changed'.
 2024-02-15 17:32:08 +11:00
David Cook
6cca7a4a3a Refactor HAML 
Making use of nested hash to DRY it up
 2024-02-15 17:32:08 +11:00
David Cook
977ea47487 move new variant form to template 
it can be activated with JS, once I can get that compoent working..

◉ Best viewed with whitespace ignored
 2024-02-15 17:32:08 +11:00
David Cook
5253aeab17 Add unit_value so we can create new variants for producuts by weight/volume 2024-02-15 17:31:50 +11:00
David Cook
eff92b076f Add new variant form 
And with the benefit of time travel, a feature spec from the future which will show us where we're heading.
 2024-02-15 17:20:38 +11:00
David Cook
d812815913 Fix: use correct parameter name 
Before, the index was defaulting to the record id, but we want to have a sequential index to guarantee the order always stays the same.
And more importantly, we'll need it for new records that don't have an ID yet.
 2024-02-15 11:00:59 +11:00
David Cook
c65771eac6 Add new 'naked' button 
I couldn't think of a better name.
 2024-02-15 10:36:45 +11:00
David Cook
024f324027 Refactor: move rows to partials 
This file was too big and it's about to get bigger.
 2024-02-15 10:36:45 +11:00
Konrad
8751cc37f3 Merge pull request #12126 from cyrillefr/Replace-remote_toggle_controller-with-generic-toggle_control_controller 
Replace remote_toggle with method inside generic controller
 2024-02-15 00:32:05 +01:00
Rachel Arnould
164bac63e0 Merge pull request #12130 from dacook/buu/modal-styles-11065 
[BUU] Image modal styles
 2024-02-14 16:12:32 +01:00
David Cook
5e4dd3864f Update image and modal size 
Using a new 'fit' modal size.

On smaller screens, we need to allow the image to shrink. That's a good general rule, but I was hesitant to make it a global rule..
 2024-02-07 12:48:44 +11:00
David Cook
d24348d0f2 Increase button size 
And fix alignment for smaller screens.
 2024-02-07 10:13:17 +11:00
cyrillefr
f8cb98f43e Replace remote_toggle with method inside generic controller 
- put former remote toggle ctrller toggle method
   in new toggleAdvancedSettings in more generic toggle ctrller
 - modified acordingly the 2 associated views
 - put former test code in more generic ctrller test file
 - deleted now useless ctrller + test files
 2024-02-06 17:02:23 +01:00
David Cook
784f74f466 Align buttons to the right 2024-02-06 14:51:13 +11:00
Rachel Arnould
d4d5449fba Merge pull request #12107 from dacook/buu/fixes 
[BUU] Style and behaviour updates
 2024-02-05 11:33:06 +01:00
Rachel Arnould
11bdba3c4e Merge pull request #12073 from rioug/12045-add-invisible-captcha 
Add invisible captcha to registration screen
 2024-02-05 10:44:41 +01:00
Gaetan Craig-Riou
6d3af4801e Merge pull request #12100 from mkllnk/remove-background-reports-toggle 
Remove background_reports feature toggle
 2024-02-05 11:47:43 +11:00
David Cook
d0724bab85 Fix column header alignmnt 2024-02-01 12:09:49 +11:00
David Cook
36722bfa20 Add more room for the On Hand column 2024-02-01 12:02:42 +11:00
David Cook
da82b12ca7 Prevent negative values for stock on hand 
Using browser validation. I didn't use model validation because the on_hand pseudo-attribute doesn't support it.

But.. it turned out to  not be so simple. Browser validation can't work if the field is hidden, and breaks the javascript. So now I made the javascript smarter, and the end result is more helpful I think.
 2024-02-01 11:18:15 +11: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
60c18ffa85 Merge pull request #12084 from cyrillefr/Replace-toggle_controller-with-generic-toggle_control_controller 
Replace toggle_controller with method inside generic controller
 2024-01-31 21:17:47 +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
Maikel Linke
29bcbc58de Simplify reports form options 2024-01-30 12:18:59 +11:00
Maikel Linke
bcfaed852b Remove background_reports feature toggle 2024-01-30 12:11:04 +11: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
e6c0afa477 Replace toggle_controller with method inside generic ctrller 
- move toggle method from toggle_controller inside toggle_control
    ctrller
  - change corresponding html attributes in view
  - mode corresponding spec in toggle_controller ctrller spec
  - delete now unused toggle controller + spec
 2024-01-25 10:16:02 +01:00
David Cook
c462ac919f Use image url helper 
Without it, I think the correct S3 url isn't generated.
 2024-01-25 14:14:58 +11:00
David Cook
f72154e40c Add image create form 
Re-using the edit image form, because they're basically the same.
 2024-01-25 14:14:58 +11:00
Konrad
773131741b Merge pull request #11817 from rioug/10809-match-taxons-to-DFC-product-types 
[DFC] match taxons to dfc product types
 2024-01-25 00:05:31 +01:00
Konrad
5377304190 Merge pull request #12050 from cyrillefr/Replace-toggle_button_disabled_controller-with-generic-toggle_control_controller 
Replace toggle_button_disable controller with generic toggle_control controller
 2024-01-24 16:39:26 +01: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
d8876c40b8 Add invisible_captcha on the user registration page 
The default action when a user submit the form too quickly is to
redirect to :back with flash error message. As we are using CableReady
it's not working for us, so I render_alert_timestamp_error_message
to show the error message to the user.
 2024-01-23 16:30:12 +11: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
Gaetan Craig-Riou
83beafc564 Add missing translation on taxon admin form 2024-01-22 10:02:10 +11:00
Konrad
bed405794f Merge pull request #11762 from binarygit/send-shipment-email-optionally 
send-shipment-email-optionally
 2024-01-18 12:02:00 +01:00
cyrillefr
8eb5ac990e Replace toggle_button_disable ctrller with generic toggle_control ctrller 
- add enableIfPresent method in toggle_control_controller.js to handle enabling on toggle
- add testing in the corresponding spec
- replace in view previous ctrler with intended generic toggle-control
 2024-01-16 20:35:21 +01:00
David Cook
c67f0c52a2 Show edit button only when hover image 
This required some branching in the haml, which would be nice to avoid. But we have more work to do here so we'll refactor at the end.
 2024-01-16 13:45:02 +11:00
David Cook
471dadeaec Accept only image files 
Leaving the more specific validation in the Rails model (rather than try to duplicate it).
 2024-01-16 13:45:02 +11:00