Rohan Mitchell
|
eccd97fc28
|
Merge branch 'master' into reduce-supplier-list-in-order-cycles
|
2015-03-12 11:55:14 +11:00 |
|
Rohan Mitchell
|
c4d4d10873
|
Reuse supplier/distributor list
|
2015-03-12 11:53:13 +11:00 |
|
Liv Galendez
|
266d6ef834
|
Fixed handling of distributors field
|
2015-03-06 11:55:35 +11:00 |
|
Rohan Mitchell
|
53fa71d1f3
|
Admin can set enterprise fee's tax category
|
2015-03-05 10:44:25 +11:00 |
|
Rohan Mitchell
|
67c77cea81
|
Tidy up haml
|
2015-03-05 10:43:54 +11:00 |
|
Matt-Yorkley
|
d194e74eda
|
Rohan's suggested changes
|
2015-03-05 10:43:51 +11:00 |
|
Matt-Yorkley
|
371f966f63
|
sales tax view
|
2015-03-05 10:43:50 +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 |
|
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
|
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 |
|
Maikel Linke
|
0fdf313424
|
Fixing img display of producers if no logo present
|
2015-02-12 10:31:13 +11:00 |
|
Maikel Linke
|
211e9c33a7
|
Fixing link to group website
|
2015-02-07 19:31:16 +11:00 |
|
Maikel Linke
|
2293623d2c
|
Display default group logo if no logo was uploaded
|
2015-02-07 19:24:36 +11:00 |
|
summerscope
|
90ba1d2198
|
Updating the groups header to behave better with a square thumbnail logo image.
Intention is for a square image constrained by PaperClip as per enterprise logos (later down the track)
|
2015-02-06 17:15:40 +11:00 |
|
summerscope
|
78877f591b
|
Fix template so website links work to push to external pages
|
2015-02-06 13:58:04 +11:00 |
|