Maikel
ca0c677d46
Auto-merged master into uk/account-balances on deployment.
2016-03-19 07:16:41 +11:00
Maikel Linke
d07daede68
Merge remote-tracking branch 'origin/master' into uk/filter-producers-for-map
2016-03-18 11:04:42 +11:00
Maikel
388b25ddf9
Auto-merged master into uk/account-balances on deployment.
2016-03-12 09:11:42 +11:00
Maikel Linke
61fb34e738
Use user's email address as enterprise.email
...
During registration, use the given email address only as public visible
profile email address. Set the internal notification email address
`enterprise.email` to the owner's email address. That can be changed
later.
2016-03-09 14:52:52 +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
4966290f87
Check missing lat/long instead of zero
2016-03-03 06:41:59 +00:00
Steve Pettitt
6a2319e16d
Remove producers without lat + long from map
2016-03-02 19:08:57 +00:00
Steve Pettitt
d39b62aa31
Fallback to a default tractor logo if missing
2016-02-20 19:00:37 +00:00
Steve Pettitt
ec3e158781
Merge current master
2016-02-20 17:24:57 +00:00
Steve Pettitt
23e774bede
Styling, fewer columns in small/medium screen, logo resize
2016-02-20 17:20:43 +00:00
stveep
83d248469f
Running balances
2016-02-16 20:32:09 +00:00
Maikel Linke
bd19bf5f3c
Refactoring filter selectors
...
The FilterSelectorsService is now able to create multiple independent
lists of selectors. These lists are explicitly given to the
filter-selector directive.
For example a group's page has one set for the group's producers and one
set for the group's shops.
2016-02-04 16:08:19 +11:00
Steve Pettitt
ccd66bba9c
Credit/debit formatting, use filters for money formatting, use full page width for table
2016-01-28 22:42:45 +00:00
Continuous Integration
e070168c4a
Auto-merge from CI [skip ci]
2016-01-15 03:30:02 +11:00
Rohan Mitchell
71569324f4
Serialise cart updates - do not submit another until the previous has completed
2016-01-07 13:53:37 +11:00
stveep
da0810382b
Sorting by most orders, currency symbol, hide until clicked, reformatting table headers
2015-12-21 22:19:00 +00:00
stveep
7e50cc9ce8
Data organisation in angular, basic table structure and balance calculation.
2015-12-21 14:12:38 +00:00
stveep
16ab8f04c3
Angularise /account page: Order service/controller, rough layout
2015-12-18 17:06:04 +00:00
Maikel Linke
8b40d094ee
new translate filter and updated specs for js translations
2015-10-07 15:47:51 +11:00
Maikel Linke
ae96541112
Internationalisation of Javascript views
2015-10-01 11:13:45 +10:00
Rohan Mitchell
eb6dcba396
Clear localstorage in Cart.clear()
2015-07-31 16:56:08 +10:00
Rohan Mitchell
09b4b3e659
When order cycle is changed, clear the cart
2015-07-31 16:56:08 +10:00
Rohan Mitchell
bf2bd403a4
Clear variants when order cycle changed, not when products are initially loaded
2015-07-31 16:56:08 +10:00
Rohan Mitchell
012a210782
Add method to clear cart
2015-07-31 16:56:08 +10:00
Rohan Mitchell
7caebb11e2
Clear variants registry before reloading products - fixes fees not updating when changing order cycle
2015-07-31 16:56:08 +10:00
Rohan Mitchell
ee65452de3
Add method to clear variants registry
2015-07-31 16:56:08 +10:00
Rohan Mitchell
3a9b13b55e
Reorder methods
2015-07-31 16:56:07 +10:00
Continuous Integration
858a613ba2
Auto-merge from CI [skip ci]
2015-07-17 11:48:16 +10:00
Rohan Mitchell
904a3a5bd4
When add to cart fails, retry every 3 seconds, with no limit of the number of retries
2015-07-16 10:05:19 +10:00
Rohan Mitchell
0ab75fe2ea
Take the first name match from the post-filter results to avoid matching off a result the user can't see
2015-07-10 17:45:17 +10:00
Rohan Mitchell
5b93ac2ae1
Remove unneeded injections, consistent spacing
2015-07-10 17:45:16 +10:00
Rohan Mitchell
06c5ffb427
Wrap geocode callback in ., fixing inconsistent updates
2015-07-10 17:45:16 +10:00
Rohan Mitchell
64bc7404dc
Region-bias geocoder results
2015-07-10 17:45:16 +10:00
Rohan Mitchell
651afc34cb
Notify enterprise change by broadcast
2015-07-10 17:45:16 +10:00
Rohan Mitchell
7f2508eeaa
When a name match is found, calculate distances from that enterprise, rather than from the geocoded lookup
2015-07-10 17:45:15 +10:00
Rohan Mitchell
6e3ca3f90f
Make Geo.distanceBetween take either a LatLng or a locatable at either parameter
2015-07-10 17:45:15 +10:00
Rohan Mitchell
744beaa26a
Perform shops search by proximity instead of plain string match
2015-07-10 17:45:15 +10:00
Rohan Mitchell
d0d9e9e367
Flag enterprises whose name matches a query
2015-07-10 17:45:15 +10:00
Rohan Mitchell
befcc37456
Fix bug in distanceBetween, update docs, deal with null queries
2015-07-10 17:45:15 +10:00
Rohan Mitchell
9fb7c47c73
Enterprises can calculate their distances from a location via geocode lookup
2015-07-10 17:45:15 +10:00
Rohan Mitchell
80bb6c36e3
Rename file
2015-07-10 17:45:15 +10:00
Rohan Mitchell
a61e96c316
Generalise Geocoder service to Geo, add distanceBetween method
2015-07-10 17:45:15 +10:00
Rohan Mitchell
ddf1bb90ea
Add geocoder service
2015-07-10 17:45:15 +10:00
Rohan Mitchell
3527ae6ea2
Update comment
2015-07-10 15:51:57 +10:00
Rohan Mitchell
2d79177bb5
When a registering an enterprise with a non-unique name, display an error message.
2015-06-24 10:08:34 +10:00
Rohan Mitchell
80834a0c27
Merge branch 'master' into ginerr_bugfixes
2015-06-05 15:49:43 +10:00
Rohan Mitchell
8afffdae9a
Fix error when product does not have a master variant
2015-06-03 12:13:42 +10:00
Rick Giner
98c1a95bd1
Issue #531 remove Google map road markers
2015-05-10 16:51:56 +10:00
Rick Giner
9c3ec950fc
Revert "ginerr_#531_remove Google map road markers"
...
This reverts commit 3e2117134f
2015-05-10 16:50:58 +10:00
Rick Giner
3e2117134f
ginerr_#531_remove Google map road markers
2015-05-10 16:50:00 +10:00
