raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-10 03:30:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,112 Commits 18 Branches 455 Tags
7c0b0bebf74576dfcb9ddd2274336e1cc18fa610
Commit Graph

22112 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
7c0b0bebf7 Bump jest from 27.2.3 to 27.2.4 
Bumps [jest](https://github.com/facebook/jest) from 27.2.3 to 27.2.4.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v27.2.3...v27.2.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-04 20:09:36 +00:00
Andy Brett
5499d777aa Merge pull request #8276 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.3.9 
Bump @storybook/addon-docs from 6.3.8 to 6.3.9
 2021-10-04 13:03:45 -07:00
dependabot[bot]
af133930c8 Bump @storybook/addon-docs from 6.3.8 to 6.3.9 
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs) from 6.3.8 to 6.3.9.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.3.9/addons/docs)

---
updated-dependencies:
- dependency-name: "@storybook/addon-docs"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-04 19:22:41 +00:00
Andy Brett
407c4de406 Merge pull request #8272 from openfoodfoundation/dependabot/bundler/jwt-2.3.0 
Bump jwt from 2.2.3 to 2.3.0
 2021-10-04 11:37:43 -07:00
Andy Brett
ebb52510b5 Merge pull request #8275 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-controls-6.3.9 
Bump @storybook/addon-controls from 6.3.8 to 6.3.9
 2021-10-04 11:22:05 -07:00
Andy Brett
291e2ca968 Merge pull request #8274 from openfoodfoundation/dependabot/npm_and_yarn/storybook/server-6.3.9 
Bump @storybook/server from 6.3.8 to 6.3.9
 2021-10-04 11:21:35 -07:00
Andy Brett
3b930fe6f7 Merge pull request #8273 from openfoodfoundation/dependabot/bundler/rubocop-1.22.1 
Bump rubocop from 1.22.0 to 1.22.1
 2021-10-04 11:21:01 -07:00
dependabot[bot]
3b55486172 Bump @storybook/addon-controls from 6.3.8 to 6.3.9 
Bumps [@storybook/addon-controls](https://github.com/storybookjs/storybook/tree/HEAD/addons/controls) from 6.3.8 to 6.3.9.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.3.9/addons/controls)

---
updated-dependencies:
- dependency-name: "@storybook/addon-controls"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-04 09:07:53 +00:00
dependabot[bot]
d88bceebef Bump @storybook/server from 6.3.8 to 6.3.9 
Bumps [@storybook/server](https://github.com/storybookjs/storybook/tree/HEAD/app/server) from 6.3.8 to 6.3.9.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.3.9/app/server)

---
updated-dependencies:
- dependency-name: "@storybook/server"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-04 09:07:17 +00:00
dependabot[bot]
12f367f47f Bump rubocop from 1.22.0 to 1.22.1 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.22.0 to 1.22.1.
- [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.22.0...v1.22.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-04 09:03:48 +00:00
dependabot[bot]
fc1efe4d05 Bump jwt from 2.2.3 to 2.3.0 
Bumps [jwt](https://github.com/jwt/ruby-jwt) from 2.2.3 to 2.3.0.
- [Release notes](https://github.com/jwt/ruby-jwt/releases)
- [Changelog](https://github.com/jwt/ruby-jwt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jwt/ruby-jwt/compare/v2.2.3...v2.3.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-04 09:03:11 +00:00
Matt-Yorkley
43f28d94b9 Update all locales with the latest Transifex translations 2021-09-30 18:22:16 +01:00
Matt-Yorkley
61fa251f6a Merge pull request #8252 from openfoodfoundation/transifex 
Transifex
 2021-09-30 19:00:49 +02:00
Matt-Yorkley
0170351597 Merge pull request #8254 from openfoodfoundation/dependabot/npm_and_yarn/mrujs-0.5.3 
Bump mrujs from 0.4.13 to 0.5.3
 2021-09-29 13:54:09 +02:00
Matt-Yorkley
df7bad2cb2 Merge pull request #8241 from openfoodfoundation/dependabot/npm_and_yarn/hotwired/turbo-7.0.1 
Bump @hotwired/turbo from 7.0.0-rc.5 to 7.0.1
 2021-09-29 13:30:51 +02:00
Matt-Yorkley
802d637b34 Merge pull request #8259 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.2.3 
Bump jest from 27.2.2 to 27.2.3
 2021-09-29 12:38:56 +02:00
Matt-Yorkley
868bb78bae Merge pull request #8258 from openfoodfoundation/dependabot/bundler/rubocop-1.22.0 
Bump rubocop from 1.21.0 to 1.22.0
 2021-09-29 12:38:37 +02:00
Transifex-Openfoodnetwork
e26e6e8d8b Updating translations for config/locales/ru.yml 2021-09-29 20:29:57 +10:00
dependabot[bot]
a9c02a3fce Bump jest from 27.2.2 to 27.2.3 
Bumps [jest](https://github.com/facebook/jest) from 27.2.2 to 27.2.3.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v27.2.2...v27.2.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-29 09:06:46 +00:00
dependabot[bot]
ac4d3a91da Bump rubocop from 1.21.0 to 1.22.0 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.21.0 to 1.22.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.21.0...v1.22.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-29 09:03:06 +00:00
Andy Brett
5e658eb9dd Update all locales with the latest Transifex translations v4.1.3 2021-09-28 09:21:09 -07:00
dependabot[bot]
f7884d4929 Bump mrujs from 0.4.13 to 0.5.3 
Bumps [mrujs](https://github.com/ParamagicDev/mrujs) from 0.4.13 to 0.5.3.
- [Release notes](https://github.com/ParamagicDev/mrujs/releases)
- [Changelog](https://github.com/ParamagicDev/mrujs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ParamagicDev/mrujs/compare/v0.4.13...v0.5.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-28 09:07:07 +00:00
Transifex-Openfoodnetwork
2079bf549d Updating translations for config/locales/nb.yml 2021-09-28 11:28:18 +10:00
Transifex-Openfoodnetwork
1abca497b7 Updating translations for config/locales/en_IE.yml 2021-09-28 11:25:12 +10:00
Maikel
c9d36e6f5c Merge pull request #8204 from meronokbay/6942-fix-payment-method-fee-bug-all 
Fix payment method fee bug for all calculator types
 2021-09-28 08:39:05 +10:00
Matt-Yorkley
0f4c8d8ecc Merge pull request #8251 from openfoodfoundation/dependabot/bundler/nokogiri-1.12.5 
Bump nokogiri from 1.12.4 to 1.12.5
 2021-09-27 23:13:06 +02:00
dependabot[bot]
6553136d2d Bump nokogiri from 1.12.4 to 1.12.5 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.12.4 to 1.12.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.12.4...v1.12.5)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-27 20:40:40 +00:00
Matt-Yorkley
9cbdc8293d Merge pull request #8244 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.2.2 
Bump jest from 27.2.1 to 27.2.2
 2021-09-27 21:36:15 +02:00
Matt-Yorkley
6d1d688b1d Merge pull request #8215 from openfoodfoundation/transifex 
Transifex
 2021-09-27 15:04:24 +02:00
dependabot[bot]
af1e26e9e1 Bump jest from 27.2.1 to 27.2.2 
Bumps [jest](https://github.com/facebook/jest) from 27.2.1 to 27.2.2.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v27.2.1...v27.2.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-27 09:07:54 +00:00
dependabot[bot]
692a21dcaf Bump @hotwired/turbo from 7.0.0-rc.5 to 7.0.1 
Bumps [@hotwired/turbo](https://github.com/hotwired/turbo) from 7.0.0-rc.5 to 7.0.1.
- [Release notes](https://github.com/hotwired/turbo/releases)
- [Commits](https://github.com/hotwired/turbo/compare/v7.0.0-rc.5...v7.0.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-27 09:06:32 +00:00
Andy Brett
6a50f68b52 Merge pull request #8217 from filipefurtad0/orders_spec_update 
Orders page spec update
 2021-09-24 13:41:06 -07:00
Andy Brett
a137bdd00e Merge pull request #8220 from openfoodfoundation/dependabot/npm_and_yarn/tmpl-1.0.5 
Bump tmpl from 1.0.4 to 1.0.5
 2021-09-24 13:24:31 -07:00
Andy Brett
b593ef78ea Merge pull request #8226 from openfoodfoundation/dependabot/npm_and_yarn/hotwired/turbo-7.0.0-rc.5 
Bump @hotwired/turbo from 7.0.0-rc.4 to 7.0.0-rc.5
 2021-09-24 13:23:00 -07:00
Andy Brett
9e5bc9ba0c Merge pull request #8222 from jibees/8221-show-order-with-line-items-and-finalized-ones 
Show orders with line items + finalized orders
 2021-09-24 13:21:09 -07:00
dependabot[bot]
1953d2164b Bump @hotwired/turbo from 7.0.0-rc.4 to 7.0.0-rc.5 
Bumps [@hotwired/turbo](https://github.com/hotwired/turbo) from 7.0.0-rc.4 to 7.0.0-rc.5.
- [Release notes](https://github.com/hotwired/turbo/releases)
- [Commits](https://github.com/hotwired/turbo/compare/v7.0.0-rc.4...v7.0.0-rc.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>
 2021-09-24 09:09:18 +00:00
Jean-Baptiste Bellet
e82e93e1cc Update test to add more case with finalized order with no line items 
Those empty order but finalized must be returned by the API
 2021-09-23 11:06:58 +02:00
Jean-Baptiste Bellet
78bbee49e9 Search for orders that are finalized 
Thus, we display the orders that contains at least one line item (whatever its state) + the finalized orders

NB // Finalized state : complete canceled resumed awaiting_return returned
 2021-09-23 11:06:15 +02:00
Maikel
5b5693dc26 Merge pull request #8180 from jibees/7504-resolve-rounded-errors 
Avoid rounded with float numbers errors with javascript
 2021-09-23 09:56:03 +10:00
Nihal M. Kelanthodika
f170b4241d Merge pull request #8168 from apricot12/7799-Enterprise-Fee-Report 2021-09-22 20:39:06 +05:30
Maikel
bdc7444422 Merge pull request #8213 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.2.1 
Bump jest from 27.2.0 to 27.2.1
 2021-09-22 18:13:42 +10:00
Maikel
53ffdaf6de Merge pull request #8212 from openfoodfoundation/dependabot/bundler/bootsnap-1.9.1 
Bump bootsnap from 1.9.0 to 1.9.1
 2021-09-22 18:13:00 +10:00
dependabot[bot]
37c6f11e05 Bump bootsnap from 1.9.0 to 1.9.1 
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.9.0 to 1.9.1.
- [Release notes](https://github.com/Shopify/bootsnap/releases)
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.9.0...v1.9.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-22 08:10:45 +00:00
Maikel
45fad30f7b Merge pull request #8211 from openfoodfoundation/dependabot/bundler/bugsnag-6.23.0 
Bump bugsnag from 6.22.1 to 6.23.0
 2021-09-22 18:09:24 +10:00
Maikel
3e689b46d0 Merge pull request #8209 from openfoodfoundation/dependabot/bundler/puma-5.5.0 
Bump puma from 5.4.0 to 5.5.0
 2021-09-22 17:10:42 +10:00
Maikel
98db38b0cc Merge pull request #8190 from openfoodfoundation/dependabot/npm_and_yarn/rails/webpacker-5.4.3 
Bump @rails/webpacker from 5.4.2 to 5.4.3
 2021-09-22 17:04:58 +10:00
Maikel
7348ceca64 Merge pull request #8189 from openfoodfoundation/dependabot/bundler/webpacker-5.4.3 
Bump webpacker from 5.4.2 to 5.4.3
 2021-09-22 17:04:02 +10:00
dependabot[bot]
ea21469ff6 Bump tmpl from 1.0.4 to 1.0.5 
Bumps [tmpl](https://github.com/daaku/nodejs-tmpl) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/daaku/nodejs-tmpl/releases)
- [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5)

---
updated-dependencies:
- dependency-name: tmpl
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-22 06:34:42 +00:00
filipefurtad0
6000d4c985 Declares variables with let! avoiding repedition (DRY) 2021-09-21 16:33:17 +01:00
filipefurtad0
f2bd45162b Updates base_spec_helper.rb to make system specs work 2021-09-21 16:00:41 +01:00