Rob Harrington
6bfe1be045
Update spec looking for matching img src
2016-05-25 08:10:20 +10:00
Rob Harrington
245db8971a
Fixing specs broken by faster PhantomJS
2016-05-25 08:10:20 +10:00
Rob Harrington
af5eec7094
WIP (Angular 1.4 Upgrade): Adding filters to ofn-select2 and using on order create/edit UI
2016-05-25 08:10:20 +10:00
Rob Harrington
383f7c57aa
Wait for login before visiting CMS
2016-05-25 08:10:20 +10:00
Rob Harrington
10133a13f2
Make sure that changes are saved before attempting to click link
2016-05-25 08:10:20 +10:00
Rohan Mitchell
8c747f02b5
Merge branch 'use-save-bar' of https://github.com/bingxie/openfoodnetwork into use-save-bar
2016-05-11 14:41:41 +10:00
Bing Xie
a37820a963
Resize window to fix failed test
2016-05-06 14:55:16 +10:00
Continuous Integration
f90e7d3239
Merge remote-tracking branch 'origin/master' into HEAD
2016-05-06 13:58:37 +10:00
Bing Xie
08f0011244
Make the page long enough to avoid the save bar overlaying the form
2016-05-06 12:43:50 +10:00
Bing Xie
57ec7bb9a9
Remove unused test code
2016-05-04 12:45:23 +10:00
Bing Xie
8b5e5105a8
Fix failed tests
2016-05-04 12:45:23 +10:00
Bing Xie
1833f0dd5d
Add save_bar to the order cycles simple editing form
2016-05-04 12:45:23 +10:00
Bing Xie
885d489bc3
Fix failed test for the default form
2016-05-04 12:45:23 +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
9ac6de4215
Admin can set bugherd API key
2016-05-04 11:42:07 +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
6c5aaef86e
Removing ability to create order discount rules
...
Issue with application of tax to discounted items is yet to be resolved
2016-04-01 21:31:36 +11:00
Rob Harrington
d8c17d160a
Applying shipping method rules in checkout
2016-04-01 19:48:25 +11:00
Rob Harrington
d278b72289
Updating Tag Rules UI to allow management of new FilterShippingMethods rule type
2016-04-01 19:48:25 +11:00
Rob Harrington
82bc26fe90
Splitting tag rule feature specs out into their own spec file
2016-04-01 19:48:25 +11:00
Rob Harrington
f9acee2be4
Shipping methods can be tagged
2016-04-01 19:48:25 +11:00
Rob Harrington
f902474591
Relevant DiscountOrder tag rules are applied to orders on update
2016-04-01 19:48:25 +11:00
Rob Harrington
bf72864c2b
Tag Rules can be deleted
2016-04-01 19:48:25 +11:00
Rob Harrington
4c2552e0bf
Enterprise users can create tag rules
2016-04-01 19:48:25 +11:00
Rob Harrington
066190c16f
First cut at an interface for updating tag rules
2016-04-01 19:48:25 +11:00
Maikel Linke
d12c486dd2
Use new spree_paypal_express branch to hide password
2016-04-01 15:48:21 +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
17f168ed06
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into uk/account-balances
...
Applied code conventions.
Conflicts:
config/locales/en.yml
2016-03-30 13:30:44 +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
d51cfccd7e
Auto-merged master into i18n-hackathon on deployment.
2016-03-23 10:09:36 +11:00
Maikel
ca0c677d46
Auto-merged master into uk/account-balances on deployment.
2016-03-19 07:16:41 +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
