Bing Xie
daa5b00a2a
Uses openstreetmap tiles
2016-04-27 13:50:15 +10:00
Maikel Linke
2367b73d3a
Revert "Associate new users with existing customer records"
...
This reverts commit a25f4fdf44
2016-04-22 14:55:43 +10:00
Maikel Linke
23e598f2f8
Destroy customer without flash notice
2016-04-22 14:55:43 +10:00
Maikel
7bec139987
Auto-merged master into products-caching-add-to-cart on deployment.
2016-04-22 10:58:26 +10:00
Rohan Mitchell
a26266159c
Fix timing issue: change in client-side value during server update
2016-04-22 10:47:20 +10:00
Rob Harrington
28d40bf27d
Fixing font styling on enterprise name in shop product summary
2016-04-21 21:27:52 +10:00
Rohan Mitchell
779be7c5a0
Extract params parsing into single method
2016-04-21 16:37:15 +10:00
Rohan Mitchell
6cba935a65
Add close button to out of stock modal
2016-04-21 11:26:30 +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
a1bcdc616f
Extract add-to-cart inputs into partials
2016-04-21 09:36:22 +10:00
Rohan Mitchell
17f69bd182
Remove trailing whitespace
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
Lynne
f986c5898e
Updating en-GB file to reflect recent additions ( #909 )
2016-04-16 12:23:26 +10: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
e17b609517
Apply code standards
2016-04-15 14:31:54 +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
9e4610f9bd
Customers: enable change of hub if no customers
...
Fix #588 .
And show search bar even when no customers are shown. Previously, the
search bar disappeared when you entered a search without results.
2016-04-15 11:12:22 +10:00
Maikel Linke
df5b554f24
Merge branch 'issue-878' of https://github.com/elf-pavlik/openfoodnetwork into locale-patches
2016-04-15 09:49:14 +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
elf Pavlik
f15e948085
small i18n fixes #878
2016-04-14 16:10:21 -05: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
Maikel Linke
0ac87b9e55
Override spree_i18n payment_state, shipment_state
2016-04-13 16:50:01 +10:00
Rohan Mitchell
59b564c4be
Report job queue status via API
2016-04-13 16:48:24 +10:00
Rohan Mitchell
193580d5d9
Enqueue jobs directly via SQL rather than loading full Rails stack
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
Maikel Linke
e3ed831e30
Merge branch 'state_translation_override' of https://github.com/stveep/openfoodnetwork into state_translation_override
2016-04-13 16:42:28 +10:00
Maikel Linke
e6b1d545a3
Merge branch 'default-logos' of https://github.com/bingxie/openfoodnetwork into default-logos
2016-04-13 15:12:01 +10:00
Steve Pettitt
b79b0d7586
Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork into uk/state_translation_override
2016-04-11 22:31:56 +01:00
Steve Pettitt
39e3374ece
Add comment
2016-04-11 22:27:47 +01:00
Steve Pettitt
27fdfb60af
Override incorrect Spree GB translations for state/county
2016-04-09 09:41:21 +01:00
