raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,175 Commits 21 Branches 450 Tags
276b94de5bd7bb971c25b4f64e6acda0b5691391
Commit Graph

4356 Commits

Author SHA1 Message Date
Cillian O'Ruanaidh
276b94de5b Sort orders by last name, then first name i.e. the same way bulk order management works 2023-07-28 14:20:29 +01:00
Maikel Linke
cea44c1a78 Add greek locale 2023-07-26 14:45:35 +10:00
jibees
605cb730f7 Merge pull request #11163 from jibees/productsV3-searching-filtering-pagination 
🚧 Products v3: viewing, searching,  filtering & pagination
 2023-07-25 15:22:42 +02:00
Filipe
8bd25f9711 Merge pull request #11251 from jibees/11207-update-all-products-report-to-include-stock 
Admin, Products & Inventory reports: add `on_hand` and `on_demand?` columns by default ; mark `Inventory (on hand)` report as deprecated
 2023-07-21 17:07:00 +01:00
Filipe
0d0beda887 Merge pull request #11084 from abdellani/update_invoice_status_automatically 
set invoice status automatically after creation
 2023-07-21 16:21:05 +01:00
Jean-Baptiste Bellet
a094a89c09 Mark "Inventory (on hand)" report as deprecated 
Co-Authored-By: Maikel <maikel@email.org.au>, @dacook
 2023-07-21 09:27:07 +02:00
filipefurtad0
4b64b9085c Adds missing keys 2023-07-20 19:18:27 +01:00
David Cook
c112fad4b2 Update all locales with the latest Transifex translations 2023-07-20 14:11:16 +10:00
filipefurtad0
8f8e28f816 Fixes missing translation on Invoices tab 
Adds invoices to en.yml, fixing #11237
 2023-07-19 18:11:45 +01:00
Jean-Baptiste Bellet
dec779a357 available_on column has been deleted 
https://github.com/openfoodfoundation/openfoodnetwork/pull/11136
 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
c378ad1d88 Add "no results found" container 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
5a8a187f54 Add clear search button and action 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
7b56cbf3d4 Add labels to selectors, and adjust css 
+ Adjusting filter elements with flex-grow properties
 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
bfe1884ab5 Can filter by categories 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
f58cf2d3b2 Can filter by producer 
Not sur the request nor the `producers` in the reflex should be like this. This is a proof of concept, and should probably be reviewed

Fix linter issues
 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
643897abb2 Add search functionnality 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
574adb88d2 Add a per page component 
This is still a WIP.
 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
47f21cb59e Add pagination with pagy 
For `admin_style_v3` use `<` and `>` for next and previous link

instead of `next` and `previous` string

Extract a mixin for a default box-shadow

Maybe this needs to be redefined. Let's see how next things goes.

When a table is followed by a pagination, remove its margin-bottom + border

Finally, design the pagination component

Add sorting/pagination module, on top of table

We use `cablea_ready.replace`, so need to add `#products-content` id

Use a `pagy` partial with reflex action, instead of the legacy one

- revert the legacy one to its previous state
 - in reflex, fetch product with page attribute, 1 by default

Move `pagy` into `admin/shared/v3/` to be reusable

+ use fontawesome icons for next and previous page

Remove useless line
 2023-07-19 14:58:39 +02:00
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
Mohamed ABDELLANI
4b003aa08b replace status:status with cancelled:boolean on invoice model 2023-07-11 09:15:25 +01:00
Jean-Baptiste Bellet
dab595f17f Update all locales with the latest Transifex translations 2023-07-07 17:11:40 +02:00
Filipe
ba1ba6dbec Merge pull request #11092 from mkllnk/bye-datadog 
Remove datadog gem, too expensive
 2023-07-06 15:20:20 +01: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
9e5061fc31 Move voucher processing out of checkout controller 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
Maikel
400d087789 Merge pull request #11133 from mkllnk/dfc-api-specs 
OFN DFC API documenation in OpenAPI format generated with Rswag
 2023-07-03 10:53:40 +10:00
filipefurtad0
efb5132ac2 Update all locales with the latest Transifex translations 2023-06-29 23:28:28 +01:00
Maikel
6392c2c115 Merge pull request #11075 from mkllnk/test-cache 
Use Redis for caching in test environment
 2023-06-29 14:33:09 +10:00
David Cook
714642f331 Use different Redis database for test environment 2023-06-29 14:15:18 +10:00
Maikel Linke
7c0a4108d8 Show api-docs in production as well 
We were hiding that before because the API is not officially released
yet but that's actually quite annoying. It's very conenient to have the
UI on production and be able to try out endpoints.
 2023-06-28 13:50:54 +10:00
Maikel Linke
8368a6ccc9 Announce the new DFC endpoint 
We need to declare in each spec file for which endpoint the spec is
because it was just choosing the first declared one by default. The
first one was v1 and now it's dfc-v1.7.
 2023-06-28 13:50:54 +10: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
Maikel Linke
e7fe04f526 Revert "Fix json v1.8.6 common.rb warning" 
This reverts commit 21b80db0ee.

This fix was needed for an old version of the JSON module with a newer
version of Ruby. But we updated the json gem since and don't need this
any more.
 2023-06-22 12:47:28 +10:00
Maikel Linke
14b2e0f962 Remove datadog gem, too expensive 2023-06-21 11:44:21 +10:00
Maikel Linke
cceca5f936 Use Redis for caching in test environment 
All other environments use it.
 2023-06-19 15:35:17 +10:00
Maikel
101e72726c Merge pull request #11032 from dacook/show-current-version2 
Show current version2
 2023-06-19 10:07:49 +10:00
Mohamed ABDELLANI
d86173c509 add feature toggle 
seperate the invoice templates that rely on presenters from the old ones.
 2023-06-18 21:03:13 +02: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
56e4b3b843 Load git version once at initialisation 
Co-authored-by: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
 2023-06-16 09:36:16 +10:00