raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-05 22:26:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 18 Branches 452 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

34725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Gaetan Craig-Riou
19fc1fab8c As per review, visit page directly to save time 
We still visit the page as user would do once to make sure it is
working.
 2023-09-22 11:35:56 +02:00
filipefurtad0
b913e5c851 Update all locales with the latest Transifex translations v4.4.12 2023-09-22 10:29:52 +01:00
Gaetan Craig-Riou
03ce39d5c5 Add metadata to tax related voucher adjustment 
In the scenario where you have tax excluded from price, when adding
a voucher to an order, we create 2 voucher adjusments. One of them
represent the tax part of the voucher, and has a label starting with
"Tax". To better differentiate them and allow a reliable way to
query it, we add a metadata entry.
 2023-09-22 11:16:21 +02: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
0a68300e40 Remove Voucher scenario 
It is now covered by unit test
 2023-09-22 10:22:47 +02:00
Gaetan Craig-Riou
25adaaa6ea Simplify test set up 2023-09-22 10:17:50 +02:00
Gaetan Craig-Riou
f54846829d Add test for #voucher_tax_adjustment 
And mock calls to VoucherAdjustmentsService
 2023-09-22 10:17:50 +02:00
Gaetan Craig-Riou
9e49da8fae Add unit test for Reporting::Reports::SalesTax::SalesTaxTotalsByOrder 
And a small refactoring.
Currently it only covers tax excluded from price
 2023-09-22 10:17:50 +02:00
Gaetan Craig-Riou
3197480121 Prevent voucher from starting with "Tax" 
Plus spec
 2023-09-22 10:17:50 +02:00
Gaetan Craig-Riou
bec5ad55dd Use VoucherAdjustmentsService to retrieve tax part of the voucher 2023-09-22 10:17:50 +02:00
Gaetan Craig-Riou
7c34145ed7 Add voucher_included_tax and voucher_excluded_tax 
It retrieves the tax part of the voucher adjustment for tax included
in price and tax excluded from price respectively.
 2023-09-22 10:17:40 +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
David Cook
ec29038372 Remove unnecessary space 2023-09-21 15:54:40 +10:00
David Cook
23959c96bc Send a Slack notification when api-changes PRs are merged 2023-09-21 15:53:34 +10:00
Maikel Linke
07ac381a97 Ignore block length of response blocks 
In Rswag request specs, the `response` block is like `describe` and is
just used to group several other blocks. It can be long and that's okay.
 2023-09-21 09:19:21 +10:00
Maikel Linke
02f251c900 Import DFC SuppliedProduct as new variant of existing product 2023-09-21 09:04:57 +10:00
Maikel Linke
db5b6e5406 Enable DFC importer to import OFN objects 2023-09-21 09:04:28 +10:00
Maikel Linke
fcf7b94278 Add our own SuppliedProduct with custom property 2023-09-21 09:02:20 +10:00
Maikel Linke
c42f62e09f Add custom OFN product id to DFC SuppliedProduct 
The Spree::Variant in OFN corresponds to a DFC SuppliedProduct. But
several Spree::Variant can be grouped under one Spree::Product which
wasn't exposed on the DFC API.

I'm adding a custom property here which can be used internally and
shouldn't break any other DFC tools.

A gotcha of this first test implementation:

The `ofn:` prefix has not been defined in the context. Software needs
to know that this is an Open Food Network attribute or ignore it.
We could define our own context and ontology and publish it on our
website but I don't see any benefit of that at this point.
 2023-09-21 08:54:32 +10:00
Maikel Linke
2175c59a6b Load spec helper not knowing Rails 
When the application is not preloaded then running Rspec doesn't know
Rails until the spec helper is loaded. So we can't use Rails to find the
path of the spec helper. This has been fixed before but the DFC Address
code was developed at the same time and missed.
 2023-09-21 08:54:32 +10:00
Maikel
458767fe13 Merge pull request #11569 from macanudo527/fix_stylehash_6 
Fix Style/HashSyntax 7/13
 2023-09-21 08:35:39 +10:00
Rachel Arnould
15137caed2 Merge pull request #11509 from dacook/buu-editing-part3-11059 
[BUU] Bulk form editing features
 2023-09-20 19:27:05 +02:00
Neal Chambers
bad1f55cdd Update .rubocop_todo.yml 2023-09-20 23:47:52 +09:00
Neal Chambers
29df80945d Fix Style/HashSyntax 2023-09-20 23:46:26 +09:00
Maikel
d216b68993 Merge pull request #11562 from macanudo527/fix_stylehash_5 
Fix Style/HashSyntax 6/13
 2023-09-20 12:00:30 +10:00
jibees
964373ce2b Merge pull request #11566 from openfoodfoundation/dependabot/bundler/valid_email2-5.0.3 
chore(deps): bump valid_email2 from 5.0.2 to 5.0.3
 2023-09-19 16:25:46 +02:00