Commit Graph

15880 Commits

Author SHA1 Message Date
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
Konrad
6e54b1e726 Merge pull request #12116 from cillian/apply-fees-on-shipments-create
Make sure fees are applied when adding the first item to a back office order
2024-02-14 23:53:54 +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
Filipe
850918dac5 Merge pull request #12112 from chahmedejaz/bugfix/12085-fix-customer-search-autofill-issue
Fix Customer Search Autofill Issue
2024-02-12 12:29:28 +00: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
98cfc68c3a Add option for modal class 2024-02-07 12:28:43 +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
b3692d7468 Remove min-height for ModalComponent 2024-02-06 15:00:29 +11:00
David Cook
6189feadaa Prevent modal covered by scrollbar
Using units relative to the document, rather than the screen.

I don't think that remaining min-height should be there at all, but reveal-modal is used a lot so I don't know for sure.
2024-02-06 14:56:39 +11:00
David Cook
784f74f466 Align buttons to the right 2024-02-06 14:51:13 +11:00
David Cook
8c6d3a27ec Move modal action styles to parent component
They were already being shared with a HelpModalComponent in fact.
2024-02-06 14:34:36 +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
Cillian O'Ruanaidh
da71f711c0 Make sure fees are applied when adding the first item to a back office order 2024-02-02 13:11:15 +00:00
Ahmed Ejaz
a6431bdec6 12085: fix customer search autofill issue 2024-02-02 01:58:35 +05: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
262823bddd Ensure On Demand field doesn't overflow following cell 2024-02-01 11:56:40 +11:00
David Cook
079925bc9a Fix for styling with a blank value
It's not usually valid, but can still be entered. I wasn't able to fix the positioning of the :after psuedo element without having a child text node. Maybe it's possible to add an empty child text node, but I didn't think it worth getting down to that level..
2024-02-01 11:31:14 +11:00
David Cook
133a9e6c7f Show popout when press printable character 2024-02-01 11:18:15 +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
David Cook
3d941dcc1f Adjust popout position
Now it's lined up perfectly with the number input.
2024-02-01 11:18:15 +11:00
David Cook
ae1fabae38 Tweak padding according to design 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
Konrad
9e6b8e0624 Merge pull request #12047 from rioug/12021-enterprise-fee-tax-on-invoice
Include Tax on enterprise fees on the invoice
2024-01-31 15:32:54 +01:00
Maikel Linke
a7571b152d Simplify report rendering
* DRY rendering_options calls.
* Remove unneeded parameter from method.
* Choose better name for background rendering method.
2024-01-30 12:46:32 +11:00
Maikel Linke
d2736002dc Remove dead code from ReportsController
That code was rendering the report in the request but we only do it in
the background now.
2024-01-30 12:34:57 +11: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
Gaetan Craig-Riou
e129ef38c2 Refactor total method to use sum instead of reduce
Plus some extra specs to cover missing scenarios
2024-01-29 14:12:28 +11:00
Gaetan Craig-Riou
04db8dbd37 Remove unused method 2024-01-29 13:21:13 +11:00
Gaetan Craig-Riou
d5499245d0 Merge pull request #11698 from openfoodfoundation/dependabot/bundler/redis-5.0.8
chore(deps): bump redis from 4.8.1 to 5.0.8
2024-01-29 10:55:58 +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
4634917597 Treat image integrity error as an input error
And thus give the user a useful message to try again.

Hmm, if this is a good idea, we should do it everywhere we upload an image. Can we build that in somehow, or at least make a shared helper that accepts a block and catches the error?

I replicated this in dev a couple of times, I think with a text file labelled as an image file. Unfortunately, I can no longer replicate in dev or with a spec.
2024-01-25 14:14:58 +11: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
Maikel Linke
687176cf49 Remove trouble-some hiredis
The hiredis client was praised as being faster parsing bulk responses
but it seems to have multiple issues now:

- The redis release 5.0 moved hiredis support to another gem.
- I tried the hiredis-client gem and it raised errors.
- There are claims of worse performance of hiredis [1].
- Maintenance responsiveness has been questioned [2].

Using the default redis driver seems to work fine though.

[1]: https://discuss.rubyonrails.org/t/hiredis-does-not-support-ssl-action-cable/75945
[2]: https://github.com/redis/hiredis/issues/655
2024-01-25 13:28:44 +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
d15395a252 Merge pull request #12052 from dacook/hotkeys
Hotkey fix
2024-01-24 23:34:50 +01:00
Konrad
ca12eab4bb Merge pull request #11985 from chahmedejaz/task/11768-add-voucher-in-enterprise-fees-with-tax-by-order-report
Include vouchers in report: Enterprise Fees With Tax Report By Order
2024-01-24 22:57:48 +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
Konrad
ec4bbe6241 Merge pull request #12038 from mkllnk/dfc-tax-category
Spec requiring tax category when creating products
2024-01-24 16:26:57 +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
fab6a79dae Fix various method to remove or add enterprise fee tax 2024-01-23 10:36:58 +11:00