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
David Cook
88c840b3ee
Update styling for close button
...
I think we need a more general solution similar to ConfirmModalComponent's .modal-actions so that we can style all modals more consistently. But it's too late in the afternoon.
2024-01-16 13:45:00 +11:00
David Cook
6ed96bae85
Submit image when selected
...
This could have been done with a tiny amount of inline JS, but I went this way in case I needed any special logic for UJS. It turns out we don't.. but it still looks a bit cleaner this way.
2024-01-16 13:44:34 +11:00
David Cook
6479990f6d
Show image update form in modal
...
It submits to the existing controller. I wanted to submit it with StimulusReflex, but it [doesn't support file uploads](https://docs.stimulusreflex.com/guide/working-with-forms.html#a-note-about-file-uploads ). Perhaps we'll enhance this with javascript later.
2024-01-16 13:44:28 +11:00
David Cook
137489f492
Refactor: move basic modal styles to generic parent component
...
The style was already being shared with a sibling component.
Now we can instantiate a plain old 'modal'.
2024-01-16 12:53:07 +11:00
David Cook
c584d639cc
Show default image if none set
2024-01-16 12:53:07 +11:00
David Cook
1f61b03796
Add image with edit button
...
With a new 'mini' button style.
For now, it's just a shortcut to the image edit page.
2024-01-16 12:50:31 +11:00
binarygit
e865f27158
Provide correct modal-link-target-value and write tests for orders#edit page
2024-01-14 15:33:31 +05:45
binarygit
bc570743a5
Bugfix: Link individual send shipment button to its corresponding form
2024-01-14 15:06:02 +05:45
binarygit
267e749369
Show same dialog box when shipping order through the actions dropdown
2024-01-14 15:06:02 +05:45
binarygit
e83fd5bd83
Create ShipOrder component
2024-01-14 15:06:02 +05:45
binarygit
aa7a4fb5a2
Send shipment email by default
2024-01-14 15:06:02 +05:45
binarygit
5fe246e739
Add translations
2024-01-14 15:06:02 +05:45
binarygit
5e45d3b877
send shipment email optionally from orders#edit page
2024-01-14 15:06:02 +05:45
binarygit
95a51159d7
send-shipment-email-optionally
2024-01-14 15:05:59 +05:45
Rachel Arnould
877a145874
Merge branch 'master' into buu-dropdown-tweaks-11518
2024-01-12 10:40:19 +01:00
Filipe
2493ee5e2a
Merge pull request #11982 from drummer83/logo_size
...
Make hint for logo size translatable and adjust to 300 px
2024-01-11 19:27:11 +00:00
Rachel Arnould
6ff2be17c6
Merge pull request #12023 from dacook/buu/sticky_table_header_and_saving_banner-2
...
[BUU] Sticky table header and saving banner - alternate solution
2024-01-11 15:23:06 +01:00
Konrad
1c01af5874
Merge pull request #11983 from bmd08a1/opt/fix-enterprise-roles
...
Improve `admin/enterprise_roles` page performance
2024-01-10 20:30:41 +01:00
