raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-04-01 06:41:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,004 Commits 15 Branches 460 Tags
4e29fcba64a45d2dacb5ec85a6eb5e0eff2ee005
Commit Graph

3015 Commits

Author SHA1 Message Date
filipefurtad0
bfb2fc528e Update all locales with the latest Transifex translations 2023-07-14 17:37:22 +01:00
Filipe
448d5ea017 Merge pull request #11135 from Matt-Yorkley/vouchers 
Vouchers part 2
 2023-07-13 12:50:32 +01:00
Jean-Baptiste Bellet
dab595f17f Update all locales with the latest Transifex translations 2023-07-07 17:11:40 +02:00
Matt-Yorkley
42a3087cdb Remove :available_on attribute from Product class 2023-07-06 14:36:35 +01:00
David Cook
05a22b80bc Merge pull request #11123 from dacook/buu-products-table 
[admin_style_v3] Products table with variants
 2023-07-06 09:37:31 +10:00
Matt-Yorkley
28795effc3 Clarify named vouchers in UI 2023-07-04 13:13:05 +01:00
Matt-Yorkley
3d44f4bc98 Introduce "zero priced order" concept with no required payment 
This applies to cases where an order contains items with zero price or where applied vouchers have reduced the order's total to zero.
 2023-07-03 11:03:05 +01:00
filipefurtad0
efb5132ac2 Update all locales with the latest Transifex translations 2023-06-29 23:28:28 +01:00
David Cook
809c15b197 Load products page with reflex 
We will add the products in the next commit.
 2023-06-28 09:59:57 +10:00
David Cook
841192fb96 Add new products page 
Hidden behind admin_style_v3 feature toggle.
 2023-06-28 09:59:57 +10:00
Maikel
a7915b8089 Merge pull request #10849 from mkllnk/report-cable 
Show "loading" screen for background reports and display when ready
 2023-06-26 10:25:48 +10:00
Cillian O'Ruanaidh
40b0bfb433 Add an OFN UID column to the Users & Enterprises report 2023-06-25 19:01:42 +02:00
Filipe
bca7813320 Merge pull request #10323 from abdellani/enterprise-fee-w-tax-by-order 
Enterprise fee w tax by order
 2023-06-22 23:25:11 +01:00
Mohamed ABDELLANI
0fbf88190e Generate invoice model 
There are three main components:
1. The invoice model
2. order serializers: serialize the order for the invoice
3. data presenters: the object that will be use to access the order's serialize data
 2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
e9367b1f86 add enterprise fees with tax report by order 2023-06-16 06:35:01 +01:00
Mohamed ABDELLANI
535f651c7e implement enterprise fee report filters 2023-06-16 06:35:01 +01:00
Mohamed ABDELLANI
a120329aa6 rename EnterpriseFeeSummary::Base to EnterpriseFeeSummary::FeeSummary 2023-06-16 06:35:01 +01:00
Maikel Linke
2453084a6b Update translations 2023-06-16 14:02:47 +10:00
David Cook
35d9837f24 Show current version at bottom of admin dashboard 
With generic link to the releases page. We could provide a link to latest tag with `git describe --tags --abbrev=0`. But I thought it better to keep things simple.
 2023-06-16 09:11:59 +10:00
Konrad
5c0db892e5 Merge pull request #10983 from jibees/10982-admin_style_v3-use-oidc-settings-instead-of-oidc-settings-in-navigation 
[OIDC] Translate 'Enterprises' > 'OIDC Settings' tab title
 2023-06-15 16:07:07 +02:00
Jean-Baptiste Bellet
149ec5511c Translate select2 messages 2023-06-12 15:11:23 +02:00
Jean-Baptiste Bellet
ff0f81167a Translate 'Enterprises' > 'OIDC Settings' tab title 2023-06-12 09:19:16 +02:00
Matt-Yorkley
a3ef604797 Run reports in background 2023-06-09 14:44:53 +10:00
Jean-Baptiste Bellet
5d43285834 Update all locales with the latest Transifex translations 2023-06-08 17:36:04 +02:00
filipefurtad0
840da55941 Update all locales with the latest Transifex translations 2023-06-02 09:17:23 +01:00
Filipe
12159edaca Merge pull request #10833 from Matt-Yorkley/order-angular 
Remove Angular from admin orders index page
 2023-06-01 13:57:39 +01:00
Filipe
2d4d8e26f5 Merge pull request #10875 from jibees/10561-allow-user-to-create-custom-tab-in-shop-navigation 
[White Label] Allow user to create custom tab in shop navigation
 2023-06-01 07:21:25 +01:00
David Cook
875f68b0e2 Update one more translation 2023-05-26 11:46:22 +10:00
Jean-Baptiste Bellet
925b0e0308 Add a form in admin to create/update a custom tab for an enterprise 2023-05-25 09:19:51 +02:00
David Cook
f890d9ceb4 Update all locales with the latest Transifex translations 2023-05-25 17:12:10 +10:00
Filipe
6d032002f1 Merge pull request #10750 from jibees/10560-allow-hide-of-groups-tab-in-shop-navigation 
White Label: allow hide of groups tab in shop navigation
 2023-05-24 21:11:04 +01:00
Konrad
b56b36f617 Merge pull request #10859 from filipefurtad0/change_voucher_default_message_en 
[Vouchers] Updates warning_forfeit_remaining_amount default message
 2023-05-23 08:20:41 +02:00
Jean-Baptiste Bellet
0d98ec8f4c In admin, add form to set hide_groups_tab attribute 
+ add specs
 2023-05-22 10:29:56 +02:00
Matt-Yorkley
048df6230b Remove angular from admin orders index page 2023-05-21 00:15:32 +01:00
Maikel Linke
37441be371 Update translations 2023-05-19 14:33:23 +10:00
Filipe
3d1b0816ed Merge pull request #10512 from abdellani/fix-tax-not-charged-when-tax-category-set-to-inherit-from-product 
Prevent saving the enterprise fee when a per order calculator is selected along with 'Inherit from product'
 2023-05-18 13:43:14 +01:00
filipefurtad0
7ea3834900 Updates warning_forfeit_remaining_amount default message 2023-05-18 11:57:15 +01:00
Maikel
10c918be75 Merge pull request #10732 from mkllnk/report-email 
[Hidden] Notify about completed report with download link via email
 2023-05-16 10:25:23 +10:00
Maikel Linke
08aff56e20 Expire report files after 1 week, maximum for S3 
We didn't see this in tests which use disk storage. But AWS S3 has a
maximum of one week for URL expiry.
 2023-05-15 19:41:45 +02:00
Maikel Linke
5ae04a5a3e Hide report link which only works at unknown time 
It was bad UX to show a link that doesn't work straight away. At the
time, it was the only way to download the report but now we send an
email which is a much better way to go.

I leave the rest of the code because we want to implement a reflex which
shows the download link once it's ready.
 2023-05-15 19:41:45 +02:00
Maikel Linke
860fe85af9 Add report download link to email notification 
I added a system spec to verify that the download link can be generated
within the mailer in a background job. ActiveStorage is a bit particular
when it comes to genererating URLs and depending on the situation it may
generate a redirect URL, a proxy URL or link directly to the storage.
But we want a redirect URL here.
 2023-05-15 19:41:45 +02:00
Gaetan Craig-Riou
815dcbcefe Fix translations 2023-05-15 13:42:39 +10:00
Gaetan Craig-Riou
d157d91054 When voucher cover more than order total, use only amount needed 
The checkout payment step will also show a warning.
The amount used is stored in the adjustment created, so we will be able
to track how much has been used down the line.
 2023-05-15 13:42:38 +10:00
Gaetan Craig-Riou
3f609d3842 Add error message if adding a voucher fails 
It's not really useful to the user but better than failing silently
 2023-05-15 13:42:38 +10:00
Gaetan Craig-Riou
e487ed0532 Add link to remove voucher when a voucher has been applied 
Improve styling to match the design
 2023-05-15 13:42:37 +10:00
Gaetan Craig-Riou
a9d9b33f7d First take at adding a voucher to an order 
Use voucher.create_adjustment to add an adjustment to the order
Currently doesn't take into account tax part
 2023-05-15 13:42:37 +10:00
Gaetan Craig-Riou
f7ee01b9f8 Add voucher input on checkout payment's step 
Voucher input is displayed  only if the distributor has any voucher
 2023-05-15 13:42:37 +10:00
filipefurtad0
d035d4bb87 Update all locales with the latest Transifex translations 2023-05-11 15:25:39 +01:00
Maikel Linke
25b7f1749c Simplify error when tax rate can't be inherited 
I changed the text to focus on the resolution: the user needs to choose
a tax category or a different calculator.

I associated the error to the model to prevent the attribute name from
being included in the error message. Alternatively, we could have
changed the name of the attribute to match the UI. But this error
affects the combination of two attributes, none of them is invalid on
its own.

I'm using Rails' default lazy lookup for error messages which results in
shorter code and a standard structure.

I also added a simple spec.
 2023-05-11 12:46:17 +01:00
Mohamed ABDELLANI
7eca32e84f prevent saving the enterprise fee when a per order calculator is selected along with 'Inherit from product' 2023-05-11 12:46:17 +01:00