Maikel Linke
c4f499d518
Allow admins and managers to see restricted shops
2016-03-25 12:04:26 +11:00
Maikel Linke
df36386757
Require customer instead of user
...
If a shop requires a login, then a customer needs to be logged in, not
just any user.
2016-03-24 18:24:46 +11:00
Maikel Linke
a48b992ec0
Shops can require users to login
...
Enterprise users have a new option to restrict their shopfronts to
logged in users only. If a guest visits one of these shopfornts, the
guest is prompted to login and is not shown any products.
Closes #849 .
2016-03-18 16:46:28 +11:00
Maikel
eeb31f65c3
Auto-merged master into combined/cart-fit-to-screen_preserve-max-quantity on deployment.
2016-01-15 16:15:09 +11:00
Steve Pettitt
a3f7ff19b0
Add new VO fields to shopping spec
2016-01-15 09:07:50 +11:00
Rohan Mitchell
037c524df2
Preserve max quantity when reloading shopfront
2016-01-07 16:35:54 +11:00
Maikel Linke
cd7721a127
Using date and time of current timezone
...
Using Time.zone.now and Date.current instead of Time.now and Date.today.
This should make all specs timezone independent.
2015-12-10 11:38:41 +11:00
Maikel Linke
229070a76b
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into i18n
2015-11-13 15:20:58 +11:00
Rohan Mitchell
178e5f59e6
Update cart by applying differences rather than clear-and-readd every time
2015-11-13 14:03:07 +11:00
Maikel Linke
91fae79be4
Update tests for new label "Login"
2015-10-07 14:06:34 +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
d9b1215a01
Update clicking checkout in spec
2015-09-04 10:54:50 +10:00
Maikel Linke
415dac3ae3
Updating spec for new Login label
2015-08-28 21:12:56 +10:00
Rohan Mitchell
faa1d0d1c5
When cart clear is declined, revert order cycle selection change
2015-07-31 16:56:08 +10:00
Rohan Mitchell
09b4b3e659
When order cycle is changed, clear the cart
2015-07-31 16:56:08 +10:00
Rohan Mitchell
7caebb11e2
Clear variants registry before reloading products - fixes fees not updating when changing order cycle
2015-07-31 16:56:08 +10:00
Rohan Mitchell
2ef0196200
Merge branch 'add-to-cart-robustness' into combined/vo-on-demand-stock-control_add-to-cart-robustness
2015-07-16 10:06:34 +10:00
Rohan Mitchell
f3ae812f2b
Update cart when max_quantity value changes, not just quantity
2015-07-16 10:05:19 +10:00
Rohan Mitchell
de7f3a9e5c
When an on-demand variant has overridden stock levels, make it not on-demand
2015-07-16 10:05:07 +10:00
Continuous Integration
c76021462c
Auto-merge from CI [skip ci]
2015-06-16 14:12:16 +10:00
Rob Harrington
d0b7550629
Removing screenshot from spec
2015-06-12 01:49:39 +08:00
Rohan Mitchell
6f513fee77
Merge branch 'master' into redesign
2015-05-29 15:20:21 +10:00
Rohan Mitchell
5e5628d0c3
Fix shops path for spec
2015-05-13 14:31:40 +10:00
Rohan Mitchell
0ac7dbf23b
Update spec references to removed file logo.jpg
2015-05-13 14:27:43 +10:00
Rob Harrington
a75a76840d
Merging master into require_standard_variant
2015-04-17 21:18:24 +10:00
Rohan Mitchell
0d9ba4257d
Merge branch 'properties'
2015-04-17 15:25:51 +10:00
Rohan Mitchell
042e076b58
Fix tax-related spec failures
2015-04-17 14:46:32 +10:00
Rohan Mitchell
0b8a619274
When the order does not have a hub, all tax rates apply
2015-04-17 13:41:38 +10:00
Rohan Mitchell
a93633a626
Show tax on order confirmation emails
2015-04-17 13:41:14 +10:00
Rohan Mitchell
3ce2c5b84f
Show tax on order confirmation page
2015-04-17 13:40:08 +10:00
Rohan Mitchell
6bb926f811
Do not show tax in checkout
2015-04-17 13:39:09 +10:00
Rohan Mitchell
beec910445
Display tax in cart
2015-04-17 13:39:09 +10:00
Rohan Mitchell
68f0e51c02
Change add_product_to_cart spec helper to use OrderPopulator, reducing inconsistencies in order adjustments, tax etc.
2015-04-17 13:39:09 +10:00
Rohan Mitchell
210c76eddc
Checkout won't load without payment and shipping methods; move spec to context where it can test the checkout
2015-04-17 13:39:09 +10:00
Rob Harrington
f13b52411d
Merge branch master into properties
2015-04-17 13:23:33 +10:00
Rob Harrington
b9f19d5777
Fixing broken specs
2015-04-17 13:00:20 +10:00
Rohan Mitchell
ccc1f3df40
Feature specs test email sending through delayed jobs
2015-04-16 16:54:43 +10:00
Rohan Mitchell
768cfab591
Change field text at checkout
2015-04-16 10:59:15 +10:00
Rob Harrington
06f10398da
Adding product property filter to shop page
2015-03-06 11:22:52 +11:00
Rohan Mitchell
7a5c56cbca
Do not show out of stock lines on order confirmation page
2015-01-29 13:19:04 +11:00
Rohan Mitchell
41e42c78c4
Update spec link name
2015-01-16 17:25:38 +11:00
Rohan Mitchell
20bde803c8
Display overridden prices when products are in the cart
2015-01-12 14:58:35 +11:00
Rohan Mitchell
6b43354386
Restructure spec
2015-01-12 14:37:43 +11:00
Rohan Mitchell
d52b6b34e3
Spec: do not subtract stock from overrides that do not override count_on_hand
2015-01-12 11:33:53 +11:00
Rohan Mitchell
4583e29ae3
When order is placed, subtract stock from variant override
2015-01-12 11:23:53 +11:00
Rohan Mitchell
4bf8716786
Extract complete_checkout to method
2015-01-07 16:29:15 +11:00
Rohan Mitchell
c0030ddb13
use_short_wait can now take a flexible wait time
2015-01-07 16:28:03 +11:00
Rohan Mitchell
370133b875
Fix minor spec issues
2015-01-07 16:06:23 +11:00
