raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-13 23:37:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,175 Commits 19 Branches 453 Tags
276b94de5bd7bb971c25b4f64e6acda0b5691391
Commit Graph

14886 Commits

Author SHA1 Message Date
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
Arun Kumar Mohan
beece545de Remove cost price field from product variant form 2021-02-06 18:48:06 -05:00
Luis Ramos
c0ddeceb1e Remove Pin Payments 2021-02-06 11:15:48 +00:00
Cillian O'Ruanaidh
1fcf797d4e Include sort direction parameter during bulk product update to prevent JS error causing 'Saving' text to hang 
Before if you did a bulk product update there was an error:

> TypeError: Cannot set property 'variants' of null

It only seemed to happen if pagination was required i.e. more than 15 products. It seemed to be happening because the default sort order on the products API endpoint which handles the bulk update is 'created desc' but 'name asc' on the /admin/products controller.

Another fix included here is for the sorting direction arrows which were not displaying on the admin products page. The sorting arrows require the sorting expression to be on the :sorting var instead of :q.sorting.

Fixes #6399
 2021-02-05 16:08:08 +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
Jean-Baptiste Bellet
7aef8a609e Use method image_path 
Instead of using URL, use the image_path method which computes the path to an image asset in the public images directory.
 2021-02-04 11:51:46 +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
Andy Brett
5d2c612839 don't send emails if auth required during checkout 2021-02-03 10:05:51 -08:00
Andy Brett
5160140d88 move SCA Auth module out of Subscriptions since we reuse it in Checkout 2021-02-03 10:05:47 -08:00
Andy Brett
5f84cd9f13 add param to ScaAuthorize call for redirect url 2021-02-03 09:50:42 -08:00
Andy Brett
6e735739a5 after customer auth + redirect, process payment and clear cvv_response_message 2021-02-03 09:50:37 -08:00
Andy Brett
558b01896f extract url helpers to helper module 2021-02-03 09:50:37 -08:00
Andy Brett
c0b3fc301e add email template to notify hub that auth is required 2021-02-03 09:50:28 -08:00
Andy Brett
4e3594b8f8 remove redundant url check method 2021-02-03 09:09:05 -08:00
Andy Brett
84db1c9bb4 update text of auth emails 2021-02-03 09:07:16 -08: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
Luis Ramos
54489948b9 Remove useless assignment 2021-02-02 23:04:12 +00:00
Luis Ramos
eb56d1ff28 Put the workaround inside a if clause on rails version so it works in both rails 4 and rails 5 2021-02-02 23:00:21 +00:00
Luis Ramos
886888c2a8 Workaround to get where_values to work in rails 5 2021-02-02 22:51:34 +00:00
Andy Brett
83d7d49e44 refactor sub confirm job; move email to service 2021-02-02 10:43:37 -08: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
Jean-Baptiste Bellet
a82b24d4c1 specify width and height 
Was too small, almost invisible.
 2021-02-02 11:19:20 +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