raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-06 22:36:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,951 Commits 18 Branches 453 Tags
9dbba35019b7f8df2a0759c697ebbf0bf14f2c3e
Commit Graph

24951 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel Linke
9dbba35019 Find customers by user id as well as email 
Also fixing up a spec which became brittle due to too much mocking.
 2022-09-29 12:06:06 +02:00
Maikel Linke
cf634d8d9b Simplify customer association 2022-09-29 12:06:06 +02:00
Maikel Linke
5fefd3b14b Remove useless customer loading and clarify name 
The method `associate_customer` only loads a customer but doesn't
actually associate one. So the deleted line doesn't have any effect.

The intention was to reset the customer after switching shops but the
before_validation logic on the order model takes care of that already.

I'm renaming this private method here for clarity.
 2022-09-29 12:06:06 +02:00
Maikel Linke
93da64f466 Spec for duplicate customers after changing email 2022-09-29 12:06:06 +02:00
Maikel Linke
0d1f48ac0d Simplify order-customer logic 2022-09-29 12:06:06 +02:00
Maikel Linke
ccbf20a73b Replace spec of customer's internal logic 
Specs should test public methods. Private methods should be able to
change without specs breaking.

The specs were also just mirroring the code and didn't really have any
meaning. So I wrote new ones which are hopefully clearer.

There's actually a case which I don't quite understand. Why don't we
require a customer for a new complete order? It means that we don't have
a customer creating it but then it's added when updating the order.
Seems inconsistent.
 2022-09-29 12:06:06 +02:00
jibees
5dc4a859f7 Merge pull request #9717 from openfoodfoundation/dependabot/bundler/view_component-2.74.0 
Bump view_component from 2.73.0 to 2.74.0
 2022-09-29 10:19:23 +02:00
jibees
9323931a21 Merge pull request #9715 from openfoodfoundation/dependabot/npm_and_yarn/babel/preset-env-7.19.3 
Bump @babel/preset-env from 7.19.1 to 7.19.3
 2022-09-29 09:33:28 +02:00
dependabot[bot]
6f6b1ce9e6 Bump view_component from 2.73.0 to 2.74.0 
Bumps [view_component](https://github.com/viewcomponent/view_component) from 2.73.0 to 2.74.0.
- [Release notes](https://github.com/viewcomponent/view_component/releases)
- [Changelog](https://github.com/ViewComponent/view_component/blob/main/docs/CHANGELOG.md)
- [Commits](https://github.com/viewcomponent/view_component/compare/v2.73.0...v2.74.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-29 07:02:17 +00:00
Maikel
2c2d244c56 Merge pull request #9716 from filipefurtad0/fix_reports_spec 
Fixes invert columns logic on reports spec
 2022-09-29 17:00:38 +10:00
Maikel
c000c0dd5d Merge pull request #9709 from openfoodfoundation/dependabot/bundler/view_component-2.73.0 
Bump view_component from 2.72.0 to 2.73.0
 2022-09-29 08:23:09 +10:00
Filipe
958c6fe8f3 Merge pull request #9685 from filipefurtad0/remove_js_tracking_code 
Removes matomo JS tracking code
 2022-09-28 23:15:23 +01:00
Filipe
9cc2d30920 Merge pull request #9642 from mkllnk/9002-customer-association 
Delete duplicate customer entries
 2022-09-28 17:17:23 +01:00
filipefurtad0
e00a59212c Fixes invert columns logic on reports spec 2022-09-28 11:49:20 +01:00
dependabot[bot]
e783594385 Bump @babel/preset-env from 7.19.1 to 7.19.3 
Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.19.1 to 7.19.3.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.19.3/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-28 09:03:57 +00:00
dependabot[bot]
fea78884e7 Bump view_component from 2.72.0 to 2.73.0 
Bumps [view_component](https://github.com/viewcomponent/view_component) from 2.72.0 to 2.73.0.
- [Release notes](https://github.com/viewcomponent/view_component/releases)
- [Changelog](https://github.com/ViewComponent/view_component/blob/main/docs/CHANGELOG.md)
- [Commits](https://github.com/viewcomponent/view_component/compare/v2.72.0...v2.73.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-28 07:23:18 +00:00
jibees
4f290b5bc5 Merge pull request #9707 from filipefurtad0/remove_visible_true_label 
Removes "visible: true" from system specs
 2022-09-28 09:21:19 +02:00
Maikel
52c38428e8 Merge pull request #9624 from filipefurtad0/add_vcr_to_the_stack 
Add VCR to the stack
 2022-09-28 10:48:59 +10:00
filipefurtad0
538844a1fb Removes _visible: true_ from system specs 2022-09-27 17:32:25 +01:00
filipefurtad0
4690cb102b Adds sets-up the cassettes correctly and other configs 
deletes unecessary files

Reverts helper option to turn VCR off
 2022-09-27 07:26:26 +01:00
Maikel Linke
4e33bd2713 Avoid trying to delete address referenced elsewhere 2022-09-27 13:14:51 +10:00
Maikel Linke
286dade66f Don't enforce ApplicationRecord in migrations 
We shouldn't use app code in migrations because app code changes while
migrations should always do the same to enable old servers to upgrade.

We have some existing migrations which use ApplicationRecord but I found
that changing them retrospectively breaks them already. So let's leave
them alone.
 2022-09-27 13:14:51 +10:00
Maikel Linke
591f901935 Delete duplicate customer entries 2022-09-27 13:14:49 +10:00
Maikel Linke
aec28e0807 Simplify customer model requiring enterprise 2022-09-27 13:14:18 +10:00
Maikel Linke
be31b9a897 Document purpose of customer model 2022-09-27 13:14:18 +10:00
Maikel
6783e7f74c Fix typo 2022-09-27 12:37:08 +10:00
Maikel
19c9eccffe Merge pull request #9704 from openfoodfoundation/dependabot/bundler/geocoder-1.8.1 
Bump geocoder from 1.8.0 to 1.8.1
 2022-09-27 12:09:12 +10:00
Maikel
561aa0e291 Merge pull request #9701 from sashashura/patch-6 
GitHub Workflows security hardening
 2022-09-27 11:56:25 +10:00
dependabot[bot]
e45decf14e Bump geocoder from 1.8.0 to 1.8.1 
Bumps [geocoder](https://github.com/alexreisner/geocoder) from 1.8.0 to 1.8.1.
- [Release notes](https://github.com/alexreisner/geocoder/releases)
- [Changelog](https://github.com/alexreisner/geocoder/blob/master/CHANGELOG.md)
- [Commits](https://github.com/alexreisner/geocoder/compare/v1.8.0...v1.8.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-26 09:32:31 +00:00
jibees
b851aba81a Merge pull request #9699 from filipefurtad0/localization_number_settings 
Adds tests to decimal, thousands and localization number settings
 2022-09-26 10:57:28 +02:00
jibees
45040ca702 Merge pull request #9696 from openfoodfoundation/dependabot/npm_and_yarn/hotwired/turbo-7.2.0 
Bump @hotwired/turbo from 7.1.0 to 7.2.0
 2022-09-26 10:56:55 +02:00
jibees
126da75167 Merge pull request #9694 from openfoodfoundation/dependabot/bundler/spring-4.1.0 
Bump spring from 4.0.0 to 4.1.0
 2022-09-26 10:55:51 +02:00
jibees
71b24ef8b9 Merge pull request #9690 from openfoodfoundation/dependabot/bundler/sidekiq-6.5.7 
Bump sidekiq from 6.5.6 to 6.5.7
 2022-09-26 10:54:42 +02:00
jibees
4ae93113f0 Merge pull request #9670 from dacook/generate-erd 
Script to generate ERD
 2022-09-26 10:33:06 +02:00
Alex
8ce82a9ad6 build: harden mapi.yml permissions 
Signed-off-by: Alex <aleksandrosansan@gmail.com>
 2022-09-23 22:52:16 +02:00
Alex
bd6bf9315a build: harden linters.yml permissions 
Signed-off-by: Alex <aleksandrosansan@gmail.com>
 2022-09-23 22:51:33 +02:00
filipefurtad0
7b33405530 Replaces translation with actual string 
DRY: creates update_and_assert_message
 2022-09-23 13:00:39 +01:00
filipefurtad0
6e3c0858c1 Adds decimal and thousands separator test 2022-09-23 12:47:18 +01:00
filipefurtad0
fb8d2827d2 Adds number localization preferences test 2022-09-23 12:03:18 +01:00
dependabot[bot]
ae8d505367 Bump @hotwired/turbo from 7.1.0 to 7.2.0 
Bumps [@hotwired/turbo](https://github.com/hotwired/turbo) from 7.1.0 to 7.2.0.
- [Release notes](https://github.com/hotwired/turbo/releases)
- [Commits](https://github.com/hotwired/turbo/compare/v7.1.0...v7.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-23 09:03:43 +00:00
Jean-Baptiste Bellet
cba9779168 Update all locales with the latest Transifex translations v4.2.14 2022-09-22 16:35:32 +02:00
dependabot[bot]
17e9dbc0f7 Bump spring from 4.0.0 to 4.1.0 
Bumps [spring](https://github.com/rails/spring) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/rails/spring/releases)
- [Changelog](https://github.com/rails/spring/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rails/spring/compare/v4.0.0...v4.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-22 09:16:42 +00:00
filipefurtad0
e798277cbf Adds real requests with concealed secret key 2022-09-21 12:32:49 +01:00
filipefurtad0
3e97433920 Adds VCR config file into support folder 
...with additional options to vcr_setup
 2022-09-21 12:32:49 +01:00
filipefurtad0
038b93fdf6 Adds VCR to the stack 
...And sets gems in alphabetical order
 2022-09-21 12:32:49 +01:00
Rachel Arnould
e98d4af630 Merge pull request #9659 from saunmanoj888/fix-bulk-product-update-unit-value 
Allow to change unit value for numbers with a comma separator on bulk product update
 2022-09-21 13:04:08 +02:00
dependabot[bot]
79374ce5d7 Bump sidekiq from 6.5.6 to 6.5.7 
Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.5.6 to 6.5.7.
- [Release notes](https://github.com/mperham/sidekiq/releases)
- [Changelog](https://github.com/mperham/sidekiq/blob/main/Changes.md)
- [Commits](https://github.com/mperham/sidekiq/compare/v6.5.6...v6.5.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-09-21 09:07:14 +00:00
jibees
e0aa94e6af Merge pull request #9689 from openfoodfoundation/dependabot/npm_and_yarn/floating-ui/dom-1.0.2 
Bump @floating-ui/dom from 1.0.1 to 1.0.2
 2022-09-21 09:21:46 +02:00
Maikel
a4de128a76 Merge pull request #9674 from filipefurtad0/wicked_pdf_config 
Makes wicked-pdf config ENV-dependent
 2022-09-21 13:16:41 +10:00
David Cook
96d1616b70 Update for compatibility with macOS (BSD grep) 
The --max-count option tells grep to stop reading lines after the first matching line. We're looking for the line AFTER the first matching line.
 2022-09-21 12:22:21 +10:00