raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-07 22:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,032 Commits 18 Branches 453 Tags
7ecd4a149ba820ffa792babaed3b1fb92543977f
Commit Graph

1321 Commits

Author SHA1 Message Date
Konrad
a55797d727 Merge pull request #11510 from rioug/11421-deactivate-voucher 
[Vouchers] add activate/deactivate feature
 2023-09-21 15:03:47 +02: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
filipefurtad0
6a31849fb4 Asserts on url from View File link 2023-09-18 10:43:13 +01:00
filipefurtad0
06ca2979dd Adds assertions on bulk invoice creation 2023-09-18 09:29:44 +01:00
David Cook
e075d40525 Prevent accidentally leaving the page 2023-09-15 16:00:41 +10:00
David Cook
99ac48a258 Discarding changes reloads from DB 
But it also clears any search filters. To confirm exactly what behaviour is desired before fixing...
 2023-09-15 15:46:02 +10: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
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
Gaetan Craig-Riou
63cd8ccf28 Test scenario where a voucher is deactivated before end of checkout 
A customer should be able to complete the checkout even if the voucher
has been deactivated after being added to the order.
 2023-09-07 14:00:26 +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