Rohan Mitchell
ba854d12c8
Remove CMS specs
2016-07-29 09:14:36 +10:00
Maikel Linke
dee0fa6724
Trigger checkout click more reliably in specs
2016-07-22 14:10:16 +10:00
Maikel Linke
b5bc3a4ca3
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into enterprise-load
2016-07-13 10:01:16 +10:00
Maikel Linke
52f68dac33
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into enterprise-load
2016-07-06 11:35:26 +10:00
Rohan Mitchell
f09cd9e477
Allow groups to be searched by URL
2016-07-06 11:08:38 +10:00
Rohan Mitchell
d6f21b24da
Add specs for producers and shops search by URL
2016-07-06 11:08:38 +10:00
Maikel Linke
08fdc8a5bd
Load producers of all or selected order cycles into shop
2016-06-29 12:57:09 +10:00
Rohan Mitchell
a5a00e9cef
Show taxons and properties on producer modal (seen on map, shop producer info)
2016-06-24 07:57:06 +10:00
Rohan Mitchell
4134cbfc9c
Include producer properties on producer listing
2016-06-24 07:57:06 +10:00
Rohan Mitchell
aae1689a27
Show product properties on producers page
2016-06-24 07:57:06 +10:00
Rohan Mitchell
fa0cc6f2c8
Add spec for filtering producers by taxon
2016-06-24 07:57:06 +10:00
Rob Harrington
d28c0159ab
Use have_selector x, count: y; instead of all(x).count.should == y
2016-06-17 16:44:02 +10:00
Maikel Linke
ee0a226388
Try to remove random failure from spec
2016-06-10 10:06:35 +10:00
Maikel Linke
5cd269411d
Trigger order button instead of click
2016-06-10 09:46:56 +10:00
Rob Harrington
365c6b3a83
Streamlining button clicking on registration spec
2016-06-08 13:06:57 +10:00
Maikel Linke
89c3758bae
Avoid race conditions in feature specs
2016-06-01 16:15:44 +10:00
Rob Harrington
7028fbe288
Find current_customer via current_distributor and current_user rather than current_order
...
Moving available_payment_methods to enterprises_helper, as per available_shipping_methods
2016-05-28 00:31:59 +10:00
Rob Harrington
6dd05ca4da
Intermittent fail hunting
2016-05-27 16:25:10 +10:00
Rob Harrington
607b674c57
Refactoring tag rule logic, placing in TagRuleApplicator lib class
2016-05-27 16:25:10 +10:00
Rob Harrington
4b8146dd00
Fixing translation error on final registration page
2016-05-25 08:10:20 +10:00
Rob Harrington
7e932f091d
Use have_current_path rather than current_path.should ==
2016-05-25 08:10:20 +10:00
Rob Harrington
6bfe1be045
Update spec looking for matching img src
2016-05-25 08:10:20 +10:00
Continuous Integration
f90e7d3239
Merge remote-tracking branch 'origin/master' into HEAD
2016-05-06 13:58:37 +10:00
Rohan Mitchell
a11696b85e
Include BugHerd script only if configured, and with configured API key
2016-05-04 12:13:03 +10:00
Rohan Mitchell
8996acf314
Fix spec
2016-04-27 15:25:05 +10:00
Rohan Mitchell
1384140e41
Notify when stock limit reached on cart rather than silently capping
2016-04-27 15:10:54 +10:00
Rohan Mitchell
1220ff8a06
Notify when stock limit reached on shopfront rather than silently capping
2016-04-27 15:05:44 +10:00
Rohan Mitchell
cf40e0432a
When cart is updated with insufficient stock, show amount in cart, not amount entered
2016-04-27 12:27:24 +10:00
Rohan Mitchell
8f8a1191cb
Remove stock cap on max_quantity
2016-04-27 12:27:24 +10:00
Steve Pettitt
43d6e49c3a
Fix spec
2016-04-26 03:31:56 +01:00
Steve Pettitt
53d50f16d6
Merge current master
2016-04-26 03:18:27 +01:00
Steve Pettitt
7f38f1dd1c
Exclude Accounts & Billing distributor
2016-04-26 03:14:13 +01:00
Rohan Mitchell
5151779f80
When update is for another line item, still update all stock levels and show warnings
2016-04-21 09:36:23 +10:00
Rohan Mitchell
dac90c8003
Fix specs
2016-04-21 09:36:23 +10:00
Rohan Mitchell
35117f7af4
Show a modal when available stock levels have reduced
2016-04-21 09:36:23 +10:00
Rohan Mitchell
5e39b11c2f
Spec out of stock handling for group buy
2016-04-21 09:36:23 +10:00
Rohan Mitchell
cfe062918b
When a variant goes out of stock, disable the input and grey out the row
2016-04-21 09:36:23 +10:00
Rohan Mitchell
d45b525497
When there's an out of stock product in the cart, placing order returns user to the cart
2016-04-21 09:36:22 +10:00
Rohan Mitchell
243f59c87d
When there's an out of stock product in the cart, checkout returns user to cart
2016-04-21 09:36:22 +10:00
Rohan Mitchell
9e321a63c0
Don't put master in order cycle - we don't do that no more
2016-04-21 09:36:22 +10:00
Rob Harrington
d8c17d160a
Applying shipping method rules in checkout
2016-04-01 19:48:25 +11:00
Maikel Linke
04f661f646
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into hide-closed-shops
...
Conflicts:
config/locales/en.yml
2016-04-01 13:02:53 +11:00
Maikel Linke
c4f92fd4cc
Hide closed shops by default, add "show" button
2016-04-01 11:45:24 +11:00
Maikel Linke
813dff8af2
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into require-login
2016-04-01 11:04:36 +11:00
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
388b25ddf9
Auto-merged master into uk/account-balances on deployment.
2016-03-12 09:11:42 +11:00
Maikel Linke
c1647ccd2c
Set public enterprise.email_address at registration
...
Sets the public email address to the given email address as well as the
internal enterprise.email (notification email address).
The field is not mandatory any more since enterprise.email is populated
from the owner's email address if no value was given.
2016-03-04 17:50:04 +11:00
Steve Pettitt
dcb07237d8
Spec worked, links didn't :)
2016-01-31 11:00:07 +00:00
