Maikel Linke
2a81d26ef1
Simplify complex method
2025-03-27 13:36:48 +11:00
Maikel Linke
c60718feea
List absent products in import preview
2025-03-27 13:36:48 +11:00
Maikel
a2e68e1f3c
Explain stock reset further
...
Co-authored-by: David Cook <david@redcliffs.net >
2025-03-27 13:36:48 +11:00
Maikel Linke
11be8360e3
Prettier and localised display of import stats
2025-03-27 13:36:47 +11:00
Maikel Linke
a6c08fe2ad
Reset stock for absent products in DFC catalog
2025-03-27 13:36:47 +11:00
Maikel Linke
8a8602158b
Test link in HTML email with Capybara
2025-03-27 12:06:05 +11:00
Maikel Linke
b554248cfe
Test for email content
2025-03-27 11:48:41 +11:00
Maikel Linke
1b8ebc3105
Test with known text
2025-03-27 11:38:35 +11:00
Maikel Linke
edcb04ed50
Save time by not storing test data in DB
2025-03-27 11:31:16 +11:00
Maikel Linke
e12c51edd1
Use RSpec matchers for emails
2025-03-27 11:29:15 +11:00
Maikel
249410bed1
Merge pull request #13228 from rioug/13217-add-order-fees-testing
...
[Enterprise fees] Add system testing for various enterprise fees
2025-03-27 10:49:23 +11:00
cyrillefr
da26f5833f
Requested changes
2025-03-26 19:44:08 +01:00
Carlos Chitty
24aaf9ab4c
bump puma
2025-03-26 13:03:13 -04:00
Carlos Chitty
ecb303fef5
Correct Style/SlicingWithRange rubocop offenses
2025-03-26 11:16:24 -04:00
Carlos Chitty
58a16d89a3
Correct Style/RedundantInitialize rubocop offense
2025-03-26 11:16:24 -04:00
Carlos Chitty
7f734cf2f8
Autocorrect Style/PreferredHashMethods rubocop offense
2025-03-26 11:16:24 -04:00
Carlos Chitty
be76e714c6
Autocorrect Style/GlobalStdStream offenses
2025-03-26 11:16:24 -04:00
Carlos Chitty
1109ccfc3d
Correct Style/FrozenStringLiteralComment rubocop offense
2025-03-26 11:16:24 -04:00
Carlos Chitty
9c8e0899d1
Correct Style/CaseEquality rubocop offense
2025-03-26 11:16:20 -04:00
filipefurtad0
e017b14f31
Adds spec for payment authorization emails
2025-03-26 12:19:02 +00:00
filipefurtad0
df3cbe84b6
Asserts that the order shipment and pick up emails have the distributors email as reply to address
2025-03-26 12:19:02 +00:00
filipefurtad0
98cba128e0
Asserts that the invoice email has the distributors email as reply to address
2025-03-26 12:18:55 +00:00
filipefurtad0
ea82b162ac
Asserts that the order cancellation email for customer has the distributors email as reply to address
2025-03-26 12:00:48 +00:00
filipefurtad0
9a161cae5b
Asserts that the order confirmation email for shops has the customer's email as reply to address
2025-03-26 12:00:48 +00:00
filipefurtad0
6ee1c8ca29
Asserts that the order cancellation email for shops has the customer's email as reply to address
2025-03-26 12:00:41 +00:00
filipefurtad0
c95c598f82
Asserts that the enterprise welcome email has no reply to address
...
Asserts that manager invitation email has the inviting enterprise as reply to address
2025-03-26 11:57:59 +00:00
Mikel Cordovilla
355c775516
Add basque language
2025-03-26 11:57:22 +01:00
Gaetan Craig-Riou
d8f2bb09d0
Re enable assertion
...
It's working fine with the current design
2025-03-26 12:50:42 +11:00
Gaetan Craig-Riou
1ee3e9a2a1
Add proper fee testing
...
The previous version wasn't testing anything as there was no fees set
up.
Now we check that fees are applied as expected, and also that supplier
fees are applied only to the expected product.
2025-03-26 12:50:35 +11:00
Maikel
83186608a0
Merge pull request #13227 from chitty/rubocop-style-autocorrection-fix
...
Autocorrect rubocop offenses Style/RedundantAssignment and Style/RedundantArgument
2025-03-26 10:16:35 +11:00
cyrillefr
1d24674386
Fixes some Rails InverseOf offenses
2025-03-25 18:46:00 +01:00
Carlos Chitty
dca2714aa7
Autocorrect rubocop offense Style/RedundantArgument
2025-03-25 13:35:56 -04:00
Carlos Chitty
ba693e3ecf
Autocorrect rubocop offense Style/RedundantAssignment
2025-03-25 13:33:50 -04: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
Maikel
11dbd5620d
Merge pull request #13167 from dacook/sync-products-on-oc-opened-12986
...
[DFC Orders] Sync remote products when order cycle opens
2025-03-25 11:02:59 +11:00
Maikel Linke
177a910aac
Disable printing expected error
2025-03-25 10:38:35 +11:00
Maikel Linke
973d1be90b
Style EmptyBlock
2025-03-25 10:38:35 +11:00
Maikel Linke
7abaaed5b6
Make test fail when we are not locking
2025-03-25 10:38:35 +11:00
Maikel Linke
dcedffac2f
Ensure we wait for all threads in spec
2025-03-25 10:38:34 +11: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
75dcee12a8
Re-record fixture
...
And document how to run it.
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
801beadb67
Reduce specificy of test
...
I guess we lose some of the detail in the db.
2025-03-25 10:38:34 +11:00
David Cook
4400b74f7e
Explicitly set timecop freeze time
...
and in that case, might as well define it once at the top.
But it didn't help with spec failures.. see next commit
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
