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
28,175 Commits 18 Branches 452 Tags
276b94de5bd7bb971c25b4f64e6acda0b5691391
Commit Graph

28175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cyrillefr
332c95dec5 Modify actual modal confirm component 
- Need to take into account some additional customn message
 2023-02-06 19:47:36 +01:00
cyrillefr
7a967715aa Create Stimulus CancelOrder controller 2023-02-06 19:47:36 +01:00
cyrillefr
c302640644 Create a reflex that handles bulk orders cancelling 2023-02-06 19:47:36 +01:00
cyrillefr
ad0ffd2a64 Create a new service for orders bulk cancelling 2023-02-06 19:47:36 +01:00
Ana Nunes da Silva
8bd890f311 Add :checkout scope in Spree::Payment 2023-02-06 11:09:40 +00:00
dependabot[bot]
64e6bd8248 Bump mrujs from 0.7.4 to 0.10.1 
Bumps [mrujs](https://github.com/ParamagicDev/mrujs) from 0.7.4 to 0.10.1.
- [Release notes](https://github.com/ParamagicDev/mrujs/releases)
- [Changelog](https://github.com/KonnorRogers/mrujs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ParamagicDev/mrujs/compare/v0.7.4...v0.10.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-06 10:45:12 +00:00
jibees
e066e5ca74 Merge pull request #10370 from openfoodfoundation/dependabot/npm_and_yarn/jquery-ui-1.13.2 
Bump jquery-ui from 1.13.0 to 1.13.2
 2023-02-06 11:43:47 +01:00
jibees
9317cc41b9 Merge pull request #10379 from openfoodfoundation/dependabot/bundler/responders-3.1.0 
Bump responders from 3.0.1 to 3.1.0
 2023-02-06 11:34:19 +01:00
dependabot[bot]
1a35882fb6 Bump responders from 3.0.1 to 3.1.0 
Bumps [responders](https://github.com/heartcombo/responders) from 3.0.1 to 3.1.0.
- [Release notes](https://github.com/heartcombo/responders/releases)
- [Changelog](https://github.com/heartcombo/responders/blob/main/CHANGELOG.md)
- [Commits](https://github.com/heartcombo/responders/compare/v3.0.1...v3.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-06 09:08:09 +00:00
dependabot[bot]
ec3d7174de Bump valid_email2 from 4.0.4 to 4.0.5 
Bumps [valid_email2](https://github.com/micke/valid_email2) from 4.0.4 to 4.0.5.
- [Release notes](https://github.com/micke/valid_email2/releases)
- [Changelog](https://github.com/micke/valid_email2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micke/valid_email2/compare/v4.0.4...v4.0.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-06 09:01:57 +00:00
Maikel
207a3c9ea7 Merge pull request #10357 from openfoodfoundation/dependabot/bundler/webpacker-5.4.4 
Bump webpacker from 5.4.3 to 5.4.4
 2023-02-06 16:26:40 +11:00
Maikel
9ff8433a8d Merge pull request #10344 from filipefurtad0/update_orders_spec_II 
Update orders spec ii
 2023-02-06 14:32:14 +11:00
jibees
6549ad7d2a Merge pull request #10366 from dacook/node-version 
Update Node version
 2023-02-03 15:12:08 +01:00
jibees
7d1b71e640 Merge pull request #10300 from dacook/add-webpack-cli 
Add required webpack package
 2023-02-03 14:22:50 +01:00
Jean-Baptiste Bellet
bddd887dcd Load orders only if current line_items are loaded 
+ update spec as well
 2023-02-03 12:25:47 +01:00
Jean-Baptiste Bellet
d00e75de70 We should load orders that are linked to line_items displayed 
This should not be related to any pagination, search or whatever: actually we consolidate line_items with order additional info based on line_items.order.id.
 2023-02-03 11:40:07 +01:00
Jean-Baptiste Bellet
06cbc120f5 Pagination is actually linked to line_items and not orders 
We display line_items as rows in BOM
 2023-02-03 11:37:51 +01:00
dependabot[bot]
e91c4f1318 Bump karma from 6.3.20 to 6.4.1 
Bumps [karma](https://github.com/karma-runner/karma) from 6.3.20 to 6.4.1.
- [Release notes](https://github.com/karma-runner/karma/releases)
- [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md)
- [Commits](https://github.com/karma-runner/karma/compare/v6.3.20...v6.4.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-03 08:51:33 +00:00
jibees
428b8b0314 Merge pull request #10365 from dacook/webpack-config 
Make webpack-cli a dev-only dependency
 2023-02-03 09:49:43 +01:00
dependabot[bot]
7d5ddb9cf6 Bump jquery-ui from 1.13.0 to 1.13.2 
Bumps [jquery-ui](https://github.com/jquery/jquery-ui) from 1.13.0 to 1.13.2.
- [Release notes](https://github.com/jquery/jquery-ui/releases)
- [Commits](https://github.com/jquery/jquery-ui/compare/1.13.0...1.13.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-03 08:48:37 +00:00
jibees
cc5632fd14 Merge pull request #10364 from dacook/dependabot-update-js-packages 
Allow Dependabot to update package.json
 2023-02-03 09:46:05 +01:00
Jean-Baptiste Bellet
9b2ed8846c load_enterprise_set_on_index is used only in one action 
so let's call it inside the action.
 2023-02-03 09:15:07 +01:00
Jean-Baptiste Bellet
e18454c55a Add pagination on enterprises page for super admin 
Enterprises are stored in `@enterprise_set` variables, and we iterate over to show the list of enterprises to super admin.

Previously, we used to use `Sets::EnterpriseSet.new(collection)` instead of creating set based on `@collection`: this leads to call the `collection` method twice, which was probably very time consuming. This commit fix also that.

+ use paginated enterprises loading on bulk update but without testing if the current user is an admin
 2023-02-03 09:15:07 +01:00
David Cook
785350a089 Bump Node to v14.21.2 
Currently our CI and servers do not respect this setting, only dev environments that have a Node version manager do.

I checked a few prod servers, and they use this version already so now I'm making it official. But we should aim to upgrade further, the current version is v19.

    WARNING: node-v14.21.2-darwin-x64 is in LTS Maintenance mode and nearing its end of life.
    It only receives *critical* security updates, *critical* bug fixes and documentation updates.
 2023-02-03 16:17:28 +11:00
David Cook
ef4731022e Recommend Node version manager 
I chose to combine this in the above section to reduce the length of the document.

Note that the OS-specific pages in the wiki should be updated after this.
 2023-02-03 16:06:34 +11:00
David Cook
8adb8a5eaf Make webpack-cli a dev-only dependency 
We shouldn't need this in production. According to the [readme](https://www.npmjs.com/package/webpack-cli) it's only a dev dependency.
 2023-02-03 15:26:00 +11:00
David Cook
a0d1183fc0 Use yarn to install dependencies 
`reviewdoc-action-prettier` is automatically running npm, but we use Yarn, which handles unmet dependencies differently. Let's make it consistent.

This caused the linter to fail when it didn't need to (https://github.com/openfoodfoundation/openfoodnetwork/pull/10300#issuecomment-1413004039).
 2023-02-03 15:21:58 +11:00
David Cook
3b49ba4de1 Allow Dependabot to update package.json 
As per the industry standard, all version numbers are specified in package.json, so Dependabot is allowed to suggest increases when a new version is released. This is the default.

Discussed in https://community.openfoodnetwork.org/t/javascript-dependency-management-with-package-json/2753
 2023-02-03 14:48:18 +11:00
Jean-Baptiste Bellet
ef4c99bf49 Replace gitlab-omniauth-openid-connect by omniauth_openid_connect 
```

All changes in this gem are now upstreamed in omniauth_openid_connect
gem v0.6.0 under the OmniAuth group: https://github.com/omniauth/omniauth_openid_connect.

In your Gemfile, replace the line:

gem 'gitlab-omniauth-openid-connect', '~> 0.10', require: 'omniauth_openid_connect'

With:

gem 'omniauth_openid_connect', '~> 0.6'

The gitlab-omniauth-openid-connect gem is no longer updated.
```

Allow upgrading omniauth_openid_connect gem

The pinned version is the most recent and I would be happy for
Dependabot to suggest newer versions when available.
 2023-02-03 12:17:17 +11:00
dependabot[bot]
40d767928e Bump gitlab-omniauth-openid-connect from 0.10.0 to 0.10.1 
Bumps [gitlab-omniauth-openid-connect](https://gitlab.com/gitlab-org/gitlab-omniauth-openid-connect) from 0.10.0 to 0.10.1.
- [Release notes](https://gitlab.com/gitlab-org/gitlab-omniauth-openid-connect/tags)
- [Commits](https://gitlab.com/gitlab-org/gitlab-omniauth-openid-connect/compare/v0.10.0...v0.10.1)

---
updated-dependencies:
- dependency-name: gitlab-omniauth-openid-connect
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-03 12:16:15 +11:00
jibees
5e689b12fe Merge pull request #10345 from mkllnk/rspec-n 
Enable RSpec's status file for --next-failure
 2023-02-02 16:54:37 +01:00
jibees
518a029b59 Merge pull request #10353 from mkllnk/taggable 
Bump acts-as-taggable-on from 8.1.0 to 9.0.1
 2023-02-02 16:43:56 +01:00
jibees
2b14269dae Merge pull request #10359 from openfoodfoundation/dependabot/bundler/jwt-2.7.0 
Bump jwt from 2.6.0 to 2.7.0
 2023-02-02 16:42:35 +01:00
Jean-Baptiste Bellet
a463a39abc Update all locales with the latest Transifex translations v4.2.33 2023-02-02 16:11:57 +01:00
Filipe
99a0056d7f Merge pull request #10257 from rioug/9720-fix-imperial-weight-display-when-using-float-value 
Fix decimal display for imperial weight on Cart, Order Confirmation page and Confirmation emails
 2023-02-02 15:03:39 +00:00
Rachel Arnould
0973e79a91 Merge pull request #10274 from jibees/8905-convert-popup-to-flash-messages- 
On `/cart` page, if consumer adds more quantity than available, use in-app flash message instead of native alert
 2023-02-02 15:50:17 +01:00
Filipe
d0897ec677 Merge pull request #10248 from jibees/10117-reports-in-order-cycle-customer-totals-incorrect-sorting-when-lastname-first-letter-isnt-capitalized 
Reports, Orders and fulfillment: Sort by customer lastname + firstname case insensitive
 2023-02-02 14:39:10 +00:00
Jean-Baptiste Bellet
915174b513 Do not stack same flash messages 
Very ugly in UI.
 2023-02-02 15:28:35 +01:00
Jean-Baptiste Bellet
f5aae5f8b9 Remplace ouf of stock alert by Flash message 2023-02-02 15:28:35 +01:00
dependabot[bot]
e94fff0d69 Bump jwt from 2.6.0 to 2.7.0 
Bumps [jwt](https://github.com/jwt/ruby-jwt) from 2.6.0 to 2.7.0.
- [Release notes](https://github.com/jwt/ruby-jwt/releases)
- [Changelog](https://github.com/jwt/ruby-jwt/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jwt/ruby-jwt/compare/v2.6.0...v2.7.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-02 09:04:00 +00:00
David Cook
14189aef5c Use yarn to install dependencies 
reviewdoc-action-prettier is automatically running npm, but that fails. We use yarn so maybe if we call it first, npm won't get called? Worth a try.
 2023-02-02 11:51:13 +11:00
David Cook
6dc54fbd22 Add required webpack package 
Webpack won't run and tells me I need to install the new package:

> The command moved into a separate package: @webpack-cli/serve

But the latest version depends on webpack 5, so should we install an older version? I couldn't get that working either.
 2023-02-02 11:39:26 +11:00
Filipe
1e3f754f96 Merge pull request #10318 from dacook/10272-remove-currency-from-calculators 
Remove unused currency from calculators
 2023-02-01 13:49:51 +00:00
Filipe
095e520777 Merge pull request #10339 from mkllnk/ssl 
Remove unnecessary SSL code
 2023-02-01 13:06:26 +00:00
jibees
452b38fa36 Merge pull request #10355 from openfoodfoundation/dependabot/bundler/sidekiq-scheduler-5.0.1 
Bump sidekiq-scheduler from 5.0.0 to 5.0.1
 2023-02-01 10:58:15 +01:00
jibees
496bc9120a Merge pull request #10354 from openfoodfoundation/dependabot/npm_and_yarn/hotwired/turbo-7.2.5 
Bump @hotwired/turbo from 7.2.4 to 7.2.5
 2023-02-01 10:51:37 +01:00
dependabot[bot]
a386d33197 Bump webpacker from 5.4.3 to 5.4.4 
Bumps [webpacker](https://github.com/rails/webpacker) from 5.4.3 to 5.4.4.
- [Release notes](https://github.com/rails/webpacker/releases)
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/webpacker/compare/v5.4.3...v5.4.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-01 09:13:05 +00:00
dependabot[bot]
762e27b015 Bump sidekiq-scheduler from 5.0.0 to 5.0.1 
Bumps [sidekiq-scheduler](https://github.com/moove-it/sidekiq-scheduler) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/moove-it/sidekiq-scheduler/releases)
- [Changelog](https://github.com/sidekiq-scheduler/sidekiq-scheduler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/moove-it/sidekiq-scheduler/compare/v5.0.0...v5.0.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-01 09:03:29 +00:00
dependabot[bot]
29915cdbbd Bump @hotwired/turbo from 7.2.4 to 7.2.5 
Bumps [@hotwired/turbo](https://github.com/hotwired/turbo) from 7.2.4 to 7.2.5.
- [Release notes](https://github.com/hotwired/turbo/releases)
- [Commits](https://github.com/hotwired/turbo/compare/v7.2.4...v7.2.5)

---
updated-dependencies:
- dependency-name: "@hotwired/turbo"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-01 09:01:50 +00:00
Gaetan Craig-Riou
5cfedddba4 UnsavedChanges controller, disabling submit button is now optional 2023-02-01 13:46:30 +11:00