3569 Commits

Author	SHA1	Message	Date
summerscope	e6591be55c	More tweaking for email templates for use case of Collection from hub. Need to tweak logic on Order confiramtion page.	2015-03-04 17:34:24 +11:00
summerscope	5b6bff1691	Removing bad nasty overrides which are confusing and bad. and nasty.	2015-03-04 17:20:05 +11:00
summerscope	47b08269d6	Order confirmation page changes for responsive layout, adding in more content from the checkout page to match the emails.	2015-03-04 17:19:24 +11:00
summerscope	76f234ee4d	Order confirmation top page working on header label	2015-03-04 17:18:55 +11:00
summerscope	163035dcad	Tweaking email template to be more like order confirmation	2015-03-04 17:18:37 +11:00
Victor Nava	6e800341c3	Fixes issue #362 Change admin account link to point to account page instead of edit user.	2015-03-04 16:00:46 +11:00
summerscope	b097a62c7a	WIP adding variant name logic to the email templates	2015-03-04 12:37:57 +11:00
summerscope	f64684dc48	Tweak responsive heading columns now that container is a bit smaller	2015-03-04 11:14:29 +11:00
summerscope	397697d17c	Tweak layout. Remove unnecessary row which was messing up the responsive layout for left column on checkout.	2015-03-04 11:13:58 +11:00
Liv Galendez	c940a34ec9	Created order_cycle_permitted_in helper	2015-03-03 21:03:01 +11:00
Liv Galendez	fc63d8719c	Used order_cycle_permitted_enterprises helper in order cycles row	2015-03-03 20:53:39 +11:00
Rob Harrington	31054c7bf4	Split order_cycle_simple_view logic into index and form scopings	2015-02-27 17:24:36 +11:00
Rob Harrington	8de6f983a2	User must set the coordinator first when creating an order cycle	2015-02-27 17:24:36 +11:00
Rob Harrington	53594b3a0f	Cannot add unconfirmed enterprises to order cycles	2015-02-27 17:24:36 +11:00
summerscope	f8619092bd	Merge branch 'order-confirmation' into master. ... Global email tweak - light header, black logo. This updates the order confirmation emails for better content and styling.	2015-02-27 17:16:35 +11:00
summerscope	2c2352cd4e	Final tweaks to different layout use cases for these emails.	2015-02-27 17:14:33 +11:00
summerscope	12bfb9301a	More updates dealing with pick up instructions.	2015-02-27 17:09:59 +11:00
summerscope	ba0d4c2111	More order confirmation email updates. Making language correct for hub vs user.	2015-02-27 16:55:36 +11:00
summerscope	4eee86a240	Tweak label	2015-02-27 16:09:14 +11:00
summerscope	587e4ae86d	WIP getting all the confirmation details right for collection, delivery, etc.	2015-02-27 16:08:20 +11:00
Maikel Linke	60c246f104	fixing side menu ng-show of items	2015-02-27 15:21:23 +11:00
summerscope	87842ecaf5	More WIP confirmation email for customer and shopfront. fixing up the order summary table. overall design improvements.	2015-02-27 14:00:49 +11:00
summerscope	2ba632456f	WIP email mailer updates for customer email confirmation etc.	2015-02-27 12:40:13 +11:00
Maikel Linke	69fd3f0b60	Fix link to group pages if someone enters "/groups/" instead of "/group"	2015-02-26 16:41:51 +11:00
Maikel Linke	1f7aec0c1d	group owner select box in own tab	2015-02-26 13:09:46 +11:00
summerscope	fc7abd5d02	Changing order of tabs at top of shopfront, leaving more room for long shopfront names in about tab	2015-02-25 16:20:10 +11:00
summerscope	469b383781	Properties and shopfront filters with taxons WIP.	2015-02-25 16:04:32 +11:00
summerscope	304bde3b9e	Working on the filters for shopfront properties and updates.	2015-02-25 10:46:51 +11:00
summerscope	e9fca885db	WIP layout changes for shopfront top	2015-02-25 10:46:43 +11:00
summerscope	122cf6c065	Groups index page styling for responsive use cases.	2015-02-25 10:22:33 +11:00
summerscope	9daf7e3955	Removing spans on follow icons as these show up as blank spaces when no data to fill.	2015-02-25 09:38:07 +11:00
Maikel Linke	f8153c07b1	moving email from "web" to "contact" on group edit page	2015-02-22 16:20:11 +11:00
Maikel Linke	eade689070	linkToService directive to generate external links	2015-02-22 16:15:04 +11:00
summerscope	e05d64a0b4	WIP on groups index page. Needs work from Maikel or Rohan.	2015-02-20 16:43:36 +11:00
summerscope	985887334f	Tweak the padding between header and tabs.	2015-02-20 16:43:03 +11:00
summerscope	3aa06ee1e4	Tabs styling for groups page - making it pretty.	2015-02-20 16:14:50 +11:00
summerscope	60b7a571c5	Tweak styling and markup for contact info in right column.	2015-02-20 15:35:07 +11:00
Rohan Mitchell	f58219eb3d	Split inputs into separate partials for each fieldset	2015-02-20 11:36:30 +11:00
Rohan Mitchell	176db78e64	Extract data fetching from views	2015-02-20 11:17:01 +11:00
Maikel Linke	d5c2abdd7e	stripping "undefined" in after_find and after_save callbacks instead of overriding getters	2015-02-19 16:33:43 +11:00
Maikel Linke	a0f0b3c93b	display only activated enterprises to add to groups	2015-02-19 11:14:25 +11:00
Maikel Linke	718a5911a3	code style and cleanup	2015-02-19 10:48:39 +11:00
Maikel Linke	bbac5aa803	Using pure css for styling odd and even menu items	2015-02-19 10:22:37 +11:00
Maikel Linke	346a4e71d0	side menu partial does not require showItem defined	2015-02-19 10:17:58 +11:00
Maikel Linke	08afcac1e5	exposing more group attributes to angular	2015-02-18 14:55:42 +11:00
Maikel Linke	903bd21577	Merge remote-tracking branch 'origin/master' into group-pages-merge ... Conflicts: README.markdown db/schema.rb	2015-02-13 15:42:36 +11:00
Maikel Linke	6b5a1255f8	fixing a bunch of tests	2015-02-12 16:36:18 +11:00
Rob Harrington	5c09ebf138	Adding manager managment to enterprise edit form	2015-02-12 11:34:58 +11:00
Rob Harrington	ee5ab22501	Moving interface for changing owner to new 'Users' tab	2015-02-12 11:34:58 +11:00
Maikel Linke	773a5480e9	Activate search input for groups again	2015-02-12 10:44:20 +11:00