François Turbelin
9529acd477
Adjust the regexp
2025-04-09 23:23:37 +02:00
François Turbelin
243d81c786
Revert "Improve the no-white-spaces regexp for enterprises"
...
This reverts commit baf89053638628052752f345b357d630d7484046.
2025-04-09 23:20:51 +02:00
François Turbelin
98251b306e
Improve the no-white-spaces regexp for enterprises
2025-04-09 22:34:25 +02:00
Gaetan Craig-Riou
6d78ee8be4
Fix rubocop warning
2025-04-09 22:34:23 +02:00
Filipe
9f988f7a02
Merge pull request #13216 from drummer83/email_header
...
Email header: Improve logo, resizing and styles
2025-04-09 12:00:09 +01:00
Filipe
c17821687d
Merge pull request #13243 from cyrillefr/GoButtonResumeEnabledAfterFailedReport
...
Fixes button staying disabled after report fail
2025-04-09 10:19:06 +01:00
Filipe
c3cb51441f
Merge pull request #13192 from dacook/display-customer-contacts-in-reports-13129
...
[FF] Add option to display customer contact details to suppliers in reports
2025-04-08 20:34:44 +01:00
cyrillefr
5c3db6cab8
Removes unused action from filter in controller
2025-04-08 14:04:37 +02:00
cyrillefr
0ef3b06cdf
Requested changes
2025-04-07 13:12:51 +02:00
David Cook
5dcdf0caed
Merge pull request #13247 from cyrillefr/FixRailsRubocopIssueInverseOfInOrder
...
Fix Rubocop InverseOf offense in Order model
2025-04-07 16:45:50 +10:00
David Cook
369b93f0dd
Update tip
...
By updating the translation key, all other locales will be notified to update their translations too.
2025-04-07 16:33:39 +10:00
Ahmed Ejaz
34e8bc83b9
Update all locales with the latest Transifex translations
2025-04-05 03:49:47 +05:00
cyrillefr
019c703b1c
Fix Rubocop InverseOf offense in Order
...
- also fix failing spec due to adding inverse
2025-04-03 12:39:06 +02:00
cyrillefr
6666896fa3
Requested changes
2025-04-02 14:46:22 +02:00
David Cook
5c5a115daa
Fix typo
2025-04-02 10:40:46 +11:00
Konrad
d42d86b763
Reduce max-width of logo to reflect the proposed aspect ratio of 640px / 130px (= 247px / 50px)
2025-04-01 18:37:59 +02:00
Konrad
3b0b023624
Remove unused styles
...
Class "btn": not used in any of the emails and invoices
Class "column-wrap": not used in any of the emails and invoices
Class "collapse": margin and padding are set globally to zero already, padding is not used, but we need margin to overwrite it for h6
2025-04-01 18:36:25 +02:00
Konrad
9ee37ee0b6
Update specs
2025-04-01 18:11:13 +02:00
Konrad
db3a8a6b30
Header: Improve logo, resizing and styles
...
Use the site's main logo instead of footer logo to allow for better contrast on gray background (dark text on gray instead of white text on gray)
The table's background color is defined in the parent table already
Limit the max width and max height of the logo and resize the logo accordingly instead of forcing it to squeeze into a fixed size
2025-04-01 18:11:13 +02:00
cyrillefr
f0a5c76b45
Fixes button staying disabled after report fail
...
- added a test
2025-04-01 17:25:53 +02:00
Filipe
a7c77dc894
Merge pull request #13084 from abdulazizali77/bugfix/11529-report-by-enterprise-fee-from-lineitems
...
Fetch variant enterprise fees from order lineitems adjustments #11529
2025-04-01 16:13:51 +01:00
Filipe
bb527a2cbd
Merge pull request #13224 from Tresor11/tb-rescue-not-found-error-for-enterprise
...
Fix: Admin visiting non-existent enterprise raises error
2025-04-01 15:00:41 +01:00
Gaetan Craig-Riou
1279ab21a6
Fix delete fee logic
...
A fee can be associated to both the incoming and outgoing exchange, the
previous logic did not account for that, resulting in the fee not being
correctly removed.
Now the delete logic also check for the metadata enterprise role to see
if any additional fee need to be removed.
2025-04-01 13:46:34 +11:00
Gaetan Craig-Riou
3744ba9198
create_*_adjustment now return the adjustment
2025-04-01 13:46:34 +11:00
Gaetan Craig-Riou
223faa5569
Move #recreate_all_fees! spec to HandleFeesService
...
Spree::Order just delegate Orders::HandleFeesService so there is no
point testing fees in the order spec
2025-04-01 13:46:34 +11:00
Gaetan Craig-Riou
b5bc6b84d7
Update Orders::HandleFeesService#recreate_all_fees!
...
We now update or create line item fees instead of deleting them and
recreating them. This is to cover the case when a product has been
removed from an Order Cycle but we want to keep the fee already applied
on existing order. This was an issue only if the existing order got
updated after the product was removed.
2025-04-01 13:46:34 +11:00
Gaetan Craig-Riou
d83f8ded0d
Remove Module from spec and some stylying
...
Also remove unnecessary use of `__send__`
2025-04-01 13:46:34 +11:00
Gaetan Craig-Riou
2a0caca570
Refactor EnterpriseFee.clear_all_adjustments
...
Renamed to clear_order_adjustments, it doesn't clear line item
adjustment
2025-04-01 13:46:34 +11:00
Gaetan Craig-Riou
02a9aaf1ec
Refactor spec
2025-04-01 13:46:34 +11:00
Trésor Bireke
5e7f0f8a1a
Merge branch 'master' into tb-rescue-not-found-error-for-enterprise
2025-04-01 01:10:17 +02:00
Gaetan Craig-Riou
0537a56b47
Merge pull request #13239 from cyrillefr/FixRailsRubocopIssueInverseOfInPayments
...
Fixes rubocop offense inverse_of on payment model
2025-04-01 09:59:01 +11:00
David Cook
bf3cfeb9fa
Merge pull request #13236 from mkllnk/deprecations
...
Alert us to deprecation warnings
2025-04-01 09:53:02 +11:00
David Cook
d8eab7875f
Merge pull request #13235 from mkllnk/stock-aggregation
...
[API change] Remove unused ProductStock concern
2025-04-01 09:45:24 +11:00
David Cook
176e33d6bf
Rubocop fixes
2025-04-01 09:29:27 +11:00
Tresor11
507705a4eb
Update method name to require
...
This commit updates the method name to be called required_enterprise
since we only expect it to raise an error when the enterprise is not found.
2025-03-31 22:28:38 +03:00
cyrillefr
09a6da0c57
Fixes rubocop offense inverse_of on payment model
...
- some clean up unused method too
2025-03-31 17:10:43 +02:00
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
