raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-13 23:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,971 Commits 19 Branches 453 Tags
fe819006392d4e9b2215aa22ecf06b13c8f2cd2d
Commit Graph

863 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Jean-Baptiste Bellet
637096534f Implement spec for #9146 issue 2023-09-12 10:20:26 +02:00
Konrad
ea622cd2d7 Merge pull request #11487 from pedrocarmona/feature/invitation-email-locale 
Send translated email when creating users via super admin interface
 2023-09-07 16:41:59 +02:00
Konrad
3b9ebf4e07 Merge pull request #11396 from abdellani/fix-if-tos-is-not-set 
fix If ToS file is not set, customer needs to accept Terms on each checkout
 2023-09-06 16:56:21 +02:00
Maikel Linke
997c8a49ca Combine system specs for efficiency 2023-09-05 10:51:38 +10:00
Pedro Carmona
51050036d4 Use instance default locale as the default locale for a new user 2023-09-05 01:00:35 +01:00
Pedro Carmona
c4830e3baa Send localized email when creating users via admin interface 
Based on the current user locale
 2023-09-05 01:00:35 +01:00
Konrad
fd6f2338e5 Merge pull request #11450 from mkllnk/feature-toggle-enterprise 
Activate vouchers feature per user or enterprise
 2023-09-04 21:30:41 +02:00
Jean-Baptiste Bellet
b6b64e9439 Add trix editor to new product form 2023-09-04 15:46:54 +02:00
Gaetan Craig-Riou
50693dd5d2 Merge pull request #11468 from dacook/buu-editing-part2-11059 
[BUU] Editing - part 2 (product and variant text fields) 🚧
 2023-09-04 23:41:44 +10:00
David Cook
63383e8ea1 Enable editing of variant price 
Formatting of the price was copied from the existing bulk product screen.
 2023-08-31 16:41:41 +10:00
David Cook
b955cd8fee Enable editing of variant SKU 
I'm not sure what the point of the product SKU was to be honest.. it will probably be removed in the product refactor.
 2023-08-31 16:41:41 +10:00
David Cook
e17d16cb52 Enable editing of variant display_name 
Best viewed with whitespace ignored.
Using Rails' nested attributes feature, which ModelSet already supports.
 2023-08-31 16:41:41 +10:00
David Cook
5356e42efc Enable editing of product SKU 2023-08-31 16:41:41 +10:00
David Cook
aff33b79ae Simplify form code 
The form elements shouldn't need an `id` attribute.
 2023-08-31 16:41:36 +10:00
Maikel Linke
5bfbf43a38 Spec bulk enterprise fee edit without row ids 
It makes the spec robust to different sorting of the rows. It also hides
the knowledge of the full element ids.
 2023-08-31 16:03:46 +10:00
Maikel Linke
bb336ff9c4 Avoid unnecessary requests in system specs 
This spec was nested within another block that executed a form submit
which we don't actually need here. So I flattened the structure and
repeated the few missing lines of code. This speeds up the execution.

The fee type is important in the setup because it determines the order
of the fees on the page and we access the rows by their row index.

This commit is best viewed without whitespace changes.
 2023-08-31 13:44:33 +10:00