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
David Cook
6f5a58ac47
Refactor spec
...
It was probably better to be explicit at each test, but this one is always repeated and approaches the line length, so I wanted to just define it once at the top.
2025-03-25 10:27:47 +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
Maikel
08dd446d54
Merge pull request #13223 from cyrillefr/FixRailsTimeZone
...
Fixes Rails TimeZone rubocop offenses
2025-03-24 10:07:01 +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
Tresor11
5b3bae85ca
Rescue Not Found Error for Enterprise for admin
...
Currently when an admin tries to edit an no-existing enterprise, a
NoMethodError is raised.
This commit adds a set_enterprise setter method to the
enterprises controller that sets the @enterprise instance variable to
have the same value as the enterprise object defined in the the edit
method; this method also rescues the NotFound error in case
the enterprise is not found and redirects the user to the enterprises
index page with a error message.
2025-03-22 00:35:27 +03:00
Ahmed Ejaz
bcfb55702b
Update all locales with the latest Transifex translations
2025-03-22 01:29:17 +05:00
cyrillefr
fa4fc7c3c5
Fixes Rails TimeZone rubocop offenses
2025-03-21 13:13:52 +01:00
Filipe
353e7ecff0
Merge pull request #13153 from mkllnk/dfc-images
...
Update images in DFC product import on URL change
2025-03-21 09:59:36 +00:00
Maikel
c60bb2776c
Merge pull request #13201 from dacook/breaking-change-labels
...
Categorise breaking-change labels in release notes
2025-03-21 10:39:48 +11:00
David Cook
da3bd4eae9
Use spaces in label names
...
The labels on GitHub have already been updated.
[skip ci]
2025-03-20 15:31:34 +11:00
David Cook
1d55c234a4
Rename release category title
...
Much less alarming than 'breaking'.
2025-03-20 15:18:57 +11:00
Maikel Linke
dc749092b4
Simplify authorisation required email
2025-03-20 09:58:46 +11:00
Abdul Aziz Ali
6a525c18ac
remove incoming exchange filtering #11529
2025-03-19 08:23:30 +08:00
Maikel
a27491bc39
Merge pull request #13218 from openfoodfoundation/revert-13144-13100-removed-fee-when-product-removed
...
Revert "Update line items enterprise fee instead of deleting and recreating "
2025-03-19 09:57:30 +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
Maikel
a0b5bd53f1
Merge pull request #13210 from dacook/test-locale
...
Ensure tests run with specified locale
2025-03-18 09:57:25 +11:00
Gaetan Craig-Riou
afb25a5209
Merge pull request #13209 from cyrillefr/FixRubocopLintIssuesIV
...
Fixes some rubocop linting offenses - part IV
2025-03-18 09:43:01 +11:00
Ahmed Ejaz
cd894dac59
Revert "TEST"
...
This reverts commit 65a64c6eb3
2025-03-18 03:35:45 +05:00
