Gaetan Craig-Riou
aee80ddf1d
Merge pull request #13230 from filipefurtad0/specs_mailer_reply_to_changes
...
Adds tests to recent reply_to email changes
2025-03-31 10:38:59 +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
filipefurtad0
b975986639
Update all locales with the latest Transifex translations
2025-03-29 11:22:49 +00: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
Abdul Aziz Ali
8b34505b36
Fix query group and pluck #11529
2025-03-28 19:12:09 +08:00
Abdul Aziz Ali
abe4c5e0da
Filter fees by metadata.enterprise_role 'supplier' #11529
2025-03-28 18:30:44 +08:00
Maikel Linke
4962304a48
Deal with nil values in sum
...
Rails was doing that for us but Rails 7.1 won't.
2025-03-28 17:01:26 +11:00
Maikel Linke
007154ef28
Notify Bugsnag on deprecations in staging & production
...
The behaviour was set to `notify` already but we were missing a
notification handler. Now we'll get alerted about deprecations which
were not covered by specs.
2025-03-28 17:01:26 +11:00
Maikel Linke
db513470e0
Fail CI on unknown deprecation warnings
2025-03-28 17:01:26 +11:00
Maikel Linke
b3ddfde1c3
Remove empty ProductStock concern
2025-03-28 14:49:47 +11:00
Maikel Linke
a48a1e1171
DRY importer spec
2025-03-28 14:48:40 +11:00
Maikel Linke
ca9f32ceae
[API change] Remove unused Product#on_hand
2025-03-28 14:48:40 +11:00
Maikel Linke
d55d4dd8ed
Remove unused Product#on_demand
2025-03-28 14:00:40 +11:00
Maikel Linke
0334f3688e
Upload to and download from Transifex
2025-03-28 11:12:10 +11:00
Maikel Linke
eddae28ce0
Fix locale syntax
2025-03-28 11:05:53 +11:00
Mikel Cordovilla Mesonero
2904b64b2a
Merge branch 'master' into Add_basque_language
2025-03-27 18:54:53 +01:00
Mikel Cordovilla Mesonero
a5fd1ec7b1
Update config/locales/eu.yml
...
Co-authored-by: Maikel <maikel@email.org.au >
2025-03-27 16:12:30 +01:00
Mikel Cordovilla Mesonero
3af00d5f7a
Update config/locales/eu.yml
...
Co-authored-by: Maikel <maikel@email.org.au >
2025-03-27 16:12:17 +01:00
Maikel
9e1a66c1e5
Merge pull request #13233 from chitty/bump-puma-to-6.5
...
Bump puma to v6.5.0
2025-03-27 16:10:21 +11:00
Maikel Linke
60eb50066e
Bump rspec-sql from 0.0.2 to 0.0.3
2025-03-27 15:21:08 +11:00
Maikel Linke
406018e7eb
Simplify resetting variants
...
I was hoping to reduce the query count but it stayed the same. In fact,
I'm expecting the query count to be higher with this version. The
DfcCatalogImporter queries all variants and links at once while the OC
job is not pre-loading the variants at the moment. We can optimise the
job though.
If we kept the old version and there were multiple catalogs per variant
then we would call the importer with the reset multiple times. The job
is iterating through each link only once though. So depending on the
ratio of catalogs to variants, I'm not sure which version would be more
efficient.
No version is properly dealing with the edge-case of multiple catalogs
per variant anyway. Imagine there are two catalogs with different stock
levels. Which one do we choose? Or do we add up?
And if the variant disappears from one catalog we still want to sell it
through the other. But depending on the order of processing, we may
reset the variant if it's missing in the last catalog. But let's worry
about that when it actually happens. Maybe it will be better to restrict
variants to one catalog.
2025-03-27 15:12:45 +11:00
Maikel Linke
1a5b6bbc8f
Reset stock for unavailable products on OC open
2025-03-27 14:40:50 +11:00
Maikel Linke
9e3ff412f9
Simplify controller
2025-03-27 13:36:48 +11:00
Maikel Linke
48e3b5b05e
Move more reset variant code for re-use
2025-03-27 13:36:48 +11:00
Maikel Linke
c43bd0c24b
Move variant reset code to shared service
2025-03-27 13:36:48 +11:00
Maikel Linke
e35a29cc29
Remember local stock of backordered products
...
When retail variants are mapped to wholesale variants, we usually have a
some leftover stock at the end of an order cycle. For example, we
backordered a slab of 12 cans of tomatoes but our customers bought only
9 of those. Then we have 3 left for the next order cycle.
Even when the product is not available for backorder with the supplier,
we still want to sell off our leftover stock, the three cans of tomatoes
in our example.
And it might be that the product will come back in the future.
2025-03-27 13:36:48 +11:00
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
