drummer83
71fa0f09c6
Add 'reply to' email address to order emails for shops
2025-03-18 16:07:55 +01:00
drummer83
aff5cd8d44
Add 'reply to' email address to payment emails
2025-03-18 16:07:55 +01:00
Filipe
e524b3ddb1
Merge pull request #13197 from dacook/reload-payments-12693
...
Fix obscure issue when choosing payment method in checkout
2025-03-18 12:04:33 +00:00
Filipe
3c801a2656
Merge pull request #13182 from mkllnk/invalid-dfc-catalog-url
...
Rescue from invalid DFC catalog URLs
2025-03-18 10:57:26 +00:00
Ahmed Ejaz
86f5385aec
13179: fix notes field length issue
...
- notes field was a children of label element
- due to this its size was bound by the label element
- now this commit makes it a sibling, making it occupy the width of column width
2025-03-16 16:00:56 +05:00
Filipe
b3c7968e50
Merge pull request #13144 from rioug/13100-removed-fee-when-product-removed
...
Update line items enterprise fee instead of deleting and recreating
2025-03-14 10:12:50 +00:00
Maikel Linke
a082a95ea1
Split method into simpler pieces
2025-03-12 13:03:35 +11:00
Maikel Linke
2f5667a294
Gracefully handle product missing from catalog
2025-03-12 12:56:08 +11:00
David Cook
b5065de7d9
Update app/views/checkout/_tabs.html.haml
...
Co-authored-by: Gaetan Craig-Riou <40413322+rioug@users.noreply.github.com >
2025-03-12 10:01:45 +11:00
Maikel Linke
64a8b5845a
Add feature toggle open_in_same_tab for admin dashboard
...
This allows us to test what users actually want.
2025-03-11 16:38:51 +11:00
David Cook
55cbe51592
Prevent Turbo pre-fetch which changes cart state
2025-03-11 16:19:34 +11:00
David Cook
f37742d84a
Prevent exception when payment has been cleared
...
Note that in the real world, this avoids a crash, but still requires the user to click the button two more times before it will work, with no hints as to why. So not a great help.
2025-03-11 16:19:21 +11:00
Maikel Linke
caf40e7301
Open admin dashboard in same tab by default
2025-03-11 16:13:27 +11:00
Maikel
2c25ab0f09
Merge pull request #13199 from cyrillefr/FixRubocopLintIssuesIII
...
Fixes some rubocop linting offenses - part III
2025-03-11 13:58:22 +11:00
Gaetan Craig-Riou
0480ddb59c
Add comment
2025-03-11 10:41:32 +11:00
Gaetan Craig-Riou
9c45801e37
Code formatting
2025-03-11 10:31:28 +11:00
Ahmed Ejaz
37de45b60e
Merge pull request #13189 from chahmedejaz/bugfix/13019-page-redirect-from-shopfront
...
Page is redirected to root after login from shopfront page
2025-03-09 06:14:44 +05:00
cyrillefr
9bb617d748
Fixes some rubocop linting offenses - part III
2025-03-06 23:42:53 +01:00
David Cook
d3b7db0082
Merge pull request #13186 from cyrillefr/FixRubocopLintIssuesII
...
Fixes some rubocop linting offenses - part II
2025-03-06 11:33:56 +11:00
Maikel
2e4b59daaf
Remove orphaned comment
2025-03-06 11:28:25 +11:00
David Cook
45eedd1e89
Simplify expresssion
...
It's worth noting that a falsy value won't get cached (as before).
But I didn't take the time to investigate if that makes a difference or not.
2025-03-06 10:14:24 +11:00
David Cook
633cdaca56
Remove unused method
...
I believe it's unused since e4d307fe5e
2025-03-06 09:49:50 +11:00
Ahmed Ejaz
b61c9500f9
13019: fix redirect issue
2025-03-05 01:35:46 +05:00
Konrad
6d67a913d9
Merge pull request #13147 from dacook/cleanup
...
Speed up super admin dashboard
2025-03-04 18:09:20 +01:00
Konrad
fcc9e3dc8b
Merge pull request #13171 from cyrillefr/EnterpriseFeesPageTrueInsteadOfBlankOption
...
Remove true as select default first option
2025-03-04 18:07:24 +01:00
David Cook
9adf3a22af
Show only first 25 enterprises
...
I thought about reducing it further, but maybe people are used to having a large list. Let's see how this performs
2025-03-03 14:46:24 +01:00
David Cook
b9aada47e0
Remove superfluous %div from haml ID elements
...
Div is the default element in HAML, so we don't need to specify it.
2025-03-03 14:46:24 +01:00
David Cook
5a1190cdda
Remove superfluous %div from haml elements with class
...
Div is the default element in HAML, so we don't need to specify it. https://haml.info/docs/yardoc/file.REFERENCE.html#implicit-div-elements
2025-03-03 14:46:24 +01:00
cyrillefr
446b948889
Fixes some rubocop linting offenses - part II
2025-03-03 14:03:47 +01:00
Maikel Linke
f9322ac71b
Style: simplify controller method
2025-03-03 12:23:58 +11:00
Maikel Linke
7f8581fd9f
DRY controller methods which became too long
2025-03-03 12:23:58 +11:00
Maikel Linke
9d5ce0ede5
Remove surrounding whitespace from pasted DFC URL
2025-03-03 12:23:58 +11:00
Maikel Linke
b6153fc155
Rescue from invalid DFC catalog URLs
...
This mistake should be dealt with differently but I wanted to make sure
that a really invalid URL is handled well, too.
2025-03-03 12:23:58 +11:00
Maikel
5bef8b7dde
Merge pull request #13178 from cyrillefr/FixRubocopLintIssuesI
...
Fixes some rubocop linting offenses
2025-02-28 10:40:56 +11:00
Filipe
feccef0b36
Merge pull request #13157 from drummer83/email_styled_password
...
Create styled email for reset password instructions
2025-02-27 16:53:04 -06:00
Filipe
cf3213cf96
Merge pull request #13168 from dacook/dfc-product-import-select-all-12301
...
[DFC Orders] Select/deselect all on DFC Product Import
2025-02-27 16:43:37 -06:00
Filipe
9a0bcac3c2
Merge pull request #13156 from drummer83/orders_input_align
...
Align inputs on orders list and adjust position of checkboxes for reports
2025-02-27 16:04:16 -06:00
cyrillefr
027d4ccbad
Fixes some rubocop linting offenses - part I
...
- Lint/RedundantSafeNavigation
- Lint/SelfAssignment
- Lint/UselessMethodDefinition
2025-02-27 16:28:00 +01:00
Maikel
462886447a
Merge pull request #13126 from mkllnk/oidc-error
...
Direct people to refresh OIDC connection when needed
2025-02-24 15:45:48 +11:00
Filipe
bd893eb3d5
Merge pull request #13139 from drummer83/reply-to-email-address
...
Add a 'reply to' email address where it makes sense and has been missing
2025-02-21 13:09:42 -06:00
cyrillefr
96d6718e6d
Remove true as select default first option
2025-02-21 14:20:59 +01:00
Konrad
7cd3c32787
Merge pull request #13164 from rioug/fix-user-controlled-method-execution
...
Fix user controlled method execution
2025-02-21 12:59:40 +01:00
Filipe
9baed8536c
Merge pull request #13121 from rioug/13054-out-of-stock-autoremove
...
Autoremove/update item from the cart if stock changed during checkout
2025-02-20 22:35:40 -06:00
Filipe
f715c366ea
Merge pull request #13160 from chahmedejaz/task/13097-add-columns-in-packing-reports
...
Add shipping method and shipment state to packing reports
2025-02-20 19:49:03 -06:00
Filipe
f7b471da08
Merge pull request #13148 from mkllnk/dfc-variants
...
Add DFC product groups with variants
2025-02-20 18:53:00 -06:00
Konrad
48688311d1
Merge pull request #13165 from chahmedejaz/bugfix/unable-to-view-images-in-dev-env
...
Fix base urls for assets in development
2025-02-20 07:56:09 +01:00
David Cook
7444ddccd1
Wait, There's A Lifecycle Callback For That
2025-02-20 12:52:27 +11:00
David Cook
7acc78b6d8
Revert "Delegate events to the parent element"
...
This reverts commit e31c16df43
2025-02-20 12:49:25 +11:00
David Cook
e31c16df43
Delegate events to the parent element
...
Ok so I wasn't as smart as I thought I was. The stimulus controller knows when its element is added/removed from the DOM (and calls connect/disconnect appropriately). But if any child elements are added, they don't automatically have my new event handlers.
So I borrowed jQuery's event delegation concept, and listen for any events that 'bubble' up to the controller element, and delegate them as needed.
Alternatively, maybe I could have used a Mutation Observer, but I think it's best to avoid where possible.
Or of course, we could just revert my change and keep the 'data-action's in the HTML. I'm curious to hear opinions on this.."
2025-02-20 12:46:27 +11:00
David Cook
4cb1b0a48e
Add total count of selected items
...
I noticed there's a controller for that too, so might as well make use of it. The orders page has it at the top, because that's where the bulk action menu is. But on this page, the action is the import button so I put it there.
2025-02-20 12:15:53 +11:00
