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
29,082 Commits 18 Branches 453 Tags
c1587b689aae7ba50970ceb2d4be57ced3e012bf
Commit Graph

29082 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel
c1587b689a Merge pull request #11589 from openfoodfoundation/dependabot/bundler/aws-sdk-s3-1.136.0 
chore(deps): bump aws-sdk-s3 from 1.135.0 to 1.136.0
 2023-09-28 09:20:36 +10:00
dependabot[bot]
4d7f21eec4 chore(deps): bump aws-sdk-s3 from 1.135.0 to 1.136.0 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.135.0 to 1.136.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-09-27 09:05:00 +00:00
David Cook
4e05047cc6 Merge pull request #11583 from macanudo527/fix_stylehash_10 
Fix Style/HashSyntax 11/13
 2023-09-26 10:38:54 +10:00
Neal Chambers
48132b055f Update .rubocop_todo.yml 2023-09-25 13:15:54 +09:00
Neal Chambers
70e218d2e9 Fix Style/HashSyntax 2023-09-25 13:15:38 +09:00
Maikel
51f125e301 Merge pull request #11582 from macanudo527/fix_stylehash_9 
Fix Style/HashSyntax 10/13
 2023-09-25 13:43:38 +10:00
Neal Chambers
232ffb1eb8 Update .rubocop_todo.yml 2023-09-24 22:41:48 +09:00
Neal Chambers
35e8f88943 Fix Style/HashSyntax 2023-09-24 22:41:27 +09:00
Rachel Arnould
aa489d4cd6 Merge pull request #11185 from jibees/11155-improve-customer-addresses-report 
Admin, reports: improve customer addresses report
 2023-09-22 18:06:47 +02:00
Jean-Baptiste Bellet
2803f1c6b2 Group all orders by customer_id, email and distributor_id 
Therefore have one (and only) row per customer

Co-Authored-By: Maikel <maikel@email.org.au>
 2023-09-22 16:44:33 +01:00
Jean-Baptiste Bellet
9ce89125a4 Fix linter error: line is too long 2023-09-22 16:44:33 +01:00
Jean-Baptiste Bellet
d6c10170da Use plain text instead of computed date in specs 
https://github.com/openfoodfoundation/openfoodnetwork/wiki/Code-Conventions#prefer-plain-text-over-method-calls-in-expected-values
 2023-09-22 16:44:33 +01:00
jibees
5eab033a80 Improve indentation 
Co-Authored-By: Maikel <maikel@email.org.au>
 2023-09-22 16:44:33 +01:00
Maikel Linke
adc5bf6e93 Simplify date filter in customers report 2023-09-22 16:44:33 +01:00
Jean-Baptiste Bellet
82ccdcca70 Customers report has only one report: Customers 
No more `addresses` report

+ Fix pre-existing rubocop issues

+ Create method to simplify and remove CyclomaticComplexity error
 2023-09-22 16:44:33 +01:00
Jean-Baptiste Bellet
5edc8d8ce1 Delete Mailing List report 2023-09-22 16:44:33 +01:00
Jean-Baptiste Bellet
c6c9cdca65 Add last completed order date 2023-09-22 16:44:33 +01:00
Jean-Baptiste Bellet
d2fbaa7cfd Add total amount spent at the shop for the customer 2023-09-22 16:44:33 +01:00
Jean-Baptiste Bellet
d55098f94f Add the number of orders for the customer 2023-09-22 16:44:33 +01:00
Jean-Baptiste Bellet
1378202732 Disable rubocop warning. Not sure how to handle it actually 2023-09-22 16:44:33 +01:00
Jean-Baptiste Bellet
cc26da6560 We'll need to get all the orders per line to count and sum them; prepare it 2023-09-22 16:44:33 +01:00
Jean-Baptiste Bellet
c134de850c Add filter on completed_at of an order 2023-09-22 16:44:33 +01:00
Jean-Baptiste Bellet
4f332504af Add new line at the end of file 2023-09-22 16:44:33 +01:00
Jean-Baptiste Bellet
9e295146cb Remove supplier filter 2023-09-22 16:44:33 +01:00
Jean-Baptiste Bellet
baff4b5399 Rename 'distributor' to 'hub' 2023-09-22 16:44:33 +01:00
filipefurtad0
b913e5c851 Update all locales with the latest Transifex translations v4.4.12 2023-09-22 10:29:52 +01:00
Rachel Arnould
a3ca7e9032 Merge pull request #11568 from jibees/11069-buu-fully-update-the-details-of-my-products-and-variants-1 
🚧 [BUU] Add `Edit` link into a small menu on the last Actions column to the right of the table
 2023-09-22 10:30:01 +02:00
Gaetan Craig-Riou
b620e413f4 Merge pull request #11378 from mkllnk/dfc-ofn-product-group-id 
[DFC API] Add custom OFN product id to DFC SuppliedProduct
 2023-09-22 17:57:11 +10:00
Jean-Baptiste Bellet
b9cd8ee462 Factorize elements into beforeEach block 2023-09-22 09:34:36 +02:00
Jean-Baptiste Bellet
458a031558 Create a private function for event listener 2023-09-22 09:30:40 +02:00
Maikel Linke
847ddab4e6 Improve readability of assignment without blank lines 2023-09-22 17:18:49 +10:00
Maikel
886988e24a Merge pull request #11578 from macanudo527/fix_stylehash_8 
Fix Style/HashSyntax 9/13
 2023-09-22 15:09:46 +10:00
Neal Chambers
4a3a246e7a Update .rubocop_todo.yml 2023-09-22 09:08:50 +09:00
Neal Chambers
fe88a88206 Fix Style/HashSyntax 2023-09-22 09:08:50 +09:00
Maikel
3ed92312dd Merge pull request #11576 from openfoodfoundation/dependabot/bundler/puma-6.4.0 
chore(deps): bump puma from 6.3.1 to 6.4.0
 2023-09-22 09:57:07 +10:00
Maikel
998370163c Merge pull request #11575 from openfoodfoundation/dependabot/bundler/aws-sdk-s3-1.135.0 
chore(deps): bump aws-sdk-s3 from 1.134.0 to 1.135.0
 2023-09-22 09:55:32 +10:00
Maikel
a2f9289031 Merge pull request #11570 from macanudo527/fix_stylehash_7 
Fix Style/HashSyntax 8/13
 2023-09-22 09:54:46 +10:00
Neal Chambers
22e3542de3 Update .rubocop_todo.yml 2023-09-21 22:58:42 +09:00
Neal Chambers
7ecd4a149b Fix Style/HashSyntax 2023-09-21 22:58:42 +09:00
Konrad
a55797d727 Merge pull request #11510 from rioug/11421-deactivate-voucher 
[Vouchers] add activate/deactivate feature
 2023-09-21 15:03:47 +02:00
Konrad
1e877f4183 Merge pull request #11555 from mkllnk/spree-orders 
Remove duplicate association from Spree::User
 2023-09-21 13:23:51 +02:00
Filipe
a587a10dfe Merge pull request #11573 from mkllnk/flaky-invoice-spec 
Compare adjustments in deterministic order for invoices
 2023-09-21 11:34:29 +01:00
jibees
4c82d27a7d Merge pull request #11574 from openfoodfoundation/dependabot/bundler/knapsack_pro-5.7.0 
chore(deps-dev): bump knapsack_pro from 5.6.0 to 5.7.0
 2023-09-21 11:34:01 +02:00
dependabot[bot]
252c86ccc0 chore(deps): bump puma from 6.3.1 to 6.4.0 
Bumps [puma](https://github.com/puma/puma) from 6.3.1 to 6.4.0.
- [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.3.1...v6.4.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-21 09:31:34 +00:00
dependabot[bot]
d54a09f26a chore(deps): bump aws-sdk-s3 from 1.134.0 to 1.135.0 
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.134.0 to 1.135.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-09-21 09:20:35 +00:00
dependabot[bot]
f44eae2d6b chore(deps-dev): bump knapsack_pro from 5.6.0 to 5.7.0 
Bumps [knapsack_pro](https://github.com/KnapsackPro/knapsack_pro-ruby) from 5.6.0 to 5.7.0.
- [Changelog](https://github.com/KnapsackPro/knapsack_pro-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v5.6.0...v5.7.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-21 09:16:47 +00:00
David Cook
52fb4f5287 Remove unused workflow 
Sadly this one can't work for PRs created from forks.
 2023-09-21 16:42:27 +10:00
Maikel Linke
6386a997d3 Compare adjustments in deterministic order for invoices 
The comparator would sometimes compare two different adjustments when it
should have compared two versions of the same adjustment.
 2023-09-21 16:37:07 +10:00
Maikel Linke
ee1611904b Fix typos in spec description 2023-09-21 16:37:07 +10:00
David Cook
f2e8063a22 Merge pull request #11572 from dacook/test-api-changes 
Remove unnecessary space
 2023-09-21 15:57:42 +10:00