raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-08 03:10:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,139 Commits 18 Branches 455 Tags
f7f7a5738ae160f91dddfeb26708172ccd1cd712
Commit Graph

12764 Commits

Author SHA1 Message Date
Maikel
f7f7a5738a Merge pull request #13895 from cillian/remove-angular-from-enterprise-settings-users 
Remove Angular from Enterprise > Settings > Users section
 2026-03-06 14:05:13 +11:00
Gaetan Craig-Riou
6854a53bd1 Merge pull request #13785 from pacodelaluna/repair-rounding-issue-on-totals-in-reports 
Repair rounding issue on totals in reports
 2026-03-06 09:34:39 +11:00
David Cook
59547ba9e4 Merge pull request #13964 from mkllnk/flaky-spec 
Stabilise actions_spec
 2026-03-04 13:06:08 +11:00
Maikel
9fb8bb15e8 Merge pull request #13951 from zilton7/fix/spree-credit-card-brand-deprecation 
Fix Spree::CreditCard#brand= deprecation for Rails 7.2 compatibility
 2026-03-04 11:01:10 +11:00
Maikel
8aa89c0bf7 Merge pull request #13669 from pacodelaluna/repair-proxy-order-to-support-order-cycle-without-closing-time 
Repair ProxyOrder to support order cycle without closing time
 2026-03-04 10:59:21 +11:00
Cillian O'Ruanaidh
447d80c960 Fix spec due to switch to email type field 2026-03-04 10:28:40 +11:00
Cillian O'Ruanaidh
d57274fc4c Manager invitation email is only for new users 2026-03-04 10:28:39 +11:00
Cillian O'Ruanaidh
efae11e2af Change assertion for flakey test failure 2026-03-04 10:28:39 +11:00
Cillian O'Ruanaidh
7433f6d183 Rename :save to save! on UserInvitation because it possibly could raise an exception 2026-03-04 10:28:39 +11:00
Cillian O'Ruanaidh
f1071575cd Remove Angular from Enterprise > Settings > Users section 2026-03-04 10:28:36 +11:00
François Turbelin
6cacde837d Remove duplicated test 2026-03-03 14:27:20 +01:00
David Cook
46de21ea2b Restore required expectation 
It is the whole purpose of the spec.
 2026-03-03 11:06:10 +11:00
François Turbelin
a069e4247f Remove helper method to use direct logic 2026-03-02 22:43:18 +01:00
François Turbelin
7010cda9f7 Tidy up the tests 2026-03-02 22:07:45 +01:00
Konrad
498ed5a3ec Resolve conflicts 2026-03-02 22:05:29 +01:00
Rachel Arnould
c13785f2e3 Merge pull request #13943 from pavelk-lab/replace-brand-story-angular-with-details 
Replace Angular expand/collapse with native HTML <details>/<summary> for brand story
 2026-02-27 15:37:00 +01:00
François Turbelin
28dde86960 Repair ProxyOrder to support order cycle without closing time 2026-02-27 14:36:20 +01:00
François Turbelin
08691f81a1 Adjust logic and specs 2026-02-27 14:09:44 +01:00
François Turbelin
de52e21ee9 Remove floating point overkill for prices sum 2026-02-26 18:04:02 +01:00
Zil Norvilis
503429960a Reverse credit_card_serializer changes 2026-02-26 15:10:21 +02:00
Maikel Linke
fd178ee80b Use unique categories to avoid flakiness 2026-02-26 11:42:46 +11:00
Maikel Linke
e4db20f86e Remove unncessary expectation 
This assertion was confusing me. It was quite complex and the only thing
it was asserting was the placeholder via a CSS selector. I don't think
it's worth keeping.
 2026-02-26 11:37:30 +11:00
Zil Norvilis
58520a0c4c test: Add specs for the stripe_card_options helper method, verifying card formatting and month padding. 2026-02-25 19:49:10 +02:00
Zil Norvilis
0bc4b1c885 refactor: Standardize credit card type attribute to cc_type across the application, removing the brand alias and related methods. 2026-02-25 19:35:53 +02:00
Maikel Linke
6d17cf50fb Test impact of longer wait time on flakiness 2026-02-25 15:08:50 +11:00
Rachel Arnould
81aac877a5 Merge pull request #13945 from mkllnk/taler-refund 
Add "void" action to Taler payment admin page
 2026-02-24 11:23:07 +01:00
Rachel Arnould
68c7d8f9f5 Merge pull request #13934 from chahmedejaz/bugfix/13827-tag-filters-reset-upon-product-update 
Tag filters are reset after updating a product
 2026-02-24 10:20:11 +01:00
Maikel Linke
2cff5bc4df Style helper code 2026-02-23 13:08:56 +11:00
Maikel Linke
1dbcddf799 Select found option after search to fix spec 
Selecting the tom select option in the dropdown often happened quicker
than the search finished. In that case we selected the option from the
list of all options and then the search would present the found option
again and leave the dropdown open.

This didn't cause any trouble in the past because any other action would
close the dropdown again. But the new cuprite version didn't trigger the
next click on the target element. It would just close the dropdown on
the next click without further action. That would then break the next
assertion looking for the next open dropdown, which didn't open with the
click.

Selecting the "active" option means that we wait for the search to
finish and present an option as active. Clicking that option closes the
dropdown without opening it again.
 2026-02-23 13:08:55 +11:00
Maikel Linke
702db32595 Connect unit label to input 
And replace redundant spec helper method.
 2026-02-23 13:08:55 +11:00
Maikel Linke
d770049d2d Replace redundant spec helper method 2026-02-23 13:08:55 +11:00
Maikel Linke
424e25f83e Merge mostly duplicate Tom Select helpers 2026-02-23 13:08:55 +11:00
Maikel Linke
9d79119eb0 Link to payment action with title 
The custom helper was adding a PowerTip which replaced the title
attribute with its own display. I removed the PowerTip and use a simple
title attribute. This should have several benefits:

- Capybara can find the link by the title.
- Screenreaders should be able read the title.
- Browser can show the title in the best position.
- Using the browser feature is more consistent and efficient.
 2026-02-23 13:00:02 +11:00
Maikel Linke
f2eec5685e Include amount in refund email 2026-02-23 13:00:02 +11:00
Zil Norvilis
2cfd386ad7 test: add spec for Spree::CreditCard#brand= setter to verify card type reformatting 2026-02-22 22:28:40 +02:00
Maikel Linke
96c2b75a0a Spec admin display of Taler payment actions 
This should satisfy code coverage.
 2026-02-20 13:43:09 +11:00
Maikel Linke
b6438992b9 Speed up spec by not saving to database 2026-02-20 13:43:09 +11:00
Maikel Linke
69108df206 Use Rails to translate email subject 
And translate the subject with the user's locale.
If the subject doesn't need parameters, you don't need to supply it.
Rails finds the translation automatically.
 2026-02-20 13:43:09 +11:00
Maikel Linke
de873ae42c Add void action to Taler for refunds 2026-02-20 13:43:09 +11:00
Maikel Linke
ed701b00dc Stop storing now redundant redirect URL 
The Taler gem now computes it from the order id. No need to store it.
 2026-02-20 13:43:04 +11:00
Maikel Linke
52e2fb923e Update Taler calls for new v0.2.0 2026-02-20 13:37:46 +11:00
Gaetan Craig-Riou
e276fb0386 Merge pull request #13930 from openfoodfoundation/dependabot/bundler/rubocop-1.84.1 
Bump rubocop from 1.81.7 to 1.84.2
 2026-02-20 09:05:41 +11:00
Pavel
b528bb47a0 Replace Angular expand/collapse with native HTML details/summary for brand story 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-02-19 21:23:09 +00:00
Rachel Arnould
f86eb3fb82 Merge pull request #13920 from mkllnk/clean-name 
Stop pre-selecting Paypal when creating a payment method
 2026-02-19 11:38:56 +01:00
Rachel Arnould
0d46a3bc2e Merge pull request #13902 from mkllnk/refund-simple 
Simplify refund logic
 2026-02-19 11:06:00 +01:00
Rachel Arnould
fb0f379c43 Merge pull request #13823 from chahmedejaz/bugfix/13625-enterprise-fee-reports-throws-504 
Some Enterprise Fee reports are unusable when managing big shops
 2026-02-18 15:22:21 +01:00
Maikel Linke
16b3da66c2 Style/HashAsLastArrayItem 2026-02-18 12:45:37 +11:00
Maikel Linke
40d8839bc4 Style Heredoc indentation 2026-02-18 09:42:33 +11:00
Maikel Linke
da1e1a9859 Style indentation 2026-02-18 09:42:07 +11:00
Ahmed Ejaz
1d4bbfa506 Supports tag filters persistence during product updates 
Adds functionality to retain tag filters applied in the admin product interface after bulk updates. Updates controller parameters to include tags_name_in, adds hidden fields for tag persistence in the view, and includes specs to verify filter state retention across update operations.
 2026-02-18 01:37:41 +05:00