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
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
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
f7aca7a9f1
Merge branch 'master' into 11431-show_warning_when_a_new_invoice_can_be_generated
2024-01-08 16:38:39 +01: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
Rachel Arnould
edfd4277ac
Merge pull request #11977 from drummer83/my_pr-11936
...
Fixes minor styling issues of admin and admin v3 in the dashboard
2024-01-03 10:47:56 +01: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
da4dc637e4
Add empty line at end of file
2023-12-27 09:33:27 +01:00
drummer83
887a6d8e7a
Make string translatable and adjust to 300 px
2023-12-26 16:00:00 +01:00
drummer83
120b2c363d
Fixing indentation error
2023-12-24 20:29:41 +01:00
drummer83
ddd455a73e
Use methodology from order_cycles for products
2023-12-24 17:58:21 +01:00
drummer83
dddebae56a
Unify coding style
2023-12-24 17:52:21 +01:00