raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-05 02:41:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,934 Commits 20 Branches 455 Tags
17eb8d5cd851663bf8ecb016f737a58fe103b283
Commit Graph

31934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
filipefurtad0
263b5e280e Renames product so it always appears first on the report results 2023-09-13 11:33:58 +01: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]
866f9b9d9d chore(deps): bump newrelic_rpm from 9.4.2 to 9.5.0 
Bumps [newrelic_rpm](https://github.com/newrelic/newrelic-ruby-agent) from 9.4.2 to 9.5.0.
- [Release notes](https://github.com/newrelic/newrelic-ruby-agent/releases)
- [Changelog](https://github.com/newrelic/newrelic-ruby-agent/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/newrelic/newrelic-ruby-agent/compare/9.4.2...9.5.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-13 10:00:35 +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
Neal Chambers
1fa0dc99fe Update .rubocop_todo.yml 2023-09-13 16:45:00 +09:00
Neal Chambers
ed06edda3f Fix Style/HashSyntax 2023-09-13 16:45:00 +09: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
Maikel Linke
95d3987752 List enterprise groups on DFC API 2023-09-13 16:36:36 +10:00
Maikel Linke
a03fb01a8c List enterprises within groups on DFC API 2023-09-13 16:36:36 +10:00
Maikel Linke
2d91a61dcb Add DFC API EnterpriseGroups#show 2023-09-13 16:36:36 +10:00
David Cook
ae72158e87 Merge pull request #11494 from mkllnk/dfc-swagger-config 
Group DFC API operations by endpoint in documentation
 2023-09-13 14:57:14 +10:00
Neal Chambers
7c3e61104a Update .rubocop_todo.yml 2023-09-12 23:19:25 +09:00
Neal Chambers
4ffd3759cc Fix Style/HashSyntax 2023-09-12 23:19:05 +09:00
jibees
0ebdc8abca Merge pull request #11526 from openfoodfoundation/dependabot/bundler/sidekiq-7.1.3 
chore(deps): bump sidekiq from 7.1.2 to 7.1.3
 2023-09-12 15:54:25 +02:00
Gaetan Craig-Riou
9925399292 Sales Tax Totals by order, fix tax amount when voucher applied 
Apply the tax discount to the tax collumn when a voucher is added
to the order, and update total excluding tax accordingly.
 2023-09-12 14:36:28 +02:00
Gaetan Craig-Riou
a7bceb0b28 Add spec scenario where a voucher is added to the order 
Voucher tax portion needs to be removed from the tax amount so we
can display the correct tax in the report.
 2023-09-12 14:14:01 +02:00
Gaetan Craig-Riou
29a4bf88d7 DRY up specs 2023-09-12 14:13:04 +02:00
dependabot[bot]
1d430265a2 chore(deps): bump sidekiq from 7.1.2 to 7.1.3 
Bumps [sidekiq](https://github.com/sidekiq/sidekiq) from 7.1.2 to 7.1.3.
- [Changelog](https://github.com/sidekiq/sidekiq/blob/main/Changes.md)
- [Commits](https://github.com/sidekiq/sidekiq/compare/v7.1.2...v7.1.3)

---
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-12 09:32:05 +00:00
Gaetan Craig-Riou
57f563f4bc Merge pull request #11516 from macanudo527/fix_rubocop_9 
Fix Style/HashSyntax 1
 2023-09-12 18:56:47 +10:00
Jean-Baptiste Bellet
637096534f Implement spec for #9146 issue 2023-09-12 10:20:26 +02:00
Jean-Baptiste Bellet
ff8b9465c7 Display info on outgoing products panel when some variants hidden 2023-09-12 10:20:26 +02:00
Jean-Baptiste Bellet
ff7629ba2c Display information on outgoing product when variant aren't available 
Update en.yml
 2023-09-12 10:20:26 +02:00
jibees
eecc0d5772 Merge pull request #11519 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.21.0 
chore(deps-dev): bump rubocop-rails from 2.20.2 to 2.21.0
 2023-09-11 16:31:03 +02:00
jibees
a08d9e5a3c Merge pull request #11523 from openfoodfoundation/dependabot/bundler/rubocop-1.56.3 
chore(deps-dev): bump rubocop from 1.56.2 to 1.56.3
 2023-09-11 16:30:23 +02:00
Jean-Baptiste Bellet
edc6ac801d Use the right colors for the question mark icon tooltip in admin style v3 2023-09-11 15:44:08 +02:00
Jean-Baptiste Bellet
75751f07b8 Move question-mark-icon into admin_style_v3 context 2023-09-11 15:31:30 +02:00
Jean-Baptiste Bellet
99ea4a63e0 No need to have a button: not conflicting with button styles 2023-09-11 15:29:09 +02:00
jibees
f05ed020f3 Merge pull request #11522 from openfoodfoundation/dependabot/npm_and_yarn/floating-ui/dom-1.5.2 
chore(deps): bump @floating-ui/dom from 1.5.1 to 1.5.2
 2023-09-11 15:03:16 +02:00
Gaetan Craig-Riou
e44a0092ea Fix edge case when trying to deactivate the only availabe voucher 
Plus spec
 2023-09-11 12:00:48 +02:00
Gaetan Craig-Riou
48956b9bd1 As per review comment, simplify voucher view a little 2023-09-11 11:59:34 +02:00
dependabot[bot]
fe83be1853 chore(deps-dev): bump rubocop from 1.56.2 to 1.56.3 
Bumps [rubocop](https://github.com/rubocop/rubocop) from 1.56.2 to 1.56.3.
- [Release notes](https://github.com/rubocop/rubocop/releases)
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop/compare/v1.56.2...v1.56.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-11 09:18:20 +00:00
dependabot[bot]
5b0b03dc5d chore(deps): bump @floating-ui/dom from 1.5.1 to 1.5.2 
Bumps [@floating-ui/dom](https://github.com/floating-ui/floating-ui/tree/HEAD/packages/dom) from 1.5.1 to 1.5.2.
- [Release notes](https://github.com/floating-ui/floating-ui/releases)
- [Changelog](https://github.com/floating-ui/floating-ui/blob/master/packages/dom/CHANGELOG.md)
- [Commits](https://github.com/floating-ui/floating-ui/commits/@floating-ui/dom@1.5.2/packages/dom)

---
updated-dependencies:
- dependency-name: "@floating-ui/dom"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-11 09:17:54 +00:00
Maikel
f885e80413 Merge pull request #11520 from openfoodfoundation/dependabot/bundler/rails-7.0.8 
chore(deps): bump rails from 7.0.7.2 to 7.0.8
 2023-09-11 15:48:37 +10:00
Maikel Linke
99529ff599 Put new rubocop violations on todo list 2023-09-11 15:44:15 +10:00