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
Konrad
1e9aaf17ba
Merge pull request #11981 from bouaik/fix-flash-type-when-updating-entreprise-fees
...
Fix flash type when updating entreprise fees
2024-01-06 20:45:16 +01:00
Gaetan Craig-Riou
b0541b0a34
Merge pull request #12004 from mkllnk/default-country
...
Cache default country simply in memory
2024-01-05 14:10:35 +11:00
Maikel
e2aeb18359
Merge pull request #11998 from abdellani/remove-unecessary-require-instructions
...
remove unnecessary require instructions
2024-01-04 15:30:33 +11:00
Maikel Linke
cb3cd3e7ea
Cache default country simply in memory
...
This simplifies the code, avoids a method naming collision with Rails
and should be faster as well.
2024-01-04 13:45:36 +11:00
Mohamed ABDELLANI
1ffdca3fc2
require tag_rule_applicator as it's not loaded automatically on OrderAvailableShippingMethods & OrderAvailablePaymentMethods
2024-01-03 12:08:26 +01:00
Mohamed ABDELLANI
3fab2c350e
require tag_rule_applicator on Shop::OrderCyclesList
2024-01-03 11:59:21 +01:00
Mohamed ABDELLANI
d239beb226
remove unnecessary require instructions
2024-01-03 11:34:57 +01: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
b9f117e643
Merge pull request #11959 from mkllnk/connect-app-id
...
Send semantic id when connecting enterprise to app
2024-01-03 11:18:01 +11: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
c2693d1a32
11068: add responsiveness to delete modal actions
2023-12-29 03:02:16 +05: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
Ahmed Ejaz
0fd868b669
11068: update variant_scope method to inline
2023-12-28 17:06:21 +05:00
David Cook
263f68f927
Merge pull request #11915 from murjax/cleanse-stripe-js-errors-11886
...
Cleanse JS errors from DOM on Stripe failure
2023-12-28 13:11:36 +11:00
drummer83
da4dc637e4
Add empty line at end of file
2023-12-27 09:33:27 +01:00
Ahmed Ejaz
86c2397f63
11068: update modal padding
2023-12-26 15:41:38 +05:00
bouaik
2e926e867c
fix flash type when updating entreprise fees
2023-12-25 10:19:51 +01:00
drummer83
120b2c363d
Fixing indentation error
2023-12-24 20:29:41 +01:00
drummer83
ad508c36e5
Avoid overflow of enterprise list when only few enterprises present
2023-12-24 19:07:14 +01:00
drummer83
2ab3efe5de
Adjust outline when focusing the overflowing enterprisie list (was red in Firefox)
2023-12-24 19:02:58 +01:00
drummer83
4e6f43afab
Add styles for hovering and warning
2023-12-24 17:59:27 +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
39d66c082b
Remove unused green class
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
87d328d6d6
11068: fix specs
2023-12-23 16:08:26 +05: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
1bb4a667da
Move banner to orignal postion at the bottom of page
2023-12-22 13:20:14 +01:00
Gaetan Craig-Riou
772c641611
Move banner up to not cover existing button
2023-12-22 13:20:14 +01:00
David Cook
041d74b7c2
Fix CSS selector
...
These styles should only apply to the form-actions in the products form.
2023-12-22 13:20:14 +01:00
Gaetan Craig-Riou
9609ba4268
Don't show the banner if no ToS file uploaded
2023-12-22 13:20:14 +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
8371eada23
Don't show the banner if enterprises are not required to accepte ToS
2023-12-22 13:20:14 +01:00
Gaetan Craig-Riou
25d1511f0b
Add Terms of Service banner styling for admin V3
2023-12-22 13:20:14 +01:00
Gaetan Craig-Riou
5c9abfefee
Per review, remove useless code pass
...
It shouldn't be possible for the update to fail, as we are not sending
any parameter. Any other failure should be handled by rails already, ie
missing csrf token.
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
Gaetan Craig-Riou
ee79fd88d2
Add /admin/users/:id/accept_terms_or_service end point
...
Plus specs
2023-12-22 13:20:14 +01:00
