Maikel Linke
|
229070a76b
|
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into i18n
|
2015-11-13 15:20:58 +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
|
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 |
|
Rob Harrington
|
f13b52411d
|
Merge branch master into properties
|
2015-04-17 13:23:33 +10:00 |
|
Rohan Mitchell
|
efbf2c7ffa
|
Display extended variant name in quick cart
|
2015-03-13 12:58:53 +11:00 |
|
summerscope
|
75b0b290ae
|
More WIP trying to work on the cart template logic with Rohan
|
2015-03-10 14:12:43 +11:00 |
|
summerscope
|
c7cf9695bc
|
WIP on cart menu trying to add the master name back in where a product has variante
|
2015-03-10 11:35:35 +11:00 |
|
Rob Harrington
|
0a300d1802
|
Rewriting small cart, so that it doesn't break all of the dropdowns on the page (can't use .row within li elements it seems...)
|
2015-03-06 19:03:46 +11:00 |
|
Rob Harrington
|
1d80bee595
|
Cart item total reflects total number of items in the cart
|
2015-01-16 16:06:51 +11:00 |
|
Rob Harrington
|
2c307f09c3
|
Changing edit cart button to link
|
2015-01-16 15:47:56 +11:00 |
|
summerscope
|
3bd77c74a5
|
Improve logic on shopping cart button to add meaningful labels for various states
|
2015-01-16 14:57:09 +11:00 |
|
summerscope
|
51687b5c2c
|
Tweak language and styling for the CTA buttons taking users to shopping cart and checkout pages
|
2015-01-16 13:27:16 +11:00 |
|
Rob Harrington
|
b3e67fa164
|
Take two on disabled logic
|
2015-01-15 17:34:04 +11:00 |
|
Rohan Mitchell
|
b0f5d0170c
|
Spec that overridden price with fees appears in quick cart
|
2014-12-18 13:32:28 +11:00 |
|
Rafael Schouten
|
01c98bf6e4
|
refactor and bugfix for tests
|
2014-09-17 01:07:34 +10:00 |
|
Rafael Schouten
|
44e9cf5ade
|
add currency spec file and update some class names
|
2014-09-10 18:22:33 +10:00 |
|
Rafael Schouten
|
991d0029dd
|
add currency localisation
|
2014-09-08 00:06:53 +10:00 |
|
summerscope
|
7d7bf7b1f2
|
Tweak layout for cart to make it more robust for content and allow for longer product labels
|
2014-08-07 12:07:35 +10:00 |
|
summerscope
|
1ca9c60c84
|
Tweak label to make a distinction between go straight to checkout and just go to shopping cart review
|
2014-08-06 13:18:58 +10:00 |
|
summerscope
|
aaae8dce2d
|
Move button out of UL in nesting
|
2014-08-06 12:57:44 +10:00 |
|
Rohan Mitchell
|
a1dd5dabac
|
Replace sleep with wait, add cart_dirty spec helper
|
2014-07-31 11:36:53 +10:00 |
|
summerscope
|
5a8fb4670f
|
Cart styling updates
|
2014-07-25 16:41:50 +10:00 |
|
Will Marshall
|
2120ab96ca
|
Fixing bugs and spec regressions
|
2014-07-24 16:02:10 +10:00 |
|
Will Marshall
|
f45dd24803
|
Patched up popovers for our nefarious purposes + cart pretties
|
2014-07-24 14:56:13 +10:00 |
|
Will Marshall
|
a480353158
|
Working bindings
|
2014-07-18 16:05:58 +10:00 |
|
Will Marshall
|
b25def810c
|
Working version of the cart integration
|
2014-07-18 14:56:15 +10:00 |
|
Will Marshall
|
33611ddb20
|
Renaming Product to Products and starting to figure out cart
|
2014-07-17 15:04:39 +10:00 |
|
summerscope
|
498559f70d
|
Adding in new icon fonts to cart partial
|
2014-06-04 16:07:41 +10:00 |
|
summerscope
|
fc4e20ffd4
|
Adding new icons from new pretty icon font
|
2014-06-03 11:50:38 +10:00 |
|
Will Marshall
|
13c6ce6786
|
Starting a basic implementation of the Cart/CurrentOrder so we know whether it's empty
|
2014-05-30 15:52:20 +10:00 |
|