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
David Cook
3319f38e6c
Rename class to signal intent
...
Because the HTML is changed, I had to also update the old stylesheet too.
2023-12-23 15:46:15 +01:00
David Cook
e379ee761b
Refactor
...
'positive' and 'zero' methods are preferred in this case.
2023-12-23 15:46:15 +01:00
David Cook
6ca98d497a
Remove unnecessary 'blue' class
...
Buttons are already blue.
And we don't want the text to be blue. This resolves #11865
2023-12-23 15:46:15 +01:00
David Cook
e9fe66748a
Replace 'orange' class with 'red'
...
It was the same colour anyway
2023-12-23 15:46:15 +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
Konrad
eb70eb4bc8
Merge pull request #11966 from bouaik/fix-menu-and-sub-menu-highlighting
...
Fix menu and sub menu highlighting
2023-12-22 22:35:47 +01: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
Konrad
5f7760c3cc
Merge pull request #11803 from rioug/11801-remove-raw-from-email-template
...
Remove raw from various template
2023-12-22 13:10:33 +01:00
Ahmed Ejaz
985487c061
11068: update confirm_modal_component
...
- add new position alignment for the modal actions
- add 'justify-space-around' and 'justify-end' as new alignment classes
- use the above classes accordingly
2023-12-22 03:10:52 +05:00
bouaik
6fa3720d05
Merge branch 'master' into fix-menu-and-sub-menu-highlighting
2023-12-21 21:20:04 +01:00
bouaik
fde7c34287
fix highlighting
2023-12-21 21:16:39 +01:00
Ahmed Ejaz
d767529e11
11068: add divs to contain modals
2023-12-20 12:54:54 +05:00
Ahmed Ejaz
f44476b9af
11068: code refactoring
...
- Make use of reflexes when deleting the product and variant
- Add reflex dataset param to confirm_modal_component
2023-12-20 12:54:54 +05:00
Ahmed Ejaz
9cf51f3453
11068: add success and failure messages
2023-12-20 12:54:54 +05:00
