Matt-Yorkley
6215777986
Shopfront review adjustments
2017-07-26 13:56:36 +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
f3f6714472
Add message about previous orders on checkout page
...
The message appears if the user ordered before within the same order
cycle and the shop allows to change previous orders.
2017-05-05 14:19:32 +10:00
Maikel Linke
3bce2eb7b5
Rename translation key checkout to avoid conflicts
...
A top-level translation key `checkout` can't co-exist with translation
keys in the path `checkout`. Moving the old key to
`shared.menu.cart.checkout` avoids conflicts. It also structures the
locale better by view.
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
d49469a3e6
Show bought items only if changes are allowed
...
An enterprise can decide to allow changes to orders in open order
cycles. The items of these orders are then displayed in the shopping
cart and can be removed on the cart edit page.
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
0fe4030d71
Display bought items only if present
2017-05-05 14:19:32 +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
Rohan Mitchell
9793450ed0
Make mobile menu mimic the large menu
2016-12-16 14:40:13 +11:00
Rohan Mitchell
c8f0502e71
Apply connect_learn_homepage feature toggle to mobile menu
2016-12-16 14:32:48 +11:00
Maikel Linke
338d3cbc38
Delete old commented code
2016-11-25 10:27:13 +11:00
Rob Harrington
47df8d6d8e
Refactoring AngularJS Shop Variant filtering logic for improved speed
2016-08-10 12:08:03 +10:00
Rohan Mitchell
1f5da8699d
Build plz
2016-08-05 15:58:00 +10:00
Rohan Mitchell
fcd422c6ce
Fix path helper fail in footer
2016-08-05 15:18:29 +10:00
Rohan Mitchell
5eecdb8c9c
Update footer: Link to sell instead of individual register links
2016-08-05 15:03:07 +10:00
Rohan Mitchell
8f4cbf1d9f
Update page alert label and background colour
2016-08-05 15:02:10 +10:00
Rohan Mitchell
0dba54a4b8
Update page alert text
2016-08-05 14:43:44 +10:00
Rohan Mitchell
d3ab9faede
Show registration CTA in footer rather than connect and learn CTA
2016-08-03 16:07:15 +10:00
Rohan Mitchell
1216da38d1
Update menu: [Groups, About] -> [Connect, Learn]
2016-08-03 16:07:15 +10:00
Rohan Mitchell
5b43d7a87a
Add connect and learn links to page alert
2016-08-03 16:07:15 +10:00
Rohan Mitchell
eb8cedc497
Remove CMS views and overrides
2016-07-29 09:14:36 +10:00
Paul Mackay
6dd989484a
Switch to using the Spree GA tracker code
2016-05-10 05:32:40 +01:00
Maikel Linke
97bcbb81b9
Change text of register call in the dropdown
...
Unified code for the dropdown and the footer.
Both contain the register call and are both pointing to the register
path now. The footer still pointed to the global site before.
2016-04-01 14:39:43 +11:00
Maikel Linke
41970ecf07
Use auth directive for Login button
...
Use the auth directive instead of the AuthenticationCtrl for the Login
button in the menu and on checkout.
2016-03-18 17:08:32 +11:00
Maikel Linke
1770cbb6bf
Display footer_email in confirmation emails correctly
...
A bug introduced in a9c37c162e
2016-02-26 16:09:14 +11:00
Maikel Linke
0cb5dfbbe0
delete old sidebar partials
2016-02-19 16:29:19 +11:00
Maikel Linke
6ba534fb58
Show noticeboard in mobile menu
2016-02-19 15:16:24 +11:00
Maikel Linke
38cac3a3c4
Explicitly referencing main_app.discourse_login_path
...
Fixes #830 .
2016-02-19 11:23:38 +11:00
Maikel Linke
82182d24e7
Merge remote-tracking branch 'origin/master' into discourse-sso
2016-02-19 11:02:59 +11:00
Lynne Davis
2d620071f0
Fxing conflicts
2016-02-11 16:14:44 +00:00
Paul Mackay
50c657133a
Change "&" to "and"
...
There are very few places where ampersands are appropriate.
Minor typo in footer.
2016-02-09 10:01:51 +00:00
Maikel Linke
bd19bf5f3c
Refactoring filter selectors
...
The FilterSelectorsService is now able to create multiple independent
lists of selectors. These lists are explicitly given to the
filter-selector directive.
For example a group's page has one set for the group's producers and one
set for the group's shops.
2016-02-04 16:08:19 +11:00
Lynne Davis
c0afa6be49
Bug fix
2016-01-29 17:57:10 +00:00
Maikel Linke
d0cb9008a2
Delete unused shopfront haml
2016-01-29 16:09:34 +11:00
Lynne Davis
02616a8ac7
Updates based on testing on staging
2016-01-27 18:43:01 +00:00
Lynne Davis
a9c37c162e
Update email footer to use instance email and social media contacts
2016-01-26 13:14:29 +00:00
Maikel Linke
217fa9a57c
UI integration of Discourse login
2016-01-07 19:01:09 +11:00
Maikel Linke
229070a76b
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into i18n
2015-11-13 15:20:58 +11:00
Maikel Linke
8bfe459241
i18n fixes of html display
2015-11-13 14:22:17 +11:00
Rohan Mitchell
bb6fb2f5e8
Merge branch 'sell-food-link' into combined/add-to-cart-speed_and_sell-food-link
2015-11-13 14:03:32 +11:00
Rohan Mitchell
6de44877c8
Update link for uber-style sell food dropdown
2015-11-13 14:03:14 +11:00
Rohan Mitchell
888e4d80ef
Add reliable way to check if cart is dirty. Previous way returned true when cart empty.
2015-11-13 14:03:07 +11:00
Maikel Linke
4eed222f18
Fixed several i18n issues reported by Myriam
2015-10-29 14:55:38 +11:00
Maikel Linke
0b4a43d77a
Merge remote-tracking branch 'origin/master' into i18n-replace-strings-in-views
...
Conflicts:
app/views/shared/menu/_cart.html.haml
app/views/spree/order_mailer/confirm_email_for_shop.html.haml
2015-09-16 16:32:16 +10:00
Maikel Linke
e25805aa78
Restoring all changes of the last combined branch
...
This reverts commit 1e55e8a907
2015-09-10 15:03:13 +10:00
Maikel Linke
1e55e8a907
Reverting all changes of the last combined branch
...
The production server hangs on certain requests. To rule out a code bug,
we revert to the last deployed version.
2015-09-10 12:50:40 +10:00
Maikel Linke
2e3ff8f5c6
doubling cart buttons
2015-09-03 15:52:54 +10:00
Maikel Linke
85c99102dd
i18n: Replacing all language strings in app/view/
...
Languages strings were moved to config/locale/en.yml. All views contain
according calls to t() now.
2015-08-28 16:59:23 +10:00
Rohan Mitchell
ec908fce92
Make TOS URL configurable
2015-07-31 14:51:17 +10:00
