Rob Harrington
31054c7bf4
Split order_cycle_simple_view logic into index and form scopings
2015-02-27 17:24:36 +11:00
Rob Harrington
5563d23beb
Rename set_coordinator method to require_coordinator
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
3beff77164
Merge remote-tracking branch 'origin/master' into group-pages
2015-02-26 17:22: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
ff4bd449a2
Setting default_country_id by application.yml
...
The spree default_country_id was set using ENV["DEFAULT_COUNTRY"] for
production environment, but not for tests and development. Since tests
reset the default_country_id in specs/support/seeds.rb, only the
development environment had a fix id set to 12. This is removed now.
This fixes creating enterprises and enterprise groups without sample
data (12 is Australia).
2015-02-26 16:29:46 +11:00
Maikel Linke
379b702b9b
spec: testing array of owned groups without order
2015-02-26 16:22:15 +11:00
Rohan Mitchell
fa4741eb65
Update auto-creation of E2E links: more specific and restricted link creation
2015-02-26 13:49:15 +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
Rohan Mitchell
fdde55f631
Add spec for ext_url filter, refactor
2015-02-23 10:06:42 +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
Maikel Linke
a522242e7a
dealing with invalid live data in migration
2015-02-21 18:43:03 +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
3ab961a7e2
New mixin for gradients
2015-02-20 16:14:40 +11:00
summerscope
60b7a571c5
Tweak styling and markup for contact info in right column.
2015-02-20 15:35:07 +11:00
Rohan Mitchell
f8ca24c5cd
Index enterprise_groups address_id
2015-02-20 14:56:16 +11:00
Rohan Mitchell
f58219eb3d
Split inputs into separate partials for each fieldset
2015-02-20 11:36:30 +11:00
Rohan Mitchell
4554c0555d
Change locking to use postgres syntax, fixes 'must be first statement in transaction' error
2015-02-20 11:31:39 +11:00
Rohan Mitchell
176db78e64
Extract data fetching from views
2015-02-20 11:17:01 +11:00
Maikel Linke
98063dae60
setting default country by id in groups controller
2015-02-19 16:57:19 +11:00
Maikel Linke
c01d45e3af
Serialize move_up and move_down methods of groups
...
There have been race conditions in other projects using the acts_as_list
gem which could be solved by serializing.
2015-02-19 16:51:58 +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
a7b723af93
owner index for enterprise groups
2015-02-19 13:23:50 +11:00
Maikel Linke
6a29b830c2
commenting changes in overridden adaptivemenu.js
2015-02-19 11:35:06 +11:00
Maikel Linke
8e83c6679a
extended test of owned groups
2015-02-19 11:25:31 +11:00
Maikel Linke
a0f0b3c93b
display only activated enterprises to add to groups
2015-02-19 11:14:25 +11:00
Maikel Linke
ecd7b16ef5
revert setting default country by name in enterprise controller
2015-02-19 11:09:43 +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
Rohan Mitchell
f83ceae5d1
Fix feature: Enterprises list is shortened when error in bulk update
2015-02-18 15:32:56 +11:00
Maikel Linke
08afcac1e5
exposing more group attributes to angular
2015-02-18 14:55:42 +11:00
Maikel Linke
9496987da6
Fix display of admin group side menu
2015-02-18 12:04:17 +11:00
Rohan Mitchell
224864a8d8
Merge pull request #385 from openfoodfoundation/empty-cart-typo
...
Fixed typo in empty cart error message
2015-02-18 10:59:17 +11:00
Liv Galendez
b9248d3e2c
Fixed typo in empty cart error message
2015-02-18 10:47:09 +11:00
