raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-30 21:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,074 Commits 18 Branches 452 Tags
96dea93745f4e88ed3fb59f3fc294bc940a6ea25
Commit Graph

11269 Commits

Author SHA1 Message Date
Pau Pérez Fabregat
7fe79eccea Merge pull request #6691 from jibees/6664-new-datetimepicker 
6664 new datetimepicker
 2021-02-11 11:21:19 +01:00
Pau Pérez Fabregat
752421cd8b Merge pull request #6814 from jibees/6797-to-much-white-space-when-editing-subscription 
6797 Too much white space when editing subscription
 2021-02-11 10:18:31 +01:00
Matt-Yorkley
4c4142c56d Fix HAML "unbalanced brackets" errors 2021-02-09 11:57:00 +00:00
Matt-Yorkley
bd7bc803cb Fix broken syntax in multiple angular files 
I have no idea how this was not already throwing errors before...
 2021-02-08 22:13:50 +00:00
Jean-Baptiste Bellet
57e20373fc overriding flatpickr selectors needs to be with uppercase 
so disable the scss-lint check SelectorFormat
 2021-02-08 22:09:06 +01:00
Jean-Baptiste Bellet
6a2461b30b overriding specific selectors needs to be as specific 
so disable the scss-lint check QualifyingElement
 2021-02-08 22:09:06 +01:00
Jean-Baptiste Bellet
8383b19458 factorize as we need only one file for datepicker 2021-02-08 22:09:06 +01:00
Jean-Baptiste Bellet
9619ea06de code climate checks 
- use variables for colors instead of values
 - trailinf line at the end of file
 - new line after each declaration
 - 2 spaces of indentation
 - avoid qualifying elements in selectors
 - prefer lowercase in hexa color
 2021-02-08 22:09:06 +01:00
Jean-Baptiste Bellet
f5c77f17a6 remove useless files. 
As we use flatpickr, these files are useless. Delete it.
 2021-02-08 22:09:06 +01:00
Jean-Baptiste Bellet
1dbafcaf7d remove animation 
To make tests ok.
I could use Capybara.disable_animation = true, but there was no animation to old datetimepicker, so it's more consistant like this.
 2021-02-08 22:09:06 +01:00
Jean-Baptiste Bellet
6dbaf1f7f3 specify date and datetime format 2021-02-08 22:09:06 +01:00
Jean-Baptiste Bellet
11d62eb331 add translation for "today" and "now" buttons 
and remove useless translations
 2021-02-08 22:09:06 +01:00
Jean-Baptiste Bellet
83f5d49ce2 remove references to jquery-ui datetimepicker 
need to add dialog module from jquery-ui
 2021-02-08 22:09:06 +01:00
Jean-Baptiste Bellet
84b402675a force onChange events to fire 
And so the "You have unsaved changes" bar appears
 2021-02-08 22:09:06 +01:00
Jean-Baptiste Bellet
079008d99b introduce "Now" button 
Throught the plugin: https://github.com/jcsmorais/shortcut-buttons-flatpickr
import js library via yarn
 2021-02-08 22:09:06 +01:00
Jean-Baptiste Bellet
2ce361c655 code climate update 
"color white should be written in hexadecimal form as #ffffff"
 2021-02-08 22:09:06 +01:00
Jean-Baptiste Bellet
947a9da18b remove useless translations 
as flatpickr is already translated
 2021-02-08 22:09:06 +01:00
Jean-Baptiste Bellet
6c3ededb0b apply flatpickr on element 
- update flatpickr instance value with `onOpen` callback
 2021-02-08 22:09:06 +01:00
Jean-Baptiste Bellet
a5d58ea36c change css selector and use a precise one 
Be more precise on selector. `flatpickr-input` is more selective.
 2021-02-08 22:09:06 +01:00
Jean-Baptiste Bellet
e06ea6ccd3 remove unused options 
as we use flatpickr, we don't need these options
 2021-02-08 22:09:06 +01:00
Jean-Baptiste Bellet
4f7f8b559a localize flatpickr date format 
Flatpickr can format date. Use a localized dateFormat.
 2021-02-08 22:09:06 +01:00
Jean-Baptiste Bellet
4d9289c45b Render flatpickr input more enabled 
by default, `input[readonly]` is styled as disable one. Using flatpickr with these disable inputs need to be customized. By clinking on it, it opens the datepicker widget.
 2021-02-08 22:09:06 +01:00
Jean-Baptiste Bellet
6cf172abc9 add flatpickr to order cycle and .datetimepicker 
Add your new date(time)picker on both order cycle and elements with class `.datetimepicker`
set the right options to datetimepicker
 2021-02-08 22:09:06 +01:00
Jean-Baptiste Bellet
c8a3951830 add flatpickr 
add flatpick as a yarn package and import it into the appropriate files (both js and scss)
 2021-02-08 22:09:06 +01:00
Pau Pérez Fabregat
ed1c1e5607 Merge pull request #6823 from Matt-Yorkley/dead-code-shipment 
Dead code: Shipment#total_cost
 2021-02-08 13:44:14 +01:00
Maikel
173cf9e536 Merge pull request #6565 from Matt-Yorkley/adjustments-inclusive 
[Adjustments] Improve inclusive/additional tax recording
 2021-02-08 09:38:31 +11:00
Matt-Yorkley
14530ddbc5 Remove dead code: Shipment#total_cost 2021-02-07 13:41:44 +00:00
Matt-Yorkley
8d6468dab1 Remove dead code: Shipment#display_total_cost 2021-02-07 13:41:40 +00:00
Matt-Yorkley
9851c9a762 Merge pull request #6678 from Matt-Yorkley/soft-deprecate-tax-rates 
Introduce soft-deprecation strategy when modifying tax rates
 2021-02-05 13:16:40 +01:00
Pau Pérez Fabregat
3ab6da03e7 Merge pull request #6296 from luisramos0/remove_migs 
Remove Migs payment gateway
 2021-02-04 22:07:35 +01:00
Pau Pérez Fabregat
4b892d408e Merge pull request #6809 from andrewpbrett/remove-bogus-providers 
Remove "Bogus" payment providers from staging and production
 2021-02-04 21:09:16 +01:00
Pau Pérez Fabregat
35a76a313a Merge pull request #6807 from jibees/6798-new-product-form-fill-all-space 
New Product Form: Fill all space available
 2021-02-04 21:08:56 +01:00
Pau Pérez Fabregat
f6e6b6041c Merge pull request #6734 from coopdevs/disable-ui-mail-settings 
Disable mail methods form so no one can edit
 2021-02-04 17:57:32 +01:00
Pau Pérez Fabregat
76fa63fd71 Merge pull request #6789 from coopdevs/authorize-only-changed-vos 
Authorize only changed vos
 2021-02-04 15:22:50 +01:00
Jean-Baptiste Bellet
ef42653fee Use all available space 
Don't need to put the table into a `.seven.columns.alpha.omega` div: use the maximum available space.
 2021-02-04 12:53:12 +01:00
Jean-Baptiste Bellet
502ef8f6f2 Use as many space as available 
Each row is sixteen long, use all space (five + eleven = sixteen)
 2021-02-04 12:52:07 +01:00
Andy Brett
51630ac77b remove "Bogus" payment providers from staging and production 2021-02-03 14:03:13 -08:00
Luis Ramos
e69eefdc0f Remove Migs payment gateway 2021-02-03 21:41:40 +00:00
Jean-Baptiste Bellet
4cb98dd4ac Fill all space available 
These two fields (Display As, and Unit Names) are mutually exclusive: they are never displayed at the same time. Use all the available space.
 2021-02-03 21:44:33 +01:00
Matt-Yorkley
389e149ded Wrap updates in a transaction block 
Ensures the operation will be rolled ack if either saving the new record or deleting the old record fail
 2021-02-03 11:54:54 +00:00
Pau Pérez Fabregat
79f98bdfa7 Merge pull request #6770 from Matt-Yorkley/more-dead-code 
Dead code: Spree::Order#clear_adjustments
 2021-02-03 09:37:42 +01:00
Pau Pérez Fabregat
fbab5120f1 Merge pull request #6771 from Matt-Yorkley/touch-updated-at 
Touch updated_at column when updating records via #update_column
 2021-02-03 09:33:37 +01:00
Pau Pérez Fabregat
9bb2970a07 Merge pull request #6782 from jibees/6766-manage-hover-on-account-tabs 
User profile tabs: specify :hover rule only for devices that can effectively handle it
 2021-02-02 15:47:03 +01:00
Pau Perez
aef0d28dd1 Do not load unmodified VOs from DB 
Closes #6727.

This avoids the authorization of all the VOs of the hub, which will go
through VOs that may have become invalid due to their underlying product
not belonging to the supplier the hub has permissions with (or any other
data integrity issue).

This is utterly confusing for the user who is only given a generic error
and doesn't understand what's wrong with the particular VO they changed,
while it may be fine after all. What's more, this often results in
a customer support request, which then may end up with a dev finding out
which VO is broken.

Also, there's no point in loading them from DB if the users didn't touch
them.
 2021-02-02 15:39:23 +01:00
Pau Pérez Fabregat
d48aa4a73f Merge pull request #6748 from coopdevs/dont-fetch-vos-with-deleted-variant 
Do not fetch VOs with deleted variant
 2021-02-02 15:38:29 +01:00
Matt-Yorkley
617d914835 Merge pull request #6788 from jibees/6783-align-new-product-form 
Use full width for "new product" form
 2021-02-02 13:11:12 +01:00
Matt-Yorkley
b1349306f9 Merge pull request #6787 from jibees/6784-align-items-on-shipping-and-payment-methods-forms 
Align items on shipping and payment methods forms
 2021-02-02 13:08:28 +01:00
Pau Perez
cdcda46bff Re-enable mail_bcc field in mail method settings 
This feels safer because we don't risk messing up with any instance's
operations while still moving us towards removing this page.
 2021-02-02 12:16:55 +01:00
Pau Pérez Fabregat
9db9d2d138 Merge pull request #6786 from jibees/6781-align-packages-selection-on-registration 
Package selection: use "columns" system to display 3 items on same line
 2021-02-01 21:06:00 +01:00
Pau Perez
20b9ac89b8 Fix missing translation 
The used key doesn't exist.
 2021-02-01 18:45:02 +01:00