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
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
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
Ahmed Ejaz
a321a962a5
11068: separate prompt_html into individual translation
2023-12-20 12:54:54 +05:00
Ahmed Ejaz
a71bb21789
11068: update confirm_button_color to confirm_button_class
2023-12-20 12:54:54 +05:00
Ahmed Ejaz
05e7674805
#11068 : add delete variant and product reflexes
2023-12-20 12:54:54 +05:00
Ahmed Ejaz
eca83eeec3
#11068 , update delete links for uniq modal ids
2023-12-20 12:54:54 +05:00
Ahmed Ejaz
5d90993f21
11068, apply delete_modals partial
2023-12-20 12:54:54 +05:00
Ahmed Ejaz
c202324cb0
#11068 : add product_v3 delete_modals partial
2023-12-20 12:54:54 +05:00
Ahmed Ejaz
d1224ea022
#11068 , resolve conflicts
2023-12-20 12:54:54 +05:00
Ahmed Ejaz
2f0965aa62
#11068 , add product_actions_controller
2023-12-20 12:54:54 +05:00
Ahmed Ejaz
4f76478619
#11068 , add delete modals
2023-12-20 12:54:54 +05:00
Ahmed Ejaz
0ff1067bc6
#11068 , add delete option for product variant
2023-12-20 12:54:54 +05:00
Ahmed Ejaz
39de2f704f
#11068 , add delete dropdown option
...
# Conflicts:
# app/views/admin/products_v3/components/_product_actions.html.haml
2023-12-20 12:54:54 +05:00
Maikel Linke
67ffb5526e
Display loading status in action button
2023-12-20 16:35:00 +11:00
Maikel Linke
b33910d5b4
Disconnect Connected App as enterprise user
...
The app has to provide a webhook URL to be notified when the app is
disconnected. Once we have better token management, we would have a
unique token per app and could revoke it. But for now it's just a
request to disconnect the app.
2023-12-20 15:29:28 +11:00
Konrad
4973b5c07c
Merge pull request #11789 from duleorlovic/11784_contact_tab
...
Fix open Contact tab from "customers only" message
2023-12-19 15:05:41 +01:00
Dusan Orlovic
120e299653
Use activate instead of changeActivePanel/ChangeActiveTab
...
Remove shop-tabs controllers since we can listen on `"data-action":
"orderCycleSelected@window->tabs-and-panels#activateDefaultPanel"`
Test for cases:
* activate by clicking on tab
* activateDefaultPanel on orderCycleSelected event
* activateFromWindowLocationOrDefaultPanelTarget to activate tab based
on achor in URL
2023-12-16 10:00:17 +01:00
Maikel Linke
35ca66cbb7
Respond fast by rendering only partial
2023-12-15 12:34:40 +11:00
Maikel Linke
1d7f96e965
Broadcast connected app to all user tabs
2023-12-15 12:34:40 +11:00
Maikel Linke
e1730f25d6
Show app connection state and update link
2023-12-15 12:34:40 +11:00
Maikel Linke
4eb273b06e
Create ConnectedApp with a reflex
...
I would have like to use a standard form to submit to the reflex but the
whole enterprise settings tab is in a form already and HTML doesn't
allow nested forms. While it does still work in browsers, it would have
added much more HTML to set up a form with a hidden input field instead
of just one additional data attribute.
The whole page is rendered by the controller again but the reflex root
attribute ensures that only parts of this tab are replaced. Otherwise
unsaved data on other tabs could be replaced and the page actually
becomes blank because AngularJS doesn't play well with the morph.
2023-12-15 11:50:04 +11:00
