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
28,897 Commits 18 Branches 453 Tags
57f058eeb2aefe2d79acd9b00120e63cc534eaeb
Commit Graph

28897 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
filipefurtad0
57f058eeb2 Updates test case 
should list all the tax rates
 2023-09-13 19:09:55 +02:00
filipefurtad0
fc9826b44a Updates test case 
should filter by fee name
 2023-09-13 19:09:55 +02:00
filipefurtad0
86e6697723 Updates test case 
should filter by producer
 2023-09-13 19:09:55 +02:00
filipefurtad0
7734b0417d Updates test case 
should filter by distributor and order cycle (2)
 2023-09-13 19:09:55 +02:00
filipefurtad0
d7a6db3eb0 Updates test case 
should filter by distributor and order cycle
 2023-09-13 19:09:55 +02:00
filipefurtad0
d8501e7d83 Updates test case 
generates the report and displays fees for the respective suppliers
 2023-09-13 19:09:55 +02:00
David Cook
47d5fe909e Deduplicate order2 setup 2023-09-13 19:09:55 +02:00
David Cook
8c514b2fe9 Deduplicate order setup 2023-09-13 19:09:55 +02:00
David Cook
b574e71fc9 Refactor: set included_in_price once 
This saves the need for an update, and more importantly moves setup out of the before block which means we can finally deduplicate order setup.
 2023-09-13 19:09:55 +02:00
David Cook
6e15049728 Refactor distributor 2023-09-13 19:09:55 +02:00
David Cook
bf2298829f Refactor order cycle setup more 
Moving more code out of before blocks which will help us reduce duplication in following commits.
 2023-09-13 19:09:55 +02:00
David Cook
ce57ac65f3 Refactor order cycle lets 
It turns out the outgoing exchanges were never even used.
 2023-09-13 19:09:55 +02:00
Mohamed ABDELLANI
9a22cdc5e7 test scenario: 'multiple orders, same enterprise fee, different tax rates' 2023-09-13 19:09:55 +02:00
Mohamed ABDELLANI
624b4c8ad2 fix calculation of the summary row's total excl tax 2023-09-13 19:09:55 +02:00
Mohamed ABDELLANI
a3f012c9fe calculate tax total using existing rows 2023-09-13 19:09:55 +02:00
Mohamed ABDELLANI
f0c3d7685e replace string reference with the translated string 2023-09-13 19:09:55 +02:00
David Cook
420494715f Tighten up spec 
I noticed that the tests don't check if the right totals are shown for each section. Now we can be certain.
 2023-09-13 19:09:55 +02:00
David Cook
b7e1a660c3 Rename supplier to be more specific 
To ensure specs are matching the right supplier.
 2023-09-13 19:09:55 +02:00
David Cook
e934bc7cb9 Ignore ClassLength 
I'm never quite sure the best way to deal with these, so I added a comment to at least explain my justification.
 2023-09-13 19:09:55 +02:00
David Cook
93cca56e68 Style/HashSyntax 2023-09-13 19:09:55 +02:00
filipefurtad0
019c7b3e71 Splits filtering tests between orders 
Sets pending test case for orders with more than one supplier
 2023-09-13 19:09:55 +02:00
filipefurtad0
e43661fd3c Adds/corrects comments around Added tax section 2023-09-13 19:09:55 +02:00
Mohamed ABDELLANI
080e81e0fe optimize join_supplier 2023-09-13 19:09:55 +02:00
Mohamed ABDELLANI
44e8d2d735 fix pending lint issues 2023-09-13 19:09:55 +02:00
Mohamed ABDELLANI
219c581f9a remove pending from "should filter by producer" 2023-09-13 19:09:55 +02:00
Mohamed ABDELLANI
6dd70d310c fix the calculation of the cost of produce 
we want the cost of produce to only include the items produced by the supplier used to group the rows.
 2023-09-13 19:09:55 +02:00
filipefurtad0
9837a4fcf2 Removes pending (3) 
Reverts Included Tax values
 2023-09-13 19:09:55 +02:00
filipefurtad0
1b4235eb1d Extends tests to inclusive tax scenario 2023-09-13 19:09:55 +02:00
filipefurtad0
bb0f9a6758 Adds pending test 
on fees from order with line items from different suppliers

Adds pending test on producer filter
 2023-09-13 19:09:55 +02:00
filipefurtad0
928337c3fd Adds a second supplier and product to the setup 2023-09-13 19:09:55 +02:00
Mohamed ABDELLANI
7a875723ca fix order_cycle summary row. 
the summary row has to only include the line items coming from the supplier used in the grouping key
 2023-09-13 19:09:55 +02:00
Mohamed ABDELLANI
7b0a99c652 fix enterprise fees listing 
For every producer, we want to only show the enterprise fees that are applied to at lease one of his products.
To do that, we use the order cycle to build a list of the enterprise fees for every variant.
Every variant will have coordinator fee + additional fees coming from incoming/outgoing exchanges.
 2023-09-13 19:09:55 +02:00
Mohamed ABDELLANI
1cd0f88c1e fix supplier filter 2023-09-13 19:09:55 +02:00
David Cook
9ae65e135b Rails/Pick 
Prefer pick("sum(amount)") over pluck("sum(amount)").first
 2023-09-13 19:09:55 +02:00
David Cook
55742f40d1 Show a line for cost of produce 
Utilising a second group_by rule, we can add a second summary_row. The cost of produce is also inserted into the TOTALS row as per requirements.
 2023-09-13 19:09:55 +02:00
David Cook
cc54e2e6c7 Add long report class to .rubocop_todo.yml 
Long classes are a problem that would be good to resolve one day. But it's hard to resolve with the current reports framework.
 2023-09-13 19:09:55 +02:00
Mohamed ABDELLANI
ee7668e713 implement enterprise fee report filters 
squash Reformat/Refactor spec
 2023-09-13 19:09:55 +02:00
Mohamed ABDELLANI
481b09edda test enterprise summary fee with tax report by producer 
Reformat/Refactor spec
 2023-09-13 19:09:55 +02:00
Mohamed ABDELLANI
2880fd5a87 implement EnterpriseFeesWithTaxReportByProducer 
squash Re-format code

squash Apply suggestions from code review

Co-authored-by: Maikel <maikel@email.org.au>

squash More refactor

squash Update lib/reporting/reports/enterprise_fee_summary/enterprise_fees_with_tax_report_by_producer.rb
 2023-09-13 19:09:55 +02:00
Filipe
0f47ec0094 Merge pull request #11525 from jibees/11524-enlarged-unit-price-tooltip-image-on-variant-edit-page 
BUU: Fix question mark icon for tooltip
 2023-09-13 16:52:15 +01:00
Filipe
dae05e31ab Merge pull request #11501 from jibees/9146-improve-user-feedback-in-oc-edit-page-for-hidden-inventory 
Improve user feedback in oc edit page for hidden inventory
 2023-09-13 16:26:39 +01:00
jibees
9f675fed32 Merge pull request #11534 from openfoodfoundation/dependabot/bundler/faraday-2.7.11 
chore(deps): bump faraday from 2.7.10 to 2.7.11
 2023-09-13 15:02:29 +02:00
jibees
f7dd94268e Merge pull request #11536 from openfoodfoundation/dependabot/bundler/sidekiq-7.1.4 
chore(deps): bump sidekiq from 7.1.3 to 7.1.4
 2023-09-13 14:59:06 +02:00
dependabot[bot]
2c79a8be3c chore(deps): bump sidekiq from 7.1.3 to 7.1.4 
Bumps [sidekiq](https://github.com/sidekiq/sidekiq) from 7.1.3 to 7.1.4.
- [Changelog](https://github.com/sidekiq/sidekiq/blob/main/Changes.md)
- [Commits](https://github.com/sidekiq/sidekiq/compare/v7.1.3...v7.1.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-13 10:02:05 +00:00
dependabot[bot]
8adc0a9144 chore(deps): bump faraday from 2.7.10 to 2.7.11 
Bumps [faraday](https://github.com/lostisland/faraday) from 2.7.10 to 2.7.11.
- [Release notes](https://github.com/lostisland/faraday/releases)
- [Changelog](https://github.com/lostisland/faraday/blob/main/CHANGELOG.md)
- [Commits](https://github.com/lostisland/faraday/compare/v2.7.10...v2.7.11)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-13 09:59:46 +00:00
Maikel
ead4f784ba Merge pull request #11528 from macanudo527/fix_stylehash_1 
Fix Style/HashSyntax 2/13
 2023-09-13 17:17:26 +10:00
Maikel
463ecf2880 Merge pull request #11508 from mkllnk/dfc-enterprise-groups 
[DFC API] Add endpoint for enterprise groups
 2023-09-13 16:50:05 +10:00
Maikel Linke
7e222ad83e Include address when showing group 
It may be nice to show more data like social media URLs but the DFC
Connector hasn't implemented that yet and it's not specified in the
current issue.
 2023-09-13 16:36:36 +10:00
Maikel Linke
88a3615de7 List groups when showing DFC Enterprise 2023-09-13 16:36:36 +10:00
Maikel Linke
cf18229e5b Avoid loading DFC catalog for Person or Groups endpoint 2023-09-13 16:36:36 +10:00