raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-12 23:27:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,670 Commits 19 Branches 453 Tags
bfd396e6445e222677f91c0c7c19b2759e65798d
Commit Graph

5515 Commits

Author SHA1 Message Date
Konrad
6ac21eaab4 Merge pull request #9999 from abdellani/add-ability-to-save-rendering-options-per-report 
Add ability to save rendering options per report
 2022-12-02 14:33:37 +01:00
jibees
1fcc98af80 Merge pull request #10026 from abdellani/make_default_time_at_00_00_instead_of_12_00 
Make default time at 00 00 instead of 12 00
 2022-12-01 17:43:08 +01:00
Rachel Arnould
524d68496a Merge pull request #10054 from jibees/10034-change-orders-page-colors 
[WIP 🚧 ] Admin/Orders, behind feature toggle `admin_style_v2`: adjust colors
 2022-11-30 10:58:14 +01:00
Mohamed ABDELLANI
9dc3f2d69e add new parameter defaultDate to flatpickr to decide the default value when selector is opened 2022-11-29 11:12:33 +01:00
jibees
ef31e1d063 Revert "Load product images in the shop lazily to improve performance" 2022-11-29 09:55:39 +01:00
Jean-Baptiste Bellet
7556eee5d4 Do not display: flex; a td but its child 
Actually, having `td.actions` with `display: flex;` cancel the `table-cell` height computation and it's then impossible to solve.
The solution here is to have a child (`div.flex`) that is `display: flex` and then the parent `td` can compute its height (as the same than its current row).
 2022-11-28 14:36:51 +01:00
Konrad
e288c7a551 Merge pull request #9956 from jibees/9626-resize-and-crop-logo-instead-of-just-resizing-should-fit-into-a-square 
Enterprise logo: Resize and crop logo instead of just resizing --> logo should fit into a square
 2022-11-27 20:28:55 +01:00
Konrad
dc030182db Merge pull request #10023 from abdellani/add-hub-filter-to-orders-and-distributors 
Add filter by distributor in "Orders And Distributors" report
 2022-11-27 19:52:19 +01:00
Jean-Baptiste Bellet
7d51bd7b83 Add secondary button 2022-11-25 16:47:48 +01:00
Mohamed ABDELLANI
e25f4b1daa integrate ReportRenderingOptions in the View/Controller 2022-11-25 09:10:53 +01:00
Rachel Arnould
56ce4ab04f Merge pull request #10025 from jibees/9998-new-admin-style 
Admin, behind feature toggle `admin_style_v2`: new navigation menu
 2022-11-24 14:59:04 +01:00
vviekk
22559a755f Removing 'required' tag for 'Latitude / Longitude' for Enterprises 
Empty/Null values are valid in db and for existing use-cases
 2022-11-21 15:19:28 +05:30
Jean-Baptiste Bellet
85d3f5f9d7 Download OpenSans font also at 700 weight 
needed in the navigation
 2022-11-21 09:48:35 +01:00
Jean-Baptiste Bellet
60f0a58508 Add admin-v2 on admin body if admin_style_v2 feature toggled on 2022-11-18 09:46:05 +01:00
Mohamed ABDELLANI
4b1bd362e0 [skip ci] add hub filter to the Order and Distributors report 2022-11-18 07:29:08 +01:00
Konrad
8510379178 Merge pull request #9985 from binarygit/add-spinner-when-enterprise-sells-changes 
[Admin][Enterprise Settings] Show spinner when enterprise sells option changes
 2022-11-17 16:59:55 +01:00
binarygit
8fc721c651 [Admin, Enterprise Settings] Show spinner when enterprise sells changes 2022-11-13 16:24:35 +05:45
Konrad
59d555165f Merge pull request #9936 from dacook/minor-admin-updates 
Code cleanup: admin interface
 2022-11-12 19:43:44 +01:00
Filipe
24eda1bfae Merge pull request #9927 from mkllnk/lazy-load-product-images 
Load product images in the shop lazily to improve performance
 2022-11-10 18:11:56 +00:00
Jean-Baptiste Bellet
262b546836 Add some visual spacing 2022-11-08 14:59:23 +01:00
Jean-Baptiste Bellet
4bfd39caec The info tip indicates image should be 100*100, so display it at 100*100 size 2022-11-08 14:54:47 +01:00
David Cook
20c0449128 Remove unnecessary case 
Seems cleaner to me.

Best viewed with whitespace ignored.
 2022-11-04 14:26:41 +11:00
Jean-Baptiste Bellet
1a241e4953 Only call confirmRefresh() on time, on date range change 
Previously, when changing the date range, we had several modals that opened.
Now, the `confirmRefresh()` method should be open only one time.

Update specs as well:
 - use the method `accept_confirm`
 - Removing pending and sleep as the spec is now green
 2022-11-03 15:55:48 +01:00
Maikel Linke
762beb7c1c Load product images in the shop lazily 
The browser decides when to load the image, usually when it's close to
the viewport.
 2022-11-03 14:02:01 +11:00
Konrad
68b2e48fb3 Merge pull request #9900 from ijdershem/idersh/issue-9845 
[9845] Make checkout terms and conditions label clickable
 2022-10-28 14:28:06 +02:00
Filipe
f7c62dfe45 Merge pull request #9862 from drummer83/master 
Format reports as list, even if only one sub-type available
 2022-10-28 12:13:42 +01:00
ijdershem-jf
0f9f4b07a8 [9845] Make checkout terms and conditions label clickable; associate label with input using correct for attribute 2022-10-27 20:30:42 -06:00
Konrad
d544233bac Merge pull request #9780 from jibees/9777-select-the-right-country 
Admin, Enterprise Details: Fix country selection on business address panel
 2022-10-27 14:32:52 +02:00
Rachel Arnould
2652bc086a Merge pull request #9755 from cillian/order-cycle-payment-methods 
Let people choose which payment methods are available to customers on order cycles
 2022-10-26 20:10:34 +02:00
Jean-Baptiste Bellet
d797ef2b3a As we are in the Business Address panel, use the business_address attr 
Not the address one, which is different

Business address country could be null, so use an empty array
 2022-10-26 11:21:44 +02:00
Jean-Baptiste Bellet
d46105ea90 Correct some input styling 2022-10-26 11:21:44 +02:00
Jean-Baptiste Bellet
151e71b4d9 Actually controller is named dependEnt-select 2022-10-26 11:21:44 +02:00
Jean-Baptiste Bellet
b6bc4c66a2 Specify the current value of country 2022-10-26 11:21:44 +02:00
Maikel Linke
9f9d8020c1 Fix URL generation for report without subtype 
The URL is generated in the partial and it just needs to know that
there's no subtype.
 2022-10-26 11:53:25 +11:00
Jean-Baptiste Bellet
e16c8661a2 Use the same template even if there is no sub_report 2022-10-25 15:27:43 +02:00
Konrad
3489f08ec5 Format reports as list, even if only one sub-type available 2022-10-25 00:31:00 +02:00
Konrad
4a7ac45dba Merge pull request #9830 from jibees/9821-remove-report_inverse_columns_logic-feature-toggle 
Remove `report_inverse_columns_logic` feature toggle
 2022-10-25 00:23:31 +02:00
Rachel Arnould
3c9b7a10f4 Merge pull request #9058 from Matt-Yorkley/oidc-redux 
Add OIDC authentication for Les Communs
 2022-10-24 13:18:36 +02:00
Jean-Baptiste Bellet
e2441cdcf6 Use the report type or subtype as the title 2022-10-24 11:12:22 +02:00
Jean-Baptiste Bellet
6dec80aaaf Links only on right side 2022-10-24 11:12:22 +02:00
Jean-Baptiste Bellet
1c349049d1 Remove report description when they are useless 2022-10-24 11:12:22 +02:00
Jean-Baptiste Bellet
02787e668f Remove report_inverse_columns_logic feature toggle 
Co-Authored-By: Maikel <maikel@email.org.au>
 2022-10-24 11:12:22 +02:00
Cillian O'Ruanaidh
4e6d64c0a1 Let people choose which payment methods are available to customers on order cycles 2022-10-21 17:21:31 +01:00
jibees
da851079f4 Merge pull request #9776 from abdellani/product-creation-minor-improvements 
Product creation minor improvements
 2022-10-20 17:30:47 +02:00
Matt-Yorkley
66c3ba3bba Remove default omniauth link 2022-10-18 11:32:14 +11:00
Matt-Yorkley
b322df8515 Generate devise links view 2022-10-18 11:32:14 +11:00
Matt-Yorkley
617164684c Configure OIDC 2022-10-18 11:32:14 +11:00
Filipe
d5c3edc8fa Merge pull request #9749 from drummer83/master 
Fix layout of 'Create a new product' button in dashboard overview
 2022-10-17 13:45:37 +01:00
Mohamed ABDELLANI
6a8c7b15dc fix product category errors message in the form 2022-10-14 03:26:40 +01:00
Mohamed ABDELLANI
955492bfdd show the error message when the variant unit is not selected 2022-10-14 03:26:40 +01:00