raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-08 22:56:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,748 Commits 18 Branches 453 Tags
ef841b161f6143bcfcaefcdc51f5947a660a0dd9
Commit Graph

26748 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel
ef841b161f Merge pull request #10660 from MadisonBowron/master 
Fix bug #10596, missing translation for editing shipping category
 2023-04-05 16:12:20 +10:00
Maikel
c11dd2c1fb Merge pull request #10642 from macanudo527/fix_rubocop_errors 
Fix Rubocop Layout/LineLength
 2023-04-05 16:11:08 +10:00
Maikel Linke
8bbc545e39 Cover untranslated text by spec 2023-04-05 15:03:42 +10:00
Maikel
fc08913152 Merge pull request #10648 from openfoodfoundation/dependabot/bundler/aws-sdk-s3-1.120.0 
Bump aws-sdk-s3 from 1.119.2 to 1.120.0
 2023-04-05 14:44:22 +10:00
Maikel
19ae3651fa Merge pull request #10643 from dacook/update-node-docker 
Update node for docker
 2023-04-05 14:43:24 +10:00
David Cook
865d81d28f Apply suggestions from code review 2023-04-05 14:05:26 +10:00
emiliecm
5abda22831 Fix bug #10596, missing translation for editing shipping category 2023-04-04 19:48:16 -04:00
jibees
e18d973047 Merge pull request #10655 from filipefurtad0/fix_flaky_oc_form_spec 
Sorts plucked shipping/payment methods
 2023-04-04 15:34:39 +02:00
jibees
afeeaf0a9b Merge pull request #10657 from openfoodfoundation/dependabot/bundler/combine_pdf-1.0.23 
Bump combine_pdf from 1.0.22 to 1.0.23
 2023-04-04 14:31:06 +02:00
jibees
3010717ece Merge pull request #10656 from openfoodfoundation/dependabot/bundler/devise-4.9.2 
Bump devise from 4.9.1 to 4.9.2
 2023-04-04 14:30:11 +02:00
dependabot[bot]
0c48dbe0d5 Bump combine_pdf from 1.0.22 to 1.0.23 
Bumps [combine_pdf](https://github.com/boazsegev/combine_pdf) from 1.0.22 to 1.0.23.
- [Release notes](https://github.com/boazsegev/combine_pdf/releases)
- [Changelog](https://github.com/boazsegev/combine_pdf/blob/master/CHANGELOG.md)
- [Commits](https://github.com/boazsegev/combine_pdf/compare/v1.0.22...v1.0.23)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-04 10:04:31 +00:00
dependabot[bot]
f7b215b7ac Bump devise from 4.9.1 to 4.9.2 
Bumps [devise](https://github.com/heartcombo/devise) from 4.9.1 to 4.9.2.
- [Release notes](https://github.com/heartcombo/devise/releases)
- [Changelog](https://github.com/heartcombo/devise/blob/main/CHANGELOG.md)
- [Commits](https://github.com/heartcombo/devise/compare/v4.9.1...v4.9.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-04 09:58:37 +00:00
filipefurtad0
29520542db Sorts plucked shipping/payment methods 2023-04-04 09:30:36 +01:00
Neal Chambers
940f806e5f Fix Rubocop Layout/LineLength 2023-04-04 09:44:15 +09:00
David Cook
c34ced2f65 Merge pull request #10639 from openfoodfoundation/dependabot/bundler/puma-6.2.1 
Bump puma from 6.1.1 to 6.2.1
 2023-04-04 10:08:57 +10:00
Filipe
2051d811cf Merge pull request #10567 from jibees/10557-allow-hide-of-ofn-main-navigation 
White Label: Allow enterprise to hide ofn main navigation on `/shop`, `/cart`, `/checkout`, `/orders` pages
 2023-04-03 20:29:37 +01:00
jibees
0335cf2441 Merge pull request #10647 from openfoodfoundation/dependabot/npm_and_yarn/webpack-dev-server-4.13.2 
Bump webpack-dev-server from 4.13.1 to 4.13.2
 2023-04-03 16:47:02 +02:00
jibees
d3ddc8a221 Merge pull request #10650 from openfoodfoundation/dependabot/bundler/devise-4.9.1 
Bump devise from 4.9.0 to 4.9.1
 2023-04-03 16:44:46 +02:00
jibees
25e00d5210 Merge pull request #10649 from openfoodfoundation/dependabot/bundler/capybara-3.39.0 
Bump capybara from 3.38.0 to 3.39.0
 2023-04-03 16:42:53 +02:00
jibees
2a556ab329 Merge pull request #10651 from openfoodfoundation/dependabot/bundler/rubocop-1.49.0 
Bump rubocop from 1.48.1 to 1.49.0
 2023-04-03 16:42:08 +02:00
dependabot[bot]
80a94011b8 Bump rubocop from 1.48.1 to 1.49.0 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.48.1 to 1.49.0.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.48.1...v1.49.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-03 10:06:36 +00:00
dependabot[bot]
d4f2704213 Bump devise from 4.9.0 to 4.9.1 
Bumps [devise](https://github.com/heartcombo/devise) from 4.9.0 to 4.9.1.
- [Release notes](https://github.com/heartcombo/devise/releases)
- [Changelog](https://github.com/heartcombo/devise/blob/main/CHANGELOG.md)
- [Commits](https://github.com/heartcombo/devise/compare/v4.9.0...v4.9.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-03 10:02:14 +00:00
dependabot[bot]
91bf3c67cd Bump capybara from 3.38.0 to 3.39.0 
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.38.0 to 3.39.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.38.0...3.39.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-03 10:01:25 +00:00
dependabot[bot]
307a9effb0 Bump aws-sdk-s3 from 1.119.2 to 1.120.0 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.119.2 to 1.120.0.
- [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-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-03 10:00:03 +00:00
dependabot[bot]
56e8f7b0c6 Bump webpack-dev-server from 4.13.1 to 4.13.2 
Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 4.13.1 to 4.13.2.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v4.13.1...v4.13.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-03 09:58:14 +00:00
Maikel
de58aa1187 Merge pull request #10529 from mkllnk/setup 
Update setup script with newest template and merge with old script
 2023-04-03 15:44:29 +10:00
Maikel Linke
da0ef8531b Install our used bundler version 2023-04-03 14:37:31 +10:00
Maikel Linke
08f2254a0e Leverage bin/setup within script/setup 
And remove duplicate output. `bin/setup` is the Rails default for
updating your environment after code updates and `script/setup` is our
convenience script for the initial setup and starting with sample data.
 2023-04-03 14:37:31 +10:00
Maikel Linke
477524039f Update bundler version when necessary 
Not just when it's missing.
 2023-04-03 14:37:31 +10:00
Maikel Linke
e5e5bf8c17 Install ruby automatically if rbenv is available 
People may use other ways to provide the right Ruby version but if they
use rbenv then we can use it automatically.
 2023-04-03 14:37:30 +10:00
Maikel Linke
4999e231bc Avoid permission warning when running sudo as root 
The command is switching to an unprivileged user which can't access
/root and therefore there was a warning when executing. Adding `--login`
to the sudo command switches to that user properly and avoids the
warning.
 2023-04-03 14:36:07 +10:00
Maikel Linke
6b857a5683 Make code examples easier to copy without $ sign 
The $ sign used to indicate shell commands. But with markdown it's
obvious that we are entering commands.

Github has a quick copy button for all code examples which used to copy
the $ sign as well. Removing it allows to copy and paste easier with
that button.
 2023-04-03 14:35:52 +10:00
Maikel Linke
f12ee186ee Speed up setup script when restarting rails 2023-04-03 14:33:39 +10:00
Maikel Linke
93ef95f58e Update JS dependencies with setup script 2023-04-03 14:33:39 +10:00
Maikel Linke
49dd1dd1fa Update setup script with newest template 
I used the script from a new Rails 7 project.
 2023-04-03 14:32:22 +10:00
David Cook
04d2f3f50d Install nodenv to use correct Node version 
Copying what we do for rbenv, using the same plugins that we use in https://github.com/openfoodfoundation/ofn-install/blob/master/roles/node/tasks/main.yml
 2023-04-03 14:11:28 +10:00
David Cook
f43bdec0f4 Update to latest node v17 
Really this should install nodenv though..
 2023-04-03 11:41:54 +10:00
dependabot[bot]
8c08827d35 Bump puma from 6.1.1 to 6.2.1 
Bumps [puma](https://github.com/puma/puma) from 6.1.1 to 6.2.1.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v6.1.1...v6.2.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-31 08:13:31 +00:00
Maikel Linke
a56081ad5b Update translations v4.3.1 2023-03-31 14:59:16 +11:00
jibees
996c6d35f3 Merge pull request #10633 from openfoodfoundation/dependabot/bundler/debug-1.7.2 
Bump debug from 1.7.1 to 1.7.2
 2023-03-30 14:08:13 +02:00
Jean-Baptiste Bellet
89036db666 Do not use a preference, but create a new column for hide_ofn_navigation 2023-03-30 09:19:17 +11:00
Jean-Baptiste Bellet
dd9fec58a4 Instead of parsing URLs pass order through method for Orders Ctrl 
Use methods for before_actions

Maybe we should for hide_of_navigation too, but a name 'hide_ofn_navigation_for_order_distributor' seemed unhelpful..
 2023-03-30 09:19:17 +11:00
Jean-Baptiste Bellet
4fa44e6c64 Put the white label behind a feature toggle white_label 
+ update specs as well

+ for admin section also
 2023-03-30 09:19:17 +11:00
Jean-Baptiste Bellet
4ad2a1a723 Prefer a concern that set a variable instead of a global helper 
Therefor, for the right controllers, simply implements:

```
include WhiteLabel

before_action :hide_ofn_navigation, only: [:show, :edit]
```

This is mort robust, since we're working in a controller level, not parsing URLs...
 2023-03-30 09:17:57 +11:00
Jean-Baptiste Bellet
5279be4dc6 Improve spec: visiting order confirmation with distributor 
Two cases:
 - the current distributor is the same than the order of the order confirmation page
 - the current distributor *is not* the same than the order of the order confirmation page (and has not set `hide_ofn_navigation` preference to `true`)
 2023-03-30 09:17:57 +11:00
Jean-Baptiste Bellet
348c1ff7da Hide the OFN navigation menu when distributor as set its preference 
Hide, when preference is true, for page:
 - shop
 - cart
 - checkout
 - order confirmation
 2023-03-30 09:17:57 +11:00
Jean-Baptiste Bellet
c20ae0de1e Edit hide_ofn_navigation in 'white label' panel for an enterprise 2023-03-30 09:17:57 +11:00
Jean-Baptiste Bellet
3452864503 Add "white label" panel in enterprise settings page 2023-03-30 09:17:57 +11:00
Jean-Baptiste Bellet
d2f29b7d73 Some refactoring to avoid rubocop class too long warning 2023-03-30 09:13:35 +11:00
Filipe
62cdda2ce2 Merge pull request #10523 from rioug/10431-voucher-minimum-backend 
Voucher bare minimum backoffice
 2023-03-29 20:21:57 +01:00