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
Rachel Arnould
5f302f347a
Merge pull request #12189 from abdellani/11829-remove-alternative-invoice-when-invoice-feature-is-enabled
...
hide alternative invoice checkbox if invoices feature is enabled
2024-03-06 11:25:38 +01:00
David Cook
cbcf388acc
Ensure gap between fields wrapped over a line
2024-03-06 14:10:51 +11:00
David Cook
864b95612a
Show error message on variant_unit_name
...
Now passing options through to the error tag
2024-03-06 13:41:22 +11: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
David Cook
38766f5256
Show variant_unit_name for 'items'
2024-03-06 13:41:22 +11:00
David Cook
b3cf977c96
Add unit name (items) field
2024-03-06 13:41:22 +11:00
David Cook
864b876a9a
Add tom-select with naked style
...
The rem units are converted to em to make the padding relative to the chevron size. This means different font sizes will Just Work.
2024-03-06 13:41:22 +11:00
David Cook
4b2406c9c2
Add unit scale dropdown
2024-03-06 13:41:17 +11:00
David Cook
958288b223
Move input styles to form stylesheet
...
A better way to arrange it, and as a bonus it makes the selectors simpler, yay!
2024-03-06 13:01:44 +11:00
David Cook
a1135f7db7
Move unit scale to separate column
...
This is because it's going to move from product to variant soon, as part of Product Refactor.
2024-03-06 13:01:43 +11:00
David Cook
8f31d8799f
Adjust column widths
...
Table layout is tricky. I had originally hoped that the table would allow us to use min/max width. But that simply doesn't work with `table-layout: fixed`. So we need to set preconfigured widths.
Now I think that table layout doesn't bring any benefit, so I think we should consider switching to flexbox or grid. ButI'll wait until all elements are in place before trying anything new.
2024-03-06 13:01:43 +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
Mohamed ABDELLANI
335c2475ab
hide alternative invoice checkbox if invoices feature is enabled
2024-02-22 20:09:43 +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
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
Mohamed ABDELLANI
56fe7f5e21
fix tax rates listing in invoices
2024-02-19 12:32:11 +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
