Bing Xie
3760a34b2b
Add save_bar to the order cycles simple editing form
2016-05-12 10:45:41 +10:00
Bing Xie
26bb1a9beb
Update AdminEditOrderCycleCtrl unit tests
2016-05-12 10:45:41 +10:00
Bing Xie
d59dea29ab
Fix failed test for the default form
2016-05-12 10:45:41 +10:00
Continuous Integration
f90e7d3239
Merge remote-tracking branch 'origin/master' into HEAD
2016-05-06 13:58:37 +10:00
Maikel Linke
3e231da472
Translate subjects of enterprise emails
...
Minor text change
Fix #906
Thanks to Nicolas Blanc:
https://github.com/openfoodfoundation/openfoodnetwork/pull/937
2016-05-06 11:31:15 +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
Maikel Linke
fa5fa9e228
Auto-complete tags on customers page
...
- new controller serving tags for an enterprise as JSON
- customers page suggesting these tags
- emphasising tags that have rules
2016-04-29 15:18:17 +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
f691636c75
Fix spec
2016-04-27 14:47:45 +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
ad6037ac63
Fix user spec, check config is set
2016-04-26 04:21:50 +01: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
Maikel Linke
2367b73d3a
Revert "Associate new users with existing customer records"
...
This reverts commit a25f4fdf44
2016-04-22 14:55:43 +10:00
Rohan Mitchell
a26266159c
Fix timing issue: change in client-side value during server update
2016-04-22 10:47:20 +10:00
Rohan Mitchell
06d7665bf9
Prospective fix for intermittent spec fail
2016-04-21 09:54:56 +10: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
3dcfa810fd
Display out of stock banner when viewing cart directly
2016-04-21 09:36:23 +10:00
Rohan Mitchell
9b3139dba9
When there's an out of stock product in the cart, visiting the shopfront returns user to the cart
2016-04-21 09:36:23 +10:00
Rohan Mitchell
b2d78e7df6
Set allow_backorders explicitly for consistency in CI
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
8695dea0a5
Remove variant from cart when it becomes out of stock
2016-04-21 09:36:23 +10:00
Rohan Mitchell
792e17c385
When removing variant from order, if not found then do nothing
2016-04-21 09:36:23 +10:00
Rohan Mitchell
6fbbe580c5
After adding an item to the cart, when less quantity available, reduce quantity and reset client-side stock level
2016-04-21 09:36:23 +10:00
Rohan Mitchell
8a62d26af4
After adding an item to the cart, when out of stock, remove from cart and reset client-side stock level
2016-04-21 09:36:23 +10:00
Rohan Mitchell
fee0f90a1b
After adding products to cart, return status of cart and available stock levels
2016-04-21 09:36:22 +10:00
Rohan Mitchell
292d027498
When adding an item to cart with not enough stock, add as much as we can without erroring
2016-04-21 09:36:22 +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
Steve Pettitt
0b820361de
Merge master
2016-04-15 08:29:52 +01:00
Steve Pettitt
fc719230a3
Add failed payments, update spec
2016-04-15 08:26:12 +01:00
Maikel Linke
49febc6333
Store customer email as lower case
2016-04-15 15:35:43 +10:00
Maikel Linke
48f1794d70
Allow admin user to create customers
2016-04-15 14:34:29 +10:00
Maikel Linke
a25f4fdf44
Associate new users with existing customer records
2016-04-15 11:57:18 +10:00
Maikel Linke
831df0b222
Create and delete customers in admin interface
...
Removed Customers service and extended CustomerResource.
2016-04-15 11:12:22 +10:00
Maikel Linke
ecd32819a6
Remove unused matcher
2016-04-15 11:12:22 +10:00
Maikel Linke
ef0d6bd4d6
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into state_translation_override
...
Conflicts:
spec/lib/open_food_network/order_cycle_management_report_spec.rb
2016-04-15 08:27:09 +10:00
Rohan Mitchell
53e6d391e3
Fix intermittent fail on insignificant result ordering
2016-04-14 09:40:55 +10:00
Maikel Linke
a2c58c7ca1
Match array without order in ocm spec
...
That spec was randomly failing.
2016-04-13 16:59:54 +10:00
Rohan Mitchell
59b564c4be
Report job queue status via API
2016-04-13 16:48:24 +10:00
Rohan Mitchell
eb846e27fd
Run a job queue heartbeat every 5 minutes
2016-04-13 16:48:24 +10:00
