Julius Pabrinkis
872a150c7d
Refactor some translations to use interpolation
2017-07-21 12:17:13 +10:00
Julius Pabrinkis
739d06cf03
Extract translations from javascript
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
ef488133e8
Add missing translations from files list.
2017-07-21 12:17:12 +10:00
Matt-Yorkley
23a6e2dd8f
Changed modal redirect behaviour
2017-06-28 14:35:17 +10:00
Continuous Integration
931a5be162
Merge remote-tracking branch 'origin/master' into HEAD
2017-06-22 13:19:25 +10:00
Maikel Linke
e437cba155
Make style flexible for all sizes of logos
...
Trying to support logos that are big. But logos that are too small
should not be stretched either, better small than ugly.
Remove static size declaration from HTML template since it doesn't
reflect the logo size.
Unfortunately, there are other CSS files that are in conflict. The file
mail/email.css.scss defines this globally:
img {
max-width: 100%;
}
2017-06-16 16:49:43 +10:00
Maikel Linke
3330e9b219
Init registration form with default country
2017-06-14 16:47:02 +10:00
Maikel Linke
884743ce97
Filter countries without states for registration
2017-06-14 16:47:01 +10:00
Maikel Linke
78f5002be5
Separate variant names by spaces
...
To enable the search for the beginning of a variant name, they need to
be separated.
See: https://github.com/openfoodfoundation/openfoodnetwork/pull/1545
2017-06-14 16:37:46 +10:00
Maikel Linke
a42799dff4
Initialise product.variant_names
...
Not initialising `product.variant_names` causes it to become the string
"undefinedVariant1Variant2" while it should just be "Variant1Variant2".
This mistake did not matter when `variant_names` was just used to search
for a sub-string. A recent change to search only for the beginning of a
word, caused this to fail.
See: https://github.com/openfoodfoundation/openfoodnetwork/pull/1545
2017-06-14 16:28:55 +10:00
Matt-Yorkley
ba27d63f9c
Fix logo sizing
2017-06-06 13:59:42 +01:00
Julius Pabrinkis
0083733c4c
#1471 Do no let long producers' name go under icon
2017-06-02 16:29:43 +10:00
Julius Pabrinkis
a1ffc869f3
Refactor code by suggestion to use RegExp and add tests coverage
2017-06-02 15:42:35 +10:00
Rhodri Karim
7a07e8fa16
Issue 1233: product filter should only match if name begins withs search term
2017-06-02 15:42:35 +10:00
Rob Harrington
8b560e6cee
Cleaning up angular variant units controllers a little bit
2017-05-24 15:05:33 +10:00
Matt-Yorkley
6c36c269c8
Product Edit UX adjustments
2017-05-24 15:05:33 +10:00
Rob Harrington
74d8dc48b4
Rewriting shopfront alert regarding changeable orders to be dynamic
2017-05-18 15:35:07 +10:00
Rob Harrington
c9f186f48f
Fixing SlideOutUp animation for darkswarm
2017-05-18 15:33:14 +10:00
Rob Harrington
61cb78fc93
Tweaks to LineItemsController, renaming #index to #bought
2017-05-12 16:29:15 +10:00
Continuous Integration
1ac8c85113
Merge remote-tracking branch 'origin/master' into HEAD
2017-05-12 09:55:25 +10:00
Rob Harrington
08e391856c
Ask user to confirm cancellation of order
2017-05-05 15:17:14 +10:00
Rob Harrington
6c90b4e6d0
Adding alert to order summary, notifying user of remaining time to make changes
2017-05-05 14:20:57 +10:00
Rob Harrington
e79a23a554
Disabling save button on order page until changes are made to the order
2017-05-05 14:20:57 +10:00
Rob Harrington
316b0915e4
Just display the date that orders can be changed until
...
No fancy moment.js stuff
2017-05-05 14:20:57 +10:00
Rob Harrington
e21bfd95f4
Renaming order.editable? to order.changes_allowed?
2017-05-05 14:20:57 +10:00
Rob Harrington
893331c7bb
Adding 'Open Orders' section to the top of customer accounts page
2017-05-05 14:20:57 +10:00
Rob Harrington
b0ff7ca767
Making accounts page orders listing full-width
2017-05-05 14:19:32 +10:00
Rob Harrington
493a537f2c
Making out-of-stock products in the cart more visible
2017-05-05 14:19:32 +10:00
Rob Harrington
cda43f075b
Moving bought items listing up into main section of cart
2017-05-05 14:19:32 +10:00
Rob Harrington
eec3a21c89
Allow editing of completed orders from confirmation page where distributor allows it
2017-05-05 14:19:32 +10:00
Maikel Linke
12a6f652ad
Warn when allowing guest orders and order changes
2017-05-05 14:19:32 +10:00
Maikel Linke
811671661e
Remove item from dropdown cart after deletion
2017-05-05 14:19:32 +10:00
Maikel Linke
219ad4a3a7
Reload bought products after choosing order cycle
2017-05-05 14:19:32 +10:00
Maikel Linke
4835ef067f
Add feature to remove line items from open order cycle
...
- Add JS controller to send delete requests.
- Add resource controller to destroy items.
- Add authorisation check to abilities.
- Update fees after removing line item.
2017-05-05 14:19:32 +10:00
Maikel Linke
4112c3cc75
Set auth token for all JS HTTP requests
2017-05-05 14:19:32 +10:00
Maikel Linke
88c3f414fb
Handle missing order in cart
2017-05-05 14:18:20 +10:00
Maikel Linke
65f62c42b9
Display products already ordered in this oc
...
Github issue #1083 , part of standing orders.
For now, just display already bought products within the same order
cycle in the popup cart view. The edit cart view should follow. Later,
it should be possible to remove items as well.
2017-05-05 14:18:20 +10:00
François Turbelin
01746ed470
Add missing translations on views
2017-05-04 21:33:17 +02:00
Julius Pabrinkis
19569f9316
#1291 Fix dropdown font-size not to zoom in iOS
2017-05-03 10:57:23 +01:00
Matt-Yorkley
fa5ed529cb
Added OC form validation
2017-04-21 09:32:49 +10:00
Matt-Yorkley
accb3076e9
Updated translations
2017-04-21 09:32:49 +10:00
Matt-Yorkley
e7a5d063ac
Update simple OC form
2017-04-12 09:41:40 +10:00
Matt-Yorkley
45fc801a08
Added tooltips to OC form
2017-04-12 09:41:39 +10:00
Matt-Yorkley
cd55d2e2ff
Product Description - strip weird tags on paste
...
squashme
2017-04-05 11:29:35 +10:00
Matt-Yorkley
b04d815408
Changes for code review
...
Fixed spec
2017-04-05 11:29:35 +10:00
Matt-Yorkley
0e91d01412
UX improvement for selected formatting options
2017-04-05 11:29:35 +10:00
Matt-Yorkley
b38eab11eb
Fixed frontend HTML display
2017-04-05 11:29:35 +10:00
Matt-Yorkley
c43dea60b7
Product Descriptions formatting
2017-04-05 11:29:35 +10:00
Keir Osborn
209c9242d9
remove word-wrap class from enterprise.email_address and enterprise.website in javascripts/templates/partials/contact.html.haml
2017-03-24 12:55:30 +11:00
Matt-Yorkley
c62a044598
PI highlight invalid fields in feedback tables
2017-03-17 16:11:52 +11:00
