Gaetan Craig-Riou
a8b5a79b4b
Merge pull request #13283 from openfoodfoundation/dependabot/npm_and_yarn/jasmine-core-5.7.0
...
Bump jasmine-core from 5.6.0 to 5.7.0
2025-04-30 11:54:21 +10:00
Filipe
d20ed5c757
Merge pull request #13275 from slothmock/fix-#13264
...
Fix #13264 - missing 'ng-bind-html'
2025-04-29 18:45:15 +01:00
Filipe
69bb78e39c
Merge pull request #13213 from chahmedejaz/task/13128-add-order-number-to-notify-producer-email
...
Add order number to notify producer emails and make customer code available for everyone
2025-04-29 18:22:06 +01:00
Filipe
bf2277b6da
Merge pull request #13255 from piyush828-design/pagy_upgrade
...
Upgrade pagy version to latest
2025-04-29 16:12:58 +01:00
dependabot[bot]
017babc695
Bump jasmine-core from 5.6.0 to 5.7.0
...
Bumps [jasmine-core](https://github.com/jasmine/jasmine ) from 5.6.0 to 5.7.0.
- [Release notes](https://github.com/jasmine/jasmine/releases )
- [Changelog](https://github.com/jasmine/jasmine/blob/main/RELEASE.md )
- [Commits](https://github.com/jasmine/jasmine/compare/v5.6.0...v5.7.0 )
---
updated-dependencies:
- dependency-name: jasmine-core
dependency-version: 5.7.0
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2025-04-29 09:28:57 +00:00
Maikel
e02b765463
Merge pull request #13282 from cyrillefr/FixRubocopNamingHeredocDelimiterNaming
...
Fixes Rubocop HeredocDelimiterNaming offense
2025-04-29 12:44:58 +10:00
Ahmed Ejaz
6f9b5e2c54
fix specs
...
- add a new class .line-items in the orders-summary to better differentiate the line-items summary vs customer-details. This css class is not defined, just .customer-order for customer details. It's only used to make a differentiation in the specs
- use the updated `parsed_email` memoized helper method for mail body content
2025-04-28 15:11:54 +05:00
Ahmed Ejaz
d9c15cf414
update locale to use lazy loading
2025-04-28 15:11:54 +05:00
Ahmed Ejaz
57c30591bc
13128: add order number in OC report
...
- Make Customer Code independant of Customer Names setting
2025-04-28 15:11:52 +05:00
cyrillefr
2dce79a93d
Fixes Rubocop HeredocDelimiterNaming offense
2025-04-28 09:47:55 +02:00
piyush828-design
0bb6860343
Merge branch 'master' into pagy_upgrade
2025-04-28 11:23:44 +05:30
David Cook
e900c95213
Merge pull request #13276 from filipefurtad0/pagy_pagination_spec
...
Adds coverage to pagination (pagy bump)
2025-04-28 13:18:58 +10:00
David Cook
7ed5ca8e1c
Clarify number of users expected
2025-04-28 12:23:53 +10:00
Gaetan Craig-Riou
6f0c5c7a1c
Merge pull request #13277 from cyrillefr/FixRubocopAccessorMethodNameOffense
...
Fixes Rubocop Naming/AccessorMethodName offenses
2025-04-28 10:24:16 +10:00
piyush828-design
5e890bb361
Merge branch 'master' into pagy_upgrade
2025-04-24 17:46:39 +05:30
Jordan Mock
3bb14fbfdb
Merge branch 'master' into fix-#13264
2025-04-24 13:13:37 +01:00
Jordan 'sloth' Mock
b56411145c
Incorrect place for origianl fix. Thanks to Blane W for pointint out the correct line.
2025-04-24 13:05:40 +01:00
filipefurtad0
1d0d294a09
Adds coverage related to S1 regression #13002
2025-04-24 10:24:13 +01:00
cyrillefr
6fb1737672
Rename get method in spec web helper
2025-04-24 09:29:40 +02:00
cyrillefr
8d5292c4ed
Rename set method in spec helper and calls
2025-04-24 09:29:40 +02:00
cyrillefr
9d2cb5f0e7
Rename get method in core controller helper
2025-04-24 09:29:40 +02:00
cyrillefr
7e8661b936
Rename a set method in Post checkout service
2025-04-24 09:29:40 +02:00
cyrillefr
7812d5f58a
Replace set_methods in order model
2025-04-24 09:29:40 +02:00
cyrillefr
9996fcb54d
Strips set prefix from method in ProducerMailer
2025-04-24 09:29:40 +02:00
piyush828-design
6f2f8e9542
fixed users page breaking
2025-04-24 12:49:47 +05:30
Maikel Linke
4756078ab9
Update all locales with the latest Transifex translations
2025-04-24 13:53:46 +10:00
Filipe
40d4b0c811
Merge pull request #13269 from drummer83/remove_txt-mails
...
Remove text versions of emails
2025-04-23 22:44:39 +01:00
filipefurtad0
e3fff0869e
Adds test case on pagination for zones index page
2025-04-23 19:45:06 +01:00
filipefurtad0
c8a91a9d44
Fixes deprecation on trailing hashes for sort_link
...
Running the spec was pointing to the following deprecation - Passing two trailing hashes to is deprecated, merge the trailing hashes into a single one. (called at /home/ffurtado/openfoodnetwork/app/views/spree/admin/users/index.html.haml:16)
2025-04-23 19:45:06 +01:00
filipefurtad0
a84c0ffd73
Adds test case on pagination for users index page
2025-04-23 19:45:06 +01:00
Jordan Mock
c14c760033
Fix #13272 - missing 'ng-bind'
...
This PR fixes issue #13272 where supplier and product names containing HTML character entities (e.g. ã) were rendered as raw text on the /admin/inventory page.
For example, a supplier name intended to appear as:
Pãtes du Contentin
would incorrectly display as:
Pãtes du Contentin
Cause:
AngularJS’s {{ ... }} interpolation inserts raw strings into the DOM without decoding HTML entities.
2025-04-23 14:05:21 +01:00
Filipe
6a9493a581
Merge pull request #13256 from ashishp91/missing_translations_for_tax_category
...
Use translation for "none" in reports
2025-04-23 13:10:13 +01:00
Filipe
07842bf5eb
Merge pull request #13081 from pacodelaluna/do-not-allow-spaces-in-external-billing-id
...
Do not allow spaces in external billing
2025-04-23 12:20:02 +01:00
David Cook
280886241a
Merge pull request #13259 from piyush828-design/add_coverage_10597
...
Added tests for edit and delete
2025-04-23 13:05:13 +10:00
piyush828-design
8c564d344b
Merge branch 'master' into add_coverage_10597
2025-04-22 11:37:54 +05:30
piyush828-design
ed0b7f88a4
updated specs
2025-04-22 11:26:56 +05:30
David Cook
e1c6709472
Merge pull request #13251 from cyrillefr/FixRailsLexicallyScopedActionFilterPartI
...
Adresses Rails/LexicallyScoped offenses
2025-04-22 11:26:11 +10:00
Ahmed Ejaz
915dccc92d
Update all locales with the latest Transifex translations
2025-04-22 01:45:38 +05:00
Konrad
d97cb9ccb3
Update specs
2025-04-21 20:11:50 +02:00
Konrad
f63552ca38
Deletes remaining text versions of emails
...
This is in preparation for advancing the white labelling feature of emails and adding more specs in that regard
Related discussion on Slack: https://openfoodnetwork.slack.com/archives/C2GQ45KNU/p1722902361401869?thread_ts=1721485724.245519&cid=C2GQ45KNU
2025-04-21 20:11:50 +02:00
Filipe
d2fa2e612c
Merge pull request #13113 from chahmedejaz/task/13031-allow-producers-to-edit-orders
...
Allow producer to edit their products on hubs' orders
2025-04-21 11:28:36 +01:00
Ahmed Ejaz
7642c54667
remove the disabled button
2025-04-21 03:38:06 +05:00
Filipe
cb9db54cd3
Merge pull request #13240 from rioug/13100-do-not-remove-fee-product-removed-from-OC
...
[Enterprise Fees] Keep fees on product when a product is removed from the order cycle
2025-04-20 21:57:56 +01:00
Filipe
3236cbb0b8
Merge pull request #13191 from mkllnk/dfc-reset
...
Reset stock for absent products in DFC catalog
2025-04-20 21:34:49 +01:00
Ahmed Ejaz
3443c79169
Update all locales with the latest Transifex translations
2025-04-21 00:40:49 +05:00
François Turbelin
318bc1dae0
Add tests
2025-04-17 21:29:23 +02:00
piyush828-design
3202d0ea81
fixed test failure
2025-04-16 18:24:32 +05:30
piyush828-design
da5cef26db
upgraded pagy to latest version
2025-04-16 17:46:31 +05:30
piyush828-design
e76b001348
Upgrade pagy version to latest
2025-04-16 17:46:31 +05:30
piyush828-design
5849ae57de
Added tests for edit and delete
2025-04-16 12:11:52 +05:30
