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
19b6cbcc9b
Packing reports: Display phone numbers to suppliers
2025-03-31 16:16:27 +11:00
David Cook
9c296b691f
Remove unnecessary parameter
...
We've never needed it and still don't need it for the next feature
2025-03-31 16:16:27 +11:00
David Cook
38fca53e91
Refactor
...
Using a more specific name for the mask rule, and making way for a second standardised rule.
2025-03-31 16:16:27 +11:00
David Cook
f40a00dde3
Expand spec to cover existing behaviour
...
And use let to avoid extra db query
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
b05a42f3bb
Refactor spec
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
Maikel
b9901b91fe
Merge pull request #13234 from mkllnk/rspec-sql
...
Bump rspec-sql from 0.0.2 to 0.0.3
2025-03-31 12:24:31 +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
Maikel
f61b2ae22e
Merge pull request #13229 from mcmpp/Add_basque_language
...
Add basque language
2025-03-31 10:45:59 +11:00
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
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
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
