David Cook
e02ef08b06
Consolidate translations for hidden field
...
The string '< Hidden >' was agreed on as a good default, so we will use the hidden_field key.
I also moved the definition in en.yml up to the more general area at the start of admin.reports section (before it was hidden between report-specific keys.
2025-03-31 16:24:07 +11:00
David Cook
729dc9d658
Move mask logic to separate module
...
And cross-reference similar files so we don't miss it next time\!
2025-03-31 16:16:27 +11:00
David Cook
47b6888fe6
Display customer emails & phone numbers to suppliers
...
when permitted.
The MaskDataService is used by the report framework, so this should affect all reports. It would be nice to test all reports, but I figured it wasn't worth it (already we only test one report for masking names).
2025-03-31 16:16:27 +11:00
David Cook
98ab910fb4
Refactor
2025-03-31 16:16:27 +11:00
David Cook
4402854a2a
AddEnableProducersToEditOrdersToEnterprises
...
With system spec for setting the preference. The enterprise edit page seems under-tested..
2025-03-31 16:16:27 +11:00
David Cook
02db30202b
Use rails form helper methods
...
This helps ensure the labels are attached to the radio buttons, so you can click on the words to select the option.
2025-03-31 16:16:27 +11:00
Gaetan Craig-Riou
421b753e0a
Merge pull request #13231 from chitty/more-rubocop-style-corrections
...
Correct rubocop Style/* offenses
2025-03-31 10:49:20 +11:00
David Cook
91a9a3cd77
Merge pull request #13226 from cyrillefr/FixRailsInversOfPartI
...
Fixes some Rails InverseOf offenses
2025-03-31 09:48:51 +11:00
Filipe
37ef5d5b02
Merge pull request #13214 from chahmedejaz/task/13179-expand-notes-edit-order
...
Fix expand notes field when editing order
2025-03-28 16:43:29 +00:00
cyrillefr
da26f5833f
Requested changes
2025-03-26 19:44:08 +01:00
Carlos Chitty
ecb303fef5
Correct Style/SlicingWithRange rubocop offenses
2025-03-26 11:16:24 -04:00
Carlos Chitty
7f734cf2f8
Autocorrect Style/PreferredHashMethods rubocop offense
2025-03-26 11:16:24 -04:00
cyrillefr
1d24674386
Fixes some Rails InverseOf offenses
2025-03-25 18:46:00 +01:00
Filipe
9fa42cae47
Merge pull request #13143 from mkllnk/admin-in-same-tab
...
Open admin dashboard in same tab by default
2025-03-25 17:10:51 +00:00
Filipe
2a3927caad
Merge pull request #13176 from drummer83/reply-to-email-address_part2
...
Add a 'reply to' email address to some more emails
2025-03-25 17:00:02 +00:00
David Cook
ff7c23c8f9
Rename OrderCycleOpenedJob
...
This name better reflects what it's doing.
As this job is scheduled automatically by Sidekiq, I think there shouldn't be any jobs with the old name in redis. So I didn't bother keeping a placholder for the old name.
And Clean up unused include
2025-03-25 10:38:34 +11:00
David Cook
6738101ebd
Raise error if record not found, and don't retry too many times
...
After 10 minutes, I'd consider that it failed to open the order cycle. Who would want their products to sync, or get a notification at a random time during the order cycle?
Best viewed with whitespace ignored.
2025-03-25 10:38:34 +11:00
David Cook
428bcc8988
Only update one timestamp
...
> The order cycle itself is not changed. It's just that time passed and it's now considered open/closed.
2025-03-25 10:38:34 +11:00
David Cook
317cbd4b32
Use existing method
...
Co-authored-by: Maikel <maikel@email.org.au >
2025-03-25 10:38:34 +11:00
David Cook
23dc0f7298
Change concurrency check to be based on order_cycle.opened_at
...
Being based on the DB value should be more robust.
This prevents an order cycle from being "opened" when it's already open. But note that the order cycle can become "unopened" (see OrderCycle#reset_opened_at).
Nice to see the database query count drop, but I must confess I don't know why!
2025-03-25 10:38:34 +11:00
David Cook
eff8fdb28b
Move to new job
...
And re-organise specs.
TOFIX: concurrency test now fails. why?
Use correct testing methods
2025-03-25 10:38:34 +11:00
David Cook
a8490a9b11
Record the exact event time for the webhook
...
There might be a delay before it gets sent, so it's better to record the time the event occurred at.
It would have been simpler to just add it to the data hash, but I felt it was an important detail for an event and should be at the top level along with event name.
In the case of order cycle opening, this is the same as opened_at. I've included this in the payload for clarity too.
2025-03-25 10:38:30 +11:00
David Cook
05e1a5b39d
Mark each order cycle as opened once pre-conditions have been processed
2025-03-25 10:27:47 +11:00
David Cook
5b21c81ca5
Synchronise remote products when order cycle opens
...
I considered pre-loading the variant and product with includes, But can't do that here because it's a polymorphic relationship.
2025-03-25 10:27:47 +11:00
Gaetan Craig-Riou
bdced0b9e2
Merge pull request #13207 from mkllnk/dfc-missing-product
...
Gracefully handle product missing from catalog
2025-03-24 10:12:48 +11:00
Ahmed Ejaz
806965b2cd
add textarea field plus the preformatted tag to display paragraph formatting in the notes
2025-03-24 00:43:07 +05:00
cyrillefr
fa4fc7c3c5
Fixes Rails TimeZone rubocop offenses
2025-03-21 13:13:52 +01:00
Maikel Linke
dc749092b4
Simplify authorisation required email
2025-03-20 09:58:46 +11:00
Gaetan Craig-Riou
11e08dcc26
Revert "Update line items enterprise fee instead of deleting and recreating "
2025-03-19 09:40:02 +11:00
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
