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
Maikel
d197251262
Merge pull request #12026 from dacook/rubocop-autocorrect
...
Autocorrect Rubocop issues
2024-01-11 09:04:49 +11: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
Konrad
19dd5b110c
Merge pull request #12009 from chahmedejaz/bugfix/11971-tos-position-issue
...
Fix ToS Position Issue
2024-01-10 19:36:57 +01:00
David Cook
0bb0e1674e
Remove unused rule
...
I forgot to remove this before.
2024-01-10 16:41:47 +11:00
David Cook
792dc2cb36
Add shadow
2024-01-10 14:15:10 +11: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
David Cook
2a3d498c13
Style/RedundantReturn
2024-01-10 09:38:35 +11:00
David Cook
7e00dbfd67
Style/RedundantParentheses
2024-01-10 09:38:21 +11:00
David Cook
18c2b2512b
Safely autocorrect Style/RedundantLineContinuation
...
Inspecting 1530 files
.................................................................................................................................................................................C................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................C.......................................................................................................................
Offenses:
app/helpers/shop_helper.rb:48:43: C: [Corrected] Layout/TrailingWhitespace: Trailing whitespace detected.
no_open_order_cycles?(order_cycles) &&
^
app/helpers/shop_helper.rb:48:44: C: [Corrected] Style/RedundantLineContinuation: Redundant line continuation.
no_open_order_cycles?(order_cycles) && \ ...
^
spec/system/admin/configuration/content_spec.rb:35:64: C: [Corrected] Layout/TrailingWhitespace: Trailing whitespace detected.
expect(page).to have_selector :link, "markdown link", href:
^
spec/system/admin/configuration/content_spec.rb:35:65: C: [Corrected] Style/RedundantLineContinuation: Redundant line continuation.
expect(page).to have_selector :link, "markdown link", href: \ ...
^
1530 files inspected, 4 offenses detected, 4 offenses corrected
2024-01-10 09:29:37 +11:00
David Cook
fbbaf51522
Safely autocorrect Lint/SymbolConversion
...
Inspecting 1530 files
.....................................................................................................................................................................................................................................................................................................................................................W.................................................................................................................................................................................................................................................W..........................................................................................................................................................................................................................................................W.......................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
Offenses:
app/models/spree/preferences/preferable_class_methods.rb:73:9: W: [Corrected] Lint/SymbolConversion: Unnecessary symbol conversion; use :"preferred_#{name}" instead.
"preferred_#{name}".to_sym
^^^^^^^^^^^^^^^^^^^^^^^^^^
app/models/spree/preferences/preferable_class_methods.rb:77:9: W: [Corrected] Lint/SymbolConversion: Unnecessary symbol conversion; use :"preferred_#{name}=" instead.
"preferred_#{name}=".to_sym
^^^^^^^^^^^^^^^^^^^^^^^^^^^
app/models/spree/preferences/preferable_class_methods.rb:81:9: W: [Corrected] Lint/SymbolConversion: Unnecessary symbol conversion; use :"prefers_#{name}?" instead.
"prefers_#{name}?".to_sym
^^^^^^^^^^^^^^^^^^^^^^^^^
app/models/spree/preferences/preferable_class_methods.rb:85:9: W: [Corrected] Lint/SymbolConversion: Unnecessary symbol conversion; use :"prefers_#{name}=" instead.
"prefers_#{name}=".to_sym
^^^^^^^^^^^^^^^^^^^^^^^^^
app/models/spree/preferences/preferable_class_methods.rb:89:9: W: [Corrected] Lint/SymbolConversion: Unnecessary symbol conversion; use :"preferred_#{name}_default" instead.
"preferred_#{name}_default".to_sym
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
app/models/spree/preferences/preferable_class_methods.rb:93:9: W: [Corrected] Lint/SymbolConversion: Unnecessary symbol conversion; use :"preferred_#{name}_type" instead.
"preferred_#{name}_type".to_sym
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
app/models/spree/preferences/preferable_class_methods.rb:97:9: W: [Corrected] Lint/SymbolConversion: Unnecessary symbol conversion; use :"preferred_#{name}_description" instead.
"preferred_#{name}_description".to_sym
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
app/services/sets/product_set.rb:121:28: W: [Corrected] Lint/SymbolConversion: Unnecessary symbol conversion; use :"variant_#{error.attribute}" instead.
product.errors.add("variant_#{error.attribute}".to_sym, error.message)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
lib/spree/core/environment_extension.rb:11:24: W: [Corrected] Lint/SymbolConversion: Unnecessary symbol conversion; use :"#{name}=" instead.
create_method( "#{name}=".to_sym ) { |val|
^^^^^^^^^^^^^^^^^
1530 files inspected, 9 offenses detected, 9 offenses corrected
2024-01-10 09:21:43 +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
Konrad
1e2985b3cb
Merge pull request #11990 from dacook/form-hotkeys
...
Add keyboard shortcut to submit forms
2024-01-09 18:33:33 +01:00
David Cook
4f27bea02f
Make table header sticky
...
But it overlaps the .form-actions. how to make them sticky together..
todo: register the z-index in variables.scss
2024-01-09 17:07:37 +11:00
David Cook
e48d009668
Hide #sort section instead of covering it
...
Before, the .form-actions was overlaying it, to avoid making the table below jump. But if the .form-actions and #sort are the same height, it won't jump when we swap them.
It does make the table jump in the case of a multi-line .form-actions message, but that only happens after submit anyway.
This is needed for the next commit..
2024-01-09 13:11:49 +11: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
e2eead0f86
Scroll to reveal White Label tab
...
The Vouchers tab pushed the White Label tab further down and it was
hidden by the savebar. The CSS adjustment in this commit makes sure
that users can always see all menu items.
The automatic scrolling by Capybara fails because of the savebar but
scrolling to the bottom works.
2024-01-08 15:52:17 +11: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
Ahmed Ejaz
056907d195
11971: update z-index for ToS
2024-01-05 00:59:42 +05:00
Maikel Linke
883bfcdf0d
Simplify column toggling in report spec
...
* This partly reverts 3a957fb988
2024-01-04 16:53:36 +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
Dung Bui
14d755d706
fix typo
2024-01-04 07:55:19 +07:00
Dung Bui
ab6a7e307b
remove unused helpers
2024-01-04 00:19:15 +07:00
Dung Bui
f1da550912
remove unused structs
2024-01-04 00:19:15 +07:00
Dung Bui
b844b188ce
fix enterprise roles page performance
2024-01-04 00:19:15 +07: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
Ahmed Ejaz
dcc962a8fd
11923: fix lint issues
2024-01-03 16:02:07 +05:00
Mohamed ABDELLANI
3fab2c350e
require tag_rule_applicator on Shop::OrderCyclesList
2024-01-03 11:59:21 +01:00
Ahmed Ejaz
3a957fb988
11923: add specs
2024-01-03 15:46:16 +05: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
David Cook
aa3d4c3f6e
Add keyboard shortcut to submit forms on frontend
2023-12-29 15:02:43 +11:00
David Cook
78e2311f59
Add keyboard shortcut to submit form in admin
...
Unfortunately it doesn't work for Angular forms. I'm not sure if there's a way to trigger an angular submit.
2023-12-29 14:57:59 +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
