raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-02 21:57:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 18 Branches 452 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

34725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt-Yorkley
65731f6c52 Update serializers and views for admin products index 2024-04-02 09:27:36 +11:00
Matt-Yorkley
3a38eeb248 Remove products taxon null constraint 2024-04-02 09:27:36 +11:00
Matt-Yorkley
2707c3137a Apply taxon to new variant when creating a new product 2024-04-02 09:27:36 +11:00
Matt-Yorkley
b30944471d Update admin forms 2024-04-02 09:27:36 +11:00
Matt-Yorkley
c805486f0a Update attribute translations 2024-04-02 09:27:36 +11:00
Matt-Yorkley
2ef266390d Move primary taxon to variant 2024-04-02 09:27:36 +11:00
Ahmed Ejaz
7b4b7c5f45 12314 - Fix specs for orders helper 2024-04-01 21:51:46 +05:00
filipefurtad0
a3b646a500 Removes connected account 
Re-records relevant VCR-cassettes for CreditCardCloner examples
 2024-04-01 11:37:17 +01:00
filipefurtad0
01cbcf79fa Removes connected account 
Re-records relevant VCR-cassettes for CreditCardRemover examples
 2024-04-01 11:37:17 +01:00
filipefurtad0
c611754272 Removes connected account 
Re-records relevant VCR-cassette on stripe_sca_spec
 2024-04-01 11:36:51 +01:00
filipefurtad0
66b98bd477 Removes connected account 
Re-records relevant VCR-cassette on payments_stripe_spec
 2024-04-01 11:36:09 +01:00
dependabot[bot]
18d1e00c47 chore(deps-dev): bump letter_opener from 1.9.0 to 1.10.0 
Bumps [letter_opener](https://github.com/ryanb/letter_opener) from 1.9.0 to 1.10.0.
- [Changelog](https://github.com/ryanb/letter_opener/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ryanb/letter_opener/compare/v1.9.0...v1.10.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-01 09:13:23 +00:00
Ahmed Ejaz
05f373f541 12314 - add order parameter in OrdersHelper methods 2024-04-01 06:41:41 +05:00
Ahmed Ejaz
4ba6afa665 12314 - fix Rails/HelperInstanceVariable error 
- InjectionHelper
- OrdersHelper
 2024-04-01 02:19:14 +05:00
Ahmed Ejaz
ac1595e718 12314 - remove shared distributor partial 
- this was only used in the enterprise show view
- the above view was deleted here 4f2389e257
- by removing this, we can remove distributor_link_class method
- it will also fix the rubocop error
 2024-03-31 18:08:22 +05:00
Ahmed Ejaz
3bb44cfe6d 12314 - fix order helper rubocop errors 
- remove the direct access of @order instance variable
- add an attr_reader for order and use it instead
 2024-03-31 17:07:00 +05:00
Ahmed Ejaz
19e3dc077e 12314: remove Rails/HelperInstanceVariable from rubocop todo 2024-03-31 17:04:15 +05:00
filipefurtad0
33889f1255 Deletes connected account, after spec 
Re-records cassettes
 2024-03-29 19:02:45 +00:00
dependabot[bot]
aab01e77e0 chore(deps-dev): bump debug from 1.9.1 to 1.9.2 
Bumps [debug](https://github.com/ruby/debug) from 1.9.1 to 1.9.2.
- [Release notes](https://github.com/ruby/debug/releases)
- [Commits](https://github.com/ruby/debug/compare/v1.9.1...v1.9.2)

---
updated-dependencies:
- dependency-name: debug
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-29 09:51:55 +00:00
dependabot[bot]
1b49606fca chore(deps): bump aws-sdk-s3 from 1.146.0 to 1.146.1 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.146.0 to 1.146.1.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/commits)

---
updated-dependencies:
- dependency-name: aws-sdk-s3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-29 09:50:56 +00:00
dependabot[bot]
45ec3d759f chore(deps): bump trix from 2.0.10 to 2.1.0 
Bumps [trix](https://github.com/basecamp/trix) from 2.0.10 to 2.1.0.
- [Release notes](https://github.com/basecamp/trix/releases)
- [Commits](https://github.com/basecamp/trix/compare/v2.0.10...v2.1.0)

---
updated-dependencies:
- dependency-name: trix
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-28 09:46:07 +00:00
Maikel
d8641bf576 Merge pull request #12268 from dacook/buu/change-variant-unit-11061 
[BUU] Change variant unit values
v4.4.37 		2024-03-28 16:19:33 +11:00
David Cook
4498e91e90 Update all locales with the latest Transifex translations 2024-03-28 16:18:36 +11:00
David Cook
116547d2d2 Merge pull request #12305 from Pauloparakleto/feat/12297-rvm-support-script-setup 
Feat/12297 rvm support script setup
 2024-03-28 09:14:51 +11:00
Pauloparakleto
80db511fe5 remove rvm script. It is called directly in script/setup 2024-03-27 10:11:21 -03:00
Pauloparakleto
3a2cb3e415 call rvm directly 2024-03-27 10:11:21 -03:00
David Cook
15c93a8e95 Add -v flag to avoid script exit 2024-03-27 10:11:21 -03:00
David Cook
4a4135f261 Simplify condition, in favour of rbenv 
If rbenv is installed, we'll favour that because that's what is currently supported.
 2024-03-27 10:11:21 -03:00
Pauloparakleto
0cd4682e36 chore(GETTING_STARTED.md): Add RVM alternative to installation guide. 2024-03-27 10:11:10 -03:00
Pauloparakleto
1d6323c520 chore(script/rvm-install): Add support to RVM. Use rvm command to install ruby version in variable. 
RVM already print the logs. No need to printf message here.
RVM already skip installation if already done with logs.
 2024-03-27 10:10:21 -03:00
Pauloparakleto
8b591b7d21 chore(script/setup): Add support to RVM. Only evaluate to rbenv if rvm path is not found. 2024-03-27 10:08:50 -03:00
filipefurtad0
0b844bca8d Sets VCR tag at the beginning of the spec file 
Rebases and re-records cassettes
 2024-03-27 11:37:03 +00:00
filipefurtad0
1fd4c83cf1 Replaces fake with real client_it 
Replaces stubs on Stripe Account Controller
 2024-03-27 11:28:30 +00:00
David Cook
266e94eba8 Fixup spec 2024-03-27 20:20:20 +11:00
David Cook
b9b2c876cc Ensure value always shows 
Even thought it's not valid (you can't save items with an empty name), it's disconcerting when the value suddenly disappears from view.
 2024-03-27 20:20:20 +11:00
David Cook
99121943a7 Fix bug 
I missed a bit in a refactor, and it wasn't covered by the spec.
 2024-03-27 20:20:20 +11:00
David Cook
b2881bb169 Add JS specs 
Converted using  https://www.codeconvert.ai/coffeescript-to-javascript-converter
With plenty of manual fixes required too..
 2024-03-27 20:20:20 +11:00
David Cook
11b8a01220 Move Jest config to a file 
With the help of 'jest --init'

I didn't end up using this, but it seems worth keeping config out of package.json
 2024-03-27 20:20:20 +11:00
David Cook
924701e161 Load available units from system config 
I'm not sure what's the best way to load data into javascript.. this works.
 2024-03-27 20:20:20 +11:00
David Cook
1d8ed67b0b Handle unit scale changes 
As discussed, this is the desired behaviour. The current screen appears to do this, but fails to save the changes.
 2024-03-27 20:20:20 +11:00
David Cook
d238fc0cad TODO: optimise and fix bug 2024-03-27 20:20:20 +11:00
David Cook
4ddb2ff1e9 Generate unit display with OptionValueNamer 2024-03-27 20:20:20 +11:00
David Cook
cf31d09ad8 Prevent submitting empty value 2024-03-27 20:20:20 +11:00
David Cook
49226ffdbc Extract unit_value and unit_description values 
Copied from display_as.js.coffee (ofn.admin.ofnDisplayAs.variantUnitProperties).
 2024-03-27 20:20:20 +11:00
David Cook
c98956bf5a Add variant controller 
This will manage the various unit fields. Maybe it should have a more specific name.
 2024-03-27 20:20:16 +11:00
dependabot[bot]
28dab2fc2e chore(deps): bump newrelic_rpm from 9.7.1 to 9.8.0 
Bumps [newrelic_rpm](https://github.com/newrelic/newrelic-ruby-agent) from 9.7.1 to 9.8.0.
- [Release notes](https://github.com/newrelic/newrelic-ruby-agent/releases)
- [Changelog](https://github.com/newrelic/newrelic-ruby-agent/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/newrelic/newrelic-ruby-agent/compare/9.7.1...9.8.0)

---
updated-dependencies:
- dependency-name: newrelic_rpm
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-27 09:10:14 +00:00
David Cook
9beaf0a0c2 Use textContent FTW 
Oh look, the test works better now too.
 2024-03-27 17:35:09 +11:00
David Cook
6291cce5d1 Fix style for empty popout button 
There's still an odd 1px height change on hover that I can't track down. I think it would be better to just give new variants a default of 1 (blank is not valid anyway).
 2024-03-27 17:35:09 +11:00
David Cook
e589605e3c Rename popout style classes 2024-03-27 17:35:08 +11:00
David Cook
e110cd1145 Fix popout to focus first _visible_ field 2024-03-27 14:34:31 +11:00