raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-30 06:31:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,911 Commits 15 Branches 460 Tags
afdb04438646fa88a35c7ad27abbe4ee47d10615
Commit Graph

34911 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Cook
afdb044386 Load names from line item where available. 
I'm not sure why Arel complained about SQL in the SELECT clause (fields), but not the GROUP BY clause (key_fields). Maybe because it's not susceptible to user injection.

I'm also not sure why I couldn't use the aliases defined in SELECT in the GROUP BY clause, but hey this seems to work.
 2026-02-06 12:17:03 +11:00
Ashish Gaur
b98552003c 13220 Add Product name in Order LineItem and update it during order creation 
13220 Fixes affiliate sales spec

13220 Use before_create to update product name

13220 Fixes rubocop warnings

13220 Update product_name in line_item in specs

13220 Fix before_create lint

13220 Add spec for checking product_name is not set in reports

13220 Fixes rubocop issue

13220 Add migrations for updating the existing line items

13220 Fixing lint issues

13220 Set product_name in line_item before doing validation

13220 Fix linter issues

13220 Fixes spec

13220 Fixes linter issues

13220 Review comments

13220 Review comments

13220 Add default product name

13220 Use product_name instead of variant product name when using line item

13220 Fix specs

13220 Revert change in affiliate_sales_data_spec

CL-13220 Store variant name in line_item

13220 Default variant name to original variant's full name for line_items

13220 Add missing frozen string literal

13220 Add spec for full_variant_name

13220 Remove UpdateProductNameInLineItems and AddNotNullToProductNameInLineItems migrations

13220 Remove presence validation for product_name

13220 Use full_product_name which defaults to variant product name if empty
 2026-02-06 12:17:03 +11:00
David Cook
38f1754738 Add spec 
This duplicates the  'returns data' spec above, but will be revelant in the following commits.
 2026-02-06 12:17:03 +11:00
Maikel
ad23735384 Merge pull request #13907 from rioug/use-wicked_pdf-fork 
Use wicked pdf fork
 2026-02-06 11:23:58 +11:00
Gaetan Craig-Riou
6fd78d4647 Fix typo 2026-02-06 10:46:10 +11:00
Gaetan Craig-Riou
cd3a80c502 Move to using our fork of wicked_pdf 
The lastest release wicked pdf does not include a fix to make it
workwith Shakapacker V8 : bce498de54
To we are using our fork for now, which includes said fix
 2026-02-06 10:44:00 +11:00
Sigmund Petersen
f8c88ea8c7 Merge pull request #13859 from rioug/10298-upgrade-to-shakapaker_v8 
Upgrade to shakapaker v8
 2026-02-04 12:51:42 +01:00
Maikel
4ba55c4067 Merge pull request #13898 from dacook/js-error-handler 
Fix function call
 2026-02-04 12:44:41 +11:00
Maikel
813249bad7 Merge pull request #13897 from arunguleria/13893-products-table-layout-changes 
13893-hiding too many columns in Admin product list, the table layout breaks
 2026-02-04 12:42:17 +11:00
Gaetan Craig-Riou
9f2c35d407 Merge pull request #13901 from openfoodfoundation/dependabot/npm_and_yarn/qs-6.14.1 
Bump qs from 6.14.0 to 6.14.1
 2026-02-04 10:05:51 +11:00
Maikel
79af9efd29 Merge pull request #13857 from rioug/10298-remove-rails-sass 
Remove rails-sass dependency
 2026-02-04 09:55:29 +11:00
Rachel Arnould
b731f9b9e4 Merge pull request #12997 from wandji20/wb-OFN-12794-user 
Remove Cable Ready responses from User related controllers
 2026-02-03 15:51:11 +01:00
dependabot[bot]
da90cdd9f6 Bump qs from 6.14.0 to 6.14.1 
Bumps [qs](https://github.com/ljharb/qs) from 6.14.0 to 6.14.1.
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.14.0...v6.14.1)

---
updated-dependencies:
- dependency-name: qs
  dependency-version: 6.14.1
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-02-03 11:31:06 +00:00
Rachel Arnould
f86c925209 Merge pull request #13883 from mkllnk/taler 
Add Taler payment method
 2026-02-03 12:30:00 +01:00
David Cook
0040e4d454 Fix script 
rm: tmp/product_import-20250505-81606-9pucu5: is a directory
 2026-02-03 11:33:02 +11:00
David Cook
876d37d19a Fix function call 
This function got renamed in 01d5830480, but this call got missed.

I would like to add a spec to cover this, but am not sure exactly how to set it up right now.
I also notice that usage occurs after the preventDefault, and one before. I'm not sure if that matters. I have myself to blame for that inconsistency 🤦
 2026-02-02 17:08:24 +11:00
Arun Guleria
36d617bceb 13893-hiding too many columns in Admin product list, the table layout breaks 2026-02-02 10:47:02 +05:30
Gaetan Craig-Riou
7c0528ad83 Merge pull request #13896 from mkllnk/cooldown 
Add 7 day cooldown to Dependabot updates
 2026-02-02 15:43:34 +11:00
Maikel Linke
f25d51e772 Add 7 day cooldown to Dependabot updates 
This should make us less vulnerable to supply chain attacks:

- https://blog.yossarian.net/2025/11/21/We-should-all-be-using-dependency-cooldowns
 2026-02-02 14:41:30 +11:00
Maikel Linke
7b559e2f83 Update all locales with the latest Transifex translations v5.4.1 2026-01-30 14:08:36 +11:00
Gaetan Craig-Riou
a94ccd4493 Merge pull request #13889 from openfoodfoundation/dependabot/npm_and_yarn/css-loader-7.1.3 
Bump css-loader from 7.1.2 to 7.1.3
 2026-01-30 09:41:52 +11:00
Gaetan Craig-Riou
fc6ed9ab4b Merge pull request #13888 from openfoodfoundation/dependabot/npm_and_yarn/floating-ui/dom-1.7.5 
Bump @floating-ui/dom from 1.7.4 to 1.7.5
 2026-01-30 09:41:02 +11:00
Maikel Linke
c115ab7a0d Translate Taler payment status to error message 2026-01-29 15:07:28 +11:00
Maikel Linke
f3428494fc Better name method spec 2026-01-29 15:07:28 +11:00
Maikel Linke
d748972fca Resolve flaky spec with defined order 2026-01-29 15:07:28 +11:00
Maikel Linke
b9c7925008 Complete Taler payment success scenario 2026-01-29 15:07:28 +11:00
Maikel Linke
c11b93a4dc Demo Taler flow without validating payment yet 2026-01-29 15:07:28 +11:00
Maikel Linke
61e0688392 Demonstrate retrieving the payment Taler URL 2026-01-29 15:07:27 +11:00
Maikel Linke
5971cdc6e2 Add new taler gem 2026-01-29 15:07:27 +11:00
Maikel Linke
b3a1d1269a Add Taler as payment method 
It doesn't take payments yet but can be selected during checkout.
 2026-01-29 15:07:27 +11:00
Maikel Linke
a0011bd2e9 Remove orphaned translations of payment methods 2026-01-29 15:07:27 +11:00
dependabot[bot]
2219513c93 Bump css-loader from 7.1.2 to 7.1.3 
Bumps [css-loader](https://github.com/webpack/css-loader) from 7.1.2 to 7.1.3.
- [Release notes](https://github.com/webpack/css-loader/releases)
- [Changelog](https://github.com/webpack/css-loader/blob/main/CHANGELOG.md)
- [Commits](https://github.com/webpack/css-loader/compare/v7.1.2...v7.1.3)

---
updated-dependencies:
- dependency-name: css-loader
  dependency-version: 7.1.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-01-28 09:33:05 +00:00
dependabot[bot]
fb713d8721 Bump @floating-ui/dom from 1.7.4 to 1.7.5 
Bumps [@floating-ui/dom](https://github.com/floating-ui/floating-ui/tree/HEAD/packages/dom) from 1.7.4 to 1.7.5.
- [Release notes](https://github.com/floating-ui/floating-ui/releases)
- [Changelog](https://github.com/floating-ui/floating-ui/blob/master/packages/dom/CHANGELOG.md)
- [Commits](https://github.com/floating-ui/floating-ui/commits/HEAD/packages/dom)

---
updated-dependencies:
- dependency-name: "@floating-ui/dom"
  dependency-version: 1.7.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-01-28 09:32:53 +00:00
David Cook
90761e0766 Merge pull request #13886 from mkllnk/setup 
Fail setup script when nodenv is missing
 2026-01-28 14:03:55 +11:00
Maikel Linke
6fb4048bfd Add context: this script will be used to deploy production 2026-01-28 13:47:18 +11:00
Maikel Linke
c3def926f1 Fail setup script when nodenv is missing 2026-01-28 10:40:40 +11:00
Maikel
d6cde5c793 Merge pull request #13873 from mkllnk/cleanup 
Clean up tmp dev files
 2026-01-28 10:38:58 +11:00
David Cook
756e876f61 Update ERD 2026-01-27 14:53:22 +11:00
Gaetan Craig-Riou
5e57325ce2 Use ruby platform for bundler 2026-01-27 09:53:39 +11:00
Gaetan Craig-Riou
cd956dadda Use factory to create address 
It removes dependency on hard coded country and state id
 2026-01-27 09:23:32 +11:00
Rachel Arnould
2a3b076170 Merge pull request #13826 from chahmedejaz/task/13744-add-none-option-in-tags-filter 
Allow to select "none" in variant tags dropdown
 2026-01-26 22:29:59 +01:00
Gaetan Craig-Riou
e6d556c809 Update locale cache key to invalidate cache 2026-01-26 14:56:10 +11:00
Gaetan Craig-Riou
f35b2be228 Upgrade dependencies 2026-01-26 14:56:06 +11:00
Gaetan Craig-Riou
cc9cb966b5 Fix images/font path 
Now `additional_paths` are stripped like `source_path`
 2026-01-26 14:54:48 +11:00
Gaetan Craig-Riou
34f9e08824 Add yarn as the package manager 2026-01-26 14:54:48 +11:00
Gaetan Craig-Riou
7d5db81017 Upgrade to Shakapacker 8.4.0 2026-01-26 14:54:48 +11:00
Gaetan Craig-Riou
1b03528aca Switch to v349_with-relaxed-dependencies for select2 
It allows us to remove dependency on `rails-sass`
Sass files are handled by `shakapacker/wepack`, so we no use for
`rails-sass`
 2026-01-26 14:51:32 +11:00
Gaetan Craig-Riou
9a90e46b78 Move mail css back to be managed by wepack 
It wil allow us to remove dependency on `rails-sass`, and `sass` which
are not maintained anymore.
More or less revert this PR: https://github.com/openfoodfoundation/openfoodnetwork/pull/12743
 2026-01-26 14:50:31 +11:00
Gaetan Craig-Riou
7e4886ad67 Merge pull request #13878 from openfoodfoundation/dependabot/npm_and_yarn/sass-embedded-1.97.3 
Bump sass-embedded from 1.97.2 to 1.97.3
 2026-01-26 14:27:15 +11:00
dependabot[bot]
9297dbfa63 Bump sass-embedded from 1.97.2 to 1.97.3 
Bumps [sass-embedded](https://github.com/sass/embedded-host-node) from 1.97.2 to 1.97.3.
- [Changelog](https://github.com/sass/embedded-host-node/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sass/embedded-host-node/compare/1.97.2...1.97.3)

---
updated-dependencies:
- dependency-name: sass-embedded
  dependency-version: 1.97.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-01-26 00:15:46 +00:00