raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-28 21:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 20 Branches 451 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

34725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Cook
a4f28a2fac Merge pull request #13377 from mkllnk/style 
Style Metrics/ModuleLength in some spec files
 2025-06-17 12:37:49 +10:00
dependabot[bot]
c1e6fff275 Bump brace-expansion from 1.1.11 to 1.1.12 
Bumps [brace-expansion](https://github.com/juliangruber/brace-expansion) from 1.1.11 to 1.1.12.
- [Release notes](https://github.com/juliangruber/brace-expansion/releases)
- [Commits](https://github.com/juliangruber/brace-expansion/compare/1.1.11...v1.1.12)

---
updated-dependencies:
- dependency-name: brace-expansion
  dependency-version: 1.1.12
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-06-17 02:23:01 +00:00
Maikel
b5b50f0b5a Merge pull request #13378 from openfoodfoundation/dependabot/npm_and_yarn/hotkeys-js-3.13.12 
Bump hotkeys-js from 3.13.11 to 3.13.12
 2025-06-17 11:42:05 +10:00
David Cook
f9764b697d Found a cleaner way to patch inspect 
I tried to move on, I really did, but I already had these things in my head and they suddenly clicked together, so I thought it worth updating now.
 2025-06-17 10:52:20 +10:00
David Cook
0f3626f12d Monkey-patch a cleaner inspect 
I would love to have hooked into the pretty inspect features which provide a better format, with indentation and colours for the console. But I couldn't find out how to.
 2025-06-17 10:52:20 +10:00
David Cook
be1f4e91e1 Map currency to DFC codes 
Probably should have just hardcoded it. Hopefully we can remove this soon anyway.
 2025-06-17 10:50:24 +10:00
Carlos Chitty
3dcc4428fa Fix escaped HTML in unit price by marking output as html_safe 2025-06-16 12:53:41 +01:00
Carlos Chitty
2fe49b2070 Instantiate UnitPrice only once in app/models/spree/line_item.rb 
Co-authored-by: Maikel <maikel@email.org.au>
 2025-06-16 12:53:41 +01:00
Carlos Chitty
85e4f749f9 refactor: move unit price formatting logic out of model into helper 
Solves Psych::DisallowedClass errors
Example: https://github.com/openfoodfoundation/openfoodnetwork/actions/runs/14739687958/job/41374343627?pr=13232

unit_price returns object with amount and unit, as mentioned in https://github.com/openfoodfoundation/openfoodnetwork/pull/6905\#discussion_r578401368
 2025-06-16 12:53:41 +01:00
dependabot[bot]
b671dfda5d Bump hotkeys-js from 3.13.11 to 3.13.12 
Bumps [hotkeys-js](https://github.com/jaywcjlove/hotkeys-js) from 3.13.11 to 3.13.12.
- [Release notes](https://github.com/jaywcjlove/hotkeys-js/releases)
- [Commits](https://github.com/jaywcjlove/hotkeys-js/compare/v3.13.11...v3.13.12)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2025-06-16 10:34:44 +00:00
Gaetan Craig-Riou
e6ef52f91c Merge pull request #13374 from filipefurtad0/unit_price_checks 
Adds Unit price checks
 2025-06-16 18:31:03 +10:00
Maikel Linke
da5b147d29 Style Metrics/ModuleLength in spec file 
Best viewed without whitespace changes.
 2025-06-16 16:51:50 +10:00
Maikel Linke
b2fd4ccb11 Style Metrics/ModuleLength in spec file 
Best viewed without whitespace changes.
 2025-06-16 16:50:38 +10:00
Maikel Linke
5a497bc6ee Style Metrics/ModuleLength in spec file 
Best viewed without whitespace changes.
 2025-06-16 16:46:30 +10:00
Maikel Linke
77b7b5ea47 Style Metrics/ModuleLength in spec file 
Best viewed without whitespace changes.
 2025-06-16 16:45:00 +10:00
Maikel Linke
035e67c33f Style Metrics/ModuleLength in spec file 
Best viewed without whitespace changes.
 2025-06-16 16:43:47 +10:00
Maikel Linke
8e1fb76327 Style Metrics/ModuleLength in spec file 
Best viewed without whitespace changes.
 2025-06-16 16:13:11 +10:00
Maikel Linke
441844dd79 Style Metrics/ModuleLength in spec file 
Best viewed without whitespace changes.
 2025-06-16 16:11:08 +10:00
Maikel Linke
55f9afef77 Regenerate Rubocop's TODO file 2025-06-16 16:07:05 +10:00
Ahmed Ejaz
a9dee9d0ca Update all locales with the latest Transifex translations v5.1.0 2025-06-15 15:21:37 +05:00
filipefurtad0
2465880e77 Adds checks to unit price on order confirmation page 2025-06-14 13:39:59 +01:00
filipefurtad0
7c89f32eb7 Adds checks to unit price on shopfront and cart 2025-06-14 13:30:10 +01:00
filipefurtad0
229a87cf72 Removes debugger superfluous debuger flag 2025-06-14 13:28:41 +01:00
Filipe
4f3887fcc8 Merge pull request #13362 from jarihu/Add-Finnish-to-Flatpickr 
Add Finnish to flatpickr controller
 2025-06-12 23:47:02 +01:00
Maikel
77af4af277 Merge pull request #13370 from openfoodfoundation/dependabot/npm_and_yarn/hotkeys-js-3.13.11 
Bump hotkeys-js from 3.13.10 to 3.13.11
 2025-06-11 15:18:32 +10:00
dependabot[bot]
677c53303c Bump hotkeys-js from 3.13.10 to 3.13.11 
Bumps [hotkeys-js](https://github.com/jaywcjlove/hotkeys-js) from 3.13.10 to 3.13.11.
- [Release notes](https://github.com/jaywcjlove/hotkeys-js/releases)
- [Commits](https://github.com/jaywcjlove/hotkeys-js/compare/v3.13.10...v3.13.11)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2025-06-10 10:10:16 +00:00
Maikel
a186de2f8f Merge pull request #13163 from cyrillefr/FixRailsUniqueValidationWithoutIndex 
Fixes Rails/UniqueValidationWithoutIndex (part of #11482)
 2025-06-10 16:35:13 +10:00
Maikel
ceeb5f0a3a Merge pull request #13367 from dacook/bump-stimulus_reflex-gem 
Bump stimulus_reflex gem to 3.5.5
 2025-06-10 15:06:33 +10:00
David Cook
418514b57d Bump stimulus_reflex gem to 3.5.5 
Why didn't dependabot do this?
We have already updated the js package to 3.5.5.

hopefully this will help with some SR flakiness that is occurring on au_prod and au_staging bulkinvoice actions (but uk_staging seems fine)
 2025-06-10 14:10:23 +10:00
David Cook
aa68b69fce Merge pull request #13364 from openfoodfoundation/dependabot/npm_and_yarn/jasmine-core-5.8.0 
Bump jasmine-core from 5.7.1 to 5.8.0
 2025-06-10 11:09:03 +10:00
dependabot[bot]
87aed5d77f Bump jasmine-core from 5.7.1 to 5.8.0 
Bumps [jasmine-core](https://github.com/jasmine/jasmine) from 5.7.1 to 5.8.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.7.1...v5.8.0)

---
updated-dependencies:
- dependency-name: jasmine-core
  dependency-version: 5.8.0
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-06-09 09:43:29 +00:00
Jari Huttunen
287cd74b33 Merge branch 'openfoodfoundation:master' into Add-Finnish-to-Flatpickr 2025-06-07 23:44:11 +03:00
Jari Huttunen
d217a1394b Add Finnish to flatpickr controller 2025-06-07 23:34:09 +03:00
filipefurtad0
a95767eb04 Update all locales with the latest Transifex translations v5.0.31 2025-06-06 13:04:23 +01:00
Filipe
f1138b7a9d Merge pull request #13349 from mkllnk/vine-error-message 
Clarify voucher code not found can mean fully redeemed
 2025-06-06 12:46:11 +01:00
Gaetan Craig-Riou
cb1a7629c5 Merge pull request #13341 from chitty/rubocop-style--fixes 
Rubocop Style corrections for Style/NestedModifier and Style/ReturnNilInPredicateMethodDefinition
 2025-06-05 17:33:39 +10:00
Carlos Chitty
63d284e81a Use Orders::WorkflowService#complete! and #advance_to_payment in specs to replace code causing Style/NestedModifier rubocop offenses 
Rewrite the loop "break unless a = order.next! while !order.delivery?" to correct the offenses. Not adding a helper because the change was only needed in a couple of places.
 2025-06-04 12:46:58 -04:00
Carlos Chitty
00aa60c8a3 Correct Style/ReturnNilInPredicateMethodDefinition rubocop offenses 
Explicitly return false instead of nil
 2025-06-04 10:25:50 -04:00
Gaetan Craig-Riou
a1e0feef14 Merge pull request #13354 from openfoodfoundation/dependabot/npm_and_yarn/pretty-quick-4.2.2 
Bump pretty-quick from 4.1.1 to 4.2.2
 2025-06-03 19:00:45 +10:00
dependabot[bot]
1ce167ef16 Bump pretty-quick from 4.1.1 to 4.2.2 
Bumps [pretty-quick](https://github.com/prettier/pretty-quick) from 4.1.1 to 4.2.2.
- [Release notes](https://github.com/prettier/pretty-quick/releases)
- [Changelog](https://github.com/prettier/pretty-quick/blob/v4.2.2/CHANGELOG.md)
- [Commits](https://github.com/prettier/pretty-quick/compare/v4.1.1...v4.2.2)

---
updated-dependencies:
- dependency-name: pretty-quick
  dependency-version: 4.2.2
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-06-03 07:43:00 +00:00
Gaetan Craig-Riou
5093fd6eb6 Merge pull request #13353 from openfoodfoundation/dependabot/npm_and_yarn/floating-ui/dom-1.7.1 
Bump @floating-ui/dom from 1.7.0 to 1.7.1
 2025-06-03 17:40:55 +10:00
dependabot[bot]
0700c65557 Bump @floating-ui/dom from 1.7.0 to 1.7.1 
Bumps [@floating-ui/dom](https://github.com/floating-ui/floating-ui/tree/HEAD/packages/dom) from 1.7.0 to 1.7.1.
- [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/@floating-ui/dom@1.7.1/packages/dom)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2025-06-02 09:53:27 +00:00
Maikel Linke
94cb1f45a0 Update all locales with the latest Transifex translations v5.0.30 2025-06-02 11:58:57 +10:00
cyrillefr
6f9a347b77 Add modified schema 2025-05-29 15:12:13 +10:00
cyrillefr
774aaf4fd8 Fixes Rails/UniqueValidationWithoutIndex (part of #11482) 
- When you define a uniqueness validation in Active Record model,
  you also should add a unique index for the column.
- Cf. https://docs.rubocop.org/rubocop-rails/cops_rails.html#railsuniquevalidationwithoutindex
- Therefore : migration files to match DB structure and Ruby code.
 2025-05-29 15:11:17 +10:00
Maikel Linke
ef22269324 Clarify voucher code not found can mean fully redeemed 2025-05-29 14:18:32 +10:00
Maikel Linke
c9ec7e13d3 Add missing spec cassette 2025-05-29 11:42:53 +10:00
Maikel
d18328c3d1 Merge pull request #13347 from jarihu/add-fi-locale 
Add Finnish locale support
 2025-05-29 11:13:33 +10:00
Maikel
2b3cc71b3d Merge pull request #13339 from cyrillefr/FixSecurityOpenOffense 
Fixes Rubocop SecurityOpen offense
 2025-05-29 10:51:47 +10:00
Jari Huttunen
6c7676b1a1 Add Finnish locale 2025-05-28 10:02:17 +03:00