raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-10 23:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,320 Commits 20 Branches 453 Tags
404ec7bf92e390a20aa45b92bcbbef5877fb5e22
Commit Graph

4733 Commits

Author SHA1 Message Date
Pau Pérez Fabregat
d7d86729ad Merge pull request #6929 from efgalvao/issue#6892 
Fix the issue #6892
 2021-02-24 20:48:27 +01:00
Matt-Yorkley
0f0f3e1ab4 Merge pull request #6940 from drummer83/patch-1 
Create independent title string for 'Map' page
 2021-02-24 17:24:25 +01:00
Pau Pérez Fabregat
d513dc31de Merge pull request #6905 from jibees/6498-show-unit-price-in-checkout 
Show unit price in checkout process (both cart page and cart sidebar)
 2021-02-24 11:59:25 +01:00
Matt-Yorkley
9852470ef6 Merge pull request #6913 from Matt-Yorkley/rails-5-backports 
Rails 5 backports
 2021-02-23 11:55:31 +01:00
drummer83
43055d8704 Create independent title string for 'Map' page 
The "map" page didn't have a separate Transifex string for the page title. Instead the string 'label_map' was being used, which is also used elsewhere on the website. So no good idea to change that.
To make the page title independent from 'label_map' the title string is changed to 'map_title' (like on shops page, producers page etc.).
 2021-02-22 21:29:42 +01:00
edmar.galvao@codeminer42.com
cf6fe1a903 Fix the issue #6892 2021-02-21 15:08:50 -03:00
Jean-Baptiste Bellet
ce0d33caa6 Add needed class to be displayed as datetimepicker input 
- + Remplace `ng-disabled` by `ng-if` as its correctly handled by flatpickr/altInput combo.
 2021-02-19 15:37:12 +01:00
Jean-Baptiste Bellet
424067d2dd Add mandatory class for date input 
- Using flatpickr component, we need to add class to have a beautiful input with white background and pointer hover it.
 2021-02-19 11:22:52 +01:00
Matt-Yorkley
5d1af5620c Merge pull request #6674 from cillian/include-ready-for-in-producer-notification 
Include the 'Ready for' time for the order cycle in the Notify Producers email
 2021-02-18 22:01:08 +01:00
Jean-Baptiste Bellet
dd0ef0d599 Display unit price info if feature is enabled 2021-02-18 15:05:40 +01:00
Jean-Baptiste Bellet
ee4943f6e2 Display unit price on /cart page 
- Use a new class to specify css customization
 - Add to `line_item.rb` a fake method: `unit_price_price_and_unit` @andrewpbrett will change it with real values.
 - Add a new variable: $text-xs to specify small font-size


squash "Display unit price on /cart page"
 2021-02-18 15:02:30 +01:00
Jean-Baptiste Bellet
5914e6c885 Add a context to question mark icon with tooltip to display it adjusted 
- This behavior permit use to create custom CSS specifications to display this tooltip best fitted to the context.
 2021-02-18 15:02:30 +01:00
Jean-Baptiste Bellet
5b91f096ba Add unit price information into the cart 
- .total-price element must be a div (display: block) to be text right aligned (and not being float: right)
 - use .option-text to display a grey text
 - use display: flex to display question mark icon and text information
 2021-02-18 15:02:30 +01:00
Matt-Yorkley
12c9ac7ccd Use params.dig when traversing nested params in views 2021-02-18 13:02:58 +00:00
Pau Pérez Fabregat
a21a8b18b1 Merge pull request #6861 from ccozkan/new-product-form-on_hand-field-improvements 
Remove required field asterisk from on_hand's field on new products form
 2021-02-18 12:39:58 +01:00
Andy Brett
f463af327c Merge pull request #6808 from andrewpbrett/authorize-payment-links 
Allow a customer to perform further action for a Stripe payment if needed (#4181)
 2021-02-17 10:17:51 -08:00
Andy Brett
cfd8403125 Merge pull request #6865 from jibees/6833-bom-fix-display-issue-for-product 
Fix some display issues on Bulk Order Management page
 2021-02-16 19:06:42 -08:00
Maikel
10c86e852f Merge pull request #6888 from mkllnk/use-google-tiles-with-google-maps 
Use Google's map tiles with Google Maps
 2021-02-17 08:56:03 +11:00
Jean-Baptiste Bellet
7442d06bed add new template to manage variant 
- The aim of this template is to display unit price
 - Duplicate the angular directive
 - Add a question mark icon and its own file
 - Add some needed colors in the branding file
 2021-02-16 15:26:21 +01:00
Maikel Linke
445fae4d09 Use Google's map tiles with Google Maps 
We started to move to Open Street Maps (OSM) and one simple change was
to show OSM tiles on top of the current Google Maps functionality. This
hybrid use violates Google's terms and conditions though and I'm
reverting it here (basically reverting daa5b00a2).

Another branch of work was already started to use OSM without Google
functionality and it's available behind a feature toggle. We can
continue that work in our own time without a license violation. This
change is only changing the tiles, the look of the map and doesn't touch
any functionality which was always provided by Google Maps.
 2021-02-16 14:30:24 +11:00
Çağrı Özkan
dee2095a13 Remove required star from on_hand field 2021-02-16 00:23:53 +03:00
Çağrı Özkan
6fad35a975 Checkout upstream's admin/products/new view 2021-02-16 00:22:09 +03:00
Andy Brett
6efad74c5c add authorize link to transactions page 2021-02-12 12:20:35 -08:00
Andy Brett
0a7396eb1c Merge pull request #6713 from andrewpbrett/sca-subs-emails 
Send emails when subscription payments require SCA auth
 2021-02-12 08:23:32 -08:00
Jean-Baptiste Bellet
034153dacf Fix some columns grid system issues 
- Use class directly instead of attribut of element (`.three` instead of `%div{ :class => "three"}` )
 - Correct a lots of bad calculation about columns grid system
 - Use class instead of style if it's possible (`.text-center` instead of `:style => 'text-align: center;'`)
 2021-02-12 10:02:27 +01:00
Andy Brett
7c2febdd78 Merge pull request #6813 from jibees/6795-missing-cases-for-loading-spinner 
Make loading spinner visible
 2021-02-11 10:55:05 -08:00
Andy Brett
5a8a3b8d6b Merge pull request #6822 from arku/chore/cost-price-removal 
Remove cost price field field from product variant form
 2021-02-11 10:48:00 -08:00
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
Çağrı Özkan
4db41f8a16 Change on_hand's field to number_field and add required attribute 2021-02-10 22:52:31 +03: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
947a9da18b remove useless translations 
as flatpickr is already translated
 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
Arun Kumar Mohan
beece545de Remove cost price field from product variant form 2021-02-06 18:48:06 -05: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
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
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
c0b3fc301e add email template to notify hub that auth is required 2021-02-03 09:50:28 -08:00
Andy Brett
84db1c9bb4 update text of auth emails 2021-02-03 09:07:16 -08: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 Perez
063d44fecc Disable mail methods form fields except mails_from 
This moves a step closer to having a simple and straightforward way to
configure the app's mail delivery which doesn't require to be a nuclear
engineer to troubleshoot mail issues.

It happens way too often that servers have mail config broken when
restarted or redeployed and it takes too much brain power to fix it. No
doubt; it's way too complex.

I chose to leave this page's form fields but "Send mails as" as
read-only. This other field is still used by instance manager to
troubleshoot mail issues.
 2021-02-01 18:45:02 +01:00
Jean-Baptiste Bellet
370a108b3d Add stripe account owner selector as a new row 
Otherwise, not displayed.
 2021-02-01 18:00:28 +01:00
Jean-Baptiste Bellet
acbe0faa1e use full width for new product form 
- use the sixteen full width: eight + eight or eight + four + four, ...
 2021-02-01 16:35:55 +01:00