raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-24 01:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,936 Commits 16 Branches 454 Tags
5df211137e8583fc47ebcce3e643b86be164f389
Commit Graph

28936 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Bellet
5df211137e Tweak stimulus pagination (used on orders) to be up to date 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
f2941f9275 form legend are red 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
1b9a7aa81e Adjust height, border and background colors for inputs 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
98f9303c99 Tweak colors, size, ... for select2 to looks like tom-select 
One day, we'll remplace select2 by tom-select
 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
e5086ce057 Adjust colors for select2 and remove useless ones 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
3a67f5c9d7 Integrate select2 to admin_v3 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
b8406be4b9 Add trix editor to admin_v3 css 
That was an omission when installing trix
 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
03d5f8acc4 No need to specify padding when having a line height 2023-09-15 10:47:43 +02:00
Jean-Baptiste Bellet
48f1c65a91 Include dashboard_item into admin_v3 2023-09-15 10:47:43 +02:00
Maikel
aad58f1c8b Merge pull request #11546 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.21.1 
chore(deps-dev): bump rubocop-rails from 2.21.0 to 2.21.1
 2023-09-15 12:59:54 +10:00
Maikel
2994227c35 Merge pull request #11542 from dacook/update-templates 
Update templates
 2023-09-15 11:42:12 +10:00
Maikel
0c87c16847 Merge pull request #11540 from macanudo527/fix_stylehash_3 
Fix Style/HashSyntax 4/13
 2023-09-15 11:32:03 +10:00
dependabot[bot]
f9aab96332 chore(deps-dev): bump rubocop-rails from 2.21.0 to 2.21.1 
Bumps [rubocop-rails](https://github.com/rubocop/rubocop-rails) from 2.21.0 to 2.21.1.
- [Release notes](https://github.com/rubocop/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop/rubocop-rails/compare/v2.21.0...v2.21.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-14 09:48:33 +00:00
Neal Chambers
0c1cb5282c Update .rubocop_todo.yml 2023-09-14 16:25:49 +09:00
Neal Chambers
bf9db13bb3 Fix Style/HashSyntax 2023-09-14 16:25:49 +09:00
David Cook
814144d77d Remember to mention API changes 
[skip ci]
 2023-09-14 15:04:01 +10:00
David Cook
00b2c70239 Release categories are now automatically generated. 2023-09-14 15:03:56 +10:00
David Cook
b0c822c63b Remember to consider webhook changes as API changes too 2023-09-14 15:03:54 +10:00
David Cook
7ef4df0087 Update all locales with the latest Transifex translations v4.4.11 2023-09-14 13:47:58 +10:00
David Cook
0966864589 Merge pull request #11511 from dacook/fix-update-button-11349 
Fix Update button sizing
 2023-09-14 13:37:19 +10:00
David Cook
2e6e083667 [fixup] Fix Update button sizing 
By disabling line wrap we can consistently predict how it will appear. The longest translation we currently have is 14 characters so this should be fine.
 2023-09-14 09:37:10 +10:00
Maikel
8e226bc473 Merge pull request #11537 from filipefurtad0/fix_flaky_orders_cycle_supplier_totals_report_spec.rb 
Renames product so it always appears first on the report results
 2023-09-14 09:08:16 +10:00
Maikel
758c6e033f Merge pull request #11533 from macanudo527/fix_stylehash_2 
Fix Style/HashSyntax 3/13
 2023-09-14 09:04:03 +10:00
Maikel
0382b4c80a Merge pull request #11535 from openfoodfoundation/dependabot/bundler/newrelic_rpm-9.5.0 
chore(deps): bump newrelic_rpm from 9.4.2 to 9.5.0
 2023-09-14 08:45:44 +10:00
Konrad
c36c5be2c9 Merge pull request #11497 from Matt-Yorkley/import-tax-category 
Fix error when importing entries with a tax category
 2023-09-13 23:28:16 +02:00
Konrad
29a12c7235 Merge pull request #11013 from filipefurtad0/add_enterprise_fees_w_tax_report_by_producer 
Adds enterprise fees w tax report by producer
 2023-09-13 21:55:59 +02:00
David Cook
ee2520a1f6 Visit page directly to save time 
Shaved a couple of seconds off, 35->33 sec.

And make it easier to hide from the list.
 2023-09-13 19:09:55 +02:00
David Cook
b27f63fa60 Refactor: DRY up init code 2023-09-13 19:09:55 +02:00
David Cook
ef1ccca4fa Temporarily 'hide' report 
The reports framework doesn't currently support hidden reports, but we can mark it with a strike-through at least.
 2023-09-13 19:09:55 +02:00
David Cook
db8392ce81 Temporarily hide report 2023-09-13 19:09:55 +02:00
Mohamed ABDELLANI
4cb91da8b2 load only enterprise fees connected to incoming exchanges on the OC 2023-09-13 19:09:55 +02:00
filipefurtad0
af525f9f7f Fixes rubocop issues 2023-09-13 19:09:55 +02:00
filipefurtad0
131474e91d Updates test case 
should list all the tax rates (2)
 2023-09-13 19:09:55 +02:00
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