Bing Xie
3760a34b2b
Add save_bar to the order cycles simple editing form
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
Bing Xie
78b4a35d12
Keep the action with save button
2016-05-12 10:45:41 +10:00
Bing Xie
7fc37e4737
Tweak save_bar css
2016-05-12 10:45:41 +10:00
Bing Xie
d10719330d
Extend save_bar directive to support more buttons
2016-05-12 10:45:41 +10:00
Bing Xie
38efa218d0
Use save bar on order cycle 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
4d6a21254f
Merge remote-tracking branch 'origin/master' into openstreetmap-tiles
2016-04-29 16:40:54 +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
36a4aab020
Adjust styling to blend
2016-04-29 15:07:55 +10:00
Rohan Mitchell
42a327211e
Merge branch 'openstreetmap-tiles' of https://github.com/bingxie/openfoodnetwork into openstreetmap-tiles
2016-04-29 14:36:47 +10:00
Rohan Mitchell
88e9eb59cf
Do not allow invalid quantity to reach model, triggering server update
2016-04-29 11:56:48 +10:00
Rohan Mitchell
65895752da
Remove cruft
2016-04-29 11:49:30 +10:00
Rohan Mitchell
1220ff8a06
Notify when stock limit reached on shopfront rather than silently capping
2016-04-27 15:05:44 +10:00
Bing Xie
824a29624f
Tweak the map UI
2016-04-27 14:17:29 +10:00
Bing Xie
daa5b00a2a
Uses openstreetmap tiles
2016-04-27 13:50:15 +10:00
Rohan Mitchell
8f8a1191cb
Remove stock cap on max_quantity
2016-04-27 12:27:24 +10:00
Steve Pettitt
53d50f16d6
Merge current master
2016-04-26 03:18:27 +01: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
6cba935a65
Add close button to out of stock modal
2016-04-21 11:26:30 +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
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
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
Steve Pettitt
0b820361de
Merge master
2016-04-15 08:29:52 +01: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
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
Steve Pettitt
bc048a943c
Show all payments, format unsuccessful payments grey, add 'invalid' translation.
2016-04-10 22:23:39 +01:00
Maikel Linke
b050f27a84
Default logos for new installations
2016-04-06 16:10:32 +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
c099711f97
Removing dialogOptions library, not required anymore
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
47df106237
Refactor tragsWithTranslation directive to handle dynamic attr names
2016-04-01 19:48:25 +11:00
Rob Harrington
ed134bac84
Removing unrequired initSelection option from ofn-select2
2016-04-01 19:48:25 +11:00
Rob Harrington
33aad10e73
Adding dialogOptions library for adding responsiveness to jquery dialog
2016-04-01 19:48:25 +11:00
Rob Harrington
3d78b375c6
Moving angularjs tag rule logic into its own module
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
86c80124fc
Moving tags-with-translation directive to admin.utils
2016-04-01 19:48:25 +11:00
Rob Harrington
443e232ea4
Renaming angular admin.shipping_methods and admin.payment_methods modules
2016-04-01 19:48:25 +11:00
Rob Harrington
c74c274a9e
Renaming shippingMethodCtrl to shippingMethodsCtrl
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
97bcbb81b9
Change text of register call in the dropdown
...
Unified code for the dropdown and the footer.
Both contain the register call and are both pointing to the register
path now. The footer still pointed to the global site before.
2016-04-01 14:39:43 +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
