raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-19 04:49:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,538 Commits 17 Branches 457 Tags
70634dc0c19acb9ddd77cf1e82c8396b83eb08cd
Commit Graph

1617 Commits

Author SHA1 Message Date
Matt-Yorkley
47dbfa7d17 Merge pull request #8145 from Matt-Yorkley/reports-query-interface 
Reports Query Interface
 2021-11-05 10:06:52 +00:00
Maikel
3f571d178f Merge pull request #8418 from KombiCode/7706-add-close-button-to-flatpickr 
7706 add close button to flatpickr
 2021-11-05 11:04:50 +11:00
Matt-Yorkley
817f0942dd Pull in reports POC work replacing Packing reports 2021-11-04 14:55:23 +00:00
Matt-Yorkley
f0ec739350 Merge pull request #8366 from lamphanqg/fix_bulk_buy_layout 
Fix broken layout of bulk buy
 2021-10-28 12:35:36 +01:00
Thierry Jet
66f754267b Customize spacing for shortcut-buttons into flatpickr 2021-10-26 14:40:42 +02:00
PHAN QUANG LAM
8a2a746c5e Fix broken layout of bulk buy 2021-10-17 07:30:07 +09:00
Jean-Baptiste Bellet
0f7ba41896 Add the number of the step as a responsive span 
that could be displayed or not (small screens)
 2021-10-08 09:42:36 +02:00
Jean-Baptiste Bellet
802c5c8c94 Create a secondary form button 2021-10-06 15:06:56 +05:30
Matt-Yorkley
f4c86a1b51 Merge pull request #8061 from Matt-Yorkley/turbo-checkout 
Split Checkout new toys
 2021-09-17 10:48:59 +02:00
Meron Ogbai
d4f7b318e7 Add haml and css for custom modals 2021-09-09 06:21:14 +03:00
Matt-Yorkley
5ef34347a3 Implement optional non-Angular flash messages 2021-09-08 10:34:34 +01:00
Matt-Yorkley
b29d88be25 Add progress bar styling 2021-09-08 00:05:04 +01:00
Jean-Baptiste Bellet
642e822e0e button is rounded 2021-08-25 15:58:55 +02:00
Jean-Baptiste Bellet
10ddaf4384 Last step (ie. summary) is larger than the two previous step 2021-08-25 15:53:22 +02:00
Jean-Baptiste Bellet
fe65359d71 Display no shipping method selected error 2021-08-23 10:16:53 +02:00
Jean-Baptiste Bellet
a873499b97 Decrease title font size on checkout 
to match specifications
 2021-08-11 15:22:28 +01:00
Jean-Baptiste Bellet
b66b1fcdae Add step 3 2021-08-11 15:22:26 +01:00
Jean-Baptiste Bellet
c286189225 Add link into success tab 
to go back to previous step and edit details once completed
 2021-08-11 15:20:01 +01:00
Jean-Baptiste Bellet
66892ed51a Add a success class for step that are already validated 2021-08-11 15:17:08 +01:00
Jean-Baptiste Bellet
1076ec777c Define a method error_message_on to display error by field 2021-07-26 15:47:36 +02:00
Jean-Baptiste Bellet
49f026629c Add tabs for the new split checkout + first step: your details 
- Add new split checkout for user with `split_checkout` feature
 - Add the first step: Your details
 - with 3 parts : Your details, Billing address and Delivery address
 2021-07-26 15:47:36 +02:00
Andy Brett
46cd05c54a Merge pull request #7712 from guidoDutra/1861-enable-shopfront-sorting-by-producer 
Enable sorting by producer in shopfront
 2021-07-06 09:27:42 -07:00
Pau Pérez Fabregat
db993652c4 Merge branch 'master' into payment-states 2021-06-18 12:20:26 +02:00
Pau Pérez Fabregat
b500486f6b Merge pull request #7211 from jibees/4207-add-query-params-in-url 
Orders list : save filters params
 2021-06-18 11:19:26 +02:00
Andy Brett
3e32abe64f add colors and translations for requires_authorization state 2021-06-17 14:23:59 -07:00
Guido Oliveira
0f2fd47ca0 Fix supplier loader issue in enterprise controller 2021-06-17 13:57:19 -03:00
Guido Oliveira
92031120e3 Create service for select2 autocomplete 2021-06-17 13:54:18 -03:00
Guido Oliveira
baca89c575 allow select producers for ordering 2021-06-16 15:02:27 -03:00
Maikel Linke
e3be519b25 Style TOS page to be usable 
It's not pretty but only used by instance managers, very rarely.
 2021-06-09 14:06:54 +10:00
Jean-Baptiste Bellet
385446807d Add a clear filters button 
- This button clear all stored filters and then update results
 2021-05-31 10:44:21 +02:00
Andy Brett
f64d5a9f59 Merge pull request #7438 from jibees/7353-fix-OC-display-issue-text-on-two-lines 
Change the position of order_cycle component into a shop front
 2021-04-29 14:05:06 -07:00
Cillian O'Ruanaidh
c41476423b Merge latest master into julesemmac/6584-map-location-confirm and resolve conflict in api/enterprises_controller.rb 2021-04-22 19:43:49 +01:00
Jean-Baptiste Bellet
5e712fa4c0 Add variable for the zIndex of the navigation header 2021-04-20 13:50:39 +02:00
Jean-Baptiste Bellet
6dbe91b199 Positions the order_cycle according to shop-tabs 
- Move from `enterprises/shop.html.haml` to `shopping_shared/_tabs.html.haml` to handle its position correctly
 - Remove marginTop and height to order cycle component and display it relative to parent's bottom (ie. the columns in `tab-buttons`)
- Adjust z-index to display the entire component
 2021-04-20 13:50:33 +02:00
Jean-Baptiste Bellet
8b3a178d97 Increase zIndex of the tooltip as it's now displayed inside modal 
specify zIndex by using vars from modal zIndex
 2021-04-16 11:09:26 +02:00
Jean-Baptiste Bellet
f9aab2ef5f Adjust little cross inside blue circle to close tooltip 2021-04-16 11:08:57 +02:00
gucci-ninja
d70c2b99fd Remove arrows on number input when adding items 2021-04-07 14:32:29 -04:00
Andy Brett
a9c7f84bd3 Merge pull request #7197 from guidoDutra/5916-fix-content-moves-when-cart-open 
fix content moving when cart is open
 2021-04-01 07:23:32 -07:00
Andy Brett
4efcd8457c Merge pull request #7227 from jibees/7215-fix-page-content-up/down-move-when-opening-the-unit-price-tooltip 
Add some CSS specification to avoid page content up/down move
 2021-04-01 07:21:13 -07:00
Jean-Baptiste Bellet
ee4beb57db Do not import darkswarm file into admin, but only needed selector 2021-03-26 12:27:33 +01:00
Jean-Baptiste Bellet
2849f18313 Add some CSS specification to avoid page content up/down move 
- Use `display: flex`
 - Improve the display of the blue cross by a better alignement into the circle
 2021-03-25 23:21:26 +01:00
Pau Pérez Fabregat
b12293d1fb Merge pull request #6991 from jibees/6494-show-unit-price-in-admin/product-edit-form 
Show unit price in admin/product edit form
 2021-03-25 15:59:09 +01:00
Guido Oliveira
6f340174d3 fix content moving when cart is open 2021-03-24 08:29:37 -03:00
julesemmac
971971803e Improving user discover on ofn map 
The context for this update is here: https://community.openfoodnetwork.org/t/improving-user-discovery-on-ofn-map/2013

Also with rebasing help from Maikel Linke <mkllnk@web.de>
 2021-03-19 21:43:29 +00:00
Pau Pérez Fabregat
71b902d9d2 Merge pull request #6980 from drummer83/clean-footer 
Cleaner and consistent design of front-end footer
 2021-03-18 15:53:09 +01:00
Jean-Baptiste Bellet
e137eb724b Readjust height of the question mark icon 
- 15px is actually the height of an `<label />` inside a form.
 2021-03-18 09:48:42 +01:00
Jean-Baptiste Bellet
daa7cca866 Adjust import to include shared/* between Darkswarm and admin 
- Import joyride css file
 - Used by question-mark-with-tooltip used in admin part
 2021-03-18 09:48:17 +01:00
Jean-Baptiste Bellet
ec0f99a949 Add joyride-tip-guide css specifications 
- Could not add the file itself because of many dependancies are broken the admin part.
 - Just use the strict minimum
 2021-03-18 09:48:17 +01:00
Jean-Baptiste Bellet
3fcbb1a5fe Move files from darkswarm to shared 
- As this directive is now used by Darkswarm and admin, move files in shared/ folders
 - Needs some css variable in admin part : as question-mark-with-tooltip is used in admin part, it needs some css variable
 - Add own scss variables file with all needed variables for question-mark-icon. Some duplication, but now really independant and shared between both darkswarm and admin.
 - Remove strange border around the button, rendered by chrome when button is focused.
 2021-03-18 09:48:17 +01:00
Jean-Baptiste Bellet
2414161210 Remove useless and error-prone css specification 
- This shouldn't be a general specification, but eventually used inside context. By default, no need to this.
 2021-03-09 17:25:32 +01:00