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
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
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
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
bed405794f
Merge pull request #11762 from binarygit/send-shipment-email-optionally
...
send-shipment-email-optionally
2024-01-18 12:02:00 +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
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
bc570743a5
Bugfix: Link individual send shipment button to its corresponding form
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
David Cook
c3e513e457
Move .form-actions into table, to allow sticky stacking
...
Unfortunately, it's not possible to stack two sticky elements that are inside different containers:
https://stackoverflow.com/questions/54689034/pure-css-multiple-stacked-position-sticky
So instead I've moved them under the same container. The .form-actions needs to cover up some of the table border.
I don't like the deep nesting of markup or class naming.. pls suggest if you have better ideas!
2024-01-10 12:33:41 +11:00
David Cook
47418d9873
Merge pull request #12014 from mkllnk/voucher-on
...
Remove feature toggle for vouchers, they are always on
2024-01-10 09:58:35 +11:00
Konrad
591885610a
Merge branch 'master' into task/11923-add-vouchers-to-oc-customer-total-report
2024-01-09 18:51:47 +01:00
David Cook
2defc4afa7
Ensure form-actions content uses available space
...
Using pre-defined colunms was a hacky short term solution, this way is more flexible.
2024-01-09 12:34:05 +11:00
Rachel Arnould
bd0a296100
Merge pull request #11846 from chahmedejaz/task/11068-delete-product-or-variant
...
[BUU] Add option to delete a product or variant
2024-01-08 13:17:29 +01:00
Maikel Linke
38843c4d4d
Remove use of feature vouchers
2024-01-08 15:53:50 +11:00
Maikel Linke
883bfcdf0d
Simplify column toggling in report spec
...
* This partly reverts 3a957fb988
2024-01-04 16:53:36 +11:00
Dung Bui
b844b188ce
fix enterprise roles page performance
2024-01-04 00:19:15 +07:00
Ahmed Ejaz
3a957fb988
11923: add specs
2024-01-03 15:46:16 +05:00
Maikel
63ce91d52a
Merge pull request #11954 from mkllnk/delete-app
...
Enterprise user can remove Connected Apps
2024-01-03 11:17:26 +11:00
Ahmed Ejaz
17bd3bb0cc
11068: update setModalDataset logic to generic logic
2023-12-28 21:34:37 +05:00
Ahmed Ejaz
548ffc0222
11068: replace p tag with a tag
2023-12-28 17:28:26 +05:00
Ahmed Ejaz
813ebd9129
11068: add confirm_actions to close the modal
2023-12-28 17:07:18 +05:00
Ahmed Ejaz
047e63541c
11068: add black-text css class
2023-12-28 17:06:56 +05:00
drummer83
887a6d8e7a
Make string translatable and adjust to 300 px
2023-12-26 16:00:00 +01:00
Ahmed Ejaz
6ed447b6ac
11068: code refactor
...
- Add single delete modal
for product and variant each
2023-12-23 15:53:28 +05:00
Gaetan Craig-Riou
91e5227d80
Move to simple UserReflex
2023-12-22 13:20:14 +01:00
Gaetan Craig-Riou
b3acdaf324
Remove user.id parameter
...
It's not needed, as the reflex get the curent user based on the user
session
2023-12-22 13:20:14 +01:00
Gaetan Craig-Riou
56b75ad9fb
Per review, stream line the css
...
Reuse existing css when possible, and use variable for z-index so its
easier to track usage of z-index
2023-12-22 13:20:14 +01:00
Gaetan Craig-Riou
aaa8f3f572
Per review, move logic to display ToS banner to a helper
...
It easier to understand when we can see the logic to display the banner
in the view.
2023-12-22 13:20:14 +01:00
Gaetan Craig-Riou
d0ba881aa2
Move acepting of ToS change to a reflex
...
Spree::Admin::UserController is for super admin user only. Moving to a
reflex simplifies the code by getting rid of a new route and a new stimulus
controller
2023-12-22 13:20:14 +01:00
Gaetan Craig-Riou
8e31e35d5d
Add Tos banner on all admin pages
...
Plus spec, this is tested on the dashboard page.
The banner will show if the user accepted_at is before the tos file
updated at time.
2023-12-22 13:20:14 +01:00
