Merge branch 'master' into currency

Conflicts:
	app/helpers/injection_helper.rb
	db/suburb_seeds.rb

app/assets/javascripts/admin/all.js

@@ -22,5 +22,6 @@
 //= require ./payment_methods/payment_methods
 //= require ./products/products
 //= require ./shipping_methods/shipping_methods
+//= require ./users/users
 
 //= require_tree .

app/assets/javascripts/admin/bulk_order_management.js.coffee

@@ -1,6 +1,7 @@
 angular.module("ofn.admin").controller "AdminOrderMgmtCtrl", [
-  "$scope", "$http", "dataFetcher", "blankOption", "pendingChanges", "VariantUnitManager", "OptionValueNamer",
-  ($scope, $http, dataFetcher, blankOption, pendingChanges, VariantUnitManager, OptionValueNamer) ->
+  "$scope", "$http", "dataFetcher", "blankOption", "pendingChanges", "VariantUnitManager", "OptionValueNamer", "SpreeApiKey"
+  ($scope, $http, dataFetcher, blankOption, pendingChanges, VariantUnitManager, OptionValueNamer, SpreeApiKey) ->
+    $scope.loading = true
 
     $scope.initialiseVariables = ->
       start = daysFromToday -7
@@ -32,14 +33,14 @@ angular.module("ofn.admin").controller "AdminOrderMgmtCtrl", [
         quantity:     { name: "Quantity",     visible: true }
         max:          { name: "Max",          visible: true }
 
-    $scope.initialise = (spree_api_key) ->
+    $scope.initialise = ->
       $scope.initialiseVariables()
       authorise_api_reponse = ""
-      dataFetcher("/api/users/authorise_api?token=" + spree_api_key).then (data) ->
+      dataFetcher("/api/users/authorise_api?token=" + SpreeApiKey).then (data) ->
         authorise_api_reponse = data
         $scope.spree_api_key_ok = data.hasOwnProperty("success") and data["success"] == "Use of API Authorised"
         if $scope.spree_api_key_ok
-          $http.defaults.headers.common["X-Spree-Token"] = spree_api_key
+          $http.defaults.headers.common["X-Spree-Token"] = SpreeApiKey
           dataFetcher("/api/enterprises/accessible?template=bulk_index&q[is_primary_producer_eq]=true").then (data) ->
             $scope.suppliers = data
             $scope.suppliers.unshift blankOption()

app/assets/javascripts/admin/bulk_product_update.js.coffee

@@ -1,6 +1,8 @@
 angular.module("ofn.admin").controller "AdminProductEditCtrl", [
-  "$scope", "$timeout", "$http", "dataFetcher", "DirtyProducts", "VariantUnitManager", "producers", "Taxons",
-  ($scope, $timeout, $http, dataFetcher, DirtyProducts, VariantUnitManager, producers, Taxons) ->
+  "$scope", "$timeout", "$http", "dataFetcher", "DirtyProducts", "VariantUnitManager", "producers", "Taxons", "SpreeApiKey",
+  ($scope, $timeout, $http, dataFetcher, DirtyProducts, VariantUnitManager, producers, Taxons, SpreeApiKey) ->
+    $scope.loading = true
+
     $scope.updateStatusMessage =
       text: ""
       style: {}
@@ -42,14 +44,13 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", [
     $scope.limit = 15
     $scope.productsWithUnsavedVariants = []
 
-
-    $scope.initialise = (spree_api_key) ->
+    $scope.initialise = ->
       authorise_api_reponse = ""
-      dataFetcher("/api/users/authorise_api?token=" + spree_api_key).then (data) ->
+      dataFetcher("/api/users/authorise_api?token=" + SpreeApiKey).then (data) ->
         authorise_api_reponse = data
         $scope.spree_api_key_ok = data.hasOwnProperty("success") and data["success"] == "Use of API Authorised"
         if $scope.spree_api_key_ok
-          $http.defaults.headers.common["X-Spree-Token"] = spree_api_key
+          $http.defaults.headers.common["X-Spree-Token"] = SpreeApiKey
           $scope.fetchProducts()
         else if authorise_api_reponse.hasOwnProperty("error")
           $scope.api_error_msg = authorise_api_reponse("error")

app/assets/javascripts/admin/enterprises/enterprises.js.coffee

@@ -1 +1 @@
-angular.module("admin.enterprises", ["admin.payment_methods", "admin.shipping_methods"])
+angular.module("admin.enterprises", ["admin.payment_methods", "admin.shipping_methods", "admin.users"])

app/assets/javascripts/admin/order_cycle.js.erb.coffee

@@ -197,12 +197,13 @@ angular.module('order_cycle', ['ngResource'])
       	this.order_cycle.outgoing_exchanges.push({enterprise_id: new_distributor_id, incoming: false, active: true, variants: {}, enterprise_fees: []})
 
       removeExchange: (exchange) ->
-        incoming_index = this.order_cycle.incoming_exchanges.indexOf exchange
-        this.order_cycle.incoming_exchanges.splice(incoming_index, 1) if incoming_index > -1
-        outgoing_index = this.order_cycle.outgoing_exchanges.indexOf exchange
-        this.order_cycle.outgoing_exchanges.splice(outgoing_index, 1) if outgoing_index > -1
-
-        this.removeDistributionOfVariant(variant_id) for variant_id, active of exchange.variants when active
+        if exchange.incoming
+          incoming_index = this.order_cycle.incoming_exchanges.indexOf exchange
+          this.order_cycle.incoming_exchanges.splice(incoming_index, 1)
+          this.removeDistributionOfVariant(variant_id) for variant_id, active of exchange.variants when active
+        else
+          outgoing_index = this.order_cycle.outgoing_exchanges.indexOf exchange
+          this.order_cycle.outgoing_exchanges.splice(outgoing_index, 1) if outgoing_index > -1
 
       addCoordinatorFee: ->
         this.order_cycle.coordinator_fees.push({})

app/assets/javascripts/admin/users/directives/user_autocomplete.js.coffee

@@ -0,0 +1,18 @@
+angular.module("admin.users").directive "ofnUserAutocomplete", ($http) ->
+  link: (scope,element,attrs) ->
+    setTimeout ->
+      element.select2
+        multiple: false
+        initSelection: (element, callback) ->
+          callback { id: element.val(), email: attrs.email }
+        ajax:
+          url: Spree.routes.user_search
+          datatype: 'json'
+          data:(term, page) ->
+            { q: term }
+          results: (data, page) ->
+            { results: data }
+        formatResult: (user) ->
+          user.email
+        formatSelection: (user) ->
+          user.email

app/assets/javascripts/admin/users/users.js.coffee

@@ -0,0 +1 @@
+angular.module("admin.users", [])

app/assets/javascripts/darkswarm/controllers/authentication/signup_controller.js.coffee

@@ -1,4 +1,4 @@
-Darkswarm.controller "SignupCtrl", ($scope, $http, $location, AuthenticationService) ->
+Darkswarm.controller "SignupCtrl", ($scope, $http, $window, $location, Redirections, AuthenticationService) ->
   $scope.path = "/signup"
   $scope.errors =
     email: null
@@ -6,6 +6,9 @@ Darkswarm.controller "SignupCtrl", ($scope, $http, $location, AuthenticationServ
 
   $scope.submit = ->
     $http.post("/user/spree_user", {spree_user: $scope.spree_user}).success (data)->
-      location.href = location.origin + location.pathname  # Strips out hash fragments
+       if Redirections.after_login
+        $window.location.href = $window.location.origin + Redirections.after_login
+       else
+        $window.location.href = $window.location.origin + $window.location.pathname  # Strips out hash fragments
     .error (data) ->
       $scope.errors = data

app/assets/javascripts/darkswarm/controllers/authentication_controller.js.coffee

@@ -1,7 +1,7 @@
 Darkswarm.controller "AuthenticationCtrl", ($scope, AuthenticationService, SpreeUser)->
   $scope.open = AuthenticationService.open
   $scope.toggle = AuthenticationService.toggle
-  
+
   $scope.spree_user = SpreeUser.spree_user
   $scope.active = AuthenticationService.active
   $scope.select = AuthenticationService.select

app/assets/javascripts/darkswarm/controllers/registration_controller.js.coffee

@@ -0,0 +1,11 @@
+Darkswarm.controller "RegistrationCtrl", ($scope, RegistrationService, EnterpriseRegistrationService, availableCountries) ->
+  $scope.currentStep = RegistrationService.currentStep
+  $scope.enterprise = EnterpriseRegistrationService.enterprise
+  $scope.select = RegistrationService.select
+
+  $scope.steps = ['details','address','contact','about','images','social']
+
+  $scope.countries = availableCountries
+
+  $scope.countryHasStates = ->
+    $scope.enterprise.country.states.length > 0

app/assets/javascripts/darkswarm/controllers/registration_form_controller.js.coffee

@@ -0,0 +1,15 @@
+Darkswarm.controller "RegistrationFormCtrl", ($scope, RegistrationService, EnterpriseRegistrationService) ->
+  $scope.submitted = false
+
+  $scope.valid = (form) ->
+    $scope.submitted = !form.$valid
+    form.$valid
+
+  $scope.create = (form) ->
+    EnterpriseRegistrationService.create() if $scope.valid(form)
+
+  $scope.update = (nextStep, form) ->
+    EnterpriseRegistrationService.update(nextStep) if $scope.valid(form)
+
+  $scope.selectIfValid = (nextStep, form) ->
+    RegistrationService.select(nextStep) if $scope.valid(form)

app/assets/javascripts/darkswarm/directives/inline_flash.js.coffee

@@ -0,0 +1,6 @@
+Darkswarm.directive "ofnInlineFlash", ->
+  restrict: 'E'
+  controller: ($scope) ->
+    $scope.visible = true
+    $scope.closeFlash = ->
+      $scope.visible = false

app/assets/javascripts/darkswarm/services/authentication_service.js.coffee

@@ -4,12 +4,14 @@ Darkswarm.factory "AuthenticationService", (Navigation, $modal, $location, Redir
     selectedPath: "/login"
 
     constructor: ->
-      if $location.path() in ["/login", "/signup", "/forgot"] 
-        @open()
+      if $location.path() in ["/login", "/signup", "/forgot"] && location.pathname isnt '/register/auth'
+        @open $location.path()
+      else if location.pathname is '/register/auth'
+        @open '/signup', 'registration_authentication.html'
 
-    open: (path = false)=>
+    open: (path = false, template = 'authentication.html') =>
       @modalInstance = $modal.open
-        templateUrl: 'authentication.html'
+        templateUrl: template
         windowClass: "login-modal medium"
       @modalInstance.result.then @close, @close
       @selectedPath = path || @selectedPath

app/assets/javascripts/darkswarm/services/enterprise_registration_service.js.coffee

@@ -0,0 +1,57 @@
+Darkswarm.factory "EnterpriseRegistrationService", ($http, RegistrationService, CurrentUser, spreeApiKey, Loading, availableCountries, enterpriseAttributes) ->
+  new class EnterpriseRegistrationService
+    enterprise:
+      user_ids: [CurrentUser.id]
+      email: CurrentUser.email
+      address: {}
+      country: availableCountries[0]
+
+    constructor: ->
+      for key, value of enterpriseAttributes
+        @enterprise[key] = value
+
+    create: =>
+      Loading.message = "Creating " + @enterprise.name
+      $http(
+        method: "POST"
+        url: "/api/enterprises"
+        data:
+          enterprise: @prepare()
+        params:
+          token: spreeApiKey
+      ).success((data) =>
+        Loading.clear()
+        @enterprise.id = data
+        RegistrationService.select('about')
+      ).error((data) =>
+        Loading.clear()
+        alert('Failed to create your enterprise.\nPlease ensure all fields are completely filled out.')
+      )
+      # RegistrationService.select('about')
+
+    update: (step) =>
+      Loading.message = "Updating " + @enterprise.name
+      $http(
+        method: "PUT"
+        url: "/api/enterprises/#{@enterprise.id}"
+        data:
+          enterprise: @prepare()
+        params:
+          token: spreeApiKey
+      ).success((data) ->
+        Loading.clear()
+        RegistrationService.select(step)
+      ).error((data) ->
+        Loading.clear()
+        alert('Failed to update your enterprise.\nPlease ensure all fields are completely filled out.')
+      )
+      # RegistrationService.select(step)
+
+    prepare: =>
+      enterprise = {}
+      excluded = [ 'address', 'country', 'id' ]
+      for key, value of @enterprise when key not in excluded
+        enterprise[key] = value
+      enterprise.address_attributes = @enterprise.address if @enterprise.address?
+      enterprise.address_attributes.country_id = @enterprise.country.id if @enterprise.country?
+      enterprise

app/assets/javascripts/darkswarm/services/registration_service.js.coffee

@@ -0,0 +1,23 @@
+Darkswarm.factory "RegistrationService", (Navigation, $modal, Loading)->
+
+  new class RegistrationService
+    constructor: ->
+      @open()
+
+    open: =>
+      @modalInstance = $modal.open
+        templateUrl: 'registration.html'
+        windowClass: "login-modal large"
+        backdrop: 'static'
+      @modalInstance.result.then @close, @close
+      @select 'introduction'
+
+    select: (step)=>
+      @current_step = step
+
+    currentStep: =>
+      @current_step
+
+    close: ->
+      Loading.message = "Taking you back to the home page"
+      Navigation.go "/"

app/assets/javascripts/templates/partials/close.html.haml

@@ -1,2 +1,2 @@
-%a.close-reveal-modal.outside{"ng-click" => "$close()"}
+%a.close-reveal-modal{"ng-click" => "$close()"}
   %i.ofn-i_009-close

app/assets/javascripts/templates/price_breakdown_button.html.haml

@@ -1,2 +1,2 @@
 %button.graph-button{"ng-class" => "{open: tt_isOpen}"}
-  %i.ofn-i-058-graph
+  %i.ofn-i_058-graph

app/assets/javascripts/templates/registration.html.haml

@@ -0,0 +1,10 @@
+%div#registration-modal{"ng-controller" => "RegistrationCtrl"}
+  %div{ ng: { show: "currentStep() == 'introduction'" } }
+    %ng-include{ src: "'registration/introduction.html'" }
+  %div{ ng: { repeat: 'step in steps', show: "currentStep() == step" } }
+    %ng-include{ src: "'registration/'+ step + '.html'" }
+  %div{ ng: { show: "currentStep() == 'finished'" } }
+    %ng-include{ src: "'registration/finished.html'" }
+        
+%a.close-reveal-modal{"ng-click" => "$close()"}  
+  %i.ofn-i_009-close

app/assets/javascripts/templates/registration/about.html.haml

@@ -0,0 +1,44 @@
+.container#registration-about
+  .header
+    %h2 Nice one!
+    %h5
+      Now let's flesh out the details about
+      %span.brick{"ng-show" => "enterprise.is_distributor"}
+        {{ enterprise.name }}
+      %span.turquoise{"ng-show" => "!enterprise.is_distributor" }
+        {{ enterprise.name }}
+
+  %ng-include{ src: "'registration/steps.html'" }
+  %form{ name: 'about', novalidate: true, ng: { controller: "RegistrationFormCtrl", submit: "update('social',about)" } }
+    .row
+      .small-12.columns
+        .alert-box.alert{"data-alert" => ""}
+          {{ enterprise.name }} won't be visible on the Open Food Network until you enter a long and short description.
+          %a.close{:href => "#"} ×
+
+        .alert-box.info{"data-alert" => ""}
+          {{ enterprise.name }} has been created on the Open Food Network. If you leave at any point from here onwards, your enterprise will be saved, and you can always login to the admin section to update or continue filling out your enterprise details.
+          %a.close{:href => "#"} ×
+
+      .small-12.large-8.columns
+        .row
+          .small-12.columns
+            %label{ for: 'enterprise_description' } Short Description:
+            %input.chunky.small-12.columns{ id: 'enterprise_description', placeholder: "A short sentence describing your enterprise", ng: { model: 'enterprise.description' } }
+        .row
+          .small-12.columns
+            %label{ for: 'enterprise_long_desc' } Long Description:
+            %textarea.chunky.small-12.columns{ id: 'enterprise_long_desc', placeholder: "We recommend keeping your description to under 600 characters or 150 words. Why? Cus people are lazy, and don't like to read too much text online. ;)", ng: { model: 'enterprise.long_description' } }
+            %small {{ enterprise.long_description.length }} characters used
+      .small-12.large-4.columns
+        .row
+          .small-12.columns
+            %label{ for: 'enterprise_abn' } ABN:
+            %input.chunky.small-12.columns{ id: 'enterprise_abn', placeholder: "eg. 99 123 456 789", ng: { model: 'enterprise.abn' } }
+        .row
+          .small-12.columns
+            %label{ for: 'enterprise_acn' } ACN:
+            %input.chunky.small-12.columns{ id: 'enterprise_acn', placeholder: "eg. 123 456 789", ng: { model: 'enterprise.acn' } }
+    .row.buttons.pad-top
+      .small-12.columns
+        %input.button.primary{ type: "submit", value: "Continue" }

app/assets/javascripts/templates/registration/address.html.haml

@@ -0,0 +1,60 @@
+.container#registration-address
+  .header
+    %h2
+      Greetings
+      %span{ ng: { class: "{brick: enterprise.is_distributor, turquoise: !enterprise.is_distributor}" } }
+        {{ enterprise.name }}
+
+    %h5 Now we need to know where you are
+  %ng-include{ src: "'registration/steps.html'" }
+  %form{ name: 'address', novalidate: true, ng: { controller: "RegistrationFormCtrl", submit: "selectIfValid('contact',address)" } }
+    .row.content
+      .small-12.medium-12.large-7.columns
+        .row
+          .small-12.columns.field
+            %label{ for: 'enterprise_address' } Address:
+            %input.chunky.small-12.columns{ id: 'enterprise_address', name: 'address1', required: true, placeholder: "eg. 123 Cranberry Drive", required: true, ng: { model: 'enterprise.address.address1' } }
+            %span.error.small-12.columns{ ng: { show: "address.address1.$error.required && submitted" } }
+              You need to enter an address.
+        .row
+          .small-12.large-8.columns.field
+            %label{ for: 'enterprise_city' } Suburb:
+            %input.chunky.small-12.columns{ id: 'enterprise_city', name: 'city', required: true, placeholder: "eg. Northcote", ng: { model: 'enterprise.address.city' } }
+            %span.error.small-12.columns{ ng: { show: "address.city.$error.required && submitted" } }
+              You need to enter a suburb.
+          .small-12.large-4.columns.field
+            %label{ for: 'enterprise_zipcode' } Postcode:
+            %input.chunky.small-12.columns{ id: 'enterprise_zipcode', name: 'zipcode', required: true, placeholder: "eg. 3070", ng: { model: 'enterprise.address.zipcode' } }
+            %span.error.small-12.columns{ ng: { show: "address.zipcode.$error.required && submitted" } }
+              You need to enter a postcode.
+        .row
+          .small-12.large-8.columns.field
+            %label{ for: 'enterprise_country' } Country:
+            %select.chunky.small-12.columns{ id: 'enterprise_country', name: 'country', required: true, ng: { model: 'enterprise.country', options: 'c as c.name for c in countries' } }
+            %span.error.small-12.columns{ ng: { show: "address.country.$error.required && submitted" } }
+              You need to enter a country.
+          .small-12.large-4.columns.field
+            %label{ for: 'enterprise_state' } State:
+            %select.chunky.small-12.columns{ id: 'enterprise_state', name: 'state', ng: { model: 'enterprise.address.state_id', options: 's.id as s.abbr for s in enterprise.country.states', show: 'countryHasStates()', required: 'countryHasStates()' } }
+            %span.error.small-12.columns{ ng: { show: "address.state.$error.required && submitted" } }
+              You need to enter a state.
+      .small-12.medium-12.large-5.hide-for-small-only
+        // This is the location area
+        / %h6
+        /   Location display
+        /   %i.ofn-i_013-help.has-tip{ 'data-tooltip' => true, title: "Choose how you want to display your enterprise's address on the Open Food Network. By default, full location is shown everywhere including street name and number."}
+        / .row
+        /   .small-12.columns
+        /     %label.indent-checkbox
+        /       %input{ type: 'checkbox', id: 'enterpise_suburb_only', ng: { model: 'enterprise.suburb_only' } }
+        /         Hide my street name and street number from the public (ie. only show the suburb)
+        /   .small-12.columns
+        /     %label.indent-checkbox
+        /       %input{ type: 'checkbox', id: 'enterprise_on_map', ng: { model: 'enterprise.on_map' } }
+        /         Blur my location on the map (show an approximate, not exact pin)
+
+    .row.buttons
+      .small-12.columns
+        %input.button.secondary{ type: "button", value: "Back", ng: { click: "select('details')" } }
+         
+        %input.button.primary{ type: "submit", value: "Continue" }

app/assets/javascripts/templates/registration/contact.html.haml

@@ -0,0 +1,46 @@
+.container#registration-contact
+  .header
+    %h2 Last step to create your enterprise!
+    %h5
+      Who is responsible for managing
+      %span{ ng: { class: "{brick: enterprise.is_distributor, turquoise: !enterprise.is_distributor}" } }
+        {{ enterprise.name }}?
+  %ng-include{ src: "'registration/steps.html'" }
+  %form{ name: 'contact', novalidate: true, ng: { controller: "RegistrationFormCtrl", submit: "create(contact)" } }
+    .row.content
+      .small-12.medium-12.large-7.columns
+        .row
+          .small-12.columns.field
+            %label{ for: 'enterprise_contact' } Primary Contact:
+            %input.chunky.small-12.columns{ id: 'enterprise_contact', name: 'contact', required: true, placeholder: "Contact Name", ng: { model: 'enterprise.contact' } }
+            %span.error.small-12.columns{ ng: { show: "contact.contact.$error.required && submitted" } }
+              You need to enter a primary contact.
+        .row
+          .small-12.columns.field
+            %label{ for: 'enterprise_email' } Email address:
+            %input.chunky.small-12.columns{ id: 'enterprise_email', name: 'email', type: 'email', required: true, placeholder: "eg. charlie@thefarm.com", ng: { model: 'enterprise.email' } }
+            %span.error.small-12.columns{ ng: { show: "(contact.email.$error.email || contact.email.$error.required) && submitted" } }
+              You need to enter valid email address.
+        .row
+          .small-12.columns.field
+            %label{ for: 'enterprise_phone' } Phone number:
+            %input.chunky.small-12.columns{ id: 'enterprise_phone', name: 'phone', placeholder: "eg. (03) 1234 5678", ng: { model: 'enterprise.phone' } }
+      .small-12.medium-12.large-5.hide-for-small-only
+        / %h6
+        /   Contact display
+        /   %i.ofn-i_013-help.has-tip{ 'data-tooltip' => true, title: "Choose how you want to display your contact details on the Open Food Network."}
+        / .row
+        /   .small-12.columns
+        /     %label.indent-checkbox
+        /       %input{ type: 'checkbox', id: 'contact_name_profile', ng: { model: 'enterprise.name_in_profile' } }   Display name in profile
+        /   .small-12.columns
+        /     %label.indent-checkbox
+        /       %input{ type: 'checkbox', id: 'contact_email_profile', ng: { model: 'enterprise.email_in_profile' } }   Display email in profile
+        /   .small-12.columns
+        /     %label.indent-checkbox
+        /       %input{ type: 'checkbox', id: 'contact_phone_profile', ng: { model: 'enterprise.phone_in_profile' } }   Display phone in profile
+    .row.buttons
+      .small-12.columns
+        %input.button.secondary{ type: "button", value: "Back", ng: { click: "select('address')" } }
+         
+        %input.button.primary{ type: "submit", value: "Continue" }

app/assets/javascripts/templates/registration/details.html.haml

@@ -0,0 +1,42 @@
+.container#registration-details{bindonce: true}
+  .header
+    %h2 Let's Get Started
+    %h5{ bo: { if: "enterprise.type != 'single'" } } Woot! First we need to know what sort of enterprise you are:
+    %h5{ bo: { if: "enterprise.type == 'single'" } } Woot! First we need to know the name of your farm:
+  %ng-include{ src: "'registration/steps.html'" }
+  %form{ name: 'details', novalidate: true, ng: { controller: "RegistrationFormCtrl", submit: "selectIfValid('address',details)" } }
+    .row
+      .small-12.columns.field
+        %label{ for: 'enterprise_name', bo: { if: "enterprise.type != 'single'" } } Enterprise Name:
+        %label{ for: 'enterprise_name', bo: { if: "enterprise.type == 'single'" } } Farm Name:
+        %input.chunky.small-12.columns{ id: 'enterprise_name', name: 'name', placeholder: "eg. Charlie's Awesome Farm", required: true, ng: { model: 'enterprise.name' } }
+        %span.error.small-12.columns{ ng: { show: "details.name.$error.required && submitted" } }
+          You need to enter a name for your enterprise!
+
+    .row#enterprise-types{ 'data-equalizer' => true, bo: { if: "enterprise.type != 'single'" } }
+      .small-12.columns.field
+        .row
+          .small-12.columns
+            %label Choose one:
+        .row
+          .small-12.medium-4.large-4.columns{ 'data-equalizer-watch' => true }
+            %a.panel#producer-panel{ href: "#", ng: { click: "enterprise.is_distributor = false; enterprise.is_primary_producer = true", class: "{selected: (!enterprise.is_distributor && enterprise.is_primary_producer)}" } }
+              .left
+                / %render-svg{ path: "/assets/map-icon-producer.svg" }
+              %h4 I'm A Producer
+              %p Producers make yummy things to eat &/or drink. You're a producer if you grow it, raise it, brew it, bake it, ferment it, milk it or mould it.
+          .small-12.medium-4.large-4.columns{ 'data-equalizer-watch' => true }
+            %a.panel#hub-panel{ href: "#", ng: { click: "enterprise.is_distributor = true; enterprise.is_primary_producer = false", class: "{selected: (enterprise.is_distributor && !enterprise.is_primary_producer)}" } }
+              .left
+                / %render-svg{ path: "/assets/map-icon-hub.svg" }
+              %h4 I'm A Hub
+              %p Hubs connect the producer to the eater. Hubs can be co-ops, independent retailers, buying groups, wholesalers, CSA box schemes, farm-gate stalls, etc.
+          .small-12.medium-4.large-4.columns{ 'data-equalizer-watch' => true }
+            %a.panel#both-panel{ href: "#", ng: { click: "enterprise.is_distributor = true; enterprise.is_primary_producer = true", class: "{selected: (enterprise.is_distributor && enterprise.is_primary_producer)}" } }
+              .left
+                / %render-svg{path: "/assets/map-icon-both.svg"}
+              %h4 I'm Both
+              %p Hey there, Jack-of-all-trades! Not only do you produce things to eat &/or drink, you also want to sell your yummies through an Open Food Network shopfront.
+    .row.buttons
+      .small-12.columns
+        %input.button.primary.right{ type: "submit", value: "Continue" }

app/assets/javascripts/templates/registration/finished.html.haml

@@ -0,0 +1,18 @@
+.container#registration-finished
+  .header
+    %h2 Well done!
+    %h5
+      You have successfully completed the profile for
+      %span.brick{"ng-show" => "enterprise.is_distributor"}
+        {{ enterprise.name }}
+      %span.turquoise{"ng-show" => "!enterprise.is_distributor" }
+        {{ enterprise.name }}
+  .content{ style: 'text-align: center'}
+    %h3 Why not check it out on the Open Food Network?
+    %a.button.primary{ type: "button", href: "/map" } Go to Map Page >
+
+    %br
+    %br
+
+    %h3 Next step - add some products:
+    %a.button.primary{ type: "button", href: "/admin/products/new" } Add a Product >

app/assets/javascripts/templates/registration/images.html.haml

@@ -0,0 +1,14 @@
+.container#registration-images
+  .header
+    %h2 Thanks!
+    %h5 Let's upload some pretty pictures so your profile looks great! :)
+  %ng-include{ src: "'registration/steps.html'" }
+  .row.content
+
+  .row.buttons
+    .small-12.columns
+      %input.button.primary.left{ type: "button", value: "Back", ng: { click: "select('about')" } }
+       
+      %input.button.primary.right{ type: "button", value: "Continue", ng: { click: "select('social')" } }
+      
+      

app/assets/javascripts/templates/registration/introduction.html.haml

@@ -0,0 +1,40 @@
+%div
+  .header
+    %h2 Hi there!
+    %h4 This wizard will step you through creating a profile
+  .row
+    .small-12.medium-3.large-2.columns.text-right.hide-for-small-only
+      %img{:src => "/assets/potatoes.png"}
+    .small-12.medium-9.large-10.columns
+      %p 
+        Your profile gives you an online presence on the 
+        %strong Open Food Network, 
+        allowing you to easily connect with potential customers or partners. You can always choose to update your info later, as well as choose to upgrade your Profile to and Online Store, where you can sell products, track orders and receive payments. Creating a profile takes about 5-10 minutes.
+  .row{ 'data-equalizer' => true }
+    .small-12.medium-6.large-6.columns.pad-top{ 'data-equalizer-watch' => true }
+      %h5 You'll need the following:
+      %ul.check-list
+        %li 
+          Your enterprise address and contact details
+        %li 
+          Your logo image
+        %li 
+          A pretty picture for your profile header
+        %li 
+          Some 'About Us' text
+
+    .small-12.medium-6.large-6.columns{ 'data-equalizer-watch' => true}
+      .highlight-box
+        %h5 Your profile entitles you to:
+        %ul.small-block-grid-1
+          %li 
+            %i.ofn-i_020-search
+            A searchable listing
+          %li 
+            %i.ofn-i_040-hub
+            A pin on the OFN map
+  .row
+    .small-12.columns
+      %hr
+      %input.button.primary{ type: "button", value: "Let's get started!", ng: { click: "select('details')" } }
+  

app/assets/javascripts/templates/registration/social.html.haml

@@ -0,0 +1,35 @@
+.container#registration-social
+  .header
+    %h2 Last step!
+    %h5 How can people find {{ enterprise.name }} online?
+  %ng-include{ src: "'registration/steps.html'" }
+  %form{ name: 'social', novalidate: true, ng: { controller: "RegistrationFormCtrl", submit: "update('finished',social)" } }
+    .row.content
+      .small-12.large-7.columns
+        .row
+          .small-12.columns
+            %label{ for: 'enterprise_website' } Website:
+            %input.chunky.small-12.columns{ id: 'enterprise_website', placeholder: "eg. openfoodnetwork.org.au", ng: { model: 'enterprise.website' } }
+        .row
+          .small-12.columns
+            %label{ for: 'enterprise_facebook' } Facebook:
+            %input.chunky.small-12.columns{ id: 'enterprise_facebook', placeholder: "eg. www.facebook.com/PageNameHere", ng: { model: 'enterprise.facebook' } }
+        .row
+          .small-12.columns
+            %label{ for: 'enterprise_linkedin' } LinkedIn:
+            %input.chunky.small-12.columns{ id: 'enterprise_linkedin', placeholder: "eg. www.linkedin.com/YourNameHere", ng: { model: 'enterprise.linkedin' } }
+      .small-12.large-5.columns
+        .row
+          .small-12.columns
+            %label{ for: 'enterprise_twitter' } Twitter:
+            %input.chunky.small-12.columns{ id: 'enterprise_twitter', placeholder: "eg. @twitter_handle", ng: { model: 'enterprise.twitter' } }
+        .row
+          .small-12.columns
+            %label{ for: 'enterprise_instagram' } Instagram:
+            %input.chunky.small-12.columns{ id: 'enterprise_instagram', placeholder: "eg. @instagram_handle", ng: { model: 'enterprise.instagram' } }
+
+    .row.buttons
+      .small-12.columns
+        %input.button.secondary{ type: "button", value: "Back", ng: { click: "select('about')" } }
+         
+        %input.button.primary{ type: "submit", value: "Continue" }

app/assets/javascripts/templates/registration/steps.html.haml

@@ -0,0 +1,5 @@
+.row#progress-bar
+  .small-12.medium-2.columns.item{ ng: { repeat: 'step in steps', class: "{active: (currentStep() == step),'show-for-medium-up': (currentStep() != step)}" } }
+    {{ $index+1 + ". " + step }}
+    
+    

app/assets/javascripts/templates/registration_authentication.html.haml

@@ -0,0 +1,17 @@
+.container
+  .row.modal-centered
+    %h2 Welcome to the Open Food Network!
+    %h5 Start By Signing Up (or logging in):
+  %div{"ng-controller" => "AuthenticationCtrl"}
+    %tabset
+      %ng-include{src: "'signup.html'"}
+      %ng-include{src: "'login.html'"}
+      %ng-include{src: "'forgot.html'"}
+    %div{ ng: { show: "active('/signup')"} }
+      %hr
+      Already have an account?
+      %a{ href: "", ng: { click: "select('/login')"}}
+        Log in now.
+
+%a.close-reveal-modal{"ng-click" => "$close()"}
+  %i.ofn-i_009-close

app/assets/javascripts/templates/signup.html.haml

@@ -1,12 +1,12 @@
-%tab#sign-up-content{"ng-controller" => "SignupCtrl", 
-  heading: "Sign up", 
+%tab#sign-up-content{"ng-controller" => "SignupCtrl",
+  heading: "Sign up",
   active: "active(path)",
   select: "select(path)"}
   %form{"ng-submit" => "submit()"}
     .row
       .large-12.columns
         %label{for: "email"} Your email
-        %input.title.input-text{name: "email", 
+        %input.title.input-text{name: "email",
           type: "email",
           id: "email",
           tabindex: 1,
@@ -16,7 +16,7 @@
     .row
       .large-12.columns
         %label{for: "password"} Choose a password
-        %input.title.input-text{name: "password", 
+        %input.title.input-text{name: "password",
           type: "password",
           id: "password",
           autocomplete: "off",
@@ -27,7 +27,7 @@
     .row
       .large-12.columns
         %label{for: "password_confirmation"} Confirm password
-        %input.title.input-text{name: "password_confirmation", 
+        %input.title.input-text{name: "password_confirmation",
           type: "password",
           id: "password_confirmation",
           autocomplete: "off",
@@ -35,7 +35,7 @@
           "ng-model" => "spree_user.password_confirmation"}
     .row
       .large-12.columns
-        %input.button.primary{name: "commit", 
-          tabindex: "3", 
-          type: "submit", 
+        %input.button.primary{name: "commit",
+          tabindex: "3",
+          type: "submit",
           value: "Sign up now"}