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

22779 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Filipe
c4f4d67fc0 Merge pull request #8503 from jibees/split-checkout-payment-forms 
Split checkout payment forms
 2021-12-15 12:57:03 +00:00
Matt-Yorkley
6bbcec1186 Merge pull request #8617 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.4.5 
Bump jest from 27.4.4 to 27.4.5
 2021-12-14 11:55:46 +00:00
dependabot[bot]
d945c64248 Bump jest from 27.4.4 to 27.4.5 
Bumps [jest](https://github.com/facebook/jest) from 27.4.4 to 27.4.5.
- [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.4.4...v27.4.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-14 09:06:31 +00:00
Matt-Yorkley
3800eb0eef Merge pull request #8610 from Matt-Yorkley/user-class 
Remove Spree.user_class
 2021-12-13 15:52:00 +00:00
Filipe
f7087842b4 Merge pull request #8556 from sinansonmez/8546-include-navigation-only-for-super-admins 
Navigation is included only for super admin users
v4.1.11 		2021-12-11 16:34:10 +00:00
Matt-Yorkley
1143960ce1 Merge pull request #8607 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.4.4 
Bump jest from 27.4.3 to 27.4.4
 2021-12-11 13:04:22 +00:00
Matt-Yorkley
6d2521bf5f Remove Spree.user_class 
This construct was previously used in Spree to switch out the user class with a dummy class during certain tests. We don't use this any more, so it's just mess.

🔥
 2021-12-10 18:18:20 +00:00
Filipe
215d8fc86e Merge pull request #8605 from mkllnk/8449-flaky-spec 
Make flaky system spec reliable
 2021-12-10 16:49:39 +00:00
dependabot[bot]
9797116bba Bump jest from 27.4.3 to 27.4.4 
Bumps [jest](https://github.com/facebook/jest) from 27.4.3 to 27.4.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.4.3...v27.4.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-12-10 16:28:29 +00:00
Matt-Yorkley
d424476854 Merge pull request #8609 from Matt-Yorkley/babel-loader 
Add babel-loader to JS dependencies
 2021-12-10 16:22:07 +00:00
Matt-Yorkley
c1d9516640 Add babel-loader to JS dependencies 
This package should have been included by other dependencies, but it seems there's some weird issues with the package not being found and this is one of the main suggested solutions.

Deployments are currently failing with: "ERROR in Entry module not found: Error: Cannot resolve module 'babel-loader'"
 2021-12-10 14:39:40 +00:00
Matt-Yorkley
99aaae1111 Merge pull request #8602 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.4.9 
Bump @storybook/addon-docs from 6.4.8 to 6.4.9
 2021-12-10 13:23:29 +00:00
dependabot[bot]
cf0738b1d0 Bump @storybook/addon-docs from 6.4.8 to 6.4.9 
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs) from 6.4.8 to 6.4.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.4.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-12-10 13:19:22 +00:00
Matt-Yorkley
bb78391759 Merge pull request #8603 from openfoodfoundation/dependabot/npm_and_yarn/storybook/server-6.4.9 
Bump @storybook/server from 6.4.8 to 6.4.9
 2021-12-10 13:15:18 +00:00
dependabot[bot]
5415b30fdf Bump @storybook/server from 6.4.8 to 6.4.9 
Bumps [@storybook/server](https://github.com/storybookjs/storybook/tree/HEAD/app/server) from 6.4.8 to 6.4.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.4.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-12-10 03:36:16 +00:00
Maikel
ba1e810a3c Merge pull request #8601 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-controls-6.4.9 
Bump @storybook/addon-controls from 6.4.1 to 6.4.9
 2021-12-10 14:32:17 +11:00
Maikel Linke
0a8ad8bd37 Make flaky system spec reliable 
It was failing 50% of the time since it was converted into a system
spec.
 2021-12-10 14:03:22 +11:00
Maikel
4be0536b18 Merge pull request #8597 from openfoodfoundation/transifex 
Transifex
 2021-12-10 12:06:27 +11:00
Maikel
d215294c40 Merge pull request #8567 from LiamMcM/fix-broken-links 
Fix out-of-date links in CONTRIBUTING.md
 2021-12-10 12:05:40 +11:00
Maikel
74de65b183 Merge pull request #8570 from mkllnk/rubocop 
Update Rubocop config
 2021-12-10 09:45:45 +11:00
Maikel Linke
67aa3447da Automatically regenerate style todo list 
We used to keep a manual file for metrics violations because the
automatic file didn't exclude on a file-by-file basis. But Rubocop has
an additional option these days so that we can generate that
automatically in the normal todo list.

The todo list was also out of date.
 2021-12-10 09:29:20 +11:00
Maikel Linke
faf0a3ab84 Remove unnecessary disabling of cop 2021-12-10 09:26:57 +11:00
Maikel Linke
207cc8908a Remove useless assignments 
Rubocop highlighted this. The todo list actually contains these files
but somehow the cop still runs and reports these as violations.
 2021-12-10 09:26:57 +11:00
Maikel Linke
64d25b2999 Remove dead code highlighted by Rubocop 
The assignments here didn't actually do anything and `number` was
restricted to numbers only already. No whitespace to remove.
 2021-12-10 09:26:57 +11:00
Jean-Baptiste Bellet
a80818d2b6 Fix rubocop warning 
Extra empty line detected at module body end.
 2021-12-09 11:30:57 +01:00
jibees
53e12fb5e5 Get rid of conditional branches with & operator 
Co-authored-by: Maikel <maikel@email.org.au>
 2021-12-09 11:12:23 +01:00
jibees
3c491299fd Update config/locales/en.yml 
Co-authored-by: Maikel <maikel@email.org.au>
 2021-12-09 11:05:41 +01:00
dependabot[bot]
baaf24948a Bump @storybook/addon-controls from 6.4.1 to 6.4.9 
Bumps [@storybook/addon-controls](https://github.com/storybookjs/storybook/tree/HEAD/addons/controls) from 6.4.1 to 6.4.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.4.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-12-09 09:06:11 +00:00
Transifex-Openfoodnetwork
a2b734f636 Updating translations for config/locales/en_US.yml 2021-12-09 01:41:49 +11:00
Maikel
8107aa3a05 Merge pull request #8589 from filipefurtad0/shop_products_spec_into_system 
Remaining shopping specs into system
 2021-12-08 18:17:51 +11:00
Maikel
d38d8283b1 Merge pull request #8588 from filipefurtad0/shop_embedded_into_system 
Updates/moves embedded_groups into system
 2021-12-08 18:13:30 +11:00
Maikel
77085cf9bb Merge pull request #8587 from filipefurtad0/checkout_stripe_into_system 
Updates/moves checkout_stripe into system
 2021-12-08 18:12:49 +11:00
Maikel
9307b97f5b Merge pull request #8586 from filipefurtad0/checkout_paypal_into_system 
Updates/moves checkout_paypal into system
 2021-12-08 18:11:45 +11:00
Maikel
81fff677ac Merge pull request #8584 from filipefurtad0/shop_cart_spec_into_system 
Updates/moves cart_spec into system
 2021-12-08 18:10:34 +11:00
Maikel
2dd80a8c6b Merge pull request #8583 from filipefurtad0/shopping_caching_into_system 
Updates/moves shops_caching into system
 2021-12-08 18:09:23 +11:00
Maikel
1957ae185b Merge pull request #8582 from filipefurtad0/darkswarm_into_system 
Updates/moves darkswarm_caching into system
 2021-12-08 18:07:49 +11:00
Maikel
086b469a1a Merge pull request #8575 from openfoodfoundation/dependabot/npm_and_yarn/storybook/server-6.4.8 
Bump @storybook/server from 6.3.12 to 6.4.8
 2021-12-08 18:06:57 +11:00
Maikel
65e5291679 Merge pull request #8569 from Matt-Yorkley/dead-code-backordered 
Remove dead code: Order#backordered?
 2021-12-08 18:05:38 +11:00
Maikel
d34478f271 Merge pull request #8448 from filipefurtad0/reports_spec_into_system 
Moves/updates reports_spec.rb into system
 2021-12-08 18:03:48 +11:00
dependabot[bot]
4bbdaf07ea Bump @storybook/server from 6.3.12 to 6.4.8 
Bumps [@storybook/server](https://github.com/storybookjs/storybook/tree/HEAD/app/server) from 6.3.12 to 6.4.8.
- [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.4.8/app/server)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-08 05:10:04 +00:00
Maikel
d2c0c3ff7b Merge pull request #8573 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.4.8 
Bump @storybook/addon-docs from 6.4.3 to 6.4.8
 2021-12-08 16:07:43 +11:00
filipefurtad0
9565400ee0 Removes typo, deletes byebug 2021-12-07 17:30:58 +00:00
filipefurtad0
7f39a1e1d6 Removes line break in assertion 2021-12-07 17:26:06 +00:00
Matt-Yorkley
83fafe9969 Fix stripe elements styling 
The selectors are different now that we're not using Angular to build the stripe card element.
 2021-12-07 16:46:42 +00:00
filipefurtad0
5a77ee75e1 Moves/Updates variant_override_spec into system 2021-12-07 16:35:19 +00:00
Matt-Yorkley
d22cb0e1e1 Add billing address name to card 2021-12-07 16:29:25 +00:00
Matt-Yorkley
6b8c91845e Update strong params 2021-12-07 16:29:25 +00:00
Matt-Yorkley
2fe96c5f63 Update Stripe controller hidden fields 2021-12-07 16:29:25 +00:00
Matt-Yorkley
9979ecf8b4 Update view to use new Stimulus controller for Stripe card form 2021-12-07 16:29:25 +00:00
Matt-Yorkley
cbd7b37eb3 Change card field name 
The order[card] field is already in use / needed for other data 👍
 2021-12-07 16:29:25 +00:00