raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-11 03:40:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
35,157 Commits 16 Branches 456 Tags
6aa4bf7a3373bf34379f580bc01df370d5e15447
Commit Graph

35157 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gaetan Craig-Riou
6aa4bf7a33 Add available credit on the admin customer page 2026-03-10 16:07:41 +11:00
Gaetan Craig-Riou
c58a65a52b Add a tab to list customer payment on the account page 2026-03-10 16:07:41 +11:00
Gaetan Craig-Riou
e21fadd124 Add CustomerAccountTransactions::DataLoaderService 
It's used to load customer transactions related to a user and a specific
enterprise
 2026-03-10 16:07:41 +11:00
Gaetan Craig-Riou
1b468522e6 Add concurrency spec 
Make sure two transactions cannot be processed at the same time
 2026-03-10 16:07:41 +11:00
Gaetan Craig-Riou
be7be9bbc6 Add api endpoing to create customer transactions 
Plus specs and documentation
 2026-03-10 16:07:41 +11:00
Gaetan Craig-Riou
6915836a14 Add balance to customer account transaction 
It stores the running balance for the customer account, so we don't have
to calulate it on the fly.
 2026-03-10 16:07:41 +11:00
Gaetan Craig-Riou
e10fd0b020 Add api payment method 
It will be used to credit customer via the customer account transaction
API
 2026-03-10 16:07:41 +11:00
Gaetan Craig-Riou
45786780a8 Code formating 2026-03-10 16:07:41 +11:00
Gaetan Craig-Riou
7d400e9860 Add CustomerAccountTransaction model 
It's used to store payment against a customer, to model customer credit
 2026-03-10 16:07:41 +11:00
Gaetan Craig-Riou
b50f299381 Merge pull request #14008 from rioug/14004-link-correct-customer-to-order 
14004 link correct customer to order
 2026-03-10 16:04:45 +11:00
Gaetan Craig-Riou
d706b3a6c2 Per review, remove customer when no existing customer 2026-03-10 15:20:56 +11:00
Gaetan Craig-Riou
153b94f18e Merge pull request #14006 from openfoodfoundation/dependabot/bundler/turbo-rails-2.0.23 
Bump turbo-rails from 2.0.20 to 2.0.23
 2026-03-10 14:55:27 +11:00
Gaetan Craig-Riou
71daccb49a Merge pull request #14005 from openfoodfoundation/dependabot/npm_and_yarn/webpack-5.105.3 
Bump webpack from 5.105.2 to 5.105.3
 2026-03-10 14:53:47 +11:00
Gaetan Craig-Riou
bca5ee226d Add spec to test the correct customer is linked 2026-03-10 14:16:01 +11:00
Gaetan Craig-Riou
fe00d1f813 reset_other! now reset the customer when present 2026-03-10 14:16:01 +11:00
Gaetan Craig-Riou
57a69f7fa3 Improve spec for reset_other! 
Covers resetting the user
 2026-03-10 14:15:54 +11:00
dependabot[bot]
f4d972fc5e Bump turbo-rails from 2.0.20 to 2.0.23 
Bumps [turbo-rails](https://github.com/hotwired/turbo-rails) from 2.0.20 to 2.0.23.
- [Release notes](https://github.com/hotwired/turbo-rails/releases)
- [Commits](https://github.com/hotwired/turbo-rails/compare/v2.0.20...v2.0.23)

---
updated-dependencies:
- dependency-name: turbo-rails
  dependency-version: 2.0.23
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-03-06 09:33:08 +00:00
dependabot[bot]
6db3b44e92 Bump webpack from 5.105.2 to 5.105.3 
Bumps [webpack](https://github.com/webpack/webpack) from 5.105.2 to 5.105.3.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Changelog](https://github.com/webpack/webpack/blob/main/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack/compare/v5.105.2...v5.105.3)

---
updated-dependencies:
- dependency-name: webpack
  dependency-version: 5.105.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-03-06 09:32:45 +00:00
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
da912f21b3 Merge pull request #14003 from openfoodfoundation/dependabot/npm_and_yarn/dompurify-3.3.2 
Bump dompurify from 3.3.1 to 3.3.2
 2026-03-06 11:29:51 +11:00
dependabot[bot]
e2146eb1a3 Bump dompurify from 3.3.1 to 3.3.2 
Bumps [dompurify](https://github.com/cure53/DOMPurify) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/cure53/DOMPurify/releases)
- [Commits](https://github.com/cure53/DOMPurify/compare/3.3.1...3.3.2)

---
updated-dependencies:
- dependency-name: dompurify
  dependency-version: 3.3.2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-03-05 23:10:00 +00:00
Gaetan Craig-Riou
8e19bfca3c Merge pull request #13991 from openfoodfoundation/dependabot/npm_and_yarn/immutable-5.1.5 
Bump immutable from 5.1.4 to 5.1.5
 2026-03-06 09:59:29 +11:00
Gaetan Craig-Riou
255836b4d2 Merge pull request #13990 from openfoodfoundation/dependabot/npm_and_yarn/svgo-4.0.1 
Bump svgo from 4.0.0 to 4.0.1
 2026-03-06 09:54:52 +11:00
Gaetan Craig-Riou
fcd7b457e6 Merge pull request #13989 from openfoodfoundation/dependabot/bundler/vcr-6.4.0 
Bump vcr from 6.3.1 to 6.4.0
 2026-03-06 09:53:05 +11:00
Gaetan Craig-Riou
eb1daf425a Merge pull request #13988 from openfoodfoundation/dependabot/npm_and_yarn/hotkeys-js-4.0.2 
Bump hotkeys-js from 4.0.1 to 4.0.2
 2026-03-06 09:51:44 +11:00
Gaetan Craig-Riou
06bc6c276a Merge pull request #13987 from mkllnk/spring-watch 
Add gem for spring to listen to filesystem changes efficiently
 2026-03-06 09:50:32 +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
Rachel Arnould
57186a74a8 Merge pull request #13958 from arunguleria/13864-remove-variants-dead-features 
13864-Remove dead feature to re-arrange variants
 2026-03-05 12:44:05 +01:00
dependabot[bot]
3575952d4b Bump immutable from 5.1.4 to 5.1.5 
Bumps [immutable](https://github.com/immutable-js/immutable-js) from 5.1.4 to 5.1.5.
- [Release notes](https://github.com/immutable-js/immutable-js/releases)
- [Changelog](https://github.com/immutable-js/immutable-js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/immutable-js/immutable-js/compare/v5.1.4...v5.1.5)

---
updated-dependencies:
- dependency-name: immutable
  dependency-version: 5.1.5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-03-04 23:24:58 +00:00
dependabot[bot]
11203da5ca Bump svgo from 4.0.0 to 4.0.1 
Bumps [svgo](https://github.com/svg/svgo) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/svg/svgo/releases)
- [Commits](https://github.com/svg/svgo/compare/v4.0.0...v4.0.1)

---
updated-dependencies:
- dependency-name: svgo
  dependency-version: 4.0.1
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-03-04 23:08:16 +00:00
dependabot[bot]
86091a5a79 Bump vcr from 6.3.1 to 6.4.0 
Bumps [vcr](https://github.com/vcr/vcr) from 6.3.1 to 6.4.0.
- [Release notes](https://github.com/vcr/vcr/releases)
- [Changelog](https://github.com/vcr/vcr/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vcr/vcr/compare/v6.3.1...v6.4.0)

---
updated-dependencies:
- dependency-name: vcr
  dependency-version: 6.4.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-03-04 09:35:06 +00:00
dependabot[bot]
f4328f1d18 Bump hotkeys-js from 4.0.1 to 4.0.2 
Bumps [hotkeys-js](https://github.com/jaywcjlove/hotkeys-js) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/jaywcjlove/hotkeys-js/releases)
- [Commits](https://github.com/jaywcjlove/hotkeys-js/compare/v4.0.1...v4.0.2)

---
updated-dependencies:
- dependency-name: hotkeys-js
  dependency-version: 4.0.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-03-04 09:34:51 +00:00
Maikel Linke
1bec028a09 Add gem for spring to listen to filesystem changes efficiently 
I found that each spring process was using around 3% CPU in the
background just scanning for file changes. By default, spring polls the
file system every 0.2 seconds.

With the added gem, I can't see any CPU use of spring in the background.
 2026-03-04 14:43:18 +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
67853bb976 Use guard 2026-03-04 10:28:39 +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
f063e2e8c6 Change to email field 2026-03-04 10:28:39 +11:00
Cillian O'Ruanaidh
d3eb887664 Align button 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
1554459eb9 Display a JS alert if /admin/search/known_users returns an error 2026-03-04 10:28:39 +11:00
Cillian O'Ruanaidh
50265780cf Call AdminTooltipComponent directly and remove unnecessary partial 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
Maikel
7a4beb8b22 Merge pull request #13982 from openfoodfoundation/dependabot/npm_and_yarn/tom-select-2.5.2 
Bump tom-select from 2.5.1 to 2.5.2
 2026-03-04 09:49:28 +11:00
Maikel
9a48ee16cc Merge pull request #13983 from openfoodfoundation/dependabot/npm_and_yarn/hotkeys-js-4.0.1 
Bump hotkeys-js from 4.0.0 to 4.0.1
 2026-03-04 09:48:23 +11:00
Maikel
50c0e8af7d Merge pull request #13984 from openfoodfoundation/dependabot/bundler/pdf-reader-2.15.1 
Bump pdf-reader from 2.15.0 to 2.15.1
 2026-03-04 09:47:35 +11:00
David Cook
1cf2928f9f Merge pull request #13979 from openfoodfoundation/RachL-patch-1 
Update release issue template
 2026-03-04 09:10:24 +11:00