From 924128098bb7ccfc9eb829b74c72e1abdcfc056e Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 15 May 2014 16:27:49 +1000
Subject: [PATCH 001/139] Restricting shipping methods

---
 app/views/checkout/_order.rabl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/checkout/_order.rabl b/app/views/checkout/_order.rabl
index 9903795493..36e5a98eed 100644
--- a/app/views/checkout/_order.rabl
+++ b/app/views/checkout/_order.rabl
@@ -18,8 +18,8 @@ child current_order.ship_address => :ship_address do
 end
 
 node :shipping_methods do
-  Hash[current_order.distributor.shipping_methods.collect { 
-    |method| [method.id, {
+  Hash[current_order.available_shipping_methods("front_end").collect { |method| 
+    [method.id, {
       require_ship_address: method.require_ship_address,
       price: method.compute_amount(current_order).to_f,
       name: method.name

From 3ce196e042687af719d948a23696702089f5832e Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 13 May 2014 12:16:43 +1000
Subject: [PATCH 002/139] Starting on the new shop

---
 app/views/shop/_products.html.haml | 129 ++++++++++++++++-------------
 1 file changed, 72 insertions(+), 57 deletions(-)

diff --git a/app/views/shop/_products.html.haml b/app/views/shop/_products.html.haml
index 7ed6606717..7fa562acdf 100644
--- a/app/views/shop/_products.html.haml
+++ b/app/views/shop/_products.html.haml
@@ -6,73 +6,88 @@
     %input#search.text{"ng-model" => "query", 
     placeholder: "Search",
     "ng-debounce" => "150",
-    "ng-keypress" => "searchKeypress($event)"}
+    "ofn-disable-enter" => true}
     %input.button.right{type: :submit, value: "Add to Cart"}
 
-    %table
-      %thead
-        %th.name Item
-        %th.notes Notes
-        %th.variant Unit
-        %th.quantity QTY
-        %th.bulk Bulk
-        %th.price.text-right Price
-      %tbody{"ng-show" => "data.loading"}
-        %tr
-          %td{colspan: 6}
-            %h3.text-center Loading Products
-      %tbody{"ng-repeat" => "product in data.products | filter:query | limitTo: limit track by product.id"}
-        %tr{"class" => "product product-{{ product.id }}"}
+    .row
+      .small-12.columns
+        .product_table
+          %product.row{"ng-controller" => "ProductNodeCtrl",
+            "ng-repeat" => "product in data.products | filter:query | limitTo: limit track by product.id"}
 
-          %td.name{bindonce: "product"}
-            %img{"bo-src" => "product.master.images[0].small_url"}
-            %div
-              %h5
-                {{ product.name }}
-              %a{"data-reveal-id" => "producer_details_{{product.supplier.id}}", "data-reveal" => ""}
-                {{ product.supplier.name }}
+            = render partial: "shop/product_summary"
+            
+            .row{bindonce: true, "ng-if" => "hasVariants()"}
+              = render partial: "shop/product_variants"
 
-          %td.notes{bindonce: ""} {{ product.notes | truncate:80 }}
+            .row{bindonce: true, "ng-if" => "!hasVariants()"}
+              = render partial: "shop/product_master"
 
-          %td{bindonce: ""} 
-            %span{"ng-hide" => "product.variants.length > 0"} {{ product.master.options_text }}
-            %span{"ng-show" => "product.variants.length > 0"}
-              %img.collapse{src: "/assets/collapse.png",
-              "ng-show" => "product.show_variants",
-              "ng-click" => "product.show_variants = !product.show_variants"}
 
-              %img.expand{src: "/assets/expand.png",
-              "ng-show" => "!product.show_variants",
-              "ng-click" => "product.show_variants = !product.show_variants"}
-          %td 
-            %span{"ng-show" => "(product.variants.length == 0)"}
-              %input{type: :number, 
-              value: nil, 
-              min: 0,
-              "ofn-disable-scroll" => true,
-              max: "{{product.on_demand && 9999 || product.count_on_hand }}",
-              name: "variants[{{product.master.id}}]", 
-              id: "variants_{{product.master.id}}",
-              "ng-model" => "product.quantity"}
+    -#%table
+      -#%thead
+        -#%th.name Item
+        -#%th.notes Notes
+        -#%th.variant Unit
+        -#%th.quantity QTY
+        -#%th.bulk Bulk
+        -#%th.price.text-right Price
+      -#%tbody{"ng-show" => "data.loading"}
+        -#%tr
+          -#%td{colspan: 6}
+            -#%h3.text-center Loading Products
+      -#%tbody{"ng-repeat" => ""}
+        -#%tr{"class" => "product product-{{ product.id }}"}
 
-          %td.group_buy
-            %span{"ng-show" => "product.group_buy && (product.variants.length == 0)"} 
-              %input{type: :number,
-              min: 0,
-              "ofn-disable-scroll" => true,
-              max: "{{product.on_demand && 9999 || product.count_on_hand }}",
-              name: "variant_attributes[{{product.master.id}}][max_quantity]",
-              "ng-model" => "product.max_quantity"}
+          -#%td.name{bindonce: "product"}
+            -#%img{"bo-src" => "product.master.images[0].small_url"}
+            -#%div
+              -#%h5
+                -#{{ product.name }}
+              -#%a{"data-reveal-id" => "producer_details_{{product.supplier.id}}", "data-reveal" => ""}
+                -#{{ product.supplier.name }}
 
-          %td.price.text-right{bindonce: ""}
-            %small{"ng-show" => "(product.variants.length > 0)"} from
-            {{ productPrice(product) | currency }}
+          -#%td.notes{bindonce: ""} {{ product.notes | truncate:80 }}
 
-        %tr.product-description{bindonce: ""}
-          %td{colspan: 2}{{ product.notes | truncate:80 }}
+          -#%td{bindonce: ""} 
+            -#%span{"ng-hide" => "product.variants.length > 0"} {{ product.master.options_text }}
+            -#%span{"ng-show" => "product.variants.length > 0"}
+              -#%img.collapse{src: "/assets/collapse.png",
+              -#"ng-show" => "product.show_variants",
+              -#"ng-click" => "product.show_variants = !product.show_variants"}
 
-        %tr.variant{"ng-repeat" => "variant in product.variants", "ng-if" => "product.show_variants"}
-          = render partial: "shop/variant"
+              -#%img.expand{src: "/assets/expand.png",
+              -#"ng-show" => "!product.show_variants",
+              -#"ng-click" => "product.show_variants = !product.show_variants"}
+          -#%td 
+            -#%span{"ng-show" => "(product.variants.length == 0)"}
+              -#%input{type: :number, 
+              -#value: nil, 
+              -#min: 0,
+              -#"ofn-disable-scroll" => true,
+              -#max: "{{product.on_demand && 9999 || product.count_on_hand }}",
+              -#name: "variants[{{product.master.id}}]", 
+              -#id: "variants_{{product.master.id}}",
+              -#"ng-model" => "product.quantity"}
+
+          -#%td.group_buy
+            -#%span{"ng-show" => "product.group_buy && (product.variants.length == 0)"} 
+              -#%input{type: :number,
+              -#min: 0,
+              -#"ofn-disable-scroll" => true,
+              -#max: "{{product.on_demand && 9999 || product.count_on_hand }}",
+              -#name: "variant_attributes[{{product.master.id}}][max_quantity]",
+              -#"ng-model" => "product.max_quantity"}
+
+          -#%td.price.text-right{bindonce: ""}
+            -#%small{"ng-show" => "(product.variants.length > 0)"} from
+            -#{{ productPrice(product) | currency }}
+
+        -#%tr.product-description{bindonce: ""}
+          -#%td{colspan: 2}{{ product.notes | truncate:80 }}
+
+        -#%tr.variant{"ng-repeat" => "variant in product.variants", "ng-if" => "product.show_variants"}
+          -#= render partial: "shop/variant"
 
     %input.button.right{type: :submit, value: "Add to Cart"}
 

From 12ddbb6a3224e7791e0c85567b3d9f81f8b09e17 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 13 May 2014 15:54:14 +1000
Subject: [PATCH 003/139] Reworking the shop page

---
 .../product_node_controller.js.coffee         |  9 +++
 .../controllers/products_controller.js.coffee |  6 --
 .../darkswarm/services/product.js.coffee      |  8 +--
 .../darkswarm/product_table.css.sass          |  4 ++
 .../stylesheets/darkswarm/shop.css.sass       | 60 -------------------
 app/views/shop/_product_master.html.haml      | 43 +++++++++++++
 app/views/shop/_product_summary.html.haml     | 12 ++++
 app/views/shop/_product_variants.html.haml    | 44 ++++++++++++++
 app/views/shop/_products.html.haml            |  7 +--
 app/views/shop/_variants.html.haml            |  0
 app/views/shop/products.rabl                  |  4 --
 11 files changed, 119 insertions(+), 78 deletions(-)
 create mode 100644 app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
 create mode 100644 app/assets/stylesheets/darkswarm/product_table.css.sass
 create mode 100644 app/views/shop/_product_master.html.haml
 create mode 100644 app/views/shop/_product_summary.html.haml
 create mode 100644 app/views/shop/_product_variants.html.haml
 create mode 100644 app/views/shop/_variants.html.haml

diff --git a/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
new file mode 100644
index 0000000000..4ec316e65f
--- /dev/null
+++ b/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
@@ -0,0 +1,9 @@
+Darkswarm.controller "ProductNodeCtrl", ($scope) ->
+  $scope.price = ->
+    if $scope.product.variants.length > 0
+      prices = (v.price for v in $scope.product.variants)
+      Math.min.apply(null, prices)
+    else
+      $scope.product.price
+
+  $scope.hasVariants = $scope.product.variants.length > 0
diff --git a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
index 9ba11baa5b..735a80257b 100644
--- a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
@@ -2,7 +2,6 @@ Darkswarm.controller "ProductsCtrl", ($scope, $rootScope, Product, OrderCycle) -
   $scope.data = Product.data
   $scope.limit = 3
   $scope.order_cycle = OrderCycle.order_cycle
-  Product.update()
 
   $scope.incrementLimit = ->
     if $scope.limit < $scope.data.products.length
@@ -14,8 +13,3 @@ Darkswarm.controller "ProductsCtrl", ($scope, $rootScope, Product, OrderCycle) -
       e.preventDefault()
 
   $scope.productPrice = (product) ->
-    if product.variants.length > 0
-      prices = (v.price for v in product.variants)
-      Math.min.apply(null, prices)
-    else
-      product.price
diff --git a/app/assets/javascripts/darkswarm/services/product.js.coffee b/app/assets/javascripts/darkswarm/services/product.js.coffee
index 89778b659c..ca31d5e9c0 100644
--- a/app/assets/javascripts/darkswarm/services/product.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/product.js.coffee
@@ -1,12 +1,12 @@
 Darkswarm.factory 'Product', ($resource) ->
   new class Product
-    data: {
+    constructor: ->
+      @update()
+    data: 
       products: null
       loading: true
-    }
+
     update: ->
       @data.products = $resource("/shop/products").query =>
         @data.loading = false 
       @data
-    all: ->
-      @data.products || @update()
diff --git a/app/assets/stylesheets/darkswarm/product_table.css.sass b/app/assets/stylesheets/darkswarm/product_table.css.sass
new file mode 100644
index 0000000000..9b0a7b4598
--- /dev/null
+++ b/app/assets/stylesheets/darkswarm/product_table.css.sass
@@ -0,0 +1,4 @@
+.product_table
+  .row
+    border: 1px solid black
+    padding: 8px inherit
diff --git a/app/assets/stylesheets/darkswarm/shop.css.sass b/app/assets/stylesheets/darkswarm/shop.css.sass
index 2107542594..03ba40eba1 100644
--- a/app/assets/stylesheets/darkswarm/shop.css.sass
+++ b/app/assets/stylesheets/darkswarm/shop.css.sass
@@ -82,63 +82,3 @@ product
       padding-top: 1em
       input.button.right
         float: left
-    table
-      table-layout: fixed
-      width: 100%
-      border-collapse: collapse
-      border: none
-      th
-        line-height: 50px
-        &.name
-          width: 330px 
-        //&.notes
-          //width: 140px
-        &.variant
-          width: 180px
-        &.quantity, &.bulk, &.price
-          width: 90px
-      .notes
-        max-width: 300px
-      td, th
-        background: #fff
-        > span
-          min-width: 50px
-          display: block
-      tbody
-        border: 1px solid #cccccc
-        border-left: 0px
-        border-right: 0px
-      td
-        padding: 20px 0px
-        &.name 
-          img
-            float: left
-            margin-right: 30px
-            @media all and (max-width: 768px)
-              margin-right: 1em
-          div
-            min-width: 150px
-      tr.product-description
-        display: none
-
-
-      // Responsive
-      @media all and (max-width: 768px)
-        td.notes, th.notes
-          display: none
-        img
-          width: 20px
-          height: auto
-        tr.product-description
-          display: table-row
-          td:empty
-            display: none
-            
-
-      input[type=number]
-        width: 60px
-        margin: 0px
-          display: block
-          float: right
-          padding-top: 14px
-
diff --git a/app/views/shop/_product_master.html.haml b/app/views/shop/_product_master.html.haml
new file mode 100644
index 0000000000..c335103d4e
--- /dev/null
+++ b/app/views/shop/_product_master.html.haml
@@ -0,0 +1,43 @@
+.small-1.column
+  %span.bulk{"bo-if" => "product.group_buy"} bulk
+  &nbsp;
+
+.small-5.columns
+  {{ product.name }}
+  ({{ product.master.options_text }})
+
+
+-# WITHOUT GROUP BUY
+.small-5.columns{"bo-if" => "!product.group_buy"}
+  %input{type: :number, 
+  min: 0,
+  "ofn-disable-scroll" => true,
+  max: "{{product.on_demand && 9999 || product.count_on_hand }}",
+  name: "variants[{{product.master.id}}]", 
+  id: "variants_{{product.master.id}}",
+  "ng-model" => "product.quantity"}
+  {{ product.master.options_text }} 
+
+-# WITH GROUP BUY
+.small-2.columns{"bo-if" => "product.group_buy"}
+  %input{type: :number, 
+  min: 0,
+  "ofn-disable-scroll" => true,
+  max: "{{product.on_demand && 9999 || product.count_on_hand }}",
+  name: "variants[{{product.master.id}}]", 
+  id: "variants_{{product.master.id}}",
+  "ng-model" => "product.quantity"}
+  {{ product.master.options_text }} 
+  (min)
+
+.small-3.columns{"bo-if" => "product.group_buy"}
+  %input{type: :number,
+  min: 0,
+  "ofn-disable-scroll" => true,
+  max: "{{product.on_demand && 9999 || product.count_on_hand }}",
+  name: "variant_attributes[{{product.master.id}}][max_quantity]",
+  "ng-model" => "product.max_quantity"}
+  (max)
+
+.small-1.column
+  {{ product.price | currency }}
diff --git a/app/views/shop/_product_summary.html.haml b/app/views/shop/_product_summary.html.haml
new file mode 100644
index 0000000000..8edb2e2536
--- /dev/null
+++ b/app/views/shop/_product_summary.html.haml
@@ -0,0 +1,12 @@
+.row{bindonce: true}
+  .small-1.column
+    %img{"bo-src" => "product.master.images[0].small_url"}
+    %img{name: "taxon icon here"}
+  .small-5.columns
+    %strong {{ product.name }}
+  .small-4.columns
+    {{ product.supplier.name }}
+  .small-1.columns
+    %span{"ng-if" => "hasVariants"} from
+    {{ price() | currency }}
+
diff --git a/app/views/shop/_product_variants.html.haml b/app/views/shop/_product_variants.html.haml
new file mode 100644
index 0000000000..c915a55361
--- /dev/null
+++ b/app/views/shop/_product_variants.html.haml
@@ -0,0 +1,44 @@
+.row{bindonce: true,
+  "ng-repeat" => "variant in product.variants"}
+  .small-1.column
+    %span.bulk{"bo-if" => "product.group_buy"} bulk
+    &nbsp;
+
+  .small-5.columns
+    {{ variant.options_text }}
+    {{ variant.id }}
+
+  -# WITHOUT GROUP BUY
+  .small-5.columns{"bo-if" => "!product.group_buy"}
+    %input{type: :number, 
+    value: nil, 
+    min: 0, 
+    "ofn-disable-scroll" => true,
+    max: "{{variant.on_demand && 9999 || variant.count_on_hand }}",
+    name: "variants[{{variant.id}}]", id: "variants_{{variant.id}}",
+    "bo-model" => "variant.quantity"}
+    {{ variant.options_text }}
+
+  -# WITH GROUP BUY
+  .small-2.columns{"bo-if" => "product.group_buy"}
+    %input{type: :number, 
+    value: nil, 
+    min: 0, 
+    "ofn-disable-scroll" => true,
+    max: "{{variant.on_demand && 9999 || variant.count_on_hand }}",
+    name: "variants[{{variant.id}}]", id: "variants_{{variant.id}}",
+    "bo-model" => "variant.quantity"}
+    {{ variant.options_text }}
+    (min)
+
+  .small-3.columns{"bo-if" => "product.group_buy"}
+    %input{type: :number,
+    min: 0,
+    "ofn-disable-scroll" => true,
+    max: "{{variant.on_demand && 9999 || variant.count_on_hand }}",
+    name: "variant_attributes[{{variant.id}}][max_quantity]",
+    "ng-model" => "variant.max_quantity"}
+    (max)
+
+  .small-1.columns
+    {{ variant.price | currency }}
diff --git a/app/views/shop/_products.html.haml b/app/views/shop/_products.html.haml
index 7fa562acdf..0944fcae9d 100644
--- a/app/views/shop/_products.html.haml
+++ b/app/views/shop/_products.html.haml
@@ -11,19 +11,18 @@
 
     .row
       .small-12.columns
-        .product_table
+        .product_table{bindonce: true}
           %product.row{"ng-controller" => "ProductNodeCtrl",
             "ng-repeat" => "product in data.products | filter:query | limitTo: limit track by product.id"}
 
             = render partial: "shop/product_summary"
             
-            .row{bindonce: true, "ng-if" => "hasVariants()"}
+            %div{"bo-if" => "hasVariants"}
               = render partial: "shop/product_variants"
 
-            .row{bindonce: true, "ng-if" => "!hasVariants()"}
+            .row{"bo-if" => "!hasVariants"}
               = render partial: "shop/product_master"
 
-
     -#%table
       -#%thead
         -#%th.name Item
diff --git a/app/views/shop/_variants.html.haml b/app/views/shop/_variants.html.haml
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/app/views/shop/products.rabl b/app/views/shop/products.rabl
index c92a1afaa0..a7430fc08c 100644
--- a/app/views/shop/products.rabl
+++ b/app/views/shop/products.rabl
@@ -1,10 +1,6 @@
 collection @products
 attributes :id, :name, :permalink, :count_on_hand, :on_demand, :group_buy
 
-node :show_variants do
-  true
-end
-
 node do |product|
   {
     notes: strip_tags(product.notes),

From 8c6e884563744de4180ec62ad85c2bf364d57ca9 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 13 May 2014 16:29:43 +1000
Subject: [PATCH 004/139] Further improvements, fixing my directive,
 re-arranging partial

---
 .../darkswarm/directives/modal.js.coffee      |  6 +-
 app/views/shop/_products.html.haml            | 93 -------------------
 app/views/shop/_variant.html.haml             | 22 -----
 app/views/shop/_variants.html.haml            |  0
 app/views/shop/products/_form.html.haml       | 27 ++++++
 .../_master.html.haml}                        |  0
 app/views/shop/products/_modal.html.haml      |  2 +
 .../_summary.html.haml}                       |  3 +-
 .../_variants.html.haml}                      |  0
 app/views/shop/show.html.haml                 |  2 +-
 10 files changed, 37 insertions(+), 118 deletions(-)
 delete mode 100644 app/views/shop/_products.html.haml
 delete mode 100644 app/views/shop/_variant.html.haml
 delete mode 100644 app/views/shop/_variants.html.haml
 create mode 100644 app/views/shop/products/_form.html.haml
 rename app/views/shop/{_product_master.html.haml => products/_master.html.haml} (100%)
 create mode 100644 app/views/shop/products/_modal.html.haml
 rename app/views/shop/{_product_summary.html.haml => products/_summary.html.haml} (86%)
 rename app/views/shop/{_product_variants.html.haml => products/_variants.html.haml} (100%)

diff --git a/app/assets/javascripts/darkswarm/directives/modal.js.coffee b/app/assets/javascripts/darkswarm/directives/modal.js.coffee
index 8c34ec18a8..0eed6e93c5 100644
--- a/app/assets/javascripts/darkswarm/directives/modal.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/modal.js.coffee
@@ -7,8 +7,12 @@ Darkswarm.directive "ofnModal", ($modal)->
   link: (scope, elem, attrs, ctrl, transclude)->
     scope.title = attrs.title
 
+    contents = null
+    transclude scope, (clone)->
+      contents = clone
+
     scope.cancel = ->
       scope.modalInstance.dismiss("cancel")
 
     elem.on "click", ->
-      scope.modalInstance = $modal.open(controller: ctrl, template: transclude())
+      scope.modalInstance = $modal.open(controller: ctrl, template: contents)
diff --git a/app/views/shop/_products.html.haml b/app/views/shop/_products.html.haml
deleted file mode 100644
index 0944fcae9d..0000000000
--- a/app/views/shop/_products.html.haml
+++ /dev/null
@@ -1,93 +0,0 @@
-%products{"ng-controller" => "ProductsCtrl", "ng-show" => "order_cycle.order_cycle_id != null",
-"infinite-scroll" => "incrementLimit()", "infinite-scroll-distance" => "1"}
-
-  = form_for :order, :url => populate_orders_path, html: {:class => "custom"} do
-
-    %input#search.text{"ng-model" => "query", 
-    placeholder: "Search",
-    "ng-debounce" => "150",
-    "ofn-disable-enter" => true}
-    %input.button.right{type: :submit, value: "Add to Cart"}
-
-    .row
-      .small-12.columns
-        .product_table{bindonce: true}
-          %product.row{"ng-controller" => "ProductNodeCtrl",
-            "ng-repeat" => "product in data.products | filter:query | limitTo: limit track by product.id"}
-
-            = render partial: "shop/product_summary"
-            
-            %div{"bo-if" => "hasVariants"}
-              = render partial: "shop/product_variants"
-
-            .row{"bo-if" => "!hasVariants"}
-              = render partial: "shop/product_master"
-
-    -#%table
-      -#%thead
-        -#%th.name Item
-        -#%th.notes Notes
-        -#%th.variant Unit
-        -#%th.quantity QTY
-        -#%th.bulk Bulk
-        -#%th.price.text-right Price
-      -#%tbody{"ng-show" => "data.loading"}
-        -#%tr
-          -#%td{colspan: 6}
-            -#%h3.text-center Loading Products
-      -#%tbody{"ng-repeat" => ""}
-        -#%tr{"class" => "product product-{{ product.id }}"}
-
-          -#%td.name{bindonce: "product"}
-            -#%img{"bo-src" => "product.master.images[0].small_url"}
-            -#%div
-              -#%h5
-                -#{{ product.name }}
-              -#%a{"data-reveal-id" => "producer_details_{{product.supplier.id}}", "data-reveal" => ""}
-                -#{{ product.supplier.name }}
-
-          -#%td.notes{bindonce: ""} {{ product.notes | truncate:80 }}
-
-          -#%td{bindonce: ""} 
-            -#%span{"ng-hide" => "product.variants.length > 0"} {{ product.master.options_text }}
-            -#%span{"ng-show" => "product.variants.length > 0"}
-              -#%img.collapse{src: "/assets/collapse.png",
-              -#"ng-show" => "product.show_variants",
-              -#"ng-click" => "product.show_variants = !product.show_variants"}
-
-              -#%img.expand{src: "/assets/expand.png",
-              -#"ng-show" => "!product.show_variants",
-              -#"ng-click" => "product.show_variants = !product.show_variants"}
-          -#%td 
-            -#%span{"ng-show" => "(product.variants.length == 0)"}
-              -#%input{type: :number, 
-              -#value: nil, 
-              -#min: 0,
-              -#"ofn-disable-scroll" => true,
-              -#max: "{{product.on_demand && 9999 || product.count_on_hand }}",
-              -#name: "variants[{{product.master.id}}]", 
-              -#id: "variants_{{product.master.id}}",
-              -#"ng-model" => "product.quantity"}
-
-          -#%td.group_buy
-            -#%span{"ng-show" => "product.group_buy && (product.variants.length == 0)"} 
-              -#%input{type: :number,
-              -#min: 0,
-              -#"ofn-disable-scroll" => true,
-              -#max: "{{product.on_demand && 9999 || product.count_on_hand }}",
-              -#name: "variant_attributes[{{product.master.id}}][max_quantity]",
-              -#"ng-model" => "product.max_quantity"}
-
-          -#%td.price.text-right{bindonce: ""}
-            -#%small{"ng-show" => "(product.variants.length > 0)"} from
-            -#{{ productPrice(product) | currency }}
-
-        -#%tr.product-description{bindonce: ""}
-          -#%td{colspan: 2}{{ product.notes | truncate:80 }}
-
-        -#%tr.variant{"ng-repeat" => "variant in product.variants", "ng-if" => "product.show_variants"}
-          -#= render partial: "shop/variant"
-
-    %input.button.right{type: :submit, value: "Add to Cart"}
-
-
diff --git a/app/views/shop/_variant.html.haml b/app/views/shop/_variant.html.haml
deleted file mode 100644
index 15d5485090..0000000000
--- a/app/views/shop/_variant.html.haml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-%td
-%td.notes
-%td{bindonce: ""} {{variant.options_text}}
-%td 
-  %input{type: :number, 
-  value: nil, 
-  min: 0, 
-  "ofn-disable-scroll" => true,
-  max: "{{variant.on_demand && 9999 || variant.count_on_hand }}",
-  name: "variants[{{variant.id}}]", id: "variants_{{variant.id}}",
-  "ng-model" => "variant.quantity"}
-%td.group_buy
-  %span{"ng-show" => "product.group_buy"} 
-    %input{type: :number,
-    min: 0,
-    "ofn-disable-scroll" => true,
-    max: "{{variant.on_demand && 9999 || variant.count_on_hand }}",
-    name: "variant_attributes[{{variant.id}}][max_quantity]",
-    "ng-model" => "variant.max_quantity"}
-%td.price.text-right{bindonce: ""}
-  {{ variant.price | currency }}
diff --git a/app/views/shop/_variants.html.haml b/app/views/shop/_variants.html.haml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/app/views/shop/products/_form.html.haml b/app/views/shop/products/_form.html.haml
new file mode 100644
index 0000000000..15e7ff6bd7
--- /dev/null
+++ b/app/views/shop/products/_form.html.haml
@@ -0,0 +1,27 @@
+%products{"ng-controller" => "ProductsCtrl", "ng-show" => "order_cycle.order_cycle_id != null",
+"infinite-scroll" => "incrementLimit()", "infinite-scroll-distance" => "1"}
+
+  = form_for :order, :url => populate_orders_path, html: {:class => "custom"} do
+
+    %input#search.text{"ng-model" => "query", 
+    placeholder: "Search",
+    "ng-debounce" => "150",
+    "ofn-disable-enter" => true}
+    %input.button.right{type: :submit, value: "Add to Cart"}
+
+    .row
+      .small-12.columns
+        .product_table{bindonce: true}
+          %product.row{"ng-controller" => "ProductNodeCtrl",
+            "ng-repeat" => "product in data.products | filter:query | limitTo: limit track by product.id"}
+            = render partial: "shop/products/summary"
+            
+            %div{"bo-if" => "hasVariants"}
+              = render partial: "shop/products/variants"
+
+            .row{"bo-if" => "!hasVariants"}
+              = render partial: "shop/products/master"
+
+    %input.button.right{type: :submit, value: "Add to Cart"}
+
+
diff --git a/app/views/shop/_product_master.html.haml b/app/views/shop/products/_master.html.haml
similarity index 100%
rename from app/views/shop/_product_master.html.haml
rename to app/views/shop/products/_master.html.haml
diff --git a/app/views/shop/products/_modal.html.haml b/app/views/shop/products/_modal.html.haml
new file mode 100644
index 0000000000..29a023704f
--- /dev/null
+++ b/app/views/shop/products/_modal.html.haml
@@ -0,0 +1,2 @@
+%ofn-modal{title: "{{product.name}}"}
+  {{ product.description }}
diff --git a/app/views/shop/_product_summary.html.haml b/app/views/shop/products/_summary.html.haml
similarity index 86%
rename from app/views/shop/_product_summary.html.haml
rename to app/views/shop/products/_summary.html.haml
index 8edb2e2536..a5fac46a7e 100644
--- a/app/views/shop/_product_summary.html.haml
+++ b/app/views/shop/products/_summary.html.haml
@@ -3,7 +3,8 @@
     %img{"bo-src" => "product.master.images[0].small_url"}
     %img{name: "taxon icon here"}
   .small-5.columns
-    %strong {{ product.name }}
+    = render partial: "shop/products/modal"
+
   .small-4.columns
     {{ product.supplier.name }}
   .small-1.columns
diff --git a/app/views/shop/_product_variants.html.haml b/app/views/shop/products/_variants.html.haml
similarity index 100%
rename from app/views/shop/_product_variants.html.haml
rename to app/views/shop/products/_variants.html.haml
diff --git a/app/views/shop/show.html.haml b/app/views/shop/show.html.haml
index ecfcc8e4e3..b833f76916 100644
--- a/app/views/shop/show.html.haml
+++ b/app/views/shop/show.html.haml
@@ -14,4 +14,4 @@
   = render partial: "shopping_shared/details"
 
   %products.row
-    = render partial: "shop/products"
+    = render partial: "shop/products/form"

From 9f169e6ef8ade8545827eb44be0fdc78e25156f6 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 14 May 2014 16:15:18 +1000
Subject: [PATCH 005/139] Adding a basic stub of the primary taxon

---
 app/models/spree/product_decorator.rb    |  4 ++
 app/views/shop/products.rabl             |  4 ++
 spec/controllers/shop_controller_spec.rb | 92 +++---------------------
 spec/models/spree/product_spec.rb        | 10 +++
 4 files changed, 26 insertions(+), 84 deletions(-)

diff --git a/app/models/spree/product_decorator.rb b/app/models/spree/product_decorator.rb
index 282a93cfb5..ba7cbc253d 100644
--- a/app/models/spree/product_decorator.rb
+++ b/app/models/spree/product_decorator.rb
@@ -118,6 +118,10 @@ Spree::Product.class_eval do
     order_cycle.variants_distributed_by(distributor).where(product_id: self)
   end
 
+  def primary_taxon
+    self.taxons.order.first
+  end
+
   # Build a product distribution for each distributor
   def build_product_distributions_for_user user
     Enterprise.is_distributor.managed_by(user).each do |distributor|
diff --git a/app/views/shop/products.rabl b/app/views/shop/products.rabl
index a7430fc08c..4f0eb0ce90 100644
--- a/app/views/shop/products.rabl
+++ b/app/views/shop/products.rabl
@@ -13,6 +13,10 @@ child :supplier => :supplier do
   attributes :id, :name, :description
 end
 
+child :primary_taxon => :primary_taxon do
+  attributes :id, :permalink, :name
+end
+
 child :master => :master do
   attributes :id, :is_master, :count_on_hand, :options_text, :count_on_hand, :on_demand
   child :images => :images do
diff --git a/spec/controllers/shop_controller_spec.rb b/spec/controllers/shop_controller_spec.rb
index 88cde0e6d9..3683137b79 100644
--- a/spec/controllers/shop_controller_spec.rb
+++ b/spec/controllers/shop_controller_spec.rb
@@ -111,90 +111,6 @@ describe ShopController do
         response.body.should be_empty
       end
 
-      # TODO: this should be a controller test baby
-      pending "filtering products" do
-        let(:distributor) { create(:distributor_enterprise) }
-        let(:supplier) { create(:supplier_enterprise) }
-        let(:oc1) { create(:simple_order_cycle, distributors: [distributor], coordinator: create(:distributor_enterprise), orders_close_at: 2.days.from_now) }
-        let(:p1) { create(:simple_product, on_demand: false) }
-        let(:p2) { create(:simple_product, on_demand: true) }
-        let(:p3) { create(:simple_product, on_demand: false) }
-        let(:p4) { create(:simple_product, on_demand: false) }
-        let(:p5) { create(:simple_product, on_demand: false) }
-        let(:p6) { create(:simple_product, on_demand: false) }
-        let(:p7) { create(:simple_product, on_demand: false) }
-        let(:v1) { create(:variant, product: p4, unit_value: 2) }
-        let(:v2) { create(:variant, product: p4, unit_value: 3, on_demand: false) }
-        let(:v3) { create(:variant, product: p4, unit_value: 4, on_demand: true) }
-        let(:v4) { create(:variant, product: p5) }
-        let(:v5) { create(:variant, product: p5) }
-        let(:v6) { create(:variant, product: p7) }
-        let(:order) { create(:order, distributor: distributor, order_cycle: order_cycle) }
-
-        before do
-          p1.master.count_on_hand = 1
-          p2.master.count_on_hand = 0
-          p1.master.update_attribute(:count_on_hand, 1)
-          p2.master.update_attribute(:count_on_hand, 0)
-          p3.master.update_attribute(:count_on_hand, 0)
-          p6.master.update_attribute(:count_on_hand, 1)
-          p6.delete
-          p7.master.update_attribute(:count_on_hand, 1)
-          v1.update_attribute(:count_on_hand, 1)
-          v2.update_attribute(:count_on_hand, 0)
-          v3.update_attribute(:count_on_hand, 0)
-          v4.update_attribute(:count_on_hand, 1)
-          v5.update_attribute(:count_on_hand, 0)
-          v6.update_attribute(:count_on_hand, 1)
-          v6.update_attribute(:deleted_at, Time.now)
-          exchange = Exchange.find(oc1.exchanges.to_enterprises(distributor).outgoing.first.id) 
-          exchange.update_attribute :pickup_time, "frogs" 
-          exchange.variants << p1.master
-          exchange.variants << p2.master
-          exchange.variants << p3.master
-          exchange.variants << p6.master
-          exchange.variants << v1
-          exchange.variants << v2
-          exchange.variants << v3
-          # v4 is in stock but not in distribution
-          # v5 is out of stock and in the distribution
-          # Neither should display, nor should their product, p5
-          exchange.variants << v5
-          exchange.variants << v6
-
-          controller.stub(:current_order).and_return order
-          visit shop_path
-        end
-
-        it "filters products based on availability" do
-          # It shows on hand products
-          page.should have_content p1.name
-          page.should have_content p4.name
-
-          # It shows on demand products
-          page.should have_content p2.name
-
-          # It does not show products that are neither on hand or on demand
-          page.should_not have_content p3.name
-
-          # It shows on demand variants
-          page.should have_content v3.options_text
-
-          # It does not show variants that are neither on hand or on demand
-          page.should_not have_content v2.options_text
-
-          # It does not show products that have no available variants in this distribution
-          page.should_not have_content p5.name
-
-          # It does not show deleted products
-          page.should_not have_content p6.name
-
-          # It does not show deleted variants
-          page.should_not have_content v6.name
-          page.should_not have_content p7.name
-        end
-      end
-
       context "RABL tests" do
         render_views
         before do
@@ -211,6 +127,7 @@ describe ShopController do
           xhr :get, :products
           response.body.should_not have_content product.name
         end
+
         it "strips html from description" do
           product.update_attribute(:description, "<a href='44'>turtles</a> frogs")
           xhr :get, :products
@@ -223,6 +140,13 @@ describe ShopController do
           xhr :get, :products
           response.body.should have_content "998.0"
         end
+
+        it "includes the primary taxon" do
+          taxon = mock_model(Spree::Taxon, name: "fruitbat") 
+          Spree::Product.any_instance.stub(:primary_taxon).and_return taxon
+          xhr :get, :products
+          response.body.should have_content "fruitbat"
+        end
       end
     end
   end
diff --git a/spec/models/spree/product_spec.rb b/spec/models/spree/product_spec.rb
index 6743e404e9..6d90b70761 100644
--- a/spec/models/spree/product_spec.rb
+++ b/spec/models/spree/product_spec.rb
@@ -547,5 +547,15 @@ module Spree
         end
       end
     end
+
+    describe "Taxons" do
+      let(:taxon1) { create(:taxon) }
+      let(:taxon2) { create(:taxon) }
+      let(:product) { create(:simple_product, taxons: [taxon1, taxon2]) }
+
+      it "returns the first taxon as the primary taxon" do
+        product.primary_taxon.should == taxon1
+      end
+    end
   end
 end

From c9fea79d19741a4a34ec8c3f9934baeb0033efe7 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 14 May 2014 16:22:25 +1000
Subject: [PATCH 006/139] Printing the primary taxon name

---
 app/views/shop/products/_summary.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/shop/products/_summary.html.haml b/app/views/shop/products/_summary.html.haml
index a5fac46a7e..500a0577a0 100644
--- a/app/views/shop/products/_summary.html.haml
+++ b/app/views/shop/products/_summary.html.haml
@@ -1,7 +1,7 @@
 .row{bindonce: true}
   .small-1.column
     %img{"bo-src" => "product.master.images[0].small_url"}
-    %img{name: "taxon icon here"}
+    {{ product.primary_taxon.name }}
   .small-5.columns
     = render partial: "shop/products/modal"
 

From adb134743fa81c8e023fc4990e4838ab6c1da2d0 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 15 May 2014 12:20:42 +1000
Subject: [PATCH 007/139] Adding producer modals to home

---
 app/views/home/_fat.html.haml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/home/_fat.html.haml b/app/views/home/_fat.html.haml
index 7d5dfb3b80..823e96a37e 100644
--- a/app/views/home/_fat.html.haml
+++ b/app/views/home/_fat.html.haml
@@ -10,8 +10,10 @@
       %li.delivery{"bo-if" => "hub.delivery"} Delivery
   .columns.small-4
     %strong Our producers
-    %p
-      Go to our shop to see our current producers
+    %ul
+      %li{"ng-repeat" => "producer in hub.producers"}
+        %ofn-modal{title: "{{ producer.name }}"}
+          {{ producer || json }}
 
 .row.active_table_row.link{"ng-show" => "open()", "ng-if" => "hub.active"}
   .columns.small-11

From 3ac9c3e00d1932e35e6fe3bf45137a2a3df2a543 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 15 May 2014 14:01:31 +1000
Subject: [PATCH 008/139] Basics of producer modal in place

---
 app/views/home/_fat.html.haml        |  3 +--
 app/views/json/_hubs.rabl            |  6 +++++-
 app/views/modals/_producer.html.haml | 13 +++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 app/views/modals/_producer.html.haml

diff --git a/app/views/home/_fat.html.haml b/app/views/home/_fat.html.haml
index 823e96a37e..67c83b73cb 100644
--- a/app/views/home/_fat.html.haml
+++ b/app/views/home/_fat.html.haml
@@ -12,8 +12,7 @@
     %strong Our producers
     %ul
       %li{"ng-repeat" => "producer in hub.producers"}
-        %ofn-modal{title: "{{ producer.name }}"}
-          {{ producer || json }}
+        = render partial: "modals/producer"
 
 .row.active_table_row.link{"ng-show" => "open()", "ng-if" => "hub.active"}
   .columns.small-11
diff --git a/app/views/json/_hubs.rabl b/app/views/json/_hubs.rabl
index a6958840bc..60cad8fbbf 100644
--- a/app/views/json/_hubs.rabl
+++ b/app/views/json/_hubs.rabl
@@ -6,7 +6,11 @@ child distributed_taxons: :taxons do
 end
 
 child suppliers: :producers do
-  attributes :name, :id
+  attributes :name, :id, :description, :long_description
+  
+  node :promo_image do |producer| 
+    producer.promo_image.url 
+  end
 end
 
 node :pickup do |hub|
diff --git a/app/views/modals/_producer.html.haml b/app/views/modals/_producer.html.haml
new file mode 100644
index 0000000000..691e9378d3
--- /dev/null
+++ b/app/views/modals/_producer.html.haml
@@ -0,0 +1,13 @@
+%ofn-modal{title: "{{ producer.name }}"}
+  #producer_modal{bindonce: true}
+    .row
+      .small-12.columns
+        %img{"bo-src" => "producer.promo_image"} 
+        %h3 {{ producer.name }}
+
+    .row
+      .small-6.columns
+        %p
+          {{ producer.description }}
+      .small-6.columns
+        Stay in touch with {{ producer.name }}

From 91fe8e18d30332f88b742630fcca263682284f21 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 15 May 2014 15:38:10 +1000
Subject: [PATCH 009/139] Taxon sorting

---
 .../darkswarm/controllers/products_controller.js.coffee    | 1 +
 app/views/json/_producers.rabl                             | 2 +-
 app/views/json/_taxon.rabl                                 | 5 +++++
 app/views/shop/products.rabl                               | 2 +-
 app/views/shop/products/_form.html.haml                    | 3 ++-
 app/views/shop/products/_summary.html.haml                 | 7 +++----
 6 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 app/views/json/_taxon.rabl

diff --git a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
index 735a80257b..09df18ca38 100644
--- a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
@@ -1,6 +1,7 @@
 Darkswarm.controller "ProductsCtrl", ($scope, $rootScope, Product, OrderCycle) ->
   $scope.data = Product.data
   $scope.limit = 3
+  $scope.ordering = {order: "name"}
   $scope.order_cycle = OrderCycle.order_cycle
 
   $scope.incrementLimit = ->
diff --git a/app/views/json/_producers.rabl b/app/views/json/_producers.rabl
index 717347e5de..95a133a182 100644
--- a/app/views/json/_producers.rabl
+++ b/app/views/json/_producers.rabl
@@ -2,7 +2,7 @@ collection @producers
 extends 'json/enterprises'
 
 child supplied_taxons: :taxons do
-  attributes :name, :id
+  extends 'json/taxon'
 end
 
 child distributors: :distributors do
diff --git a/app/views/json/_taxon.rabl b/app/views/json/_taxon.rabl
new file mode 100644
index 0000000000..916abeff78
--- /dev/null
+++ b/app/views/json/_taxon.rabl
@@ -0,0 +1,5 @@
+attributes :name, :id, :permalink
+
+node :icon do |taxon|
+  taxon.icon.url
+end
diff --git a/app/views/shop/products.rabl b/app/views/shop/products.rabl
index 4f0eb0ce90..c79157dae5 100644
--- a/app/views/shop/products.rabl
+++ b/app/views/shop/products.rabl
@@ -14,7 +14,7 @@ child :supplier => :supplier do
 end
 
 child :primary_taxon => :primary_taxon do
-  attributes :id, :permalink, :name
+  extends 'json/taxon'
 end
 
 child :master => :master do
diff --git a/app/views/shop/products/_form.html.haml b/app/views/shop/products/_form.html.haml
index 15e7ff6bd7..b13c4cb0a9 100644
--- a/app/views/shop/products/_form.html.haml
+++ b/app/views/shop/products/_form.html.haml
@@ -13,7 +13,8 @@
       .small-12.columns
         .product_table{bindonce: true}
           %product.row{"ng-controller" => "ProductNodeCtrl",
-            "ng-repeat" => "product in data.products | filter:query | limitTo: limit track by product.id"}
+            "ng-repeat" => "product in data.products | filter:query | orderBy:order | limitTo: limit track by product.id"}
+
             = render partial: "shop/products/summary"
             
             %div{"bo-if" => "hasVariants"}
diff --git a/app/views/shop/products/_summary.html.haml b/app/views/shop/products/_summary.html.haml
index 500a0577a0..a6e4e26497 100644
--- a/app/views/shop/products/_summary.html.haml
+++ b/app/views/shop/products/_summary.html.haml
@@ -1,13 +1,12 @@
-.row{bindonce: true}
+.row
   .small-1.column
     %img{"bo-src" => "product.master.images[0].small_url"}
-    {{ product.primary_taxon.name }}
+    %img{"bo-src" => "product.primary_taxon.icon", "ng-click" => "ordering.order = 'primary_taxon'"}
+
   .small-5.columns
     = render partial: "shop/products/modal"
-
   .small-4.columns
     {{ product.supplier.name }}
   .small-1.columns
     %span{"ng-if" => "hasVariants"} from
     {{ price() | currency }}
-

From 7c213a061b96929c78667b667a5bd26f3526cb52 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 15 May 2014 16:10:54 +1000
Subject: [PATCH 010/139] Getting working taxon sorting and icon rendering in

---
 app/views/shop/products/_form.html.haml    | 4 +---
 app/views/shop/products/_summary.html.haml | 4 +++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/shop/products/_form.html.haml b/app/views/shop/products/_form.html.haml
index b13c4cb0a9..3a7cea9e63 100644
--- a/app/views/shop/products/_form.html.haml
+++ b/app/views/shop/products/_form.html.haml
@@ -13,7 +13,7 @@
       .small-12.columns
         .product_table{bindonce: true}
           %product.row{"ng-controller" => "ProductNodeCtrl",
-            "ng-repeat" => "product in data.products | filter:query | orderBy:order | limitTo: limit track by product.id"}
+            "ng-repeat" => "product in data.products | filter:query | orderBy:ordering.order | limitTo: limit track by product.id"}
 
             = render partial: "shop/products/summary"
             
@@ -24,5 +24,3 @@
               = render partial: "shop/products/master"
 
     %input.button.right{type: :submit, value: "Add to Cart"}
-
-
diff --git a/app/views/shop/products/_summary.html.haml b/app/views/shop/products/_summary.html.haml
index a6e4e26497..50f81093d1 100644
--- a/app/views/shop/products/_summary.html.haml
+++ b/app/views/shop/products/_summary.html.haml
@@ -1,7 +1,9 @@
 .row
   .small-1.column
     %img{"bo-src" => "product.master.images[0].small_url"}
-    %img{"bo-src" => "product.primary_taxon.icon", "ng-click" => "ordering.order = 'primary_taxon'"}
+    %img{"bo-src" => "product.primary_taxon.icon", 
+    "ng-click" => "ordering.order = 'primary_taxon.name'",
+    name: "{{product.primary_taxon.name}}"}
 
   .small-5.columns
     = render partial: "shop/products/modal"

From 3e22e55b61d7025274b7c5c6925bd8c08888530d Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 15 May 2014 16:17:12 +1000
Subject: [PATCH 011/139] Printing taxon icons on home

---
 app/views/home/_fat.html.haml | 3 ++-
 app/views/json/_hubs.rabl     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/home/_fat.html.haml b/app/views/home/_fat.html.haml
index 67c83b73cb..9382844265 100644
--- a/app/views/home/_fat.html.haml
+++ b/app/views/home/_fat.html.haml
@@ -2,7 +2,8 @@
   .columns.small-4
     %strong Shop for
     %p.trans-sentence
-      {{ hub.taxons | printArrayOfObjects }}
+      %img{"ng-repeat" => "taxon in hub.taxons", "bo-src" => "taxon.icon",
+      name: "{{taxon.name}}", alt: "{{taxon.name}}"}
   .columns.small-4
     %strong Delivery options
     %ol
diff --git a/app/views/json/_hubs.rabl b/app/views/json/_hubs.rabl
index 60cad8fbbf..ca57a73aea 100644
--- a/app/views/json/_hubs.rabl
+++ b/app/views/json/_hubs.rabl
@@ -2,7 +2,7 @@ collection Enterprise.visible.is_distributor
 extends 'json/enterprises'
 
 child distributed_taxons: :taxons do
-  attributes :name, :id
+  extends "json/taxon"
 end
 
 child suppliers: :producers do

From eab9c28d2e462c45e3db36740f09164acd027448 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Fri, 16 May 2014 14:00:33 +1000
Subject: [PATCH 012/139] Adding groups to this branch, also tidying up the
 shop stuff for Laura

---
 app/assets/javascripts/groups.js.coffee     |  3 +++
 app/assets/stylesheets/groups.css.scss      |  3 +++
 app/controllers/groups_controller.rb        |  5 +++++
 app/helpers/groups_helper.rb                |  2 ++
 app/views/groups/index.html.haml            |  0
 app/views/shop/products/_form.html.haml     |  4 ++--
 app/views/shop/products/_master.html.haml   |  8 ++------
 app/views/shop/products/_summary.html.haml  | 11 +++++++----
 app/views/shop/products/_variants.html.haml |  8 +++-----
 spec/controllers/groups_controller_spec.rb  |  9 +++++++++
 spec/helpers/groups_helper_spec.rb          | 15 +++++++++++++++
 11 files changed, 51 insertions(+), 17 deletions(-)
 create mode 100644 app/assets/javascripts/groups.js.coffee
 create mode 100644 app/assets/stylesheets/groups.css.scss
 create mode 100644 app/controllers/groups_controller.rb
 create mode 100644 app/helpers/groups_helper.rb
 create mode 100644 app/views/groups/index.html.haml
 create mode 100644 spec/controllers/groups_controller_spec.rb
 create mode 100644 spec/helpers/groups_helper_spec.rb

diff --git a/app/assets/javascripts/groups.js.coffee b/app/assets/javascripts/groups.js.coffee
new file mode 100644
index 0000000000..761567942f
--- /dev/null
+++ b/app/assets/javascripts/groups.js.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/app/assets/stylesheets/groups.css.scss b/app/assets/stylesheets/groups.css.scss
new file mode 100644
index 0000000000..c2a5f9013b
--- /dev/null
+++ b/app/assets/stylesheets/groups.css.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the groups controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
new file mode 100644
index 0000000000..1d6932b0d5
--- /dev/null
+++ b/app/controllers/groups_controller.rb
@@ -0,0 +1,5 @@
+class GroupsController < ApplicationController
+  def index
+    @groups = EnterpriseGroup.on_front_page.by_position
+  end
+end
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb
new file mode 100644
index 0000000000..c091b2fc82
--- /dev/null
+++ b/app/helpers/groups_helper.rb
@@ -0,0 +1,2 @@
+module GroupsHelper
+end
diff --git a/app/views/groups/index.html.haml b/app/views/groups/index.html.haml
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/app/views/shop/products/_form.html.haml b/app/views/shop/products/_form.html.haml
index 3a7cea9e63..076857fa89 100644
--- a/app/views/shop/products/_form.html.haml
+++ b/app/views/shop/products/_form.html.haml
@@ -12,7 +12,7 @@
     .row
       .small-12.columns
         .product_table{bindonce: true}
-          %product.row{"ng-controller" => "ProductNodeCtrl",
+          %product{"ng-controller" => "ProductNodeCtrl",
             "ng-repeat" => "product in data.products | filter:query | orderBy:ordering.order | limitTo: limit track by product.id"}
 
             = render partial: "shop/products/summary"
@@ -20,7 +20,7 @@
             %div{"bo-if" => "hasVariants"}
               = render partial: "shop/products/variants"
 
-            .row{"bo-if" => "!hasVariants"}
+            .row.variant{"bo-if" => "!hasVariants"}
               = render partial: "shop/products/master"
 
     %input.button.right{type: :submit, value: "Add to Cart"}
diff --git a/app/views/shop/products/_master.html.haml b/app/views/shop/products/_master.html.haml
index c335103d4e..7398912bda 100644
--- a/app/views/shop/products/_master.html.haml
+++ b/app/views/shop/products/_master.html.haml
@@ -2,11 +2,9 @@
   %span.bulk{"bo-if" => "product.group_buy"} bulk
   &nbsp;
 
-.small-5.columns
-  {{ product.name }}
+.small-4.columns
   ({{ product.master.options_text }})
 
-
 -# WITHOUT GROUP BUY
 .small-5.columns{"bo-if" => "!product.group_buy"}
   %input{type: :number, 
@@ -16,7 +14,6 @@
   name: "variants[{{product.master.id}}]", 
   id: "variants_{{product.master.id}}",
   "ng-model" => "product.quantity"}
-  {{ product.master.options_text }} 
 
 -# WITH GROUP BUY
 .small-2.columns{"bo-if" => "product.group_buy"}
@@ -27,7 +24,6 @@
   name: "variants[{{product.master.id}}]", 
   id: "variants_{{product.master.id}}",
   "ng-model" => "product.quantity"}
-  {{ product.master.options_text }} 
   (min)
 
 .small-3.columns{"bo-if" => "product.group_buy"}
@@ -39,5 +35,5 @@
   "ng-model" => "product.max_quantity"}
   (max)
 
-.small-1.column
+.small-2.columns.text-right
   {{ product.price | currency }}
diff --git a/app/views/shop/products/_summary.html.haml b/app/views/shop/products/_summary.html.haml
index 50f81093d1..ae0e759df6 100644
--- a/app/views/shop/products/_summary.html.haml
+++ b/app/views/shop/products/_summary.html.haml
@@ -1,14 +1,17 @@
-.row
+.row.summary
   .small-1.column
     %img{"bo-src" => "product.master.images[0].small_url"}
+
+  .small-4.columns
     %img{"bo-src" => "product.primary_taxon.icon", 
     "ng-click" => "ordering.order = 'primary_taxon.name'",
     name: "{{product.primary_taxon.name}}"}
+    {{ product.name}}
+    -#= render partial: "shop/products/modal"
 
   .small-5.columns
-    = render partial: "shop/products/modal"
-  .small-4.columns
     {{ product.supplier.name }}
-  .small-1.columns
+
+  .small-2.columns.text-right
     %span{"ng-if" => "hasVariants"} from
     {{ price() | currency }}
diff --git a/app/views/shop/products/_variants.html.haml b/app/views/shop/products/_variants.html.haml
index c915a55361..01041bd1ca 100644
--- a/app/views/shop/products/_variants.html.haml
+++ b/app/views/shop/products/_variants.html.haml
@@ -1,12 +1,12 @@
 .row{bindonce: true,
   "ng-repeat" => "variant in product.variants"}
+
   .small-1.column
     %span.bulk{"bo-if" => "product.group_buy"} bulk
     &nbsp;
 
-  .small-5.columns
+  .small-4.columns
     {{ variant.options_text }}
-    {{ variant.id }}
 
   -# WITHOUT GROUP BUY
   .small-5.columns{"bo-if" => "!product.group_buy"}
@@ -17,7 +17,6 @@
     max: "{{variant.on_demand && 9999 || variant.count_on_hand }}",
     name: "variants[{{variant.id}}]", id: "variants_{{variant.id}}",
     "bo-model" => "variant.quantity"}
-    {{ variant.options_text }}
 
   -# WITH GROUP BUY
   .small-2.columns{"bo-if" => "product.group_buy"}
@@ -28,7 +27,6 @@
     max: "{{variant.on_demand && 9999 || variant.count_on_hand }}",
     name: "variants[{{variant.id}}]", id: "variants_{{variant.id}}",
     "bo-model" => "variant.quantity"}
-    {{ variant.options_text }}
     (min)
 
   .small-3.columns{"bo-if" => "product.group_buy"}
@@ -40,5 +38,5 @@
     "ng-model" => "variant.max_quantity"}
     (max)
 
-  .small-1.columns
+  .small-2.columns.text-right
     {{ variant.price | currency }}
diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb
new file mode 100644
index 0000000000..4005d82a2a
--- /dev/null
+++ b/spec/controllers/groups_controller_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe GroupsController do
+  it "gets all visible groups" do
+    EnterpriseGroup.stub_chain :on_front_page, :by_position
+    EnterpriseGroup.should_receive :on_front_page
+    get :index
+  end
+end
diff --git a/spec/helpers/groups_helper_spec.rb b/spec/helpers/groups_helper_spec.rb
new file mode 100644
index 0000000000..08a4335bae
--- /dev/null
+++ b/spec/helpers/groups_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+# Specs in this file have access to a helper object that includes
+# the GroupsHelper. For example:
+#
+# describe GroupsHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+describe GroupsHelper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From 1dd9f6326b5b9904198cf21673a1770b774ae166 Mon Sep 17 00:00:00 2001
From: summerscope <summerscope@gmail.com>
Date: Fri, 16 May 2014 15:59:53 +1000
Subject: [PATCH 013/139] Tweaking the markup and styling for shop page.

---
 .../stylesheets/darkswarm/shop.css.sass       | 33 +++++++++++++--
 app/views/shop/products/_form.html.haml       | 41 ++++++++++---------
 app/views/shop/products/_summary.html.haml    | 11 ++---
 app/views/shop/products/_variants.html.haml   |  2 +-
 app/views/shop/show.html.haml                 |  2 +-
 5 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/app/assets/stylesheets/darkswarm/shop.css.sass b/app/assets/stylesheets/darkswarm/shop.css.sass
index 03ba40eba1..f9f2f37818 100644
--- a/app/assets/stylesheets/darkswarm/shop.css.sass
+++ b/app/assets/stylesheets/darkswarm/shop.css.sass
@@ -1,8 +1,7 @@
 @import mixins
 @import variables
+@import branding
 
-product
-  display: block 
 
 .darkswarm
   #search
@@ -77,8 +76,36 @@ product
 
   products
     display: block
-    padding-top: 2.3em 
+    padding-top: 2.3em
     @media all and (max-width: 768px)
       padding-top: 1em
       input.button.right
         float: left
+    
+    product
+      border: 1px solid #ff0000
+      display: block 
+      margin-bottom: 1em !important
+
+      .row.summary, .row.variants
+        margin-left: 0
+        margin-right: 0
+
+      .row.summary
+        background: #ccc
+
+      .summary-header
+        &, & *
+          @include avenir
+          color: $clr-brick
+
+      .summary-price
+        &, & *
+          @include avenir
+      
+      
+
+
+
+
+
diff --git a/app/views/shop/products/_form.html.haml b/app/views/shop/products/_form.html.haml
index 076857fa89..07dd7c8e1a 100644
--- a/app/views/shop/products/_form.html.haml
+++ b/app/views/shop/products/_form.html.haml
@@ -1,26 +1,29 @@
-%products{"ng-controller" => "ProductsCtrl", "ng-show" => "order_cycle.order_cycle_id != null",
+%products.small-12.columns{"ng-controller" => "ProductsCtrl", "ng-show" => "order_cycle.order_cycle_id != null",
 "infinite-scroll" => "incrementLimit()", "infinite-scroll-distance" => "1"}
 
   = form_for :order, :url => populate_orders_path, html: {:class => "custom"} do
 
-    %input#search.text{"ng-model" => "query", 
-    placeholder: "Search",
-    "ng-debounce" => "150",
-    "ofn-disable-enter" => true}
-    %input.button.right{type: :submit, value: "Add to Cart"}
+    .row
+      .small-6.columns
+        %input#search.text{"ng-model" => "query", 
+        placeholder: "Search",
+        "ng-debounce" => "150",
+        "ofn-disable-enter" => true}
+      .small-6.columns
+        %input.button.right{type: :submit, value: "Add to Cart"}
+    
+    %div{bindonce: true}
+      %product{"ng-controller" => "ProductNodeCtrl",
+        "ng-repeat" => "product in data.products | filter:query | orderBy:ordering.order | limitTo: limit track by product.id"}
+        %div
+          = render partial: "shop/products/summary"
+        
+          %div{"bo-if" => "hasVariants"}
+            = render partial: "shop/products/variants"
 
+        .variant.row{"bo-if" => "!hasVariants"}
+          = render partial: "shop/products/master"
+    
     .row
       .small-12.columns
-        .product_table{bindonce: true}
-          %product{"ng-controller" => "ProductNodeCtrl",
-            "ng-repeat" => "product in data.products | filter:query | orderBy:ordering.order | limitTo: limit track by product.id"}
-
-            = render partial: "shop/products/summary"
-            
-            %div{"bo-if" => "hasVariants"}
-              = render partial: "shop/products/variants"
-
-            .row.variant{"bo-if" => "!hasVariants"}
-              = render partial: "shop/products/master"
-
-    %input.button.right{type: :submit, value: "Add to Cart"}
+        %input.button.right{type: :submit, value: "Add to Cart"}
diff --git a/app/views/shop/products/_summary.html.haml b/app/views/shop/products/_summary.html.haml
index ae0e759df6..ebf2a8104c 100644
--- a/app/views/shop/products/_summary.html.haml
+++ b/app/views/shop/products/_summary.html.haml
@@ -2,16 +2,17 @@
   .small-1.column
     %img{"bo-src" => "product.master.images[0].small_url"}
 
-  .small-4.columns
+  .small-4.columns.summary-header
     %img{"bo-src" => "product.primary_taxon.icon", 
     "ng-click" => "ordering.order = 'primary_taxon.name'",
     name: "{{product.primary_taxon.name}}"}
     {{ product.name}}
     -#= render partial: "shop/products/modal"
 
-  .small-5.columns
+  .small-5.columns.summary-header
     {{ product.supplier.name }}
 
-  .small-2.columns.text-right
-    %span{"ng-if" => "hasVariants"} from
-    {{ price() | currency }}
+  .small-2.columns.summary-price.text-right
+    %span{"ng-if" => "hasVariants"} 
+      %em from
+      {{ price() | currency }}
diff --git a/app/views/shop/products/_variants.html.haml b/app/views/shop/products/_variants.html.haml
index 01041bd1ca..40a4371337 100644
--- a/app/views/shop/products/_variants.html.haml
+++ b/app/views/shop/products/_variants.html.haml
@@ -1,4 +1,4 @@
-.row{bindonce: true,
+.row.variants{bindonce: true,
   "ng-repeat" => "variant in product.variants"}
 
   .small-1.column
diff --git a/app/views/shop/show.html.haml b/app/views/shop/show.html.haml
index b833f76916..ba9493e46b 100644
--- a/app/views/shop/show.html.haml
+++ b/app/views/shop/show.html.haml
@@ -13,5 +13,5 @@
 
   = render partial: "shopping_shared/details"
 
-  %products.row
+  .row
     = render partial: "shop/products/form"

From 4e4667c33df5bfdb3fccb68fef7072168533184a Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Fri, 16 May 2014 11:26:40 +1000
Subject: [PATCH 014/139] Adding groups

---
 config/routes.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/routes.rb b/config/routes.rb
index e4868d777c..69a3c99d56 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -7,6 +7,7 @@ Openfoodnetwork::Application.routes.draw do
     get :order_cycle
   end
 
+  resources :groups
   resources :producers
 
   get '/checkout', :to => 'checkout#edit' , :as => :checkout

From 09586024180b18ff62f43b03754176bcc69a928b Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Fri, 16 May 2014 15:43:26 +1000
Subject: [PATCH 015/139] Starting on migrations and admin forms

---
 .../controllers/groups_controller.js.coffee   |  3 +++
 .../darkswarm/services/groups.js.coffee       |  4 ++++
 app/assets/javascripts/groups.js.coffee       |  3 ---
 app/controllers/groups_controller.rb          |  4 +++-
 app/models/enterprise_group.rb                |  9 +++++++++
 app/views/groups/index.html.haml              | 19 +++++++++++++++++++
 app/views/json/_groups.rabl                   |  2 ++
 ...achment_promo_image_to_enterprise_group.rb | 15 +++++++++++++++
 .../20140516044750_add_fields_to_groups.rb    |  6 ++++++
 ...add_attachment_logo_to_enterprise_group.rb | 15 +++++++++++++++
 db/schema.rb                                  | 18 ++++++++++++++----
 spec/factories.rb                             |  1 +
 spec/features/admin/enterprise_groups_spec.rb |  5 ++++-
 spec/models/enterprise_group_spec.rb          |  7 +++++++
 14 files changed, 102 insertions(+), 9 deletions(-)
 create mode 100644 app/assets/javascripts/darkswarm/controllers/groups_controller.js.coffee
 create mode 100644 app/assets/javascripts/darkswarm/services/groups.js.coffee
 delete mode 100644 app/assets/javascripts/groups.js.coffee
 create mode 100644 app/views/json/_groups.rabl
 create mode 100644 db/migrate/20140516042552_add_attachment_promo_image_to_enterprise_group.rb
 create mode 100644 db/migrate/20140516044750_add_fields_to_groups.rb
 create mode 100644 db/migrate/20140516045323_add_attachment_logo_to_enterprise_group.rb

diff --git a/app/assets/javascripts/darkswarm/controllers/groups_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/groups_controller.js.coffee
new file mode 100644
index 0000000000..8fd47c49f8
--- /dev/null
+++ b/app/assets/javascripts/darkswarm/controllers/groups_controller.js.coffee
@@ -0,0 +1,3 @@
+Darkswarm.controller "GroupsCtrl", ($scope, Groups) ->
+  $scope.Groups = Groups
+  $scope.order = 'position'
diff --git a/app/assets/javascripts/darkswarm/services/groups.js.coffee b/app/assets/javascripts/darkswarm/services/groups.js.coffee
new file mode 100644
index 0000000000..e5e50615e8
--- /dev/null
+++ b/app/assets/javascripts/darkswarm/services/groups.js.coffee
@@ -0,0 +1,4 @@
+Darkswarm.factory 'Groups', (groups) ->
+  new class Groups
+    constructor: ->
+      @groups = groups
diff --git a/app/assets/javascripts/groups.js.coffee b/app/assets/javascripts/groups.js.coffee
deleted file mode 100644
index 761567942f..0000000000
--- a/app/assets/javascripts/groups.js.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 1d6932b0d5..84290f20a3 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -1,4 +1,6 @@
-class GroupsController < ApplicationController
+class GroupsController < BaseController
+  layout 'darkswarm'
+
   def index
     @groups = EnterpriseGroup.on_front_page.by_position
   end
diff --git a/app/models/enterprise_group.rb b/app/models/enterprise_group.rb
index 41d2a997cc..0638577850 100644
--- a/app/models/enterprise_group.rb
+++ b/app/models/enterprise_group.rb
@@ -4,6 +4,15 @@ class EnterpriseGroup < ActiveRecord::Base
   has_and_belongs_to_many :enterprises
 
   validates :name, presence: true
+  #validates :description, presence: true
+
+  attr_accessible :promo_image
+  has_attached_file :promo_image, styles: {medium: "1200x1200>"}
+  validates_attachment_content_type :promo_image, :content_type => /\Aimage\/.*\Z/
+
+  attr_accessible :logo
+  has_attached_file :logo, styles: {medium: "100x100"}
+  validates_attachment_content_type :logo, :content_type => /\Aimage\/.*\Z/
 
   scope :by_position, order('position ASC')
   scope :on_front_page, where(on_front_page: true)
diff --git a/app/views/groups/index.html.haml b/app/views/groups/index.html.haml
index e69de29bb2..c08bff367c 100644
--- a/app/views/groups/index.html.haml
+++ b/app/views/groups/index.html.haml
@@ -0,0 +1,19 @@
+#groups{"ng-controller" => "GroupsCtrl"}
+  :javascript
+    angular.module('Darkswarm').value('groups', #{render partial: "json/groups", object: @groups})
+  .row
+    .small-12.columns.text-center
+      %h1 Groups / Regions
+      %h3 Check out our food groups below
+
+      %input{type: :text, 
+      "ng-model" => "query", 
+      placeholder: "Search group name",
+      "ng-debounce" => "150",
+      "ofn-disable-enter" => true}
+
+  .row{bindonce: true}
+    .small.12.columns
+      .group_table
+        .group{"ng-repeat" => "group in Groups.groups | filter:query | orderBy:order"}
+          {{ group.name }}
diff --git a/app/views/json/_groups.rabl b/app/views/json/_groups.rabl
new file mode 100644
index 0000000000..3029006c76
--- /dev/null
+++ b/app/views/json/_groups.rabl
@@ -0,0 +1,2 @@
+collection @groups
+attributes :id, :name, :position
diff --git a/db/migrate/20140516042552_add_attachment_promo_image_to_enterprise_group.rb b/db/migrate/20140516042552_add_attachment_promo_image_to_enterprise_group.rb
new file mode 100644
index 0000000000..bd67cb92f0
--- /dev/null
+++ b/db/migrate/20140516042552_add_attachment_promo_image_to_enterprise_group.rb
@@ -0,0 +1,15 @@
+class AddAttachmentPromoImageToEnterpriseGroup < ActiveRecord::Migration
+  def self.up
+    add_column :enterprise_groups, :promo_image_file_name, :string
+    add_column :enterprise_groups, :promo_image_content_type, :string
+    add_column :enterprise_groups, :promo_image_file_size, :integer
+    add_column :enterprise_groups, :promo_image_updated_at, :datetime
+  end
+
+  def self.down
+    remove_column :enterprise_groups, :promo_image_file_name
+    remove_column :enterprise_groups, :promo_image_content_type
+    remove_column :enterprise_groups, :promo_image_file_size
+    remove_column :enterprise_groups, :promo_image_updated_at
+  end
+end
diff --git a/db/migrate/20140516044750_add_fields_to_groups.rb b/db/migrate/20140516044750_add_fields_to_groups.rb
new file mode 100644
index 0000000000..a50ef1db14
--- /dev/null
+++ b/db/migrate/20140516044750_add_fields_to_groups.rb
@@ -0,0 +1,6 @@
+class AddFieldsToGroups < ActiveRecord::Migration
+  def change
+    add_column :enterprise_groups, :description, :text
+    add_column :enterprise_groups, :long_description, :text
+  end
+end
diff --git a/db/migrate/20140516045323_add_attachment_logo_to_enterprise_group.rb b/db/migrate/20140516045323_add_attachment_logo_to_enterprise_group.rb
new file mode 100644
index 0000000000..525bccb63e
--- /dev/null
+++ b/db/migrate/20140516045323_add_attachment_logo_to_enterprise_group.rb
@@ -0,0 +1,15 @@
+class AddAttachmentLogoToEnterpriseGroup < ActiveRecord::Migration
+  def self.up
+    add_column :enterprise_groups, :logo_file_name, :string
+    add_column :enterprise_groups, :logo_content_type, :string
+    add_column :enterprise_groups, :logo_file_size, :integer
+    add_column :enterprise_groups, :logo_updated_at, :datetime
+  end
+
+  def self.down
+    remove_column :enterprise_groups, :logo_file_name
+    remove_column :enterprise_groups, :logo_content_type
+    remove_column :enterprise_groups, :logo_file_size
+    remove_column :enterprise_groups, :logo_updated_at
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index cacc8fc793..5394fcbd61 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140514044959) do
+ActiveRecord::Schema.define(:version => 20140516045323) do
 
   create_table "adjustment_metadata", :force => true do |t|
     t.integer "adjustment_id"
@@ -182,9 +182,19 @@ ActiveRecord::Schema.define(:version => 20140514044959) do
   add_index "enterprise_fees", ["enterprise_id"], :name => "index_enterprise_fees_on_enterprise_id"
 
   create_table "enterprise_groups", :force => true do |t|
-    t.string  "name"
-    t.boolean "on_front_page"
-    t.integer "position"
+    t.string   "name"
+    t.boolean  "on_front_page"
+    t.integer  "position"
+    t.string   "promo_image_file_name"
+    t.string   "promo_image_content_type"
+    t.integer  "promo_image_file_size"
+    t.datetime "promo_image_updated_at"
+    t.text     "description"
+    t.text     "long_description"
+    t.string   "logo_file_name"
+    t.string   "logo_content_type"
+    t.integer  "logo_file_size"
+    t.datetime "logo_updated_at"
   end
 
   create_table "enterprise_groups_enterprises", :id => false, :force => true do |t|
diff --git a/spec/factories.rb b/spec/factories.rb
index 710ba1c8ba..13c0bd0e8e 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -98,6 +98,7 @@ FactoryGirl.define do
 
   factory :enterprise_group, :class => EnterpriseGroup do
     name 'Enterprise group'
+    description 'this is a group'
     on_front_page false
   end
 
diff --git a/spec/features/admin/enterprise_groups_spec.rb b/spec/features/admin/enterprise_groups_spec.rb
index 012179e75a..f0ab8564b1 100644
--- a/spec/features/admin/enterprise_groups_spec.rb
+++ b/spec/features/admin/enterprise_groups_spec.rb
@@ -33,6 +33,7 @@ feature %q{
     click_link 'New Enterprise Group'
 
     fill_in 'enterprise_group_name', with: 'EGEGEG'
+    fill_in 'enterprise_group_description', with: 'This is a description'
     check 'enterprise_group_on_front_page'
     select e1.name, from: 'enterprise_group_enterprise_ids'
     select e2.name, from: 'enterprise_group_enterprise_ids'
@@ -42,6 +43,7 @@ feature %q{
 
     eg = EnterpriseGroup.last
     eg.name.should == 'EGEGEG'
+    eg.description.should == 'This is a description'
     eg.on_front_page.should be_true
     eg.enterprises.sort.should == [e1, e2].sort
   end
@@ -60,6 +62,7 @@ feature %q{
     page.should have_select 'enterprise_group_enterprise_ids', selected: [e1.name, e2.name]
 
     fill_in 'enterprise_group_name', with: 'xyzzy'
+    fill_in 'enterprise_group_description', with: 'This is a description'
     uncheck 'enterprise_group_on_front_page'
     unselect e1.name, from: 'enterprise_group_enterprise_ids'
     select e2.name, from: 'enterprise_group_enterprise_ids'
@@ -69,6 +72,7 @@ feature %q{
 
     eg = EnterpriseGroup.last
     eg.name.should == 'xyzzy'
+    eg.description.should == 'This is a description'
     eg.on_front_page.should be_false
     eg.enterprises.should == [e2]
   end
@@ -99,7 +103,6 @@ feature %q{
     EnterpriseGroup.all.should_not include eg
   end
 
-
   context "as an enterprise user" do
     xit "should show me only enterprises I manage when creating a new enterprise group"
   end
diff --git a/spec/models/enterprise_group_spec.rb b/spec/models/enterprise_group_spec.rb
index 167a8c2f7b..3e38882064 100644
--- a/spec/models/enterprise_group_spec.rb
+++ b/spec/models/enterprise_group_spec.rb
@@ -11,6 +11,13 @@ describe EnterpriseGroup do
       e = build(:enterprise_group, name: '')
       e.should_not be_valid
     end
+
+    it "requires a description" do
+      e = build(:enterprise_group, description: '')
+    end
+
+    it { should have_attached_file :promo_image }
+    it { should have_attached_file :logo }
   end
 
   describe "relations" do

From 61cf35a5b93ab42b9995cf0b4fe53eec33d474b2 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Fri, 16 May 2014 16:30:37 +1000
Subject: [PATCH 016/139] Adding attr_accessors and paperclip file uploads

---
 .../admin/enterprise_groups_controller.rb     |  2 --
 app/models/enterprise_group.rb                |  6 ++--
 .../admin/enterprise_groups/_form.html.haml   | 29 +++++++++++++++++++
 spec/features/admin/enterprise_groups_spec.rb |  3 +-
 4 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/app/controllers/admin/enterprise_groups_controller.rb b/app/controllers/admin/enterprise_groups_controller.rb
index 466bde2cd5..cc2f3ed1db 100644
--- a/app/controllers/admin/enterprise_groups_controller.rb
+++ b/app/controllers/admin/enterprise_groups_controller.rb
@@ -15,12 +15,10 @@ module Admin
       redirect_to main_app.admin_enterprise_groups_path
     end
 
-
     private
 
     def collection
       EnterpriseGroup.by_position
     end
-
   end
 end
diff --git a/app/models/enterprise_group.rb b/app/models/enterprise_group.rb
index 0638577850..6c163b087a 100644
--- a/app/models/enterprise_group.rb
+++ b/app/models/enterprise_group.rb
@@ -4,10 +4,12 @@ class EnterpriseGroup < ActiveRecord::Base
   has_and_belongs_to_many :enterprises
 
   validates :name, presence: true
-  #validates :description, presence: true
+  validates :description, presence: true
+
+  attr_accessible :name, :description, :long_description, :on_front_page, :enterprise_ids
 
   attr_accessible :promo_image
-  has_attached_file :promo_image, styles: {medium: "1200x1200>"}
+  has_attached_file :promo_image, styles: {medium: "800>400"}
   validates_attachment_content_type :promo_image, :content_type => /\Aimage\/.*\Z/
 
   attr_accessible :logo
diff --git a/app/views/admin/enterprise_groups/_form.html.haml b/app/views/admin/enterprise_groups/_form.html.haml
index b41a68d4a5..ec4934bf19 100644
--- a/app/views/admin/enterprise_groups/_form.html.haml
+++ b/app/views/admin/enterprise_groups/_form.html.haml
@@ -3,6 +3,16 @@
   %br/
   = f.text_field :name
 
+= f.field_container :description do
+  = f.label :description
+  %br/
+  = f.text_field :description
+
+= f.field_container :long_description do
+  = f.label :long_description
+  %br/
+  = f.text_area :long_description
+
 = f.field_container :on_front_page do
   = f.label :on_front_page, 'On front page?'
   %br/
@@ -12,3 +22,22 @@
   = f.label :enterprise_ids, 'Enterprises'
   %br/
   = f.collection_select :enterprise_ids, Enterprise.all, :id, :name, {}, {class: "select2 fullwidth", multiple: true}
+
+
+.row
+  .alpha.three.columns
+    = f.label :logo, class: 'with-tip', 'data-powertip' => 'This is the logo'
+    .with-tip{'data-powertip' => 'This is the logo'}
+      %a What's this?
+  .omega.eight.columns
+    = image_tag @object.logo.url if @object.logo.present?
+    = f.file_field :logo
+
+.row
+  .alpha.three.columns
+    = f.label :promo_image, class: 'with-tip', 'data-powertip' => 'This image is displayed at the top of the Group profile'
+    .with-tip{'data-powertip' => 'This image is displayed at the top of the Group profile'}
+      %a What's this?
+  .omega.eight.columns
+    = image_tag @object.promo_image.url if @object.promo_image.present?
+    = f.file_field :promo_image
diff --git a/spec/features/admin/enterprise_groups_spec.rb b/spec/features/admin/enterprise_groups_spec.rb
index f0ab8564b1..24e89e9be7 100644
--- a/spec/features/admin/enterprise_groups_spec.rb
+++ b/spec/features/admin/enterprise_groups_spec.rb
@@ -62,9 +62,9 @@ feature %q{
     page.should have_select 'enterprise_group_enterprise_ids', selected: [e1.name, e2.name]
 
     fill_in 'enterprise_group_name', with: 'xyzzy'
-    fill_in 'enterprise_group_description', with: 'This is a description'
     uncheck 'enterprise_group_on_front_page'
     unselect e1.name, from: 'enterprise_group_enterprise_ids'
+
     select e2.name, from: 'enterprise_group_enterprise_ids'
     click_button 'Update'
 
@@ -72,7 +72,6 @@ feature %q{
 
     eg = EnterpriseGroup.last
     eg.name.should == 'xyzzy'
-    eg.description.should == 'This is a description'
     eg.on_front_page.should be_false
     eg.enterprises.should == [e2]
   end

From e7f6a9badfd0bb7cc09541cd7724807a060da15a Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 20 May 2014 10:47:09 +1000
Subject: [PATCH 017/139] Adding data to groups page

---
 app/views/groups/index.html.haml             | 14 ++++++++++----
 app/views/json/_enterprises.rabl             |  8 ++++++++
 app/views/json/_groups.rabl                  | 10 +++++++++-
 app/views/json/_hubs.rabl                    |  8 --------
 app/views/shared/menu/_large_menu.html.haml  |  2 +-
 app/views/shared/menu/_mobile_menu.html.haml |  5 +----
 6 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/app/views/groups/index.html.haml b/app/views/groups/index.html.haml
index c08bff367c..552e45fd48 100644
--- a/app/views/groups/index.html.haml
+++ b/app/views/groups/index.html.haml
@@ -12,8 +12,14 @@
       "ng-debounce" => "150",
       "ofn-disable-enter" => true}
 
-  .row{bindonce: true}
+  .row.group_table{bindonce: true}
     .small.12.columns
-      .group_table
-        .group{"ng-repeat" => "group in Groups.groups | filter:query | orderBy:order"}
-          {{ group.name }}
+      .group{"ng-repeat" => "group in Groups.groups | filter:query | orderBy:order"}
+        %h2 {{ group.name }}
+        %p {{ group.description }}
+        %p {{ group.long_description }}
+        %img{"bo-src" => "group.logo"}
+
+        %ul
+          %li{"ng-repeat" => "enterprise in group.enterprises"}
+            %a{"bo-href" => "enterprise.path"} {{ enterprise.name }}
diff --git a/app/views/json/_enterprises.rabl b/app/views/json/_enterprises.rabl
index 97e040eca9..2f2f82c944 100644
--- a/app/views/json/_enterprises.rabl
+++ b/app/views/json/_enterprises.rabl
@@ -4,3 +4,11 @@ attributes :name, :id, :description
 child :address do
   extends "json/partials/address"
 end
+
+node :path do |enterprise|
+  shop_enterprise_path(enterprise) 
+end
+
+node :hash do |enterprise|
+  enterprise.to_param
+end
diff --git a/app/views/json/_groups.rabl b/app/views/json/_groups.rabl
index 3029006c76..9475b425c4 100644
--- a/app/views/json/_groups.rabl
+++ b/app/views/json/_groups.rabl
@@ -1,2 +1,10 @@
 collection @groups
-attributes :id, :name, :position
+attributes :id, :name, :position, :description, :long_description
+
+child enterprises: :enterprises do
+  extends 'json/enterprises'
+end
+
+node :logo do |group|
+  group.logo(:original)
+end
diff --git a/app/views/json/_hubs.rabl b/app/views/json/_hubs.rabl
index ca57a73aea..dc589b878b 100644
--- a/app/views/json/_hubs.rabl
+++ b/app/views/json/_hubs.rabl
@@ -21,14 +21,6 @@ node :delivery do |hub|
   not hub.shipping_methods.where(:require_ship_address => true).empty?
 end
 
-node :path do |hub|
-  shop_enterprise_path(hub) 
-end
-
-node :hash do |hub|
-  hub.to_param
-end
-
 node :active do |hub|
   @active_distributors.include?(hub)
 end
diff --git a/app/views/shared/menu/_large_menu.html.haml b/app/views/shared/menu/_large_menu.html.haml
index 328d46ca85..a5c6180150 100644
--- a/app/views/shared/menu/_large_menu.html.haml
+++ b/app/views/shared/menu/_large_menu.html.haml
@@ -21,7 +21,7 @@
           %span.nav-primary Producers
       %li.divider
       %li
-        %a{href: ""}
+        %a{href: groups_path}
           %span.nav-primary Groups
       %li.divider
       - if spree_current_user.andand.has_spree_role? 'admin'
diff --git a/app/views/shared/menu/_mobile_menu.html.haml b/app/views/shared/menu/_mobile_menu.html.haml
index a33cb85c11..43096c34b6 100644
--- a/app/views/shared/menu/_mobile_menu.html.haml
+++ b/app/views/shared/menu/_mobile_menu.html.haml
@@ -36,17 +36,14 @@
       %li
         %a{href: root_path + "#/#hubs"}
           %span.nav-primary Hubs
-
     %li
       %a{href: ""}
         %span.nav-primary Map
-
     %li
       %a{href: main_app.producers_path}
         %span.nav-primary Producers
-
     %li
-      %a{href: ""}
+      %a{href: groups_path}
         %span.nav-primary Groups
 
     

From 685ba3f63ac0fffecb23042bbc71844ebd43cf0b Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 20 May 2014 12:17:56 +1000
Subject: [PATCH 018/139] Fixing my modal and the tests

---
 .../darkswarm/directives/modal.js.coffee      |  7 ++----
 app/views/modals/_food_hub.html.haml          |  2 +-
 app/views/modals/_learn_more.html.haml        |  2 +-
 app/views/shared/menu/_large_menu.html.haml   |  2 +-
 app/views/shared/menu/_mobile_menu.html.haml  |  2 +-
 app/views/shop/products/_form.html.haml       |  2 +-
 app/views/shop/products/_summary.html.haml    |  2 +-
 app/views/shop/products/_variants.html.haml   |  2 +-
 spec/controllers/shop_controller_spec.rb      |  1 +
 .../consumer/shopping/shopping_spec.rb        | 23 ++++++++-----------
 spec/support/request/shop_workflow.rb         |  8 +++++++
 11 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/directives/modal.js.coffee b/app/assets/javascripts/darkswarm/directives/modal.js.coffee
index 0eed6e93c5..73217b3812 100644
--- a/app/assets/javascripts/darkswarm/directives/modal.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/modal.js.coffee
@@ -2,17 +2,14 @@ Darkswarm.directive "ofnModal", ($modal)->
   restrict: 'E'
   replace: true
   transclude: true
+  scope: {}
   template: "<a>{{title}}</a>"
 
   link: (scope, elem, attrs, ctrl, transclude)->
     scope.title = attrs.title
-
     contents = null
     transclude scope, (clone)->
       contents = clone
 
-    scope.cancel = ->
-      scope.modalInstance.dismiss("cancel")
-
-    elem.on "click", ->
+    elem.on "click", =>
       scope.modalInstance = $modal.open(controller: ctrl, template: contents)
diff --git a/app/views/modals/_food_hub.html.haml b/app/views/modals/_food_hub.html.haml
index e80ffe3745..9b559d26cc 100644
--- a/app/views/modals/_food_hub.html.haml
+++ b/app/views/modals/_food_hub.html.haml
@@ -2,4 +2,4 @@
 %h5 Our food hubs are the point of contact between you and the people who make your food! 
 %p You can search for a convenient hub by location or name. Some hubs have multiple points where you can pick-up your purchases, and some will also provide delivery options. Each food hub is a sales point with independent business operations and logisitics - so variations between hubs are to be expected. 
 %p You can only shop one food hub at a time.
-%a.close-reveal-modal{"ng-click" => "cancel()"} &#215;
\ No newline at end of file
+%a.close-reveal-modal{"ng-click" => "$close()"} &#215;
diff --git a/app/views/modals/_learn_more.html.haml b/app/views/modals/_learn_more.html.haml
index 870d5fe0bc..4cb0534c6e 100644
--- a/app/views/modals/_learn_more.html.haml
+++ b/app/views/modals/_learn_more.html.haml
@@ -6,4 +6,4 @@
 %h5 Learn more
 %p If you want to learn more about the Open Food Network, how it works, and get involved, check out: 
 %a.button.neutral-btn.dark{:href => "http://www.openfoodnetwork.org" , :target => "_blank" } Open Food Network
-%a.close-reveal-modal{"ng-click" => "cancel()"} &#215;
+%a.close-reveal-modal{"ng-click" => "$close()"} &#215;
diff --git a/app/views/shared/menu/_large_menu.html.haml b/app/views/shared/menu/_large_menu.html.haml
index a5c6180150..6f9bae4488 100644
--- a/app/views/shared/menu/_large_menu.html.haml
+++ b/app/views/shared/menu/_large_menu.html.haml
@@ -21,7 +21,7 @@
           %span.nav-primary Producers
       %li.divider
       %li
-        %a{href: groups_path}
+        %a{href: main_app.groups_path}
           %span.nav-primary Groups
       %li.divider
       - if spree_current_user.andand.has_spree_role? 'admin'
diff --git a/app/views/shared/menu/_mobile_menu.html.haml b/app/views/shared/menu/_mobile_menu.html.haml
index 43096c34b6..5478436eb8 100644
--- a/app/views/shared/menu/_mobile_menu.html.haml
+++ b/app/views/shared/menu/_mobile_menu.html.haml
@@ -43,7 +43,7 @@
       %a{href: main_app.producers_path}
         %span.nav-primary Producers
     %li
-      %a{href: groups_path}
+      %a{href: main_app.groups_path}
         %span.nav-primary Groups
 
     
diff --git a/app/views/shop/products/_form.html.haml b/app/views/shop/products/_form.html.haml
index 07dd7c8e1a..8c70f76188 100644
--- a/app/views/shop/products/_form.html.haml
+++ b/app/views/shop/products/_form.html.haml
@@ -26,4 +26,4 @@
     
     .row
       .small-12.columns
-        %input.button.right{type: :submit, value: "Add to Cart"}
+        %input.button.right.add_to_cart{type: :submit, value: "Add to Cart"}
diff --git a/app/views/shop/products/_summary.html.haml b/app/views/shop/products/_summary.html.haml
index ebf2a8104c..5e777a5dbb 100644
--- a/app/views/shop/products/_summary.html.haml
+++ b/app/views/shop/products/_summary.html.haml
@@ -12,7 +12,7 @@
   .small-5.columns.summary-header
     {{ product.supplier.name }}
 
-  .small-2.columns.summary-price.text-right
+  .small-2.columns.summary-price.text-right.price
     %span{"ng-if" => "hasVariants"} 
       %em from
       {{ price() | currency }}
diff --git a/app/views/shop/products/_variants.html.haml b/app/views/shop/products/_variants.html.haml
index 40a4371337..14ff8eff24 100644
--- a/app/views/shop/products/_variants.html.haml
+++ b/app/views/shop/products/_variants.html.haml
@@ -38,5 +38,5 @@
     "ng-model" => "variant.max_quantity"}
     (max)
 
-  .small-2.columns.text-right
+  .small-2.columns.text-right.price
     {{ variant.price | currency }}
diff --git a/spec/controllers/shop_controller_spec.rb b/spec/controllers/shop_controller_spec.rb
index 3683137b79..f0857f54bc 100644
--- a/spec/controllers/shop_controller_spec.rb
+++ b/spec/controllers/shop_controller_spec.rb
@@ -144,6 +144,7 @@ describe ShopController do
         it "includes the primary taxon" do
           taxon = mock_model(Spree::Taxon, name: "fruitbat") 
           Spree::Product.any_instance.stub(:primary_taxon).and_return taxon
+          taxon.stub_chain(:icon, :url).and_return ""
           xhr :get, :products
           response.body.should have_content "fruitbat"
         end
diff --git a/spec/features/consumer/shopping/shopping_spec.rb b/spec/features/consumer/shopping/shopping_spec.rb
index 19fcb5a44b..9946be2f5b 100644
--- a/spec/features/consumer/shopping/shopping_spec.rb
+++ b/spec/features/consumer/shopping/shopping_spec.rb
@@ -90,10 +90,6 @@ feature "As a consumer I want to shop with a distributor", js: true do
       it "should not show quantity field for product with variants" do
         visit shop_path
         page.should_not have_selector("#variants_#{product.master.id}", visible: true)
-
-        #it "expands variants" do
-        find(".collapse").trigger "click"
-        page.should_not have_text variant1.options_text
       end
 
       it "uses the adjusted price" do
@@ -104,15 +100,16 @@ feature "As a consumer I want to shop with a distributor", js: true do
         visit shop_path
 
         # Page should not have product.price (with or without fee)
-        page.should_not have_selector 'tr.product > td', text: "from $10.00"
-        page.should_not have_selector 'tr.product > td', text: "from $33.00"
+        page.should_not have_price "from $10.00"
+        page.should_not have_price "from $33.00"
 
         # Page should have variant prices (with fee)
-        page.should have_selector 'tr.variant > td.price', text: "$43.00"
-        page.should have_selector 'tr.variant > td.price', text: "$53.00"
+        page.should have_price "$43.00"
+        page.should have_price "$53.00"
 
         # Product price should be listed as the lesser of these
-        page.should have_selector 'tr.product > td', text: "from $43.00"
+        #page.should have_selector 'tr.product > td', text: "from $43.00"
+        page.should have_price "from $43.00"
       end
     end
 
@@ -131,7 +128,7 @@ feature "As a consumer I want to shop with a distributor", js: true do
         it "should save group buy data to ze cart" do
           fill_in "variants[#{product.master.id}]", with: 5
           fill_in "variant_attributes[#{product.master.id}][max_quantity]", with: 9
-          first("form.custom > input.button.right").click 
+          add_to_cart
           page.should have_content product.name
           li = Spree::Order.order(:created_at).last.line_items.order(:created_at).last
           li.max_quantity.should == 9
@@ -142,7 +139,7 @@ feature "As a consumer I want to shop with a distributor", js: true do
         pending "adding a product with a max quantity less than quantity results in max_quantity==quantity" do
           fill_in "variants[#{product.master.id}]", with: 5
           fill_in "variant_attributes[#{product.master.id}][max_quantity]", with: 1
-          first("form.custom > input.button.right").click 
+          add_to_cart
           page.should have_content product.name
           li = Spree::Order.order(:created_at).last.line_items.order(:created_at).last
           li.max_quantity.should == 5
@@ -161,7 +158,7 @@ feature "As a consumer I want to shop with a distributor", js: true do
         it "should save group buy data to ze cart" do
           fill_in "variants[#{variant.id}]", with: 6
           fill_in "variant_attributes[#{variant.id}][max_quantity]", with: 7
-          first("form.custom > input.button.right").click 
+          add_to_cart
           page.should have_content product.name
           li = Spree::Order.order(:created_at).last.line_items.order(:created_at).last
           li.max_quantity.should == 7
@@ -181,7 +178,7 @@ feature "As a consumer I want to shop with a distributor", js: true do
       end
       it "should let us add products to our cart" do
         fill_in "variants[#{variant.id}]", with: "1"
-        first("form.custom > input.button.right").click
+        add_to_cart
         current_path.should == "/cart" 
         page.should have_content product.name
       end
diff --git a/spec/support/request/shop_workflow.rb b/spec/support/request/shop_workflow.rb
index bdad9e5d49..c87d33149a 100644
--- a/spec/support/request/shop_workflow.rb
+++ b/spec/support/request/shop_workflow.rb
@@ -1,4 +1,12 @@
 module ShopWorkflow
+  def add_to_cart
+    first("input.add_to_cart").click
+  end
+
+  def have_price(price)
+    have_selector ".price", text: price
+  end
+
   def set_order(order)
     ApplicationController.any_instance.stub(:session).and_return({order_id: order.id, access_token: order.token})
   end

From 9557d69f711e659aa1c1b023dc1f711ddc3f0796 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 20 May 2014 12:30:28 +1000
Subject: [PATCH 019/139] Showing admin for enterprise or admin user

---
 app/helpers/shared_helper.rb                 | 6 +++++-
 app/views/shared/menu/_large_menu.html.haml  | 2 +-
 app/views/shared/menu/_mobile_menu.html.haml | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/helpers/shared_helper.rb b/app/helpers/shared_helper.rb
index f255999009..be1e0ba0f4 100644
--- a/app/helpers/shared_helper.rb
+++ b/app/helpers/shared_helper.rb
@@ -20,6 +20,10 @@ module SharedHelper
   end
   
   def enterprise_user?
-    spree_current_user.andand.enterprises.count > 0
+    spree_current_user.andand.enterprises.andand.count.to_i > 0
+  end
+
+  def admin_user?
+    spree_current_user.andand.has_spree_role? 'admin'
   end
 end
diff --git a/app/views/shared/menu/_large_menu.html.haml b/app/views/shared/menu/_large_menu.html.haml
index 328d46ca85..9443dfa979 100644
--- a/app/views/shared/menu/_large_menu.html.haml
+++ b/app/views/shared/menu/_large_menu.html.haml
@@ -24,7 +24,7 @@
         %a{href: ""}
           %span.nav-primary Groups
       %li.divider
-      - if spree_current_user.andand.has_spree_role? 'admin'
+      - if admin_user? or enterprise_user?
         %li
           %a{href: spree.admin_path}
             %span.nav-primary Admin
diff --git a/app/views/shared/menu/_mobile_menu.html.haml b/app/views/shared/menu/_mobile_menu.html.haml
index a33cb85c11..7d37d9b2cb 100644
--- a/app/views/shared/menu/_mobile_menu.html.haml
+++ b/app/views/shared/menu/_mobile_menu.html.haml
@@ -15,7 +15,7 @@
   %ul.off-canvas-list
     %li= link_to image_tag("ofn_logo_small.png"), root_path
 
-    - if spree_current_user.andand.has_spree_role? 'admin'
+    - if admin_user? or enterprise_user?
       %li
         %a{href: spree.admin_path}
           %span.nav-primary Admin

From 3eb6f98c70b7dfa988f66bacf861a1114daccfab Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 20 May 2014 12:39:22 +1000
Subject: [PATCH 020/139] Putting error messages on checkout into error flash
 for easier debugging

---
 app/controllers/checkout_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb
index 5cf940c223..2bedcf5b6b 100644
--- a/app/controllers/checkout_controller.rb
+++ b/app/controllers/checkout_controller.rb
@@ -26,7 +26,7 @@ class CheckoutController < Spree::CheckoutController
         if @order.next
           state_callback(:after)
         else
-          flash[:error] = t(:payment_processing_failed)
+          flash[:error] = @order.errors.full_messages.to_sentence
           update_failed
           return
         end

From 52345d9bb347a2402ce7fb57474e2dd4e0fa3fc6 Mon Sep 17 00:00:00 2001
From: summerscope <summerscope@gmail.com>
Date: Tue, 20 May 2014 14:11:41 +1000
Subject: [PATCH 021/139] Improvements to shoptfront page styling

---
 app/assets/stylesheets/darkswarm/mixins.sass  |  2 +-
 .../stylesheets/darkswarm/shop.css.sass       | 42 ++++++++++++++-----
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/app/assets/stylesheets/darkswarm/mixins.sass b/app/assets/stylesheets/darkswarm/mixins.sass
index 1f8086d9f2..fde601f2d9 100644
--- a/app/assets/stylesheets/darkswarm/mixins.sass
+++ b/app/assets/stylesheets/darkswarm/mixins.sass
@@ -12,7 +12,7 @@
   border: 1px solid #999
   font-size: 18px
   @extend .avenir
-  padding: 22px 18px
+  padding: 0.75em 1em
   height: auto
   margin-bottom: 1em
 
diff --git a/app/assets/stylesheets/darkswarm/shop.css.sass b/app/assets/stylesheets/darkswarm/shop.css.sass
index f9f2f37818..0c2972367a 100644
--- a/app/assets/stylesheets/darkswarm/shop.css.sass
+++ b/app/assets/stylesheets/darkswarm/shop.css.sass
@@ -82,27 +82,49 @@
       input.button.right
         float: left
     
+    
+    product:hover, product:focus, product:active
+      border-color: $clr-brick
+      @include box-shadow(0 0 3px 0 $clr-brick-bright)
+
+      .row.variants
+        border-top: 1px solid $clr-brick-light
+        background: $clr-brick-ultra-light
+
     product
-      border: 1px solid #ff0000
+      @include csstrans
+      border: 1px solid #989898
       display: block 
       margin-bottom: 1em !important
 
+      input
+        margin: 0
+        width: 8em
+
+      .columns
+        padding-top: 1em
+        padding-bottom: 1em
+
       .row.summary, .row.variants
+        @include csstrans
         margin-left: 0
         margin-right: 0
+        background: #f7f7f7
+        border-top: 1px solid #dfdfdf
 
       .row.summary
-        background: #ccc
+        @include csstrans
+        background: #fff
 
-      .summary-header
-        &, & *
-          @include avenir
-          color: $clr-brick
+        .summary-header
+          &, & *
+            @include avenir
+            color: $clr-brick
 
-      .summary-price
-        &, & *
-          @include avenir
-      
+        .summary-price
+          &, & *
+            @include avenir
+        
       
 
 

From 4e463e70874ae8244e491392bba0c4491ef447aa Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 20 May 2014 12:30:28 +1000
Subject: [PATCH 022/139] Showing admin for enterprise or admin user

---
 app/helpers/shared_helper.rb                 | 6 +++++-
 app/views/shared/menu/_large_menu.html.haml  | 2 +-
 app/views/shared/menu/_mobile_menu.html.haml | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/helpers/shared_helper.rb b/app/helpers/shared_helper.rb
index f255999009..be1e0ba0f4 100644
--- a/app/helpers/shared_helper.rb
+++ b/app/helpers/shared_helper.rb
@@ -20,6 +20,10 @@ module SharedHelper
   end
   
   def enterprise_user?
-    spree_current_user.andand.enterprises.count > 0
+    spree_current_user.andand.enterprises.andand.count.to_i > 0
+  end
+
+  def admin_user?
+    spree_current_user.andand.has_spree_role? 'admin'
   end
 end
diff --git a/app/views/shared/menu/_large_menu.html.haml b/app/views/shared/menu/_large_menu.html.haml
index 6f9bae4488..7a72b80f60 100644
--- a/app/views/shared/menu/_large_menu.html.haml
+++ b/app/views/shared/menu/_large_menu.html.haml
@@ -24,7 +24,7 @@
         %a{href: main_app.groups_path}
           %span.nav-primary Groups
       %li.divider
-      - if spree_current_user.andand.has_spree_role? 'admin'
+      - if admin_user? or enterprise_user?
         %li
           %a{href: spree.admin_path}
             %span.nav-primary Admin
diff --git a/app/views/shared/menu/_mobile_menu.html.haml b/app/views/shared/menu/_mobile_menu.html.haml
index 5478436eb8..5e9f22c597 100644
--- a/app/views/shared/menu/_mobile_menu.html.haml
+++ b/app/views/shared/menu/_mobile_menu.html.haml
@@ -15,7 +15,7 @@
   %ul.off-canvas-list
     %li= link_to image_tag("ofn_logo_small.png"), root_path
 
-    - if spree_current_user.andand.has_spree_role? 'admin'
+    - if admin_user? or enterprise_user?
       %li
         %a{href: spree.admin_path}
           %span.nav-primary Admin

From 2fc45d635d4e9d0a616fd27f7c5954c365d69844 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 20 May 2014 12:39:22 +1000
Subject: [PATCH 023/139] Putting error messages on checkout into error flash
 for easier debugging

---
 app/controllers/checkout_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb
index 5cf940c223..2bedcf5b6b 100644
--- a/app/controllers/checkout_controller.rb
+++ b/app/controllers/checkout_controller.rb
@@ -26,7 +26,7 @@ class CheckoutController < Spree::CheckoutController
         if @order.next
           state_callback(:after)
         else
-          flash[:error] = t(:payment_processing_failed)
+          flash[:error] = @order.errors.full_messages.to_sentence
           update_failed
           return
         end

From df82627bd1058289dffc7b331e075f0f0e558b2d Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 20 May 2014 15:47:00 +1000
Subject: [PATCH 024/139] Starting to rework login behaviour when hitting
 /admin

---
 app/controllers/checkout_controller.rb            |  6 +++++-
 .../spree/admin/base_controller_decorator.rb      |  2 +-
 .../spree/admin/overview_controller_decorator.rb  | 15 ++++++++++++++-
 config/routes.rb                                  |  2 ++
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb
index 2bedcf5b6b..3879f16741 100644
--- a/app/controllers/checkout_controller.rb
+++ b/app/controllers/checkout_controller.rb
@@ -26,7 +26,11 @@ class CheckoutController < Spree::CheckoutController
         if @order.next
           state_callback(:after)
         else
-          flash[:error] = @order.errors.full_messages.to_sentence
+          unless @order.errors.empty?
+            flash[:error] = @order.errors.full_messages.to_sentence
+          else
+            flash[:error] = t(:payment_processing_failed)
+          end
           update_failed
           return
         end
diff --git a/app/controllers/spree/admin/base_controller_decorator.rb b/app/controllers/spree/admin/base_controller_decorator.rb
index 8e876513fa..df7076345f 100644
--- a/app/controllers/spree/admin/base_controller_decorator.rb
+++ b/app/controllers/spree/admin/base_controller_decorator.rb
@@ -11,4 +11,4 @@ Spree::Admin::BaseController.class_eval do
     authorize! :admin, record
     authorize! action, record
   end
-end
\ No newline at end of file
+end
diff --git a/app/controllers/spree/admin/overview_controller_decorator.rb b/app/controllers/spree/admin/overview_controller_decorator.rb
index dd53294f6f..5c96901c1d 100644
--- a/app/controllers/spree/admin/overview_controller_decorator.rb
+++ b/app/controllers/spree/admin/overview_controller_decorator.rb
@@ -4,4 +4,17 @@ Spree::Admin::OverviewController.class_eval do
     @product_count = Spree::Product.active.managed_by(spree_current_user).count
     @order_cycle_count = OrderCycle.active.managed_by(spree_current_user).count
   end
-end
\ No newline at end of file
+
+  # This is in Spree::Core::ControllerHelpers::Auth
+  # But you can't easily reopen modules in Ruby
+  def unauthorized
+    if try_spree_current_user
+      flash[:error] = t(:authorization_failure)
+      redirect_to '/unauthorized'
+    else
+      store_location
+      url = respond_to?(:spree_login_path) ? spree_login_path : root_path
+      redirect_to url
+    end
+  end
+end
diff --git a/config/routes.rb b/config/routes.rb
index 69a3c99d56..310d1d9e4d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,6 +1,8 @@
 Openfoodnetwork::Application.routes.draw do
   root :to => 'home#index'
 
+  get "/#/login", to: "home#index", as: :spree_login
+
   resource :shop, controller: "shop" do
     get :products
     post :order_cycle

From 0957edee5d67d24a5f73ef74527de64495a4248d Mon Sep 17 00:00:00 2001
From: summerscope <summerscope@gmail.com>
Date: Tue, 20 May 2014 15:50:03 +1000
Subject: [PATCH 025/139] Styling for shopping cart page

---
 app/assets/stylesheets/darkswarm/all.scss     |  3 +-
 .../stylesheets/darkswarm/forms.css.sass      |  5 +++
 .../darkswarm/shopping-cart.css.sass          |  6 +++
 app/views/shop/show.html.haml                 |  2 +
 app/views/spree/orders/_form.html.haml        | 23 ++++++++++++
 app/views/spree/orders/_line_item.html.haml   |  2 +-
 app/views/spree/orders/edit.html.haml         | 37 +++++--------------
 7 files changed, 48 insertions(+), 30 deletions(-)
 create mode 100644 app/assets/stylesheets/darkswarm/forms.css.sass
 create mode 100644 app/assets/stylesheets/darkswarm/shopping-cart.css.sass

diff --git a/app/assets/stylesheets/darkswarm/all.scss b/app/assets/stylesheets/darkswarm/all.scss
index a3ee62ec56..80e43cdc8b 100644
--- a/app/assets/stylesheets/darkswarm/all.scss
+++ b/app/assets/stylesheets/darkswarm/all.scss
@@ -11,5 +11,4 @@
 
 ofn-modal {
   display: block;
-}
-
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/darkswarm/forms.css.sass b/app/assets/stylesheets/darkswarm/forms.css.sass
new file mode 100644
index 0000000000..7047159601
--- /dev/null
+++ b/app/assets/stylesheets/darkswarm/forms.css.sass
@@ -0,0 +1,5 @@
+@import mixins
+@import branding
+
+fieldset
+  border: 0
\ No newline at end of file
diff --git a/app/assets/stylesheets/darkswarm/shopping-cart.css.sass b/app/assets/stylesheets/darkswarm/shopping-cart.css.sass
new file mode 100644
index 0000000000..a5314c3ef2
--- /dev/null
+++ b/app/assets/stylesheets/darkswarm/shopping-cart.css.sass
@@ -0,0 +1,6 @@
+@import mixins
+@import branding
+
+#edit-cart
+  button, .button
+    margin: 0
diff --git a/app/views/shop/show.html.haml b/app/views/shop/show.html.haml
index ba9493e46b..b94bd59bf9 100644
--- a/app/views/shop/show.html.haml
+++ b/app/views/shop/show.html.haml
@@ -15,3 +15,5 @@
 
   .row
     = render partial: "shop/products/form"
+
+= render partial: "shared/footer"
\ No newline at end of file
diff --git a/app/views/spree/orders/_form.html.haml b/app/views/spree/orders/_form.html.haml
index 9366e0025d..09b3b72c22 100644
--- a/app/views/spree/orders/_form.html.haml
+++ b/app/views/spree/orders/_form.html.haml
@@ -19,4 +19,27 @@
     = order_form.fields_for :line_items do |item_form|
       = render :partial => 'line_item', :locals => { :variant => item_form.object.variant, :line_item => item_form.object, :item_form => item_form }
 
+  %tfoot#edit-cart
+    %tr
+      %td
+        Product 
+        \:
+        %span.order-total.item-total= number_to_currency @order.item_total
+      %td
+        Distribution
+        \:
+        %span.order-total.distribution-total= order_distribution_subtotal(@order)
+      %td
+      %td
+        = button_tag :class => 'neutral-btn dark expand small', :id => 'update-button' do
+          %i.fi-refresh
+          = t(:update)
+      %td
+        %h5.order-total.grand-total= @order.display_total
+      %td#empty-cart
+        / This needs help from Will - would like a link not button
+        %span#clear_cart_link{"data-hook" => ""}
+          = form_tag empty_cart_path, :method => :put do
+            = submit_tag t(:empty_cart), :class => 'button alert expand small'
+
   = render "spree/orders/adjustments" unless @order.adjustments.eligible.blank?
diff --git a/app/views/spree/orders/_line_item.html.haml b/app/views/spree/orders/_line_item.html.haml
index bb7054655f..6986caf100 100644
--- a/app/views/spree/orders/_line_item.html.haml
+++ b/app/views/spree/orders/_line_item.html.haml
@@ -21,7 +21,7 @@
   %td.cart-item-total{"data-hook" => "cart_item_total"}
     = line_item.display_amount.to_html unless line_item.quantity.nil?
 
-  %td.cart-item-delete{"data-hook" => "cart_item_delete"}
+  %td.cart-item-delete.text-center{"data-hook" => "cart_item_delete"}
     {{ quantity }}
     = link_to image_tag('icons/delete.png'), '#', :class => 'delete', 
       :id => "delete_#{dom_id(line_item)}"
diff --git a/app/views/spree/orders/edit.html.haml b/app/views/spree/orders/edit.html.haml
index 06b82d5169..f0c6b95a78 100644
--- a/app/views/spree/orders/edit.html.haml
+++ b/app/views/spree/orders/edit.html.haml
@@ -24,35 +24,18 @@
               .row
                 = render :partial => 'form', :locals => { :order_form => order_form }
 
-            #subtotal.row{'data-hook' => ""}
-              .columns.large-5
-                %h5
-                  Product 
-                  \:
-                  %span.order-total.item-total= number_to_currency @order.item_total
-              .columns.large-4
-                %h5
-                  Distribution
-                  \:
-                  %span.order-total.distribution-total= order_distribution_subtotal(@order)
-              .columns.large-3
-                %h4
-                  Cart Total
-                  \:
-                  %span.order-total.grand-total= @order.display_total
 
         .links{'data-hook' => "cart_buttons"}
           .row
-            #empty-cart.columns.large-8{"data-hook" => ""}
-              = form_tag empty_cart_path, :method => :put do
-                #clear_cart_link{"data-hook" => ""}
-                  = link_to "Continue Shopping", main_app.shop_path, class: "button secondary"
-                  = t(:or)
-                  = submit_tag t(:empty_cart), :class => 'button secondary'
-
+            .columns.large-8{"data-hook" => ""}
+              
+              %a.button.large.secondary{href: main_app.shop_path}
+                %i.fi-arrow-left 
+                Continue shopping
             .columns.large-4.text-right
-              = button_tag :class => 'secondary', :id => 'update-button' do
-                = t(:update)
-              = t(:or)
-              = link_to "Checkout", main_app.checkout_path, class: "button checkout primary", id: "checkout-link"
+              %a#checkout-link.button.large.primary{href: main_app.checkout_path}
+                Checkout
+                %i.fi-arrow-right
+
+= render partial: "shared/footer"
 

From 601281ced777d2fde2f753695715e0acdd45c518 Mon Sep 17 00:00:00 2001
From: summerscope <summerscope@gmail.com>
Date: Tue, 20 May 2014 16:04:26 +1000
Subject: [PATCH 026/139] Add button style to shop page

---
 app/views/shop/products/_form.html.haml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/shop/products/_form.html.haml b/app/views/shop/products/_form.html.haml
index 8c70f76188..5a3af9684e 100644
--- a/app/views/shop/products/_form.html.haml
+++ b/app/views/shop/products/_form.html.haml
@@ -10,7 +10,7 @@
         "ng-debounce" => "150",
         "ofn-disable-enter" => true}
       .small-6.columns
-        %input.button.right{type: :submit, value: "Add to Cart"}
+        %input.button.primary.right{type: :submit, value: "Add to Cart"}
     
     %div{bindonce: true}
       %product{"ng-controller" => "ProductNodeCtrl",
@@ -26,4 +26,4 @@
     
     .row
       .small-12.columns
-        %input.button.right.add_to_cart{type: :submit, value: "Add to Cart"}
+        %input.button.primary.right.add_to_cart{type: :submit, value: "Add to Cart"}

From 0b595e21d2f8e87a517c0f64f4bf9881ae17bcba Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 20 May 2014 12:30:28 +1000
Subject: [PATCH 027/139] Showing admin for enterprise or admin user

---
 app/helpers/shared_helper.rb                 | 6 +++++-
 app/views/shared/menu/_large_menu.html.haml  | 2 +-
 app/views/shared/menu/_mobile_menu.html.haml | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/helpers/shared_helper.rb b/app/helpers/shared_helper.rb
index f255999009..be1e0ba0f4 100644
--- a/app/helpers/shared_helper.rb
+++ b/app/helpers/shared_helper.rb
@@ -20,6 +20,10 @@ module SharedHelper
   end
   
   def enterprise_user?
-    spree_current_user.andand.enterprises.count > 0
+    spree_current_user.andand.enterprises.andand.count.to_i > 0
+  end
+
+  def admin_user?
+    spree_current_user.andand.has_spree_role? 'admin'
   end
 end
diff --git a/app/views/shared/menu/_large_menu.html.haml b/app/views/shared/menu/_large_menu.html.haml
index 6f9bae4488..7a72b80f60 100644
--- a/app/views/shared/menu/_large_menu.html.haml
+++ b/app/views/shared/menu/_large_menu.html.haml
@@ -24,7 +24,7 @@
         %a{href: main_app.groups_path}
           %span.nav-primary Groups
       %li.divider
-      - if spree_current_user.andand.has_spree_role? 'admin'
+      - if admin_user? or enterprise_user?
         %li
           %a{href: spree.admin_path}
             %span.nav-primary Admin
diff --git a/app/views/shared/menu/_mobile_menu.html.haml b/app/views/shared/menu/_mobile_menu.html.haml
index 5478436eb8..5e9f22c597 100644
--- a/app/views/shared/menu/_mobile_menu.html.haml
+++ b/app/views/shared/menu/_mobile_menu.html.haml
@@ -15,7 +15,7 @@
   %ul.off-canvas-list
     %li= link_to image_tag("ofn_logo_small.png"), root_path
 
-    - if spree_current_user.andand.has_spree_role? 'admin'
+    - if admin_user? or enterprise_user?
       %li
         %a{href: spree.admin_path}
           %span.nav-primary Admin

From da69167b4ce3649060e69f57ad4968b66e8db30e Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 20 May 2014 12:39:22 +1000
Subject: [PATCH 028/139] Putting error messages on checkout into error flash
 for easier debugging

---
 app/controllers/checkout_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb
index 5cf940c223..2bedcf5b6b 100644
--- a/app/controllers/checkout_controller.rb
+++ b/app/controllers/checkout_controller.rb
@@ -26,7 +26,7 @@ class CheckoutController < Spree::CheckoutController
         if @order.next
           state_callback(:after)
         else
-          flash[:error] = t(:payment_processing_failed)
+          flash[:error] = @order.errors.full_messages.to_sentence
           update_failed
           return
         end

From 36aba8049fbede064d5f1e5e00607c243b16a0e2 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 20 May 2014 15:47:00 +1000
Subject: [PATCH 029/139] Starting to rework login behaviour when hitting
 /admin

---
 app/controllers/checkout_controller.rb            |  6 +++++-
 .../spree/admin/base_controller_decorator.rb      |  2 +-
 .../spree/admin/overview_controller_decorator.rb  | 15 ++++++++++++++-
 config/routes.rb                                  |  2 ++
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb
index 2bedcf5b6b..3879f16741 100644
--- a/app/controllers/checkout_controller.rb
+++ b/app/controllers/checkout_controller.rb
@@ -26,7 +26,11 @@ class CheckoutController < Spree::CheckoutController
         if @order.next
           state_callback(:after)
         else
-          flash[:error] = @order.errors.full_messages.to_sentence
+          unless @order.errors.empty?
+            flash[:error] = @order.errors.full_messages.to_sentence
+          else
+            flash[:error] = t(:payment_processing_failed)
+          end
           update_failed
           return
         end
diff --git a/app/controllers/spree/admin/base_controller_decorator.rb b/app/controllers/spree/admin/base_controller_decorator.rb
index 8e876513fa..df7076345f 100644
--- a/app/controllers/spree/admin/base_controller_decorator.rb
+++ b/app/controllers/spree/admin/base_controller_decorator.rb
@@ -11,4 +11,4 @@ Spree::Admin::BaseController.class_eval do
     authorize! :admin, record
     authorize! action, record
   end
-end
\ No newline at end of file
+end
diff --git a/app/controllers/spree/admin/overview_controller_decorator.rb b/app/controllers/spree/admin/overview_controller_decorator.rb
index dd53294f6f..5c96901c1d 100644
--- a/app/controllers/spree/admin/overview_controller_decorator.rb
+++ b/app/controllers/spree/admin/overview_controller_decorator.rb
@@ -4,4 +4,17 @@ Spree::Admin::OverviewController.class_eval do
     @product_count = Spree::Product.active.managed_by(spree_current_user).count
     @order_cycle_count = OrderCycle.active.managed_by(spree_current_user).count
   end
-end
\ No newline at end of file
+
+  # This is in Spree::Core::ControllerHelpers::Auth
+  # But you can't easily reopen modules in Ruby
+  def unauthorized
+    if try_spree_current_user
+      flash[:error] = t(:authorization_failure)
+      redirect_to '/unauthorized'
+    else
+      store_location
+      url = respond_to?(:spree_login_path) ? spree_login_path : root_path
+      redirect_to url
+    end
+  end
+end
diff --git a/config/routes.rb b/config/routes.rb
index 69a3c99d56..310d1d9e4d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,6 +1,8 @@
 Openfoodnetwork::Application.routes.draw do
   root :to => 'home#index'
 
+  get "/#/login", to: "home#index", as: :spree_login
+
   resource :shop, controller: "shop" do
     get :products
     post :order_cycle

From ef91f8d17ffe14fde9aaea4ce0273b91a5f2bcf8 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 20 May 2014 16:04:53 +1000
Subject: [PATCH 030/139] Redirecting if cart is empty and activating the empty
 cart link

---
 app/controllers/spree/orders_controller_decorator.rb | 10 ++++++++++
 app/views/spree/orders/_form.html.haml               |  5 +++--
 spec/controllers/spree/orders_controller_spec.rb     | 11 +++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/app/controllers/spree/orders_controller_decorator.rb b/app/controllers/spree/orders_controller_decorator.rb
index af1d5621c5..ce20dfd58d 100644
--- a/app/controllers/spree/orders_controller_decorator.rb
+++ b/app/controllers/spree/orders_controller_decorator.rb
@@ -11,6 +11,16 @@ Spree::OrdersController.class_eval do
   include OrderCyclesHelper
   layout 'darkswarm'
 
+  # Patching to redirect to shop if order is empty
+  def edit
+    @order = current_order(true)
+    if @order.line_items.empty?
+      redirect_to main_app.shop_path
+    else
+      associate_user
+    end
+  end
+
   # Patch Orders#populate to populate multi_cart (if enabled)
   def populate
     if OpenFoodNetwork::FeatureToggle.enabled? :multi_cart
diff --git a/app/views/spree/orders/_form.html.haml b/app/views/spree/orders/_form.html.haml
index 09b3b72c22..3723299f84 100644
--- a/app/views/spree/orders/_form.html.haml
+++ b/app/views/spree/orders/_form.html.haml
@@ -39,7 +39,8 @@
       %td#empty-cart
         / This needs help from Will - would like a link not button
         %span#clear_cart_link{"data-hook" => ""}
-          = form_tag empty_cart_path, :method => :put do
-            = submit_tag t(:empty_cart), :class => 'button alert expand small'
+          = link_to "Empty cart", empty_cart_path, method: :put
+          -#= form_tag empty_cart_path, :method => :put do
+            -#= submit_tag t(:empty_cart), :class => 'button alert expand small'
 
   = render "spree/orders/adjustments" unless @order.adjustments.eligible.blank?
diff --git a/spec/controllers/spree/orders_controller_spec.rb b/spec/controllers/spree/orders_controller_spec.rb
index a9118355d6..53c7be68f0 100644
--- a/spec/controllers/spree/orders_controller_spec.rb
+++ b/spec/controllers/spree/orders_controller_spec.rb
@@ -2,12 +2,23 @@ require 'spec_helper'
 
 describe Spree::OrdersController do
   let(:distributor) { double(:distributor) }
+  let(:order) { create(:order) }
+  let(:order_cycle) { create(:simple_order_cycle) }
 
   it "redirects home when no distributor is selected" do
     spree_get :edit
     response.should redirect_to root_path
   end
 
+  it "redirects to shop when order is empty" do
+    controller.stub(:current_distributor).and_return(distributor)
+    controller.stub(:current_order_cycle).and_return(order_cycle)
+    controller.stub(:current_order).and_return order
+    order.stub_chain(:line_items, :empty?).and_return true
+    spree_get :edit
+    response.should redirect_to shop_path
+  end
+
   it "redirects to the shop when no order cycle is selected" do
     controller.stub(:current_distributor).and_return(distributor)
     spree_get :edit

From d874855aa14ce3696a73530107ceac60cc1c6227 Mon Sep 17 00:00:00 2001
From: summerscope <summerscope@gmail.com>
Date: Tue, 20 May 2014 16:40:23 +1000
Subject: [PATCH 031/139] Update styling on empty cart

---
 app/assets/stylesheets/darkswarm/typography.css.sass | 5 ++++-
 app/views/spree/orders/_form.html.haml               | 5 ++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/darkswarm/typography.css.sass b/app/assets/stylesheets/darkswarm/typography.css.sass
index 68d990240d..63d4efe13f 100644
--- a/app/assets/stylesheets/darkswarm/typography.css.sass
+++ b/app/assets/stylesheets/darkswarm/typography.css.sass
@@ -26,7 +26,7 @@ a
     text-decoration: none
     color: $clr-brick-bright
 
-small
+small, .small
   font-size: 0.75rem
 
 @mixin avenir
@@ -56,6 +56,9 @@ ul.ofn-list
 .pad-top
   padding-top: 1em
 
+.not-bold
+  font-weight: normal
+
 strong.avenir
   font-weight: normal // Avenir is basically bold anyway
 
diff --git a/app/views/spree/orders/_form.html.haml b/app/views/spree/orders/_form.html.haml
index 3723299f84..bec495a458 100644
--- a/app/views/spree/orders/_form.html.haml
+++ b/app/views/spree/orders/_form.html.haml
@@ -36,10 +36,9 @@
           = t(:update)
       %td
         %h5.order-total.grand-total= @order.display_total
-      %td#empty-cart
-        / This needs help from Will - would like a link not button
+      %td#empty-cart.text-center
         %span#clear_cart_link{"data-hook" => ""}
-          = link_to "Empty cart", empty_cart_path, method: :put
+          = link_to "Empty cart", empty_cart_path, method: :put, :class => 'not-bold small'
           -#= form_tag empty_cart_path, :method => :put do
             -#= submit_tag t(:empty_cart), :class => 'button alert expand small'
 

From 391b1da04c09aca950196c6bed0c166411eb35aa Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 21 May 2014 10:46:03 +1000
Subject: [PATCH 032/139] adding session token to order test

---
 app/controllers/spree/orders_controller_decorator.rb | 1 +
 spec/controllers/spree/orders_controller_spec.rb     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/controllers/spree/orders_controller_decorator.rb b/app/controllers/spree/orders_controller_decorator.rb
index ce20dfd58d..959e51204f 100644
--- a/app/controllers/spree/orders_controller_decorator.rb
+++ b/app/controllers/spree/orders_controller_decorator.rb
@@ -28,6 +28,7 @@ Spree::OrdersController.class_eval do
     end
     populator = Spree::OrderPopulator.new(current_order(true), current_currency)
     if populator.populate(params.slice(:products, :variants, :quantity))
+
       fire_event('spree.cart.add')
       fire_event('spree.order.contents_changed')
       respond_with(@order) do |format|
diff --git a/spec/controllers/spree/orders_controller_spec.rb b/spec/controllers/spree/orders_controller_spec.rb
index 53c7be68f0..e6c9b91894 100644
--- a/spec/controllers/spree/orders_controller_spec.rb
+++ b/spec/controllers/spree/orders_controller_spec.rb
@@ -15,6 +15,7 @@ describe Spree::OrdersController do
     controller.stub(:current_order_cycle).and_return(order_cycle)
     controller.stub(:current_order).and_return order
     order.stub_chain(:line_items, :empty?).and_return true
+    session[:access_token] = order.token
     spree_get :edit
     response.should redirect_to shop_path
   end

From 4f1b8d06e71e1bcb654f5436a948750884a9efcd Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 15 May 2014 12:19:07 +1000
Subject: [PATCH 033/139] Construct enterprise relationships with a factory

---
 spec/factories.rb              | 3 +++
 spec/models/enterprise_spec.rb | 8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/spec/factories.rb b/spec/factories.rb
index 13c0bd0e8e..b2ed52b7a7 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -96,6 +96,9 @@ FactoryGirl.define do
     is_distributor true
   end
 
+  factory :enterprise_relationship do
+  end
+
   factory :enterprise_group, :class => EnterpriseGroup do
     name 'Enterprise group'
     description 'this is a group'
diff --git a/spec/models/enterprise_spec.rb b/spec/models/enterprise_spec.rb
index 06c4c0850e..f375b8890a 100644
--- a/spec/models/enterprise_spec.rb
+++ b/spec/models/enterprise_spec.rb
@@ -31,10 +31,10 @@ describe Enterprise do
       let(:e) { create(:distributor_enterprise) }
       let(:p) { create(:supplier_enterprise) }
       let(:c) { create(:distributor_enterprise) }
-      before do
-        EnterpriseRelationship.create! parent_id: p.id, child_id: e.id
-        EnterpriseRelationship.create! parent_id: e.id, child_id: c.id
-      end
+
+      let!(:er1) { create(:enterprise_relationship, parent_id: p.id, child_id: e.id) }
+      let!(:er2) { create(:enterprise_relationship, parent_id: e.id, child_id: c.id) }
+
       it "finds relatives" do
         e.relatives.sort.should == [p, c].sort
       end

From aa53d8238655d544c6557fe12d28d23c05781d36 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 15 May 2014 12:19:48 +1000
Subject: [PATCH 034/139] Add stub page for managing enterprise relationships

---
 .../admin/enterprise_relationships_controller.rb          | 7 +++++++
 app/views/admin/enterprise_relationships/index.html.haml  | 8 ++++++++
 app/views/admin/enterprises/index.html.erb                | 2 ++
 app/views/admin/shared/_enterprises_sub_menu.html.haml    | 4 ++++
 config/routes.rb                                          | 2 ++
 5 files changed, 23 insertions(+)
 create mode 100644 app/controllers/admin/enterprise_relationships_controller.rb
 create mode 100644 app/views/admin/enterprise_relationships/index.html.haml
 create mode 100644 app/views/admin/shared/_enterprises_sub_menu.html.haml

diff --git a/app/controllers/admin/enterprise_relationships_controller.rb b/app/controllers/admin/enterprise_relationships_controller.rb
new file mode 100644
index 0000000000..7959b9d9b5
--- /dev/null
+++ b/app/controllers/admin/enterprise_relationships_controller.rb
@@ -0,0 +1,7 @@
+module Admin
+  class EnterpriseRelationshipsController < ResourceController
+    def index
+      
+    end
+  end
+end
diff --git a/app/views/admin/enterprise_relationships/index.html.haml b/app/views/admin/enterprise_relationships/index.html.haml
new file mode 100644
index 0000000000..7f2c236d82
--- /dev/null
+++ b/app/views/admin/enterprise_relationships/index.html.haml
@@ -0,0 +1,8 @@
+- content_for :page_title do
+  Enterprise Relationships
+
+= render 'admin/shared/enterprises_sub_menu'
+
+%table#enterprise-relationships
+  %tr
+    %td Hello, world.
diff --git a/app/views/admin/enterprises/index.html.erb b/app/views/admin/enterprises/index.html.erb
index d2917bcc45..1795b17950 100644
--- a/app/views/admin/enterprises/index.html.erb
+++ b/app/views/admin/enterprises/index.html.erb
@@ -8,6 +8,8 @@
   </li>
 <% end %>
 
+<%= render 'admin/shared/enterprises_sub_menu' %>
+
 
 <%= form_for @enterprise_set, :url => main_app.bulk_update_admin_enterprises_path do |f| %>
   <table class="index" id="listing_enterprises">
diff --git a/app/views/admin/shared/_enterprises_sub_menu.html.haml b/app/views/admin/shared/_enterprises_sub_menu.html.haml
new file mode 100644
index 0000000000..57ce5e9194
--- /dev/null
+++ b/app/views/admin/shared/_enterprises_sub_menu.html.haml
@@ -0,0 +1,4 @@
+= content_for :sub_menu do
+  %ul#sub_nav.inline-menu{"data-hook" => "admin_order_sub_tabs"}
+    = tab :enterprises, url: main_app.admin_enterprises_path
+    = tab :relationships, url: main_app.admin_enterprise_relationships_path
diff --git a/config/routes.rb b/config/routes.rb
index 310d1d9e4d..973cb288cc 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -41,6 +41,8 @@ Openfoodnetwork::Application.routes.draw do
       post :bulk_update, :on => :collection, :as => :bulk_update
     end
 
+    resources :enterprise_relationships
+
     resources :enterprise_fees do
       post :bulk_update, :on => :collection, :as => :bulk_update
     end

From f7de504d89bb461fe45d6b259070e728c93d4367 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 15 May 2014 12:27:58 +1000
Subject: [PATCH 035/139] Add stub angular controller for managing enterprise
 relationships

---
 .../enterprise_relationships_controller.js.coffee   |  2 ++
 .../admin/enterprise_relationships/index.html.haml  | 13 ++++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee

diff --git a/app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee b/app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee
new file mode 100644
index 0000000000..39a4ad38c4
--- /dev/null
+++ b/app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee
@@ -0,0 +1,2 @@
+Admin.controller "AdminEnterpriseRelationshipsCtrl", ($scope) ->
+  $scope.hello = "Hello, angular."
diff --git a/app/views/admin/enterprise_relationships/index.html.haml b/app/views/admin/enterprise_relationships/index.html.haml
index 7f2c236d82..aff1fa2e6f 100644
--- a/app/views/admin/enterprise_relationships/index.html.haml
+++ b/app/views/admin/enterprise_relationships/index.html.haml
@@ -3,6 +3,13 @@
 
 = render 'admin/shared/enterprises_sub_menu'
 
-%table#enterprise-relationships
-  %tr
-    %td Hello, world.
+%div{"ng-app" => "ofn.admin", "ng-controller" => "AdminEnterpriseRelationshipsCtrl"}
+  %table#enterprise-relationships
+    %thead
+      %tr
+        %th Parent
+        %th Child
+    %tbody
+      %tr
+        %td {{ hello }}
+        %td {{ hello }}

From 1a854b89eca8b0dda3f6fc5632af68c99e77c4e3 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 15 May 2014 14:24:35 +1000
Subject: [PATCH 036/139] Sort enterprise relationships by enterprise name

---
 app/models/enterprise_relationship.rb       |  5 +++++
 spec/models/enterprise_relationship_spec.rb | 16 ++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 spec/models/enterprise_relationship_spec.rb

diff --git a/app/models/enterprise_relationship.rb b/app/models/enterprise_relationship.rb
index 2cbda1511a..2afd8c8a3e 100644
--- a/app/models/enterprise_relationship.rb
+++ b/app/models/enterprise_relationship.rb
@@ -4,4 +4,9 @@ class EnterpriseRelationship < ActiveRecord::Base
 
   validates_presence_of :parent_id, :child_id
   validates_uniqueness_of :child_id, scope: :parent_id
+
+  scope :with_enterprises,
+    joins('LEFT JOIN enterprises AS parent_enterprises ON parent_enterprises.id = enterprise_relationships.parent_id').
+    joins('LEFT JOIN enterprises AS child_enterprises ON child_enterprises.id = enterprise_relationships.child_id')
+  scope :by_name, with_enterprises.order('parent_enterprises.name, child_enterprises.name')
 end
diff --git a/spec/models/enterprise_relationship_spec.rb b/spec/models/enterprise_relationship_spec.rb
new file mode 100644
index 0000000000..7cca07472e
--- /dev/null
+++ b/spec/models/enterprise_relationship_spec.rb
@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe EnterpriseRelationship do
+  describe "scopes" do
+    it "sorts by parent, child enterprise name" do
+      e1 = create(:enterprise, name: 'A')
+      e2 = create(:enterprise, name: 'B')
+      e3 = create(:enterprise, name: 'C')
+      er1 = create(:enterprise_relationship, parent: e1, child: e3)
+      er2 = create(:enterprise_relationship, parent: e2, child: e1)
+      er3 = create(:enterprise_relationship, parent: e1, child: e2)
+
+      EnterpriseRelationship.by_name.should == [er3, er1, er2]
+    end
+  end
+end

From 6414ae2972454cffd4171a00cdbd2d8b4a7f21d4 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 15 May 2014 14:47:53 +1000
Subject: [PATCH 037/139] Output enterprise relationships as JSON

---
 .../admin/json/_enterprise_relationships.rabl | 11 +++++++++
 .../enterprise_relationships_rabl_spec.rb     | 23 +++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 app/views/admin/json/_enterprise_relationships.rabl
 create mode 100644 spec/views/admin/json/enterprise_relationships_rabl_spec.rb

diff --git a/app/views/admin/json/_enterprise_relationships.rabl b/app/views/admin/json/_enterprise_relationships.rabl
new file mode 100644
index 0000000000..1867dd9c56
--- /dev/null
+++ b/app/views/admin/json/_enterprise_relationships.rabl
@@ -0,0 +1,11 @@
+collection @enterprise_relationships
+
+attributes :parent_id, :child_id
+
+node :parent_name do |enterprise_relationship|
+  enterprise_relationship.parent.name
+end
+
+node :child_name do |enterprise_relationship|
+  enterprise_relationship.child.name
+end
diff --git a/spec/views/admin/json/enterprise_relationships_rabl_spec.rb b/spec/views/admin/json/enterprise_relationships_rabl_spec.rb
new file mode 100644
index 0000000000..9b72a0d45b
--- /dev/null
+++ b/spec/views/admin/json/enterprise_relationships_rabl_spec.rb
@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe "admin/json/_enterprise_relationships.json.rabl" do
+  let(:parent) { create(:enterprise) }
+  let(:child) { create(:enterprise) }
+  let(:enterprise_relationship) { create(:enterprise_relationship, parent: parent, child: child) }
+  let(:render) { Rabl.render([enterprise_relationship], 'admin/json/enterprise_relationships', view_path: 'app/views', scope: RablHelper::FakeContext.instance) }
+
+  it "renders a list of enterprise relationships" do
+    render.should have_json_type(Array).at_path ''
+    render.should have_json_type(Object).at_path '0'
+  end
+
+  it "renders enterprise ids" do
+    render.should be_json_eql(parent.id).at_path '0/parent_id'
+    render.should be_json_eql(child.id).at_path '0/child_id'
+  end
+
+  it "renders enterprise names" do
+    render.should be_json_eql(parent.name.to_json).at_path '0/parent_name'
+    render.should be_json_eql(child.name.to_json).at_path '0/child_name'
+  end
+end

From 61af8204d9f078d69989aae3611683f2920cab87 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 15 May 2014 14:49:25 +1000
Subject: [PATCH 038/139] Add spec matcher have_table_row

---
 spec/support/matchers/table_matchers.rb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 spec/support/matchers/table_matchers.rb

diff --git a/spec/support/matchers/table_matchers.rb b/spec/support/matchers/table_matchers.rb
new file mode 100644
index 0000000000..7a06965c67
--- /dev/null
+++ b/spec/support/matchers/table_matchers.rb
@@ -0,0 +1,16 @@
+RSpec::Matchers.define :have_table_row do |row|
+
+  match do |node|
+    @row = row
+    node.all('tr').map { |tr| tr.all('th, td').map(&:text) }.include? row
+  end
+
+  failure_message_for_should do |text|
+    "expected to find table row #{@row}"
+  end
+
+  failure_message_for_should_not do |text|
+    "expected not to find table row #{@row}"
+  end
+
+end

From 5f4e4ebeb025e26b2e48e17452c4eb71b3784d2b Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 15 May 2014 14:49:39 +1000
Subject: [PATCH 039/139] Admin can list enterprise relationships

---
 ...erprise_relationships_controller.js.coffee |  4 +--
 .../enterprise_relationships.js.coffee        |  4 +++
 .../enterprise_relationships_controller.rb    |  2 +-
 .../enterprise_relationships/index.html.haml  | 10 ++++--
 .../admin/enterprise_relationships_spec.rb    | 32 +++++++++++++++++++
 5 files changed, 46 insertions(+), 6 deletions(-)
 create mode 100644 app/assets/javascripts/admin/services/enterprise_relationships.js.coffee
 create mode 100644 spec/features/admin/enterprise_relationships_spec.rb

diff --git a/app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee b/app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee
index 39a4ad38c4..cd86cf20d6 100644
--- a/app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee
+++ b/app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee
@@ -1,2 +1,2 @@
-Admin.controller "AdminEnterpriseRelationshipsCtrl", ($scope) ->
-  $scope.hello = "Hello, angular."
+Admin.controller "AdminEnterpriseRelationshipsCtrl", ($scope, EnterpriseRelationships) ->
+  $scope.EnterpriseRelationships = EnterpriseRelationships
diff --git a/app/assets/javascripts/admin/services/enterprise_relationships.js.coffee b/app/assets/javascripts/admin/services/enterprise_relationships.js.coffee
new file mode 100644
index 0000000000..0201a9793e
--- /dev/null
+++ b/app/assets/javascripts/admin/services/enterprise_relationships.js.coffee
@@ -0,0 +1,4 @@
+Admin.factory 'EnterpriseRelationships', (enterprise_relationships) ->
+  new class EnterpriseRelationships
+    constructor: ->
+      @enterprise_relationships = enterprise_relationships
diff --git a/app/controllers/admin/enterprise_relationships_controller.rb b/app/controllers/admin/enterprise_relationships_controller.rb
index 7959b9d9b5..d8dcfdde9d 100644
--- a/app/controllers/admin/enterprise_relationships_controller.rb
+++ b/app/controllers/admin/enterprise_relationships_controller.rb
@@ -1,7 +1,7 @@
 module Admin
   class EnterpriseRelationshipsController < ResourceController
     def index
-      
+      @enterprise_relationships = EnterpriseRelationship.by_name
     end
   end
 end
diff --git a/app/views/admin/enterprise_relationships/index.html.haml b/app/views/admin/enterprise_relationships/index.html.haml
index aff1fa2e6f..897593b22d 100644
--- a/app/views/admin/enterprise_relationships/index.html.haml
+++ b/app/views/admin/enterprise_relationships/index.html.haml
@@ -4,12 +4,16 @@
 = render 'admin/shared/enterprises_sub_menu'
 
 %div{"ng-app" => "ofn.admin", "ng-controller" => "AdminEnterpriseRelationshipsCtrl"}
+  :javascript
+    angular.module('ofn.admin').value('enterprise_relationships', #{render partial: "admin/json/enterprise_relationships", object: @enterprise_relationships})
+  -#%pre {{ EnterpriseRelationships.enterprise_relationships | json }}
+
   %table#enterprise-relationships
     %thead
       %tr
         %th Parent
         %th Child
     %tbody
-      %tr
-        %td {{ hello }}
-        %td {{ hello }}
+      %tr{"ng-repeat" => "enterprise_relationship in EnterpriseRelationships.enterprise_relationships"}
+        %td {{ enterprise_relationship.parent_name }}
+        %td {{ enterprise_relationship.child_name }}
diff --git a/spec/features/admin/enterprise_relationships_spec.rb b/spec/features/admin/enterprise_relationships_spec.rb
new file mode 100644
index 0000000000..ca0a065e5f
--- /dev/null
+++ b/spec/features/admin/enterprise_relationships_spec.rb
@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+feature %q{
+  As an Administrator
+  I want to manage relationships between enterprises
+}, js: true do
+  include AuthenticationWorkflow
+  include WebHelper
+
+  before { login_to_admin_section }
+
+  scenario "listing relationships" do
+    # Given some enterprises with relationships
+    e1, e2, e3, e4 = create(:enterprise), create(:enterprise), create(:enterprise), create(:enterprise)
+    create(:enterprise_relationship, parent: e1, child: e2)
+    create(:enterprise_relationship, parent: e3, child: e4)
+
+    # When I go to the relationships page
+    click_link 'Enterprises'
+    click_link 'Relationships'
+
+    # Then I should see the relationships
+    within('table#enterprise-relationships') do
+      page.should have_table_row [e1.name, e2.name]
+      page.should have_table_row [e3.name, e4.name]
+    end
+  end
+
+
+  scenario "creating a relationship"
+  scenario "deleting a relationship"
+end

From ba7e29074f825f54150628dbf64be97b02942b71 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 15 May 2014 16:20:02 +1000
Subject: [PATCH 040/139] have_table_row waits

---
 spec/support/matchers/table_matchers.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/spec/support/matchers/table_matchers.rb b/spec/support/matchers/table_matchers.rb
index 7a06965c67..71fb297e33 100644
--- a/spec/support/matchers/table_matchers.rb
+++ b/spec/support/matchers/table_matchers.rb
@@ -2,7 +2,14 @@ RSpec::Matchers.define :have_table_row do |row|
 
   match do |node|
     @row = row
-    node.all('tr').map { |tr| tr.all('th, td').map(&:text) }.include? row
+
+    begin
+      wait_until { node.all('tr').map { |tr| tr.all('th, td').map(&:text) }.include? row }
+    rescue TimeoutError
+      false
+    else
+      true
+    end
   end
 
   failure_message_for_should do |text|

From 3cb55062ccca817215a17bbe65358cd49eab7be2 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 15 May 2014 16:20:25 +1000
Subject: [PATCH 041/139] Split enterprise_relationships rabl into show and
 index

---
 app/views/admin/json/_enterprise_relationship.rabl  | 11 +++++++++++
 app/views/admin/json/_enterprise_relationships.rabl | 11 +----------
 2 files changed, 12 insertions(+), 10 deletions(-)
 create mode 100644 app/views/admin/json/_enterprise_relationship.rabl

diff --git a/app/views/admin/json/_enterprise_relationship.rabl b/app/views/admin/json/_enterprise_relationship.rabl
new file mode 100644
index 0000000000..23d08d4c87
--- /dev/null
+++ b/app/views/admin/json/_enterprise_relationship.rabl
@@ -0,0 +1,11 @@
+object @enterprise_relationship
+
+attributes :parent_id, :child_id
+
+node :parent_name do |enterprise_relationship|
+  enterprise_relationship.parent.name
+end
+
+node :child_name do |enterprise_relationship|
+  enterprise_relationship.child.name
+end
diff --git a/app/views/admin/json/_enterprise_relationships.rabl b/app/views/admin/json/_enterprise_relationships.rabl
index 1867dd9c56..aad55b9770 100644
--- a/app/views/admin/json/_enterprise_relationships.rabl
+++ b/app/views/admin/json/_enterprise_relationships.rabl
@@ -1,11 +1,2 @@
 collection @enterprise_relationships
-
-attributes :parent_id, :child_id
-
-node :parent_name do |enterprise_relationship|
-  enterprise_relationship.parent.name
-end
-
-node :child_name do |enterprise_relationship|
-  enterprise_relationship.child.name
-end
+extends "admin/json/enterprise_relationship"

From 9b2a80c6b5320336dfe934071c9e1ba5da369037 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 15 May 2014 16:23:04 +1000
Subject: [PATCH 042/139] Admin can create enterprise relationships

---
 ...nterprise_relationships_controller.js.coffee | 12 +++++++++++-
 .../admin/services/enterprises.js.coffee        |  4 ++++
 .../enterprise_relationships_controller.rb      | 11 +++++++++++
 .../enterprise_relationships/index.html.haml    | 13 +++++++++++--
 app/views/admin/json/_enterprises.rabl          |  3 +++
 .../admin/enterprise_relationships_spec.rb      | 17 ++++++++++++++++-
 6 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 app/assets/javascripts/admin/services/enterprises.js.coffee
 create mode 100644 app/views/admin/json/_enterprises.rabl

diff --git a/app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee b/app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee
index cd86cf20d6..e7934f86fc 100644
--- a/app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee
+++ b/app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee
@@ -1,2 +1,12 @@
-Admin.controller "AdminEnterpriseRelationshipsCtrl", ($scope, EnterpriseRelationships) ->
+Admin.controller "AdminEnterpriseRelationshipsCtrl", ($scope, $http, EnterpriseRelationships, Enterprises) ->
   $scope.EnterpriseRelationships = EnterpriseRelationships
+  $scope.Enterprises = Enterprises
+
+  $scope.create = ->
+    $http.post('/admin/enterprise_relationships', {enterprise_relationship: {parent_id: $scope.parent_id, child_id: $scope.child_id}}).success (data, status) =>
+      $scope.EnterpriseRelationships.enterprise_relationships.unshift({parent_name: data.parent_name, child_name: data.child_name})
+
+    .error (response, status) =>
+      #@errors = response.errors
+      #flash.error = response.flash?.error
+      #flash.success = response.flash?.notice
diff --git a/app/assets/javascripts/admin/services/enterprises.js.coffee b/app/assets/javascripts/admin/services/enterprises.js.coffee
new file mode 100644
index 0000000000..199b6294c3
--- /dev/null
+++ b/app/assets/javascripts/admin/services/enterprises.js.coffee
@@ -0,0 +1,4 @@
+Admin.factory 'Enterprises', (enterprises) ->
+  new class Enterprises
+    constructor: ->
+      @enterprises = enterprises
diff --git a/app/controllers/admin/enterprise_relationships_controller.rb b/app/controllers/admin/enterprise_relationships_controller.rb
index d8dcfdde9d..aecc788cc0 100644
--- a/app/controllers/admin/enterprise_relationships_controller.rb
+++ b/app/controllers/admin/enterprise_relationships_controller.rb
@@ -1,7 +1,18 @@
 module Admin
   class EnterpriseRelationshipsController < ResourceController
     def index
+      @enterprises = Enterprise.managed_by(spree_current_user).by_name
       @enterprise_relationships = EnterpriseRelationship.by_name
     end
+
+    def create
+      @enterprise_relationship = EnterpriseRelationship.new params[:enterprise_relationship]
+
+      if @enterprise_relationship.save
+        render partial: "admin/json/enterprise_relationship", locals: {enterprise_relationship: @enterprise_relationship}
+      else
+        render status: 413, json: @enterprise_relationship.errors
+      end
+    end
   end
 end
diff --git a/app/views/admin/enterprise_relationships/index.html.haml b/app/views/admin/enterprise_relationships/index.html.haml
index 897593b22d..abe74c1738 100644
--- a/app/views/admin/enterprise_relationships/index.html.haml
+++ b/app/views/admin/enterprise_relationships/index.html.haml
@@ -5,15 +5,24 @@
 
 %div{"ng-app" => "ofn.admin", "ng-controller" => "AdminEnterpriseRelationshipsCtrl"}
   :javascript
-    angular.module('ofn.admin').value('enterprise_relationships', #{render partial: "admin/json/enterprise_relationships", object: @enterprise_relationships})
-  -#%pre {{ EnterpriseRelationships.enterprise_relationships | json }}
+    angular.module('ofn.admin').value('enterprise_relationships', #{render partial: "admin/json/enterprise_relationships", object: @enterprise_relationships});
+    angular.module('ofn.admin').value('enterprises',              #{render partial: "admin/json/enterprises",              object: @enterprises});
 
   %table#enterprise-relationships
     %thead
       %tr
         %th Parent
         %th Child
+        %th.actions
     %tbody
+      %tr
+        %td
+          %select{name: "enterprise_relationship_parent_name", "ng-model" => "parent_id", "ng-options" => "e.id as e.name for e in Enterprises.enterprises"}
+        %td
+          %select{name: "enterprise_relationship_child_name", "ng-model" => "child_id", "ng-options" => "e.id as e.name for e in Enterprises.enterprises"}
+        %td.actions
+          %input{type: "button", value: "Create", "ng-click" => "create()"}
+
       %tr{"ng-repeat" => "enterprise_relationship in EnterpriseRelationships.enterprise_relationships"}
         %td {{ enterprise_relationship.parent_name }}
         %td {{ enterprise_relationship.child_name }}
diff --git a/app/views/admin/json/_enterprises.rabl b/app/views/admin/json/_enterprises.rabl
new file mode 100644
index 0000000000..29e1dc7bf6
--- /dev/null
+++ b/app/views/admin/json/_enterprises.rabl
@@ -0,0 +1,3 @@
+collection @enterprises
+
+attributes :id, :name
diff --git a/spec/features/admin/enterprise_relationships_spec.rb b/spec/features/admin/enterprise_relationships_spec.rb
index ca0a065e5f..f2421320a6 100644
--- a/spec/features/admin/enterprise_relationships_spec.rb
+++ b/spec/features/admin/enterprise_relationships_spec.rb
@@ -27,6 +27,21 @@ feature %q{
   end
 
 
-  scenario "creating a relationship"
+  scenario "creating a relationship" do
+    e1 = create(:enterprise, name: 'One')
+    e2 = create(:enterprise, name: 'Two')
+
+    visit admin_enterprise_relationships_path
+    select 'One', from: 'enterprise_relationship_parent_name'
+    select 'Two', from: 'enterprise_relationship_child_name'
+    click_button 'Create'
+
+    page.should have_table_row [e1.name, e2.name]
+    EnterpriseRelationship.where(parent_id: e1, child_id: e2).should be_present
+  end
+
+
+  scenario "error when creating relationship"
+
   scenario "deleting a relationship"
 end

From e40843bccb64ef8d04d8f478e894385f70413b2e Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 16 May 2014 11:25:51 +1000
Subject: [PATCH 043/139] Allow error messages without attribute name. Improve
 enterprise relationship error message.

---
 Gemfile                               | 1 +
 Gemfile.lock                          | 7 +++++++
 app/models/enterprise_relationship.rb | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index af4108c9eb..87566eebfa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -35,6 +35,7 @@ gem 'geocoder'
 gem 'gmaps4rails'
 gem 'spinjs-rails'
 gem 'rack-ssl', :require => 'rack/ssl'
+gem 'custom_error_message', :github => 'jeremydurham/custom-err-msg'
 
 gem 'foreigner'
 gem 'immigrant'
diff --git a/Gemfile.lock b/Gemfile.lock
index 87a0acf967..733ef43572 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,6 +6,12 @@ GIT
       actionpack (~> 3.0)
       activemodel (~> 3.0)
 
+GIT
+  remote: git://github.com/jeremydurham/custom-err-msg.git
+  revision: 3a8ec9dddc7a5b0aab7c69a6060596de300c68f4
+  specs:
+    custom_error_message (1.1.1)
+
 GIT
   remote: git://github.com/openfoodfoundation/spree.git
   revision: da651b40f5c6cdd32e00b060729eb9aefd4f615f
@@ -492,6 +498,7 @@ DEPENDENCIES
   coffee-rails (~> 3.2.1)
   comfortable_mexican_sofa
   compass-rails
+  custom_error_message!
   database_cleaner (= 0.7.1)
   db2fog
   debugger-linecache
diff --git a/app/models/enterprise_relationship.rb b/app/models/enterprise_relationship.rb
index 2afd8c8a3e..09fff8ba03 100644
--- a/app/models/enterprise_relationship.rb
+++ b/app/models/enterprise_relationship.rb
@@ -3,7 +3,7 @@ class EnterpriseRelationship < ActiveRecord::Base
   belongs_to :child, class_name: 'Enterprise'
 
   validates_presence_of :parent_id, :child_id
-  validates_uniqueness_of :child_id, scope: :parent_id
+  validates_uniqueness_of :child_id, scope: :parent_id, message: "^That relationship is already established."
 
   scope :with_enterprises,
     joins('LEFT JOIN enterprises AS parent_enterprises ON parent_enterprises.id = enterprise_relationships.parent_id').

From b9a9937541f21bb6347003a9b3a6ac914b510a46 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 16 May 2014 11:27:59 +1000
Subject: [PATCH 044/139] Attempting to create a relationship with invalid data
 shows an error message

---
 ...erprise_relationships_controller.js.coffee |  5 ++---
 .../enterprise_relationships_controller.rb    |  2 +-
 .../enterprise_relationships/index.html.haml  |  1 +
 .../admin/enterprise_relationships_spec.rb    | 19 ++++++++++++++++++-
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee b/app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee
index e7934f86fc..02001bc48f 100644
--- a/app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee
+++ b/app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee
@@ -5,8 +5,7 @@ Admin.controller "AdminEnterpriseRelationshipsCtrl", ($scope, $http, EnterpriseR
   $scope.create = ->
     $http.post('/admin/enterprise_relationships', {enterprise_relationship: {parent_id: $scope.parent_id, child_id: $scope.child_id}}).success (data, status) =>
       $scope.EnterpriseRelationships.enterprise_relationships.unshift({parent_name: data.parent_name, child_name: data.child_name})
+      $scope.errors = ""
 
     .error (response, status) =>
-      #@errors = response.errors
-      #flash.error = response.flash?.error
-      #flash.success = response.flash?.notice
+      $scope.errors = response.errors
diff --git a/app/controllers/admin/enterprise_relationships_controller.rb b/app/controllers/admin/enterprise_relationships_controller.rb
index aecc788cc0..9661470574 100644
--- a/app/controllers/admin/enterprise_relationships_controller.rb
+++ b/app/controllers/admin/enterprise_relationships_controller.rb
@@ -11,7 +11,7 @@ module Admin
       if @enterprise_relationship.save
         render partial: "admin/json/enterprise_relationship", locals: {enterprise_relationship: @enterprise_relationship}
       else
-        render status: 413, json: @enterprise_relationship.errors
+        render status: 400, json: {errors: @enterprise_relationship.errors.full_messages.join(', ')}
       end
     end
   end
diff --git a/app/views/admin/enterprise_relationships/index.html.haml b/app/views/admin/enterprise_relationships/index.html.haml
index abe74c1738..050c57cc96 100644
--- a/app/views/admin/enterprise_relationships/index.html.haml
+++ b/app/views/admin/enterprise_relationships/index.html.haml
@@ -22,6 +22,7 @@
           %select{name: "enterprise_relationship_child_name", "ng-model" => "child_id", "ng-options" => "e.id as e.name for e in Enterprises.enterprises"}
         %td.actions
           %input{type: "button", value: "Create", "ng-click" => "create()"}
+          .errors {{ errors }}
 
       %tr{"ng-repeat" => "enterprise_relationship in EnterpriseRelationships.enterprise_relationships"}
         %td {{ enterprise_relationship.parent_name }}
diff --git a/spec/features/admin/enterprise_relationships_spec.rb b/spec/features/admin/enterprise_relationships_spec.rb
index f2421320a6..ae54f1112c 100644
--- a/spec/features/admin/enterprise_relationships_spec.rb
+++ b/spec/features/admin/enterprise_relationships_spec.rb
@@ -9,6 +9,7 @@ feature %q{
 
   before { login_to_admin_section }
 
+
   scenario "listing relationships" do
     # Given some enterprises with relationships
     e1, e2, e3, e4 = create(:enterprise), create(:enterprise), create(:enterprise), create(:enterprise)
@@ -41,7 +42,23 @@ feature %q{
   end
 
 
-  scenario "error when creating relationship"
+  scenario "attempting to create a relationship with invalid data" do
+    e1 = create(:enterprise, name: 'One')
+    e2 = create(:enterprise, name: 'Two')
+    create(:enterprise_relationship, parent: e1, child: e2)
+
+    expect do
+      # When I attempt to create a duplicate relationship
+      visit admin_enterprise_relationships_path
+      select 'One', from: 'enterprise_relationship_parent_name'
+      select 'Two', from: 'enterprise_relationship_child_name'
+      click_button 'Create'
+
+      # Then I should see an error message
+      page.should have_content "That relationship is already established."
+    end.to change(EnterpriseRelationship, :count).by(0)
+  end
+
 
   scenario "deleting a relationship"
 end

From f1df0210915933a2aa82c6c9ed9b899e93ca732d Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 16 May 2014 11:28:13 +1000
Subject: [PATCH 045/139] Show enterprise relationships tab as selected

---
 app/views/admin/shared/_enterprises_sub_menu.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/shared/_enterprises_sub_menu.html.haml b/app/views/admin/shared/_enterprises_sub_menu.html.haml
index 57ce5e9194..4a793689b7 100644
--- a/app/views/admin/shared/_enterprises_sub_menu.html.haml
+++ b/app/views/admin/shared/_enterprises_sub_menu.html.haml
@@ -1,4 +1,4 @@
 = content_for :sub_menu do
   %ul#sub_nav.inline-menu{"data-hook" => "admin_order_sub_tabs"}
     = tab :enterprises, url: main_app.admin_enterprises_path
-    = tab :relationships, url: main_app.admin_enterprise_relationships_path
+    = tab :relationships, url: main_app.admin_enterprise_relationships_path, match_path: '/enterprise_relationships'

From aa965e3752d7256686bbbe716b5926de32c94f87 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 16 May 2014 11:34:10 +1000
Subject: [PATCH 046/139] Show a CSS3 animation when a row is added

---
 app/assets/javascripts/admin/admin.js.coffee  |  2 +-
 app/assets/javascripts/admin/all.js           |  1 +
 .../admin/enterprise_relationships.css.sass   | 20 +++++++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 app/assets/stylesheets/admin/enterprise_relationships.css.sass

diff --git a/app/assets/javascripts/admin/admin.js.coffee b/app/assets/javascripts/admin/admin.js.coffee
index ba07bb7933..76154e9e20 100644
--- a/app/assets/javascripts/admin/admin.js.coffee
+++ b/app/assets/javascripts/admin/admin.js.coffee
@@ -1,3 +1,3 @@
-window.Admin = angular.module("ofn.admin", ["ngResource","ofn.dropdown"]).config ($httpProvider) ->
+window.Admin = angular.module("ofn.admin", ["ngResource", "ngAnimate", "ofn.dropdown"]).config ($httpProvider) ->
   $httpProvider.defaults.headers.common["X-CSRF-Token"] = $("meta[name=csrf-token]").attr("content")
   $httpProvider.defaults.headers.common["Accept"] = "application/json, text/javascript, */*"
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/all.js b/app/assets/javascripts/admin/all.js
index 3cf4fe97e7..99c936c4d7 100644
--- a/app/assets/javascripts/admin/all.js
+++ b/app/assets/javascripts/admin/all.js
@@ -11,6 +11,7 @@
 //= require shared/jquery-ui-timepicker-addon
 //= require angular
 //= require angular-resource
+//= require angular-animate
 //= require admin/spree_core
 //= require admin/spree_auth
 //= require admin/spree_promo
diff --git a/app/assets/stylesheets/admin/enterprise_relationships.css.sass b/app/assets/stylesheets/admin/enterprise_relationships.css.sass
new file mode 100644
index 0000000000..cffc0b0623
--- /dev/null
+++ b/app/assets/stylesheets/admin/enterprise_relationships.css.sass
@@ -0,0 +1,20 @@
+// TODO: Provide -moz- and -o- directives
+@-webkit-keyframes alert-flash
+  0%
+    background-color: #f9f1ae
+
+  100%
+    background-color: #fff
+
+
+table#enterprise-relationships
+  th.actions, td.actions
+    width: 16%
+    .errors
+      color: #f00
+
+  tr.ng-enter
+    -webkit-animation-name: alert-flash
+    -webkit-animation-duration: 1200ms
+    -webkit-animation-iteration-count: 1
+    -webkit-animation-timing-function: ease-in-out

From 5d0680234d5ba003bc47bc0381ea846828cd7780 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 16 May 2014 14:44:01 +1000
Subject: [PATCH 047/139] Admin can delete enterprise relationships

---
 ...erprise_relationships_controller.js.coffee |  6 +++++-
 .../enterprise_relationships.js.coffee        |  7 ++++++-
 .../enterprise_relationships_controller.rb    |  6 ++++++
 .../enterprise_relationships/index.html.haml  |  2 ++
 .../admin/json/_enterprise_relationship.rabl  |  2 +-
 .../admin/enterprise_relationships_spec.rb    | 20 +++++++++++++++----
 6 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee b/app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee
index 02001bc48f..51e2dd9ee0 100644
--- a/app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee
+++ b/app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee
@@ -4,8 +4,12 @@ Admin.controller "AdminEnterpriseRelationshipsCtrl", ($scope, $http, EnterpriseR
 
   $scope.create = ->
     $http.post('/admin/enterprise_relationships', {enterprise_relationship: {parent_id: $scope.parent_id, child_id: $scope.child_id}}).success (data, status) =>
-      $scope.EnterpriseRelationships.enterprise_relationships.unshift({parent_name: data.parent_name, child_name: data.child_name})
+      $scope.EnterpriseRelationships.enterprise_relationships.unshift(data)
       $scope.errors = ""
 
     .error (response, status) =>
       $scope.errors = response.errors
+
+  $scope.delete = (enterprise_relationship) ->
+    if confirm("Are you sure?")
+      $scope.EnterpriseRelationships.delete enterprise_relationship
diff --git a/app/assets/javascripts/admin/services/enterprise_relationships.js.coffee b/app/assets/javascripts/admin/services/enterprise_relationships.js.coffee
index 0201a9793e..8af5fef666 100644
--- a/app/assets/javascripts/admin/services/enterprise_relationships.js.coffee
+++ b/app/assets/javascripts/admin/services/enterprise_relationships.js.coffee
@@ -1,4 +1,9 @@
-Admin.factory 'EnterpriseRelationships', (enterprise_relationships) ->
+Admin.factory 'EnterpriseRelationships', ($http, enterprise_relationships) ->
   new class EnterpriseRelationships
     constructor: ->
       @enterprise_relationships = enterprise_relationships
+
+    delete: (er) ->
+      ers = @enterprise_relationships
+      $http.delete('/admin/enterprise_relationships/' + er.id).success (data) ->
+        ers.splice ers.indexOf(er), 1
diff --git a/app/controllers/admin/enterprise_relationships_controller.rb b/app/controllers/admin/enterprise_relationships_controller.rb
index 9661470574..46ac45a3e5 100644
--- a/app/controllers/admin/enterprise_relationships_controller.rb
+++ b/app/controllers/admin/enterprise_relationships_controller.rb
@@ -14,5 +14,11 @@ module Admin
         render status: 400, json: {errors: @enterprise_relationship.errors.full_messages.join(', ')}
       end
     end
+
+    def destroy
+      @enterprise_relationship = EnterpriseRelationship.find params[:id]
+      @enterprise_relationship.destroy
+      render nothing: true
+    end
   end
 end
diff --git a/app/views/admin/enterprise_relationships/index.html.haml b/app/views/admin/enterprise_relationships/index.html.haml
index 050c57cc96..1992f883d4 100644
--- a/app/views/admin/enterprise_relationships/index.html.haml
+++ b/app/views/admin/enterprise_relationships/index.html.haml
@@ -27,3 +27,5 @@
       %tr{"ng-repeat" => "enterprise_relationship in EnterpriseRelationships.enterprise_relationships"}
         %td {{ enterprise_relationship.parent_name }}
         %td {{ enterprise_relationship.child_name }}
+        %td.actions
+          %a.delete-enterprise-relationship.icon-trash.no-text{'ng-click' => 'delete(enterprise_relationship)'}
diff --git a/app/views/admin/json/_enterprise_relationship.rabl b/app/views/admin/json/_enterprise_relationship.rabl
index 23d08d4c87..9be152ec5c 100644
--- a/app/views/admin/json/_enterprise_relationship.rabl
+++ b/app/views/admin/json/_enterprise_relationship.rabl
@@ -1,6 +1,6 @@
 object @enterprise_relationship
 
-attributes :parent_id, :child_id
+attributes :id, :parent_id, :child_id
 
 node :parent_name do |enterprise_relationship|
   enterprise_relationship.parent.name
diff --git a/spec/features/admin/enterprise_relationships_spec.rb b/spec/features/admin/enterprise_relationships_spec.rb
index ae54f1112c..0161677afe 100644
--- a/spec/features/admin/enterprise_relationships_spec.rb
+++ b/spec/features/admin/enterprise_relationships_spec.rb
@@ -22,8 +22,8 @@ feature %q{
 
     # Then I should see the relationships
     within('table#enterprise-relationships') do
-      page.should have_table_row [e1.name, e2.name]
-      page.should have_table_row [e3.name, e4.name]
+      page.should have_table_row [e1.name, e2.name, '']
+      page.should have_table_row [e3.name, e4.name, '']
     end
   end
 
@@ -37,7 +37,7 @@ feature %q{
     select 'Two', from: 'enterprise_relationship_child_name'
     click_button 'Create'
 
-    page.should have_table_row [e1.name, e2.name]
+    page.should have_table_row [e1.name, e2.name, '']
     EnterpriseRelationship.where(parent_id: e1, child_id: e2).should be_present
   end
 
@@ -60,5 +60,17 @@ feature %q{
   end
 
 
-  scenario "deleting a relationship"
+  scenario "deleting a relationship" do
+    e1 = create(:enterprise, name: 'One')
+    e2 = create(:enterprise, name: 'Two')
+    er = create(:enterprise_relationship, parent: e1, child: e2)
+
+    visit admin_enterprise_relationships_path
+    page.should have_table_row [e1.name, e2.name, '']
+
+    first("a.delete-enterprise-relationship").click
+
+    page.should_not have_table_row [e1.name, e2.name, '']
+    EnterpriseRelationship.where(id: er.id).should be_empty
+  end
 end

From 18886c931f643267109eb4ca8f1e440b4251256b Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 16 May 2014 15:04:14 +1000
Subject: [PATCH 048/139] Extract create EnterpriseRelationship to service

---
 .../enterprise_relationships_controller.js.coffee |  9 ++-------
 .../services/enterprise_relationships.js.coffee   | 15 ++++++++++++---
 .../enterprise_relationships/index.html.haml      |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee b/app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee
index 51e2dd9ee0..c66e79c046 100644
--- a/app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee
+++ b/app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee
@@ -1,14 +1,9 @@
-Admin.controller "AdminEnterpriseRelationshipsCtrl", ($scope, $http, EnterpriseRelationships, Enterprises) ->
+Admin.controller "AdminEnterpriseRelationshipsCtrl", ($scope, EnterpriseRelationships, Enterprises) ->
   $scope.EnterpriseRelationships = EnterpriseRelationships
   $scope.Enterprises = Enterprises
 
   $scope.create = ->
-    $http.post('/admin/enterprise_relationships', {enterprise_relationship: {parent_id: $scope.parent_id, child_id: $scope.child_id}}).success (data, status) =>
-      $scope.EnterpriseRelationships.enterprise_relationships.unshift(data)
-      $scope.errors = ""
-
-    .error (response, status) =>
-      $scope.errors = response.errors
+    $scope.EnterpriseRelationships.create($scope.parent_id, $scope.child_id)
 
   $scope.delete = (enterprise_relationship) ->
     if confirm("Are you sure?")
diff --git a/app/assets/javascripts/admin/services/enterprise_relationships.js.coffee b/app/assets/javascripts/admin/services/enterprise_relationships.js.coffee
index 8af5fef666..0469aa5637 100644
--- a/app/assets/javascripts/admin/services/enterprise_relationships.js.coffee
+++ b/app/assets/javascripts/admin/services/enterprise_relationships.js.coffee
@@ -1,9 +1,18 @@
 Admin.factory 'EnterpriseRelationships', ($http, enterprise_relationships) ->
   new class EnterpriseRelationships
+    create_errors: ""
+
     constructor: ->
       @enterprise_relationships = enterprise_relationships
 
+    create: (parent_id, child_id) ->
+      $http.post('/admin/enterprise_relationships', {enterprise_relationship: {parent_id: parent_id, child_id: child_id}}).success (data, status) =>
+        @enterprise_relationships.unshift(data)
+        @create_errors = ""
+
+      .error (response, status) =>
+        @create_errors = response.errors
+
     delete: (er) ->
-      ers = @enterprise_relationships
-      $http.delete('/admin/enterprise_relationships/' + er.id).success (data) ->
-        ers.splice ers.indexOf(er), 1
+      $http.delete('/admin/enterprise_relationships/' + er.id).success (data) =>
+        @enterprise_relationships.splice @enterprise_relationships.indexOf(er), 1
diff --git a/app/views/admin/enterprise_relationships/index.html.haml b/app/views/admin/enterprise_relationships/index.html.haml
index 1992f883d4..ec843edc9d 100644
--- a/app/views/admin/enterprise_relationships/index.html.haml
+++ b/app/views/admin/enterprise_relationships/index.html.haml
@@ -22,7 +22,7 @@
           %select{name: "enterprise_relationship_child_name", "ng-model" => "child_id", "ng-options" => "e.id as e.name for e in Enterprises.enterprises"}
         %td.actions
           %input{type: "button", value: "Create", "ng-click" => "create()"}
-          .errors {{ errors }}
+          .errors {{ EnterpriseRelationships.create_errors }}
 
       %tr{"ng-repeat" => "enterprise_relationship in EnterpriseRelationships.enterprise_relationships"}
         %td {{ enterprise_relationship.parent_name }}

From 6026a74c7322b7b06594985d78c2d53e67777aeb Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 21 May 2014 14:59:24 +1000
Subject: [PATCH 049/139] Table matcher have_table_row does not wait for full
 duration on should_not

---
 spec/support/matchers/table_matchers.rb | 34 ++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/spec/support/matchers/table_matchers.rb b/spec/support/matchers/table_matchers.rb
index 71fb297e33..d0eb28d641 100644
--- a/spec/support/matchers/table_matchers.rb
+++ b/spec/support/matchers/table_matchers.rb
@@ -1,17 +1,37 @@
 RSpec::Matchers.define :have_table_row do |row|
 
-  match do |node|
+  match_for_should do |node|
     @row = row
 
-    begin
-      wait_until { node.all('tr').map { |tr| tr.all('th, td').map(&:text) }.include? row }
-    rescue TimeoutError
-      false
-    else
-      true
+    false_on_timeout_error do
+      wait_until { rows_under(node).include? row }
     end
   end
 
+  match_for_should_not do |node|
+    @row = row
+
+    false_on_timeout_error do
+      # Without this sleep, we trigger capybara's wait when looking up the table, for the full
+      # period of default_wait_time.
+      sleep 0.1
+      wait_until { !rows_under(node).include? row }
+    end
+  end
+
+  def rows_under(node)
+    node.all('tr').map { |tr| tr.all('th, td').map(&:text) }
+  end
+
+  def false_on_timeout_error
+    yield
+  rescue TimeoutError
+    false
+  else
+    true
+  end
+
+
   failure_message_for_should do |text|
     "expected to find table row #{@row}"
   end

From 92292c853ddbeb3e9833607081cfd91c84a9adb8 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 21 May 2014 15:03:29 +1000
Subject: [PATCH 050/139] Extract partials from enterprise relationships admin
 page

---
 .../enterprise_relationships/_data.html.haml  |  3 +++
 .../_enterprise_relationship.html.haml        |  4 ++++
 .../enterprise_relationships/_form.html.haml  |  8 ++++++++
 .../enterprise_relationships/index.html.haml  | 19 +++----------------
 4 files changed, 18 insertions(+), 16 deletions(-)
 create mode 100644 app/views/admin/enterprise_relationships/_data.html.haml
 create mode 100644 app/views/admin/enterprise_relationships/_enterprise_relationship.html.haml
 create mode 100644 app/views/admin/enterprise_relationships/_form.html.haml

diff --git a/app/views/admin/enterprise_relationships/_data.html.haml b/app/views/admin/enterprise_relationships/_data.html.haml
new file mode 100644
index 0000000000..2361755707
--- /dev/null
+++ b/app/views/admin/enterprise_relationships/_data.html.haml
@@ -0,0 +1,3 @@
+:javascript
+  angular.module('ofn.admin').value('enterprise_relationships', #{render partial: "admin/json/enterprise_relationships", object: @enterprise_relationships});
+  angular.module('ofn.admin').value('enterprises',              #{render partial: "admin/json/enterprises",              object: @enterprises});
diff --git a/app/views/admin/enterprise_relationships/_enterprise_relationship.html.haml b/app/views/admin/enterprise_relationships/_enterprise_relationship.html.haml
new file mode 100644
index 0000000000..237a0f5a38
--- /dev/null
+++ b/app/views/admin/enterprise_relationships/_enterprise_relationship.html.haml
@@ -0,0 +1,4 @@
+%td {{ enterprise_relationship.parent_name }}
+%td {{ enterprise_relationship.child_name }}
+%td.actions
+  %a.delete-enterprise-relationship.icon-trash.no-text{'ng-click' => 'delete(enterprise_relationship)'}
diff --git a/app/views/admin/enterprise_relationships/_form.html.haml b/app/views/admin/enterprise_relationships/_form.html.haml
new file mode 100644
index 0000000000..f0b5a9fe72
--- /dev/null
+++ b/app/views/admin/enterprise_relationships/_form.html.haml
@@ -0,0 +1,8 @@
+%tr
+  %td
+    %select{name: "enterprise_relationship_parent_name", "ng-model" => "parent_id", "ng-options" => "e.id as e.name for e in Enterprises.enterprises"}
+  %td
+    %select{name: "enterprise_relationship_child_name", "ng-model" => "child_id", "ng-options" => "e.id as e.name for e in Enterprises.enterprises"}
+  %td.actions
+    %input{type: "button", value: "Create", "ng-click" => "create()"}
+    .errors {{ EnterpriseRelationships.create_errors }}
diff --git a/app/views/admin/enterprise_relationships/index.html.haml b/app/views/admin/enterprise_relationships/index.html.haml
index ec843edc9d..4e5cedb944 100644
--- a/app/views/admin/enterprise_relationships/index.html.haml
+++ b/app/views/admin/enterprise_relationships/index.html.haml
@@ -4,9 +4,7 @@
 = render 'admin/shared/enterprises_sub_menu'
 
 %div{"ng-app" => "ofn.admin", "ng-controller" => "AdminEnterpriseRelationshipsCtrl"}
-  :javascript
-    angular.module('ofn.admin').value('enterprise_relationships', #{render partial: "admin/json/enterprise_relationships", object: @enterprise_relationships});
-    angular.module('ofn.admin').value('enterprises',              #{render partial: "admin/json/enterprises",              object: @enterprises});
+  = render 'data'
 
   %table#enterprise-relationships
     %thead
@@ -15,17 +13,6 @@
         %th Child
         %th.actions
     %tbody
-      %tr
-        %td
-          %select{name: "enterprise_relationship_parent_name", "ng-model" => "parent_id", "ng-options" => "e.id as e.name for e in Enterprises.enterprises"}
-        %td
-          %select{name: "enterprise_relationship_child_name", "ng-model" => "child_id", "ng-options" => "e.id as e.name for e in Enterprises.enterprises"}
-        %td.actions
-          %input{type: "button", value: "Create", "ng-click" => "create()"}
-          .errors {{ EnterpriseRelationships.create_errors }}
-
+      = render 'form'
       %tr{"ng-repeat" => "enterprise_relationship in EnterpriseRelationships.enterprise_relationships"}
-        %td {{ enterprise_relationship.parent_name }}
-        %td {{ enterprise_relationship.child_name }}
-        %td.actions
-          %a.delete-enterprise-relationship.icon-trash.no-text{'ng-click' => 'delete(enterprise_relationship)'}
+        = render 'enterprise_relationship'

From 76d1754c32509b9fc0290aec9ffcfe87df196c93 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 21 May 2014 15:11:14 +1000
Subject: [PATCH 051/139] Reorder helper method at bottom

---
 spec/support/matchers/table_matchers.rb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/spec/support/matchers/table_matchers.rb b/spec/support/matchers/table_matchers.rb
index d0eb28d641..146002b751 100644
--- a/spec/support/matchers/table_matchers.rb
+++ b/spec/support/matchers/table_matchers.rb
@@ -19,6 +19,15 @@ RSpec::Matchers.define :have_table_row do |row|
     end
   end
 
+  failure_message_for_should do |text|
+    "expected to find table row #{@row}"
+  end
+
+  failure_message_for_should_not do |text|
+    "expected not to find table row #{@row}"
+  end
+
+
   def rows_under(node)
     node.all('tr').map { |tr| tr.all('th, td').map(&:text) }
   end
@@ -31,13 +40,4 @@ RSpec::Matchers.define :have_table_row do |row|
     true
   end
 
-
-  failure_message_for_should do |text|
-    "expected to find table row #{@row}"
-  end
-
-  failure_message_for_should_not do |text|
-    "expected not to find table row #{@row}"
-  end
-
 end

From 0c647841a6a157bcd134a6183a9781399d089088 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 21 May 2014 16:18:07 +1000
Subject: [PATCH 052/139] Add dynamic filter to enterprise relationships

---
 app/assets/stylesheets/admin/openfoodnetwork.css.scss    | 4 +++-
 app/views/admin/enterprise_relationships/index.html.haml | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/admin/openfoodnetwork.css.scss b/app/assets/stylesheets/admin/openfoodnetwork.css.scss
index 92092bd136..87983a6bc7 100644
--- a/app/assets/stylesheets/admin/openfoodnetwork.css.scss
+++ b/app/assets/stylesheets/admin/openfoodnetwork.css.scss
@@ -19,9 +19,11 @@ table .blank-action {
 }
 
 
+input.search {
+  margin-bottom: 1em;
+}
 #new_enterprise_fee_set input.search {
   float: right;
-  margin-bottom: 1em;
 }
 
 .ng .ng-invalid.ng-dirty {
diff --git a/app/views/admin/enterprise_relationships/index.html.haml b/app/views/admin/enterprise_relationships/index.html.haml
index 4e5cedb944..a12eaaa2b8 100644
--- a/app/views/admin/enterprise_relationships/index.html.haml
+++ b/app/views/admin/enterprise_relationships/index.html.haml
@@ -6,6 +6,8 @@
 %div{"ng-app" => "ofn.admin", "ng-controller" => "AdminEnterpriseRelationshipsCtrl"}
   = render 'data'
 
+  %input.search{"ng-model" => "query", "placeholder" => "Search"}
+
   %table#enterprise-relationships
     %thead
       %tr
@@ -14,5 +16,5 @@
         %th.actions
     %tbody
       = render 'form'
-      %tr{"ng-repeat" => "enterprise_relationship in EnterpriseRelationships.enterprise_relationships"}
+      %tr{"ng-repeat" => "enterprise_relationship in EnterpriseRelationships.enterprise_relationships | filter:query"}
         = render 'enterprise_relationship'

From a049266732561c21b53c33a076f7bd2a0464fe05 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 21 May 2014 16:28:27 +1000
Subject: [PATCH 053/139] Replace enterprise relationship parent/child concepts
 with 'X permits Y'

---
 .../_enterprise_relationship.html.haml                       | 1 +
 app/views/admin/enterprise_relationships/_form.html.haml     | 1 +
 app/views/admin/enterprise_relationships/index.html.haml     | 5 -----
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/views/admin/enterprise_relationships/_enterprise_relationship.html.haml b/app/views/admin/enterprise_relationships/_enterprise_relationship.html.haml
index 237a0f5a38..3f93027ca1 100644
--- a/app/views/admin/enterprise_relationships/_enterprise_relationship.html.haml
+++ b/app/views/admin/enterprise_relationships/_enterprise_relationship.html.haml
@@ -1,4 +1,5 @@
 %td {{ enterprise_relationship.parent_name }}
+%td permits
 %td {{ enterprise_relationship.child_name }}
 %td.actions
   %a.delete-enterprise-relationship.icon-trash.no-text{'ng-click' => 'delete(enterprise_relationship)'}
diff --git a/app/views/admin/enterprise_relationships/_form.html.haml b/app/views/admin/enterprise_relationships/_form.html.haml
index f0b5a9fe72..5cc10b0fe1 100644
--- a/app/views/admin/enterprise_relationships/_form.html.haml
+++ b/app/views/admin/enterprise_relationships/_form.html.haml
@@ -1,6 +1,7 @@
 %tr
   %td
     %select{name: "enterprise_relationship_parent_name", "ng-model" => "parent_id", "ng-options" => "e.id as e.name for e in Enterprises.enterprises"}
+  %td permits
   %td
     %select{name: "enterprise_relationship_child_name", "ng-model" => "child_id", "ng-options" => "e.id as e.name for e in Enterprises.enterprises"}
   %td.actions
diff --git a/app/views/admin/enterprise_relationships/index.html.haml b/app/views/admin/enterprise_relationships/index.html.haml
index a12eaaa2b8..e0e289efcf 100644
--- a/app/views/admin/enterprise_relationships/index.html.haml
+++ b/app/views/admin/enterprise_relationships/index.html.haml
@@ -9,11 +9,6 @@
   %input.search{"ng-model" => "query", "placeholder" => "Search"}
 
   %table#enterprise-relationships
-    %thead
-      %tr
-        %th Parent
-        %th Child
-        %th.actions
     %tbody
       = render 'form'
       %tr{"ng-repeat" => "enterprise_relationship in EnterpriseRelationships.enterprise_relationships | filter:query"}

From d8fa30ea6fbe3213a7fa5310e349e7b237536889 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 21 May 2014 16:54:26 +1000
Subject: [PATCH 054/139] Add a sequence to option type position, prevents
 inconsistent ordering in specs

---
 spec/factories.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/spec/factories.rb b/spec/factories.rb
index b2ed52b7a7..6da7824d47 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -190,6 +190,10 @@ FactoryGirl.modify do
     distributors { [Enterprise.is_distributor.first || FactoryGirl.create(:distributor_enterprise)] }
   end
 
+  factory :option_type do
+    # Prevent inconsistent ordering in specs when all option types have the same (0) position
+    sequence(:position)
+  end
 end
 
 

From 48a7b9c3f86e7b6099830ab78592d68dbe6c8468 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 22 May 2014 08:50:52 +1000
Subject: [PATCH 055/139] Fix specs from 'X permits Y' table format change

---
 spec/features/admin/enterprise_relationships_spec.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spec/features/admin/enterprise_relationships_spec.rb b/spec/features/admin/enterprise_relationships_spec.rb
index 0161677afe..ea95f86ba4 100644
--- a/spec/features/admin/enterprise_relationships_spec.rb
+++ b/spec/features/admin/enterprise_relationships_spec.rb
@@ -22,8 +22,8 @@ feature %q{
 
     # Then I should see the relationships
     within('table#enterprise-relationships') do
-      page.should have_table_row [e1.name, e2.name, '']
-      page.should have_table_row [e3.name, e4.name, '']
+      page.should have_table_row [e1.name, 'permits', e2.name, '']
+      page.should have_table_row [e3.name, 'permits', e4.name, '']
     end
   end
 
@@ -37,7 +37,7 @@ feature %q{
     select 'Two', from: 'enterprise_relationship_child_name'
     click_button 'Create'
 
-    page.should have_table_row [e1.name, e2.name, '']
+    page.should have_table_row [e1.name, 'permits', e2.name, '']
     EnterpriseRelationship.where(parent_id: e1, child_id: e2).should be_present
   end
 
@@ -66,11 +66,11 @@ feature %q{
     er = create(:enterprise_relationship, parent: e1, child: e2)
 
     visit admin_enterprise_relationships_path
-    page.should have_table_row [e1.name, e2.name, '']
+    page.should have_table_row [e1.name, 'permits', e2.name, '']
 
     first("a.delete-enterprise-relationship").click
 
-    page.should_not have_table_row [e1.name, e2.name, '']
+    page.should_not have_table_row [e1.name, 'permits', e2.name, '']
     EnterpriseRelationship.where(id: er.id).should be_empty
   end
 end

From 2d0a42b2c232592d297833250bae71574bf4f0e0 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 21 May 2014 14:09:48 +1000
Subject: [PATCH 056/139] Adding working modals

---
 .../controllers/products/product_node_controller.js.coffee   | 2 ++
 app/assets/javascripts/darkswarm/directives/modal.js.coffee  | 5 ++++-
 app/views/modals/_producer.html.haml                         | 5 ++---
 .../products/_modal.html.haml => modals/_product.html.haml}  | 2 ++
 app/views/shop/products/_summary.html.haml                   | 5 ++---
 5 files changed, 12 insertions(+), 7 deletions(-)
 rename app/views/{shop/products/_modal.html.haml => modals/_product.html.haml} (73%)

diff --git a/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
index 4ec316e65f..3e24f006ae 100644
--- a/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
@@ -6,4 +6,6 @@ Darkswarm.controller "ProductNodeCtrl", ($scope) ->
     else
       $scope.product.price
 
+  $scope.producer = $scope.product.supplier
+
   $scope.hasVariants = $scope.product.variants.length > 0
diff --git a/app/assets/javascripts/darkswarm/directives/modal.js.coffee b/app/assets/javascripts/darkswarm/directives/modal.js.coffee
index 73217b3812..6f62c7cb45 100644
--- a/app/assets/javascripts/darkswarm/directives/modal.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/modal.js.coffee
@@ -8,7 +8,10 @@ Darkswarm.directive "ofnModal", ($modal)->
   link: (scope, elem, attrs, ctrl, transclude)->
     scope.title = attrs.title
     contents = null
-    transclude scope, (clone)->
+    
+    # We're using an isolate scope, which is a child of the original scope
+    # We have to compile the transclude against the original scope, not the isolate
+    transclude scope.$parent, (clone)->
       contents = clone
 
     elem.on "click", =>
diff --git a/app/views/modals/_producer.html.haml b/app/views/modals/_producer.html.haml
index 691e9378d3..056f9e488f 100644
--- a/app/views/modals/_producer.html.haml
+++ b/app/views/modals/_producer.html.haml
@@ -1,10 +1,9 @@
 %ofn-modal{title: "{{ producer.name }}"}
-  #producer_modal{bindonce: true}
+  #producer_modal
     .row
       .small-12.columns
-        %img{"bo-src" => "producer.promo_image"} 
+        %img{"ng-src" => "producer.promo_image"} 
         %h3 {{ producer.name }}
-
     .row
       .small-6.columns
         %p
diff --git a/app/views/shop/products/_modal.html.haml b/app/views/modals/_product.html.haml
similarity index 73%
rename from app/views/shop/products/_modal.html.haml
rename to app/views/modals/_product.html.haml
index 29a023704f..acca8f919b 100644
--- a/app/views/shop/products/_modal.html.haml
+++ b/app/views/modals/_product.html.haml
@@ -1,2 +1,4 @@
 %ofn-modal{title: "{{product.name}}"}
+
+  {{ product | json }}
   {{ product.description }}
diff --git a/app/views/shop/products/_summary.html.haml b/app/views/shop/products/_summary.html.haml
index 5e777a5dbb..e41c6ef440 100644
--- a/app/views/shop/products/_summary.html.haml
+++ b/app/views/shop/products/_summary.html.haml
@@ -6,11 +6,10 @@
     %img{"bo-src" => "product.primary_taxon.icon", 
     "ng-click" => "ordering.order = 'primary_taxon.name'",
     name: "{{product.primary_taxon.name}}"}
-    {{ product.name}}
-    -#= render partial: "shop/products/modal"
+    = render partial: "modals/product"
 
   .small-5.columns.summary-header
-    {{ product.supplier.name }}
+    = render partial: "modals/producer"
 
   .small-2.columns.summary-price.text-right.price
     %span{"ng-if" => "hasVariants"} 

From 67e72f4504d04cb4a8894dcb4162f96c1e338014 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 21 May 2014 16:39:59 +1000
Subject: [PATCH 057/139] Setting up after_login redirects

---
 .../authentication/login_controller.js.coffee |  7 ++++--
 .../services/authentication_service.js.coffee |  2 +-
 .../darkswarm/services/redirections.js.coffee |  3 +++
 .../admin/overview_controller_decorator.rb    |  3 +--
 app/helpers/shared_helper.rb                  |  5 +++++
 app/views/json/_injection.html.haml           |  2 ++
 app/views/layouts/darkswarm.html.haml         |  8 +++----
 app/views/shared/_current_hub.haml            |  2 --
 app/views/shared/_current_user.haml           |  2 --
 spec/features/consumer/authentication_spec.rb | 22 ++++++++++++++++++-
 10 files changed, 42 insertions(+), 14 deletions(-)
 create mode 100644 app/assets/javascripts/darkswarm/services/redirections.js.coffee
 create mode 100644 app/views/json/_injection.html.haml
 delete mode 100644 app/views/shared/_current_hub.haml
 delete mode 100644 app/views/shared/_current_user.haml

diff --git a/app/assets/javascripts/darkswarm/controllers/authentication/login_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/authentication/login_controller.js.coffee
index c2211bc033..da625e3d34 100644
--- a/app/assets/javascripts/darkswarm/controllers/authentication/login_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/authentication/login_controller.js.coffee
@@ -1,8 +1,11 @@
-Darkswarm.controller "LoginCtrl", ($scope, $http, $location, AuthenticationService) ->
+Darkswarm.controller "LoginCtrl", ($scope, $http, AuthenticationService, Redirections) ->
   $scope.path = "/login"
 
   $scope.submit = ->
     $http.post("/user/spree_user/sign_in", {spree_user: $scope.spree_user}).success (data)->
-      location.href = location.origin + location.pathname  # Strips out hash fragments
+      if Redirections.after_login
+        location.href = location.origin + Redirections.after_login
+      else
+        location.href = location.origin + location.pathname  # Strips out hash fragments
     .error (data) ->
       $scope.errors = data.message
diff --git a/app/assets/javascripts/darkswarm/services/authentication_service.js.coffee b/app/assets/javascripts/darkswarm/services/authentication_service.js.coffee
index eada8bc44b..820d5bde9c 100644
--- a/app/assets/javascripts/darkswarm/services/authentication_service.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/authentication_service.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory "AuthenticationService", (Navigation, $modal, $location)->
+Darkswarm.factory "AuthenticationService", (Navigation, $modal, $location, Redirections)->
   new class AuthenticationService
     selectedPath: "/login"
 
diff --git a/app/assets/javascripts/darkswarm/services/redirections.js.coffee b/app/assets/javascripts/darkswarm/services/redirections.js.coffee
new file mode 100644
index 0000000000..a479964e9e
--- /dev/null
+++ b/app/assets/javascripts/darkswarm/services/redirections.js.coffee
@@ -0,0 +1,3 @@
+Darkswarm.factory "Redirections", ($location)->
+  new class Redirections
+    after_login: $location.search().after_login
diff --git a/app/controllers/spree/admin/overview_controller_decorator.rb b/app/controllers/spree/admin/overview_controller_decorator.rb
index 5c96901c1d..a6142d26c0 100644
--- a/app/controllers/spree/admin/overview_controller_decorator.rb
+++ b/app/controllers/spree/admin/overview_controller_decorator.rb
@@ -13,8 +13,7 @@ Spree::Admin::OverviewController.class_eval do
       redirect_to '/unauthorized'
     else
       store_location
-      url = respond_to?(:spree_login_path) ? spree_login_path : root_path
-      redirect_to url
+      redirect_to root_path(anchor: "login?after_login=#{spree.admin_path}")
     end
   end
 end
diff --git a/app/helpers/shared_helper.rb b/app/helpers/shared_helper.rb
index be1e0ba0f4..828277cb57 100644
--- a/app/helpers/shared_helper.rb
+++ b/app/helpers/shared_helper.rb
@@ -1,4 +1,9 @@
 module SharedHelper
+
+  def inject_json(name, partial)
+    render "json/injection", name: name, partial: partial
+  end
+
   def distributor_link_class(distributor)
     cart = current_order(true)
     @active_distributors ||= Enterprise.distributors_with_active_order_cycles
diff --git a/app/views/json/_injection.html.haml b/app/views/json/_injection.html.haml
new file mode 100644
index 0000000000..95b921406b
--- /dev/null
+++ b/app/views/json/_injection.html.haml
@@ -0,0 +1,2 @@
+:javascript
+  angular.module('Darkswarm').value("#{name.to_s}", #{render "json/#{partial.to_s}"})
diff --git a/app/views/layouts/darkswarm.html.haml b/app/views/layouts/darkswarm.html.haml
index 5c2dcaee66..edeffafeed 100644
--- a/app/views/layouts/darkswarm.html.haml
+++ b/app/views/layouts/darkswarm.html.haml
@@ -15,16 +15,16 @@
     = csrf_meta_tags
 
   %body.off-canvas{"ng-app" => "Darkswarm"}
+    = inject_json "currentHub", "current_hub"
+    = inject_json "user", "current_user"
+
     .off-canvas-wrap{offcanvas: true}
       .inner-wrap
-        = render partial: "shared/current_hub"
-        = render partial: "shared/current_user"
         = render partial: "shared/menu/menu"
+
         = display_flash_messages
         %ofn-flash
 
-        -#= render "shared/sidebar"
-
         %section{ role: "main" }
           = yield
           
diff --git a/app/views/shared/_current_hub.haml b/app/views/shared/_current_hub.haml
deleted file mode 100644
index 5a0ff7c564..0000000000
--- a/app/views/shared/_current_hub.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-:javascript
-  angular.module('Darkswarm').value('currentHub', #{render "json/current_hub"})
diff --git a/app/views/shared/_current_user.haml b/app/views/shared/_current_user.haml
deleted file mode 100644
index 9745a71313..0000000000
--- a/app/views/shared/_current_user.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-:javascript
-  angular.module('Darkswarm').value('user', #{render "json/current_user"})
diff --git a/spec/features/consumer/authentication_spec.rb b/spec/features/consumer/authentication_spec.rb
index 77b60290d1..76e4a20877 100644
--- a/spec/features/consumer/authentication_spec.rb
+++ b/spec/features/consumer/authentication_spec.rb
@@ -5,7 +5,27 @@ feature "Authentication", js: true do
   describe "login" do
     let(:user) { create(:user, password: "password", password_confirmation: "password") }
 
-    describe "newskool" do
+    describe "With redirects" do
+      scenario "logging in with a redirect set" do
+        visit groups_path(anchor: "login?after_login=#{producers_path}")
+        fill_in "Email", with: user.email
+        fill_in "Password", with: user.password
+        click_login_button
+        page.should have_content "Select a producer from the list below"
+        current_path.should == producers_path
+      end
+
+      scenario "logging into admin redirects home, then back to admin" do
+        visit spree.admin_path
+        fill_in "Email", with: user.email
+        fill_in "Password", with: user.password
+        click_login_button
+        page.should have_content "Dashboard"
+        current_path.should == spree.admin_path
+      end
+    end
+
+    describe "Loggin in from the home page" do
       before do
         visit root_path
       end

From f997026796896aea652967cc249e86e56ccecd41 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 21 May 2014 16:54:48 +1000
Subject: [PATCH 058/139] Reworking the JS specs

---
 .../product_node_controller.js.coffee         |  1 +
 .../controllers/products_controller.js.coffee |  2 -
 .../darkswarm/services/product.js.coffee      |  3 +
 .../hub_node_controller_spec.js.coffee        | 11 ----
 .../product_node_controller_spec.js.coffee    | 24 +++++++
 .../products_controller_spec.js.coffee        | 64 ++++++-------------
 .../darkswarm/services/order_spec.js.coffee   |  2 +
 .../{ => services}/product_spec.js.coffee     |  2 +-
 8 files changed, 50 insertions(+), 59 deletions(-)
 create mode 100644 spec/javascripts/unit/darkswarm/controllers/products/product_node_controller_spec.js.coffee
 rename spec/javascripts/unit/darkswarm/{ => services}/product_spec.js.coffee (86%)

diff --git a/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
index 3e24f006ae..959423e3ca 100644
--- a/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
@@ -1,4 +1,5 @@
 Darkswarm.controller "ProductNodeCtrl", ($scope) ->
+
   $scope.price = ->
     if $scope.product.variants.length > 0
       prices = (v.price for v in $scope.product.variants)
diff --git a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
index 09df18ca38..323df2fc4e 100644
--- a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
@@ -12,5 +12,3 @@ Darkswarm.controller "ProductsCtrl", ($scope, $rootScope, Product, OrderCycle) -
     code = e.keyCode || e.which
     if code == 13
       e.preventDefault()
-
-  $scope.productPrice = (product) ->
diff --git a/app/assets/javascripts/darkswarm/services/product.js.coffee b/app/assets/javascripts/darkswarm/services/product.js.coffee
index ca31d5e9c0..e58b83bacc 100644
--- a/app/assets/javascripts/darkswarm/services/product.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/product.js.coffee
@@ -2,6 +2,9 @@ Darkswarm.factory 'Product', ($resource) ->
   new class Product
     constructor: ->
       @update()
+    
+    # TODO: don't need to scope this into object
+    # Already on object as far as controller scope is concerned
     data: 
       products: null
       loading: true
diff --git a/spec/javascripts/unit/darkswarm/controllers/hub_node_controller_spec.js.coffee b/spec/javascripts/unit/darkswarm/controllers/hub_node_controller_spec.js.coffee
index a2d14f5811..cb77cb1703 100644
--- a/spec/javascripts/unit/darkswarm/controllers/hub_node_controller_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/controllers/hub_node_controller_spec.js.coffee
@@ -19,14 +19,3 @@ describe "HubNodeCtrl", ->
     expect(scope.current()).toEqual false
     scope.hub = {id: 99} 
     expect(scope.current()).toEqual true
-
-  it "knows whether selecting this hub will empty the cart", ->
-    CurrentHub.id = undefined
-    expect(scope.emptiesCart()).toEqual false
-
-    CurrentHub.id = 99
-    scope.hub.id = 99
-    expect(scope.emptiesCart()).toEqual false
-
-    scope.hub.id = 1
-    expect(scope.emptiesCart()).toEqual true
diff --git a/spec/javascripts/unit/darkswarm/controllers/products/product_node_controller_spec.js.coffee b/spec/javascripts/unit/darkswarm/controllers/products/product_node_controller_spec.js.coffee
new file mode 100644
index 0000000000..4b9e404b9e
--- /dev/null
+++ b/spec/javascripts/unit/darkswarm/controllers/products/product_node_controller_spec.js.coffee
@@ -0,0 +1,24 @@
+describe "ProductNodeCtrl", ->
+  ctrl = null
+  scope = null
+  product =
+    id: 99
+    price: 10.00
+    variants: []
+
+  beforeEach ->
+    module('Darkswarm')
+    inject ($controller) ->
+      scope =
+        product: product
+      ctrl = $controller 'ProductNodeCtrl', {$scope: scope}
+
+  describe "determining the price to display for a product", ->
+    it "displays the product price when the product does not have variants", ->
+      expect(scope.price()).toEqual 10.00
+
+    it "displays the minimum variant price when the product has variants", ->
+      scope.product =
+        price: 11
+        variants: [{price: 22}, {price: 33}]
+      expect(scope.price()).toEqual 22
diff --git a/spec/javascripts/unit/darkswarm/controllers/products_controller_spec.js.coffee b/spec/javascripts/unit/darkswarm/controllers/products_controller_spec.js.coffee
index 269c8385b8..685d495039 100644
--- a/spec/javascripts/unit/darkswarm/controllers/products_controller_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/controllers/products_controller_spec.js.coffee
@@ -1,47 +1,21 @@
-describe 'All controllers', ->
-  describe 'ProductsCtrl', ->
-    ctrl = null
-    scope = null
-    event = null
-    Product = null
+describe 'ProductsCtrl', ->
+  ctrl = null
+  scope = null
+  event = null
+  Product = null
 
-    beforeEach ->
-      module('Darkswarm')
-      Product = 
-        all: ->
-        update: ->
-        data: "testy mctest"
-      OrderCycle =
-        order_cycle: {}
-          
-      inject ($controller) ->
-        scope = {}
-        ctrl = $controller 'ProductsCtrl', {$scope: scope, Product: Product, OrderCycle: OrderCycle}
-
-    it 'fetches products from Product', ->
-      expect(scope.data).toEqual 'testy mctest'
-
-    describe "determining the price to display for a product", ->
-      it "displays the product price when the product does not have variants", ->
-        product = {variants: [], price: 12.34}
-        expect(scope.productPrice(product)).toEqual 12.34
-
-      it "displays the minimum variant price when the product has variants", ->
-        product =
-          price: 11
-          variants: [{price: 22}, {price: 33}]
-        expect(scope.productPrice(product)).toEqual 22
-  
-  describe 'OrderCycleCtrl', ->
-    ctrl = null
-    scope = null
-    event = null
-    product_ctrl = null
-    OrderCycle = null
-
-    beforeEach ->
-      module 'Darkswarm'
+  beforeEach ->
+    module('Darkswarm')
+    Product = 
+      all: ->
+      update: ->
+      data: "testy mctest"
+    OrderCycle =
+      order_cycle: {}
+        
+    inject ($controller) ->
       scope = {}
-      inject ($controller) ->
-        scope = {}
-        ctrl = $controller 'OrderCycleCtrl', {$scope: scope}
+      ctrl = $controller 'ProductsCtrl', {$scope: scope, Product: Product, OrderCycle: OrderCycle}
+
+  it 'fetches products from Product', ->
+    expect(scope.data).toEqual 'testy mctest'
diff --git a/spec/javascripts/unit/darkswarm/services/order_spec.js.coffee b/spec/javascripts/unit/darkswarm/services/order_spec.js.coffee
index 0462e92952..fedcf23629 100644
--- a/spec/javascripts/unit/darkswarm/services/order_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/services/order_spec.js.coffee
@@ -26,8 +26,10 @@ describe 'Order service', ->
     }
     angular.module('Darkswarm').value('order', orderData)
     module 'Darkswarm'
+
     inject ($injector, _$httpBackend_)->
       $httpBackend = _$httpBackend_
+      $httpBackend.expectGET("/shop/products").respond 200, []
       Order = $injector.get("Order")
       Navigation = $injector.get("Navigation")
       flash = $injector.get("flash")
diff --git a/spec/javascripts/unit/darkswarm/product_spec.js.coffee b/spec/javascripts/unit/darkswarm/services/product_spec.js.coffee
similarity index 86%
rename from spec/javascripts/unit/darkswarm/product_spec.js.coffee
rename to spec/javascripts/unit/darkswarm/services/product_spec.js.coffee
index 7108d819af..260074a981 100644
--- a/spec/javascripts/unit/darkswarm/product_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/services/product_spec.js.coffee
@@ -10,5 +10,5 @@ describe 'Product service', ->
 
   it "Fetches products from the backend on init", ->
     $httpBackend.expectGET("/shop/products").respond([{test : "cats"}])
-    products = Product.all()
     $httpBackend.flush()
+    expect(Product.data.products[0].test).toEqual "cats" 

From 12dfcd0de96f89326497a1af25cbf61be67af5c1 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 22 May 2014 10:43:26 +1000
Subject: [PATCH 059/139] Fixing auth workflowsg

---
 spec/support/request/authentication_workflow.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/spec/support/request/authentication_workflow.rb b/spec/support/request/authentication_workflow.rb
index e26932bfef..b7975ac7ec 100644
--- a/spec/support/request/authentication_workflow.rb
+++ b/spec/support/request/authentication_workflow.rb
@@ -33,7 +33,7 @@ module AuthenticationWorkflow
       :login => 'admin@ofn.org')
 
     admin_user.spree_roles << admin_role
-    login_to_admin_as admin_user
+    quick_login_as admin_user
   end
 
   def create_enterprise_user(enterprises = [])
@@ -47,10 +47,12 @@ module AuthenticationWorkflow
   end
 
   def login_to_admin_as user
+    quick_login_as user
     visit spree.admin_path
-    fill_in 'spree_user_email', :with => user.email
-    fill_in 'spree_user_password', :with => user.password
-    click_button 'Login'
+    #visit spree.admin_path
+    #fill_in 'spree_user_email', :with => user.email
+    #fill_in 'spree_user_password', :with => user.password
+    #click_button 'Login'
   end
 
   def login_to_consumer_section

From f6bc1a82beede476cd973e3db064486b8fdc48c3 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 22 May 2014 10:54:51 +1000
Subject: [PATCH 060/139] Enterprise user can manage enterprise relationships

---
 app/models/spree/ability_decorator.rb |  7 ++++++-
 spec/models/spree/ability_spec.rb     | 27 +++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/app/models/spree/ability_decorator.rb b/app/models/spree/ability_decorator.rb
index ee83e85bf7..44e7d5e02e 100644
--- a/app/models/spree/ability_decorator.rb
+++ b/app/models/spree/ability_decorator.rb
@@ -1,6 +1,6 @@
-
 class AbilityDecorator
   include CanCan::Ability
+
   def initialize(user)
     if user.enterprises.count > 0
 
@@ -53,6 +53,11 @@ class AbilityDecorator
         (user.enterprises & shipping_method.distributors).any?
       end
 
+      can [:admin, :index, :create], EnterpriseRelationship
+      can [:destroy], EnterpriseRelationship do |enterprise_relationship|
+        user.enterprises.include? enterprise_relationship.parent
+      end
+
       can [:create], OrderCycle
       can [:admin, :index, :read, :edit, :update, :bulk_update, :clone], OrderCycle do |order_cycle|
         user.enterprises.include? order_cycle.coordinator
diff --git a/spec/models/spree/ability_spec.rb b/spec/models/spree/ability_spec.rb
index fc13925bae..111c8e5196 100644
--- a/spec/models/spree/ability_spec.rb
+++ b/spec/models/spree/ability_spec.rb
@@ -17,6 +17,9 @@ module Spree
       let(:p1) { create(:product, supplier: s1, distributors:[d1, d2]) }
       let(:p2) { create(:product, supplier: s2, distributors:[d1, d2]) }
 
+      let(:er1) { create(:enterprise_relationship, parent: s1, child: d1) }
+      let(:er2) { create(:enterprise_relationship, parent: d1, child: s1) }
+
       subject { user }
       let(:user) { nil }
 
@@ -72,6 +75,18 @@ module Spree
           should have_ability([:admin, :index, :read, :create, :edit], for: Spree::Classification)
         end
 
+        it "should be able to read and create enterprise relationships" do
+          should have_ability([:admin, :index, :create], for: EnterpriseRelationship)
+        end
+
+        it "should be able to destroy enterprise relationships for its enterprises" do
+          should have_ability(:destroy, for: er1)
+        end
+
+        it "should not be able to destroy enterprise relationships for other enterprises" do
+          should_not have_ability(:destroy, for: er2)
+        end
+
       end
 
       context "when is a distributor enterprise user" do
@@ -146,6 +161,18 @@ module Spree
         it "should be able to read/write ShippingMethods" do
           should have_ability([:admin, :index, :create, :update, :destroy], for: Spree::ShippingMethod)
         end
+
+        it "should be able to read and create enterprise relationships" do
+          should have_ability([:admin, :index, :create], for: EnterpriseRelationship)
+        end
+
+        it "should be able to destroy enterprise relationships for its enterprises" do
+          should have_ability(:destroy, for: er2)
+        end
+
+        it "should not be able to destroy enterprise relationships for other enterprises" do
+          should_not have_ability(:destroy, for: er1)
+        end
       end
 
       context 'Order Cycle co-ordinator' do

From 66cd5c937f7d03623d023f100be1a3e6897220a4 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 22 May 2014 10:59:41 +1000
Subject: [PATCH 061/139] Add a helper to make capybara specs fail fast

---
 spec/support/request/web_helper.rb | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/spec/support/request/web_helper.rb b/spec/support/request/web_helper.rb
index 6add44834e..3a2cb82128 100644
--- a/spec/support/request/web_helper.rb
+++ b/spec/support/request/web_helper.rb
@@ -1,4 +1,22 @@
 module WebHelper
+  def self.included(base)
+    base.extend ClassMethods
+  end
+
+  module ClassMethods
+    # By default, Capybara uses a 30 s wait time, which is more reliable for CI, but too slow
+    # for TDD. Use this to make tests fail fast. Usage:
+    #
+    # describe "foo" do
+    #   use_short_wait
+    #   ...
+    # end
+    def use_short_wait
+      around { |example| Capybara.using_wait_time(2) { example.run } }
+    end
+  end
+
+
   def current_path_should_be path
     current_path = URI.parse(current_url).path
     current_path.should == path

From fb05ad57e1ca8f00684fb406270b6bdc90a92ede Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 22 May 2014 11:00:29 +1000
Subject: [PATCH 062/139] Tidy up spec helper, clean database before suite run

---
 spec/spec_helper.rb | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 49a7f39250..4f96a09070 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -71,26 +71,20 @@ RSpec.configure do |config|
   # rspec-rails.
   config.infer_base_class_for_anonymous_controllers = false
 
-  # ## Filters
-  #
+  # Filters
   config.filter_run_excluding :skip => true, :future => true, :to_figure_out => true
 
-  config.before(:each) do
-    Spree::Address.any_instance.stub(:geocode).and_return([1,1])
+  # DatabaseCleaner
+  config.before(:suite)          { DatabaseCleaner.clean_with :deletion, {except: ['spree_countries', 'spree_states']} }
+  config.before(:each)           { DatabaseCleaner.strategy = :transaction }
+  config.before(:each, js: true) { DatabaseCleaner.strategy = :deletion, {except: ['spree_countries', 'spree_states']} }
+  config.before(:each)           { DatabaseCleaner.start }
+  config.after(:each)            { DatabaseCleaner.clean }
 
-    if example.metadata[:js]
-      DatabaseCleaner.strategy = :deletion, { :except => ['spree_countries', 'spree_states'] }
-    else
-      DatabaseCleaner.strategy = :transaction
-    end
-
-    DatabaseCleaner.start
-  end
-
-  config.after(:each) do
-    DatabaseCleaner.clean
-  end
+  # Geocoding
+  config.before(:each) { Spree::Address.any_instance.stub(:geocode).and_return([1,1]) }
 
+  # Helpers
   config.include Rails.application.routes.url_helpers
   config.include Spree::UrlHelpers
   config.include Spree::CheckoutHelpers
@@ -103,7 +97,7 @@ RSpec.configure do |config|
   config.include OpenFoodNetwork::DistributionHelper
   config.include ActionView::Helpers::DateHelper
 
-  # Factory girl
+  # FactoryGirl
   require 'factory_girl_rails'
   config.include FactoryGirl::Syntax::Methods
 

From 06955a024fb05d56f26d82fb559e5f724a165e11 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 22 May 2014 11:02:03 +1000
Subject: [PATCH 063/139] Enterprise user can only create relationships with
 their own enterprises as parent

---
 .../admin/services/enterprises.js.coffee      |   5 +-
 .../enterprise_relationships_controller.rb    |   3 +-
 .../enterprise_relationships/_data.html.haml  |   3 +-
 .../enterprise_relationships/_form.html.haml  |   4 +-
 .../admin/enterprise_relationships_spec.rb    | 124 ++++++++++--------
 5 files changed, 79 insertions(+), 60 deletions(-)

diff --git a/app/assets/javascripts/admin/services/enterprises.js.coffee b/app/assets/javascripts/admin/services/enterprises.js.coffee
index 199b6294c3..778a915c22 100644
--- a/app/assets/javascripts/admin/services/enterprises.js.coffee
+++ b/app/assets/javascripts/admin/services/enterprises.js.coffee
@@ -1,4 +1,5 @@
-Admin.factory 'Enterprises', (enterprises) ->
+Admin.factory 'Enterprises', (my_enterprises, all_enterprises) ->
   new class Enterprises
     constructor: ->
-      @enterprises = enterprises
+      @my_enterprises = my_enterprises
+      @all_enterprises = all_enterprises
diff --git a/app/controllers/admin/enterprise_relationships_controller.rb b/app/controllers/admin/enterprise_relationships_controller.rb
index 46ac45a3e5..9bb94b7849 100644
--- a/app/controllers/admin/enterprise_relationships_controller.rb
+++ b/app/controllers/admin/enterprise_relationships_controller.rb
@@ -1,7 +1,8 @@
 module Admin
   class EnterpriseRelationshipsController < ResourceController
     def index
-      @enterprises = Enterprise.managed_by(spree_current_user).by_name
+      @my_enterprises = Enterprise.managed_by(spree_current_user).by_name
+      @all_enterprises = Enterprise.by_name
       @enterprise_relationships = EnterpriseRelationship.by_name
     end
 
diff --git a/app/views/admin/enterprise_relationships/_data.html.haml b/app/views/admin/enterprise_relationships/_data.html.haml
index 2361755707..7c13978e90 100644
--- a/app/views/admin/enterprise_relationships/_data.html.haml
+++ b/app/views/admin/enterprise_relationships/_data.html.haml
@@ -1,3 +1,4 @@
 :javascript
   angular.module('ofn.admin').value('enterprise_relationships', #{render partial: "admin/json/enterprise_relationships", object: @enterprise_relationships});
-  angular.module('ofn.admin').value('enterprises',              #{render partial: "admin/json/enterprises",              object: @enterprises});
+  angular.module('ofn.admin').value('my_enterprises',           #{render partial: "admin/json/enterprises",              object: @my_enterprises});
+  angular.module('ofn.admin').value('all_enterprises',          #{render partial: "admin/json/enterprises",              object: @all_enterprises});
diff --git a/app/views/admin/enterprise_relationships/_form.html.haml b/app/views/admin/enterprise_relationships/_form.html.haml
index 5cc10b0fe1..1a737ec3a5 100644
--- a/app/views/admin/enterprise_relationships/_form.html.haml
+++ b/app/views/admin/enterprise_relationships/_form.html.haml
@@ -1,9 +1,9 @@
 %tr
   %td
-    %select{name: "enterprise_relationship_parent_name", "ng-model" => "parent_id", "ng-options" => "e.id as e.name for e in Enterprises.enterprises"}
+    %select{name: "enterprise_relationship_parent_id", "ng-model" => "parent_id", "ng-options" => "e.id as e.name for e in Enterprises.my_enterprises"}
   %td permits
   %td
-    %select{name: "enterprise_relationship_child_name", "ng-model" => "child_id", "ng-options" => "e.id as e.name for e in Enterprises.enterprises"}
+    %select{name: "enterprise_relationship_child_id", "ng-model" => "child_id", "ng-options" => "e.id as e.name for e in Enterprises.all_enterprises"}
   %td.actions
     %input{type: "button", value: "Create", "ng-click" => "create()"}
     .errors {{ EnterpriseRelationships.create_errors }}
diff --git a/spec/features/admin/enterprise_relationships_spec.rb b/spec/features/admin/enterprise_relationships_spec.rb
index ea95f86ba4..9e17a44979 100644
--- a/spec/features/admin/enterprise_relationships_spec.rb
+++ b/spec/features/admin/enterprise_relationships_spec.rb
@@ -7,70 +7,86 @@ feature %q{
   include AuthenticationWorkflow
   include WebHelper
 
-  before { login_to_admin_section }
+
+  context "as a site administrator" do
+    before { login_to_admin_section }
+
+    scenario "listing relationships" do
+      # Given some enterprises with relationships
+      e1, e2, e3, e4 = create(:enterprise), create(:enterprise), create(:enterprise), create(:enterprise)
+      create(:enterprise_relationship, parent: e1, child: e2)
+      create(:enterprise_relationship, parent: e3, child: e4)
+
+      # When I go to the relationships page
+      click_link 'Enterprises'
+      click_link 'Relationships'
+
+      # Then I should see the relationships
+      within('table#enterprise-relationships') do
+        page.should have_table_row [e1.name, 'permits', e2.name, '']
+        page.should have_table_row [e3.name, 'permits', e4.name, '']
+      end
+    end
 
 
-  scenario "listing relationships" do
-    # Given some enterprises with relationships
-    e1, e2, e3, e4 = create(:enterprise), create(:enterprise), create(:enterprise), create(:enterprise)
-    create(:enterprise_relationship, parent: e1, child: e2)
-    create(:enterprise_relationship, parent: e3, child: e4)
+    scenario "creating a relationship" do
+      e1 = create(:enterprise, name: 'One')
+      e2 = create(:enterprise, name: 'Two')
 
-    # When I go to the relationships page
-    click_link 'Enterprises'
-    click_link 'Relationships'
+      visit admin_enterprise_relationships_path
+      select 'One', from: 'enterprise_relationship_parent_id'
+      select 'Two', from: 'enterprise_relationship_child_id'
+      click_button 'Create'
 
-    # Then I should see the relationships
-    within('table#enterprise-relationships') do
       page.should have_table_row [e1.name, 'permits', e2.name, '']
-      page.should have_table_row [e3.name, 'permits', e4.name, '']
+      EnterpriseRelationship.where(parent_id: e1, child_id: e2).should be_present
+    end
+
+
+    scenario "attempting to create a relationship with invalid data" do
+      e1 = create(:enterprise, name: 'One')
+      e2 = create(:enterprise, name: 'Two')
+      create(:enterprise_relationship, parent: e1, child: e2)
+
+      expect do
+        # When I attempt to create a duplicate relationship
+        visit admin_enterprise_relationships_path
+        select 'One', from: 'enterprise_relationship_parent_id'
+        select 'Two', from: 'enterprise_relationship_child_id'
+        click_button 'Create'
+
+        # Then I should see an error message
+        page.should have_content "That relationship is already established."
+      end.to change(EnterpriseRelationship, :count).by(0)
+    end
+
+
+    scenario "deleting a relationship" do
+      e1 = create(:enterprise, name: 'One')
+      e2 = create(:enterprise, name: 'Two')
+      er = create(:enterprise_relationship, parent: e1, child: e2)
+
+      visit admin_enterprise_relationships_path
+      page.should have_table_row [e1.name, 'permits', e2.name, '']
+
+      first("a.delete-enterprise-relationship").click
+
+      page.should_not have_table_row [e1.name, 'permits', e2.name, '']
+      EnterpriseRelationship.where(id: er.id).should be_empty
     end
   end
 
+  context "as an enterprise user" do
+    let!(:d1) { create(:distributor_enterprise) }
+    let!(:d2) { create(:distributor_enterprise) }
+    let(:enterprise_user) { create_enterprise_user([d1]) }
 
-  scenario "creating a relationship" do
-    e1 = create(:enterprise, name: 'One')
-    e2 = create(:enterprise, name: 'Two')
+    before { login_to_admin_as enterprise_user }
 
-    visit admin_enterprise_relationships_path
-    select 'One', from: 'enterprise_relationship_parent_name'
-    select 'Two', from: 'enterprise_relationship_child_name'
-    click_button 'Create'
-
-    page.should have_table_row [e1.name, 'permits', e2.name, '']
-    EnterpriseRelationship.where(parent_id: e1, child_id: e2).should be_present
-  end
-
-
-  scenario "attempting to create a relationship with invalid data" do
-    e1 = create(:enterprise, name: 'One')
-    e2 = create(:enterprise, name: 'Two')
-    create(:enterprise_relationship, parent: e1, child: e2)
-
-    expect do
-      # When I attempt to create a duplicate relationship
+    scenario "enterprise user can only add their own enterprises as parent" do
       visit admin_enterprise_relationships_path
-      select 'One', from: 'enterprise_relationship_parent_name'
-      select 'Two', from: 'enterprise_relationship_child_name'
-      click_button 'Create'
-
-      # Then I should see an error message
-      page.should have_content "That relationship is already established."
-    end.to change(EnterpriseRelationship, :count).by(0)
-  end
-
-
-  scenario "deleting a relationship" do
-    e1 = create(:enterprise, name: 'One')
-    e2 = create(:enterprise, name: 'Two')
-    er = create(:enterprise_relationship, parent: e1, child: e2)
-
-    visit admin_enterprise_relationships_path
-    page.should have_table_row [e1.name, 'permits', e2.name, '']
-
-    first("a.delete-enterprise-relationship").click
-
-    page.should_not have_table_row [e1.name, 'permits', e2.name, '']
-    EnterpriseRelationship.where(id: er.id).should be_empty
+      page.should have_select 'enterprise_relationship_parent_id', options: ['', d1.name]
+      page.should have_select 'enterprise_relationship_child_id', options: ['', d1.name, d2.name]
+    end
   end
 end

From d7b4318aff0826c06ac5f22d40c1d0a0b3dce1e2 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 22 May 2014 11:25:37 +1000
Subject: [PATCH 064/139] Find enterprise relationships involving any of a
 number of enterprises

---
 app/models/enterprise_relationship.rb       |  4 ++++
 spec/models/enterprise_relationship_spec.rb | 23 ++++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/app/models/enterprise_relationship.rb b/app/models/enterprise_relationship.rb
index 09fff8ba03..26bf8fc012 100644
--- a/app/models/enterprise_relationship.rb
+++ b/app/models/enterprise_relationship.rb
@@ -9,4 +9,8 @@ class EnterpriseRelationship < ActiveRecord::Base
     joins('LEFT JOIN enterprises AS parent_enterprises ON parent_enterprises.id = enterprise_relationships.parent_id').
     joins('LEFT JOIN enterprises AS child_enterprises ON child_enterprises.id = enterprise_relationships.child_id')
   scope :by_name, with_enterprises.order('parent_enterprises.name, child_enterprises.name')
+
+  scope :involving_enterprises, ->(enterprises) {
+    where('parent_id IN (?) OR child_id IN (?)', enterprises, enterprises)
+  }
 end
diff --git a/spec/models/enterprise_relationship_spec.rb b/spec/models/enterprise_relationship_spec.rb
index 7cca07472e..b715674594 100644
--- a/spec/models/enterprise_relationship_spec.rb
+++ b/spec/models/enterprise_relationship_spec.rb
@@ -2,15 +2,32 @@ require 'spec_helper'
 
 describe EnterpriseRelationship do
   describe "scopes" do
+    let(:e1)  { create(:enterprise, name: 'A') }
+    let(:e2)  { create(:enterprise, name: 'B') }
+    let(:e3)  { create(:enterprise, name: 'C') }
+
     it "sorts by parent, child enterprise name" do
-      e1 = create(:enterprise, name: 'A')
-      e2 = create(:enterprise, name: 'B')
-      e3 = create(:enterprise, name: 'C')
       er1 = create(:enterprise_relationship, parent: e1, child: e3)
       er2 = create(:enterprise_relationship, parent: e2, child: e1)
       er3 = create(:enterprise_relationship, parent: e1, child: e2)
 
       EnterpriseRelationship.by_name.should == [er3, er1, er2]
     end
+
+    describe "finding relationships involving some enterprises" do
+      let!(:er) { create(:enterprise_relationship, parent: e1, child: e2) }
+
+      it "returns relationships where an enterprise is the parent" do
+        EnterpriseRelationship.involving_enterprises([e1]).should == [er]
+      end
+
+      it "returns relationships where an enterprise is the child" do
+        EnterpriseRelationship.involving_enterprises([e2]).should == [er]
+      end
+
+      it "does not return other relationships" do
+        EnterpriseRelationship.involving_enterprises([e3]).should == []
+      end
+    end
   end
 end

From c2f762d570647ec7d1bd39de360ec9b0ae94cae9 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 22 May 2014 11:27:19 +1000
Subject: [PATCH 065/139] Enterprise user can only see relationships involving
 their enterprises

---
 .../enterprise_relationships_controller.rb      |  2 +-
 .../admin/enterprise_relationships_spec.rb      | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admin/enterprise_relationships_controller.rb b/app/controllers/admin/enterprise_relationships_controller.rb
index 9bb94b7849..212bf3849d 100644
--- a/app/controllers/admin/enterprise_relationships_controller.rb
+++ b/app/controllers/admin/enterprise_relationships_controller.rb
@@ -3,7 +3,7 @@ module Admin
     def index
       @my_enterprises = Enterprise.managed_by(spree_current_user).by_name
       @all_enterprises = Enterprise.by_name
-      @enterprise_relationships = EnterpriseRelationship.by_name
+      @enterprise_relationships = EnterpriseRelationship.by_name.involving_enterprises @my_enterprises
     end
 
     def create
diff --git a/spec/features/admin/enterprise_relationships_spec.rb b/spec/features/admin/enterprise_relationships_spec.rb
index 9e17a44979..7e15a243c8 100644
--- a/spec/features/admin/enterprise_relationships_spec.rb
+++ b/spec/features/admin/enterprise_relationships_spec.rb
@@ -76,17 +76,32 @@ feature %q{
     end
   end
 
+
   context "as an enterprise user" do
     let!(:d1) { create(:distributor_enterprise) }
     let!(:d2) { create(:distributor_enterprise) }
+    let!(:d3) { create(:distributor_enterprise) }
     let(:enterprise_user) { create_enterprise_user([d1]) }
 
+    let!(:er1) { create(:enterprise_relationship, parent: d1, child: d2) }
+    let!(:er2) { create(:enterprise_relationship, parent: d2, child: d1) }
+    let!(:er3) { create(:enterprise_relationship, parent: d2, child: d3) }
+
     before { login_to_admin_as enterprise_user }
 
+    scenario "enterprise user can only see relationships involving their enterprises" do
+      visit admin_enterprise_relationships_path
+
+      page.should     have_table_row [d1.name, 'permits', d2.name, '']
+      page.should     have_table_row [d2.name, 'permits', d1.name, '']
+      page.should_not have_table_row [d2.name, 'permits', d3.name, '']
+    end
+
+
     scenario "enterprise user can only add their own enterprises as parent" do
       visit admin_enterprise_relationships_path
       page.should have_select 'enterprise_relationship_parent_id', options: ['', d1.name]
-      page.should have_select 'enterprise_relationship_child_id', options: ['', d1.name, d2.name]
+      page.should have_select 'enterprise_relationship_child_id', options: ['', d1.name, d2.name, d3.name]
     end
   end
 end

From a16f726377306ddabee778c5a70bc132ecf93805 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 22 May 2014 11:32:37 +1000
Subject: [PATCH 066/139] Extract have_relationship test

---
 .../admin/enterprise_relationships_spec.rb    | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/spec/features/admin/enterprise_relationships_spec.rb b/spec/features/admin/enterprise_relationships_spec.rb
index 7e15a243c8..1443cd4c34 100644
--- a/spec/features/admin/enterprise_relationships_spec.rb
+++ b/spec/features/admin/enterprise_relationships_spec.rb
@@ -23,8 +23,8 @@ feature %q{
 
       # Then I should see the relationships
       within('table#enterprise-relationships') do
-        page.should have_table_row [e1.name, 'permits', e2.name, '']
-        page.should have_table_row [e3.name, 'permits', e4.name, '']
+        page.should have_relationship e1, e2
+        page.should have_relationship e3, e4
       end
     end
 
@@ -38,7 +38,7 @@ feature %q{
       select 'Two', from: 'enterprise_relationship_child_id'
       click_button 'Create'
 
-      page.should have_table_row [e1.name, 'permits', e2.name, '']
+      page.should have_relationship e1, e2
       EnterpriseRelationship.where(parent_id: e1, child_id: e2).should be_present
     end
 
@@ -67,11 +67,11 @@ feature %q{
       er = create(:enterprise_relationship, parent: e1, child: e2)
 
       visit admin_enterprise_relationships_path
-      page.should have_table_row [e1.name, 'permits', e2.name, '']
+      page.should have_relationship e1, e2
 
       first("a.delete-enterprise-relationship").click
 
-      page.should_not have_table_row [e1.name, 'permits', e2.name, '']
+      page.should_not have_relationship e1, e2
       EnterpriseRelationship.where(id: er.id).should be_empty
     end
   end
@@ -92,9 +92,9 @@ feature %q{
     scenario "enterprise user can only see relationships involving their enterprises" do
       visit admin_enterprise_relationships_path
 
-      page.should     have_table_row [d1.name, 'permits', d2.name, '']
-      page.should     have_table_row [d2.name, 'permits', d1.name, '']
-      page.should_not have_table_row [d2.name, 'permits', d3.name, '']
+      page.should     have_relationship d1, d2
+      page.should     have_relationship d2, d1
+      page.should_not have_relationship d2, d3
     end
 
 
@@ -104,4 +104,11 @@ feature %q{
       page.should have_select 'enterprise_relationship_child_id', options: ['', d1.name, d2.name, d3.name]
     end
   end
+
+
+  private
+
+  def have_relationship(parent, child)
+    have_table_row [parent.name, 'permits', child.name, '']
+  end
 end

From 34c31afabe853c4dadeb9867e4215d8f716240c1 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 22 May 2014 11:34:46 +1000
Subject: [PATCH 067/139] Adding large image

---
 app/views/shop/products.rabl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/shop/products.rabl b/app/views/shop/products.rabl
index c79157dae5..c8b5d5398c 100644
--- a/app/views/shop/products.rabl
+++ b/app/views/shop/products.rabl
@@ -22,7 +22,8 @@ child :master => :master do
   child :images => :images do
     attributes :id, :alt
     node do |img|
-      {:small_url => img.attachment.url(:small, false)}
+      {:small_url => img.attachment.url(:small, false),
+      :large_url => img.attachment.url(:large, false)}
     end
   end
 end

From 70f549e92a6308b94cd024b9e3e7603fa87d8005 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 22 May 2014 11:46:06 +1000
Subject: [PATCH 068/139] Patching our modified admin login

---
 spec/support/request/authentication_workflow.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spec/support/request/authentication_workflow.rb b/spec/support/request/authentication_workflow.rb
index b7975ac7ec..add8de9f28 100644
--- a/spec/support/request/authentication_workflow.rb
+++ b/spec/support/request/authentication_workflow.rb
@@ -34,6 +34,7 @@ module AuthenticationWorkflow
 
     admin_user.spree_roles << admin_role
     quick_login_as admin_user
+    visit spree.admin_path
   end
 
   def create_enterprise_user(enterprises = [])

From c69a4a5f1a023ef1589b5a251a1898f585885a26 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 22 May 2014 12:12:10 +1000
Subject: [PATCH 069/139] Adding social media links

---
 app/views/admin/enterprises/_form.html.haml   | 21 +++++++++++++------
 ...2015012_add_social_media_to_enterprises.rb |  7 +++++++
 db/schema.rb                                  |  5 ++++-
 spec/features/admin/enterprises_spec.rb       |  2 ++
 4 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 db/migrate/20140522015012_add_social_media_to_enterprises.rb

diff --git a/app/views/admin/enterprises/_form.html.haml b/app/views/admin/enterprises/_form.html.haml
index ab795d21fd..161f43d34d 100644
--- a/app/views/admin/enterprises/_form.html.haml
+++ b/app/views/admin/enterprises/_form.html.haml
@@ -116,12 +116,21 @@
           = f.label :website
         .omega.eight.columns
           = f.text_field :website, { placeholder: "eg. www.truffles.com"}
-      -# TODO: Facebook model field
-      -#.row
-      -#  .alpha.two.columns
-      -#    = f.label :facebook, 'Facebook'
-      -#  .omega.four.columns
-      -#    = f.text_field :facebook
+      .row
+        .alpha.two.columns
+          = f.label :facebook, 'Facebook'
+        .omega.four.columns
+          = f.text_field :facebook
+      .row
+        .alpha.two.columns
+          = f.label :instagram, 'Instagram'
+        .omega.four.columns
+          = f.text_field :instagram
+      .row
+        .alpha.two.columns
+          = f.label :linkedin, 'LinkedIn'
+        .omega.four.columns
+          = f.text_field :linkedin
       .row
         .alpha.three.columns
           = f.label :twitter
diff --git a/db/migrate/20140522015012_add_social_media_to_enterprises.rb b/db/migrate/20140522015012_add_social_media_to_enterprises.rb
new file mode 100644
index 0000000000..9ca88cf0dc
--- /dev/null
+++ b/db/migrate/20140522015012_add_social_media_to_enterprises.rb
@@ -0,0 +1,7 @@
+class AddSocialMediaToEnterprises < ActiveRecord::Migration
+  def change
+    add_column :enterprises, :facebook, :string
+    add_column :enterprises, :instagram, :string
+    add_column :enterprises, :linkedin, :string
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5394fcbd61..77df8baf75 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140516045323) do
+ActiveRecord::Schema.define(:version => 20140522015012) do
 
   create_table "adjustment_metadata", :force => true do |t|
     t.integer "adjustment_id"
@@ -250,6 +250,9 @@ ActiveRecord::Schema.define(:version => 20140516045323) do
     t.integer  "promo_image_file_size"
     t.datetime "promo_image_updated_at"
     t.boolean  "visible",                  :default => true
+    t.string   "facebook"
+    t.string   "instagram"
+    t.string   "linkedin"
   end
 
   add_index "enterprises", ["address_id"], :name => "index_enterprises_on_address_id"
diff --git a/spec/features/admin/enterprises_spec.rb b/spec/features/admin/enterprises_spec.rb
index f6d5e32fec..765a6251bf 100644
--- a/spec/features/admin/enterprises_spec.rb
+++ b/spec/features/admin/enterprises_spec.rb
@@ -76,6 +76,8 @@ feature %q{
     fill_in 'enterprise_email', :with => 'info@eaterprises.com.au'
     fill_in 'enterprise_website', :with => 'http://eaterprises.com.au'
     fill_in 'enterprise_twitter', :with => '@eaterprises'
+    fill_in 'enterprise_facebook', :with => 'facebook.com/eaterprises'
+    fill_in 'enterprise_instagram', :with => 'eaterprises'
     fill_in 'enterprise_abn', :with => '09812309823'
     fill_in 'enterprise_acn', :with => ''
 

From d6512a78d486a08e698c5529a2afe875a21fa46f Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 22 May 2014 12:39:52 +1000
Subject: [PATCH 070/139] Removing position fixed

---
 .../shared/mm-foundation-tpls-0.2.0-SNAPSHOT.js          | 2 +-
 .../assets/javascripts/mm-foundation-tpls-0.1.0.min.js   | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)
 delete mode 100644 vendor/assets/javascripts/mm-foundation-tpls-0.1.0.min.js

diff --git a/app/assets/javascripts/shared/mm-foundation-tpls-0.2.0-SNAPSHOT.js b/app/assets/javascripts/shared/mm-foundation-tpls-0.2.0-SNAPSHOT.js
index d4fb9527d8..972b74247f 100644
--- a/app/assets/javascripts/shared/mm-foundation-tpls-0.2.0-SNAPSHOT.js
+++ b/app/assets/javascripts/shared/mm-foundation-tpls-0.2.0-SNAPSHOT.js
@@ -2477,7 +2477,7 @@ angular.module("template/modal/window.html", []).run(["$templateCache", function
   $templateCache.put("template/modal/window.html",
     "<div tabindex=\"-1\" class=\"reveal-modal fade {{ windowClass }}\"\n" +
     "  ng-class=\"{in: animate}\" ng-click=\"close($event)\"\n" +
-    "  style=\"display: block; position: fixed; visibility: visible\">\n" +
+    "  style=\"display: block; visibility: visible\">\n" +
     "  <div ng-transclude></div>\n" +
     "</div>\n" +
     "");
diff --git a/vendor/assets/javascripts/mm-foundation-tpls-0.1.0.min.js b/vendor/assets/javascripts/mm-foundation-tpls-0.1.0.min.js
deleted file mode 100644
index 5fa09b885a..0000000000
--- a/vendor/assets/javascripts/mm-foundation-tpls-0.1.0.min.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * angular-mm-foundation
- * http://madmimi.github.io/angular-foundation/
-
- * Version: 0.1.0 - 2014-02-05
- * License: MIT
- */
-angular.module("mm.foundation",["mm.foundation.tpls","mm.foundation.accordion","mm.foundation.alert","mm.foundation.bindHtml","mm.foundation.buttons","mm.foundation.position","mm.foundation.dropdownToggle","mm.foundation.transition","mm.foundation.modal","mm.foundation.pagination","mm.foundation.tooltip","mm.foundation.popover","mm.foundation.progressbar","mm.foundation.rating","mm.foundation.tabs","mm.foundation.tour","mm.foundation.typeahead"]),angular.module("mm.foundation.tpls",["template/accordion/accordion-group.html","template/accordion/accordion.html","template/alert/alert.html","template/modal/backdrop.html","template/modal/window.html","template/pagination/pager.html","template/pagination/pagination.html","template/tooltip/tooltip-html-unsafe-popup.html","template/tooltip/tooltip-popup.html","template/popover/popover.html","template/progressbar/bar.html","template/progressbar/progress.html","template/progressbar/progressbar.html","template/rating/rating.html","template/tabs/tab.html","template/tabs/tabset.html","template/tour/tour.html","template/typeahead/typeahead-match.html","template/typeahead/typeahead-popup.html"]),angular.module("mm.foundation.accordion",[]).constant("accordionConfig",{closeOthers:!0}).controller("AccordionController",["$scope","$attrs","accordionConfig",function(a,b,c){this.groups=[],this.closeOthers=function(d){var e=angular.isDefined(b.closeOthers)?a.$eval(b.closeOthers):c.closeOthers;e&&angular.forEach(this.groups,function(a){a!==d&&(a.isOpen=!1)})},this.addGroup=function(a){var b=this;this.groups.push(a),a.$on("$destroy",function(){b.removeGroup(a)})},this.removeGroup=function(a){var b=this.groups.indexOf(a);-1!==b&&this.groups.splice(this.groups.indexOf(a),1)}}]).directive("accordion",function(){return{restrict:"EA",controller:"AccordionController",transclude:!0,replace:!1,templateUrl:"template/accordion/accordion.html"}}).directive("accordionGroup",["$parse",function(a){return{require:"^accordion",restrict:"EA",transclude:!0,replace:!0,templateUrl:"template/accordion/accordion-group.html",scope:{heading:"@"},controller:function(){this.setHeading=function(a){this.heading=a}},link:function(b,c,d,e){var f,g;e.addGroup(b),b.isOpen=!1,d.isOpen&&(f=a(d.isOpen),g=f.assign,b.$parent.$watch(f,function(a){b.isOpen=!!a})),b.$watch("isOpen",function(a){a&&e.closeOthers(b),g&&g(b.$parent,a)})}}}]).directive("accordionHeading",function(){return{restrict:"EA",transclude:!0,template:"",replace:!0,require:"^accordionGroup",compile:function(a,b,c){return function(a,b,d,e){e.setHeading(c(a,function(){}))}}}}).directive("accordionTransclude",function(){return{require:"^accordionGroup",link:function(a,b,c,d){a.$watch(function(){return d[c.accordionTransclude]},function(a){a&&(b.html(""),b.append(a))})}}}),angular.module("mm.foundation.alert",[]).controller("AlertController",["$scope","$attrs",function(a,b){a.closeable="close"in b}]).directive("alert",function(){return{restrict:"EA",controller:"AlertController",templateUrl:"template/alert/alert.html",transclude:!0,replace:!0,scope:{type:"=",close:"&"}}}),angular.module("mm.foundation.bindHtml",[]).directive("bindHtmlUnsafe",function(){return function(a,b,c){b.addClass("ng-binding").data("$binding",c.bindHtmlUnsafe),a.$watch(c.bindHtmlUnsafe,function(a){b.html(a||"")})}}),angular.module("mm.foundation.buttons",[]).constant("buttonConfig",{activeClass:"active",toggleEvent:"click"}).controller("ButtonsController",["buttonConfig",function(a){this.activeClass=a.activeClass,this.toggleEvent=a.toggleEvent}]).directive("btnRadio",function(){return{require:["btnRadio","ngModel"],controller:"ButtonsController",link:function(a,b,c,d){var e=d[0],f=d[1];f.$render=function(){b.toggleClass(e.activeClass,angular.equals(f.$modelValue,a.$eval(c.btnRadio)))},b.bind(e.toggleEvent,function(){b.hasClass(e.activeClass)||a.$apply(function(){f.$setViewValue(a.$eval(c.btnRadio)),f.$render()})})}}}).directive("btnCheckbox",function(){return{require:["btnCheckbox","ngModel"],controller:"ButtonsController",link:function(a,b,c,d){function e(){return g(c.btnCheckboxTrue,!0)}function f(){return g(c.btnCheckboxFalse,!1)}function g(b,c){var d=a.$eval(b);return angular.isDefined(d)?d:c}var h=d[0],i=d[1];i.$render=function(){b.toggleClass(h.activeClass,angular.equals(i.$modelValue,e()))},b.bind(h.toggleEvent,function(){a.$apply(function(){i.$setViewValue(b.hasClass(h.activeClass)?f():e()),i.$render()})})}}}),angular.module("mm.foundation.position",[]).factory("$position",["$document","$window",function(a,b){function c(a,c){return a.currentStyle?a.currentStyle[c]:b.getComputedStyle?b.getComputedStyle(a)[c]:a.style[c]}function d(a){return"static"===(c(a,"position")||"static")}var e=function(b){for(var c=a[0],e=b.offsetParent||c;e&&e!==c&&d(e);)e=e.offsetParent;return e||c};return{position:function(b){var c=this.offset(b),d={top:0,left:0},f=e(b[0]);f!=a[0]&&(d=this.offset(angular.element(f)),d.top+=f.clientTop-f.scrollTop,d.left+=f.clientLeft-f.scrollLeft);var g=b[0].getBoundingClientRect();return{width:g.width||b.prop("offsetWidth"),height:g.height||b.prop("offsetHeight"),top:c.top-d.top,left:c.left-d.left}},offset:function(c){var d=c[0].getBoundingClientRect();return{width:d.width||c.prop("offsetWidth"),height:d.height||c.prop("offsetHeight"),top:d.top+(b.pageYOffset||a[0].body.scrollTop||a[0].documentElement.scrollTop),left:d.left+(b.pageXOffset||a[0].body.scrollLeft||a[0].documentElement.scrollLeft)}}}}]),angular.module("mm.foundation.dropdownToggle",["mm.foundation.position"]).directive("dropdownToggle",["$document","$location","$position",function(a,b,c){var d=null,e=angular.noop;return{restrict:"CA",scope:{dropdownToggle:"@"},link:function(b,f){var g=angular.element(a[0].querySelector(b.dropdownToggle));b.$watch("$location.path",function(){e()}),g.css("display","none").bind("click",function(){e()}),f.bind("click",function(b){var h=f===d;if(b.preventDefault(),b.stopPropagation(),d&&e(),!h&&!f.hasClass("disabled")&&!f.prop("disabled")){g.css("display","block");var i=c.offset(f),j=c.offset(angular.element(g[0].offsetParent));g.css({left:i.left-j.left+"px",top:i.top-j.top+i.height+"px"}),d=f,e=function(b){b&&(b.preventDefault(),b.stopPropagation()),a.unbind("click",e),g.css("display","none"),e=angular.noop,d=null},a.bind("click",e)}})}}}]),angular.module("mm.foundation.transition",[]).factory("$transition",["$q","$timeout","$rootScope",function(a,b,c){function d(a){for(var b in a)if(void 0!==f.style[b])return a[b]}var e=function(d,f,g){g=g||{};var h=a.defer(),i=e[g.animation?"animationEndEventName":"transitionEndEventName"],j=function(){c.$apply(function(){d.unbind(i,j),h.resolve(d)})};return i&&d.bind(i,j),b(function(){angular.isString(f)?d.addClass(f):angular.isFunction(f)?f(d):angular.isObject(f)&&d.css(f),i||h.resolve(d)}),h.promise.cancel=function(){i&&d.unbind(i,j),h.reject("Transition cancelled")},h.promise},f=document.createElement("trans"),g={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd",transition:"transitionend"},h={WebkitTransition:"webkitAnimationEnd",MozTransition:"animationend",OTransition:"oAnimationEnd",transition:"animationend"};return e.transitionEndEventName=d(g),e.animationEndEventName=d(h),e}]),angular.module("mm.foundation.modal",["mm.foundation.transition"]).factory("$$stackedMap",function(){return{createNew:function(){var a=[];return{add:function(b,c){a.push({key:b,value:c})},get:function(b){for(var c=0;c<a.length;c++)if(b==a[c].key)return a[c]},keys:function(){for(var b=[],c=0;c<a.length;c++)b.push(a[c].key);return b},top:function(){return a[a.length-1]},remove:function(b){for(var c=-1,d=0;d<a.length;d++)if(b==a[d].key){c=d;break}return a.splice(c,1)[0]},removeTop:function(){return a.splice(a.length-1,1)[0]},length:function(){return a.length}}}}}).directive("modalBackdrop",["$modalStack","$timeout",function(a,b){return{restrict:"EA",replace:!0,templateUrl:"template/modal/backdrop.html",link:function(c){c.animate=!1,b(function(){c.animate=!0}),c.close=function(b){var c=a.getTop();c&&c.value.backdrop&&"static"!=c.value.backdrop&&b.target===b.currentTarget&&(b.preventDefault(),b.stopPropagation(),a.dismiss(c.key,"backdrop click"))}}}}]).directive("modalWindow",["$modalStack","$timeout",function(a,b){return{restrict:"EA",scope:{index:"@",animate:"="},replace:!0,transclude:!0,templateUrl:"template/modal/window.html",link:function(a,c,d){a.windowClass=d.windowClass||"",b(function(){a.animate=!0,c[0].focus()})}}}]).factory("$modalStack",["$transition","$timeout","$document","$compile","$rootScope","$$stackedMap",function(a,b,c,d,e,f){function g(){for(var a=-1,b=n.keys(),c=0;c<b.length;c++)n.get(b[c]).value.backdrop&&(a=c);return a}function h(a){var b=c.find("body").eq(0),d=n.get(a).value;n.remove(a),j(d.modalDomEl,d.modalScope,300,i),b.toggleClass(m,n.length()>0)}function i(){if(k&&-1==g()){var a=l;j(k,l,150,function(){a.$destroy(),a=null}),k=void 0,l=void 0}}function j(c,d,e,f){function g(){g.done||(g.done=!0,c.remove(),f&&f())}d.animate=!1;var h=a.transitionEndEventName;if(h){var i=b(g,e);c.bind(h,function(){b.cancel(i),g(),d.$apply()})}else b(g,0)}var k,l,m="modal-open",n=f.createNew(),o={};return e.$watch(g,function(a){l&&(l.index=a)}),c.bind("keydown",function(a){var b;27===a.which&&(b=n.top(),b&&b.value.keyboard&&e.$apply(function(){o.dismiss(b.key)}))}),o.open=function(a,b){n.add(a,{deferred:b.deferred,modalScope:b.scope,backdrop:b.backdrop,keyboard:b.keyboard});var f=c.find("body").eq(0),h=g();h>=0&&!k&&(l=e.$new(!0),l.index=h,k=d("<div modal-backdrop></div>")(l),f.append(k));var i=angular.element("<div modal-window></div>");i.attr("window-class",b.windowClass),i.attr("index",n.length()-1),i.attr("animate","animate"),i.html(b.content);var j=d(i)(b.scope);n.top().value.modalDomEl=j,f.append(j),f.addClass(m)},o.close=function(a,b){var c=n.get(a).value;c&&(c.deferred.resolve(b),h(a))},o.dismiss=function(a,b){var c=n.get(a).value;c&&(c.deferred.reject(b),h(a))},o.dismissAll=function(a){for(var b=this.getTop();b;)this.dismiss(b.key,a),b=this.getTop()},o.getTop=function(){return n.top()},o}]).provider("$modal",function(){var a={options:{backdrop:!0,keyboard:!0},$get:["$injector","$rootScope","$q","$http","$templateCache","$controller","$modalStack",function(b,c,d,e,f,g,h){function i(a){return a.template?d.when(a.template):e.get(a.templateUrl,{cache:f}).then(function(a){return a.data})}function j(a){var c=[];return angular.forEach(a,function(a){(angular.isFunction(a)||angular.isArray(a))&&c.push(d.when(b.invoke(a)))}),c}var k={};return k.open=function(b){var e=d.defer(),f=d.defer(),k={result:e.promise,opened:f.promise,close:function(a){h.close(k,a)},dismiss:function(a){h.dismiss(k,a)}};if(b=angular.extend({},a.options,b),b.resolve=b.resolve||{},!b.template&&!b.templateUrl)throw new Error("One of template or templateUrl options is required.");var l=d.all([i(b)].concat(j(b.resolve)));return l.then(function(a){var d=(b.scope||c).$new();d.$close=k.close,d.$dismiss=k.dismiss;var f,i={},j=1;b.controller&&(i.$scope=d,i.$modalInstance=k,angular.forEach(b.resolve,function(b,c){i[c]=a[j++]}),f=g(b.controller,i)),h.open(k,{scope:d,deferred:e,content:a[0],backdrop:b.backdrop,keyboard:b.keyboard,windowClass:b.windowClass})},function(a){e.reject(a)}),l.then(function(){f.resolve(!0)},function(){f.reject(!1)}),k},k}]};return a}),angular.module("mm.foundation.pagination",[]).controller("PaginationController",["$scope","$attrs","$parse","$interpolate",function(a,b,c,d){var e=this,f=b.numPages?c(b.numPages).assign:angular.noop;this.init=function(d){b.itemsPerPage?a.$parent.$watch(c(b.itemsPerPage),function(b){e.itemsPerPage=parseInt(b,10),a.totalPages=e.calculateTotalPages()}):this.itemsPerPage=d},this.noPrevious=function(){return 1===this.page},this.noNext=function(){return this.page===a.totalPages},this.isActive=function(a){return this.page===a},this.calculateTotalPages=function(){var b=this.itemsPerPage<1?1:Math.ceil(a.totalItems/this.itemsPerPage);return Math.max(b||0,1)},this.getAttributeValue=function(b,c,e){return angular.isDefined(b)?e?d(b)(a.$parent):a.$parent.$eval(b):c},this.render=function(){this.page=parseInt(a.page,10)||1,this.page>0&&this.page<=a.totalPages&&(a.pages=this.getPages(this.page,a.totalPages))},a.selectPage=function(b){!e.isActive(b)&&b>0&&b<=a.totalPages&&(a.page=b,a.onSelectPage({page:b}))},a.$watch("page",function(){e.render()}),a.$watch("totalItems",function(){a.totalPages=e.calculateTotalPages()}),a.$watch("totalPages",function(b){f(a.$parent,b),e.page>b?a.selectPage(b):e.render()})}]).constant("paginationConfig",{itemsPerPage:10,boundaryLinks:!1,directionLinks:!0,firstText:"First",previousText:"Previous",nextText:"Next",lastText:"Last",rotate:!0}).directive("pagination",["$parse","paginationConfig",function(a,b){return{restrict:"EA",scope:{page:"=",totalItems:"=",onSelectPage:" &"},controller:"PaginationController",templateUrl:"template/pagination/pagination.html",replace:!0,link:function(c,d,e,f){function g(a,b,c,d){return{number:a,text:b,active:c,disabled:d}}var h,i=f.getAttributeValue(e.boundaryLinks,b.boundaryLinks),j=f.getAttributeValue(e.directionLinks,b.directionLinks),k=f.getAttributeValue(e.firstText,b.firstText,!0),l=f.getAttributeValue(e.previousText,b.previousText,!0),m=f.getAttributeValue(e.nextText,b.nextText,!0),n=f.getAttributeValue(e.lastText,b.lastText,!0),o=f.getAttributeValue(e.rotate,b.rotate);f.init(b.itemsPerPage),e.maxSize&&c.$parent.$watch(a(e.maxSize),function(a){h=parseInt(a,10),f.render()}),f.getPages=function(a,b){var c=[],d=1,e=b,p=angular.isDefined(h)&&b>h;p&&(o?(d=Math.max(a-Math.floor(h/2),1),e=d+h-1,e>b&&(e=b,d=e-h+1)):(d=(Math.ceil(a/h)-1)*h+1,e=Math.min(d+h-1,b)));for(var q=d;e>=q;q++){var r=g(q,q,f.isActive(q),!1);c.push(r)}if(p&&!o){if(d>1){var s=g(d-1,"...",!1,!1);c.unshift(s)}if(b>e){var t=g(e+1,"...",!1,!1);c.push(t)}}if(j){var u=g(a-1,l,!1,f.noPrevious());c.unshift(u);var v=g(a+1,m,!1,f.noNext());c.push(v)}if(i){var w=g(1,k,!1,f.noPrevious());c.unshift(w);var x=g(b,n,!1,f.noNext());c.push(x)}return c}}}}]).constant("pagerConfig",{itemsPerPage:10,previousText:"« Previous",nextText:"Next »",align:!0}).directive("pager",["pagerConfig",function(a){return{restrict:"EA",scope:{page:"=",totalItems:"=",onSelectPage:" &"},controller:"PaginationController",templateUrl:"template/pagination/pager.html",replace:!0,link:function(b,c,d,e){function f(a,b,c,d,e){return{number:a,text:b,disabled:c,previous:i&&d,next:i&&e}}var g=e.getAttributeValue(d.previousText,a.previousText,!0),h=e.getAttributeValue(d.nextText,a.nextText,!0),i=e.getAttributeValue(d.align,a.align);e.init(a.itemsPerPage),e.getPages=function(a){return[f(a-1,g,e.noPrevious(),!0,!1),f(a+1,h,e.noNext(),!1,!0)]}}}}]),angular.module("mm.foundation.tooltip",["mm.foundation.position","mm.foundation.bindHtml"]).provider("$tooltip",function(){function a(a){var b=/[A-Z]/g,c="-";return a.replace(b,function(a,b){return(b?c:"")+a.toLowerCase()})}var b={placement:"top",animation:!0,popupDelay:0},c={mouseenter:"mouseleave",click:"click",focus:"blur"},d={};this.options=function(a){angular.extend(d,a)},this.setTriggers=function(a){angular.extend(c,a)},this.$get=["$window","$compile","$timeout","$parse","$document","$position","$interpolate",function(e,f,g,h,i,j,k){return function(e,l,m){function n(a){var b=a||o.trigger||m,d=c[b]||b;return{show:b,hide:d}}var o=angular.extend({},b,d),p=a(e),q=k.startSymbol(),r=k.endSymbol(),s="<div "+p+'-popup title="'+q+"tt_title"+r+'" content="'+q+"tt_content"+r+'" placement="'+q+"tt_placement"+r+'" animation="tt_animation" is-open="tt_isOpen"></div>';return{restrict:"EA",scope:!0,compile:function(){var a=f(s);return function(b,c,d){function f(){b.tt_isOpen?m():k()}function k(){(!z||b.$eval(d[l+"Enable"]))&&(b.tt_popupDelay?(v=g(p,b.tt_popupDelay,!1),v.then(function(a){a()})):p()())}function m(){b.$apply(function(){q()})}function p(){return b.tt_content?(r(),u&&g.cancel(u),t.css({top:0,left:0,display:"block"}),w?i.find("body").append(t):c.after(t),A(),b.tt_isOpen=!0,b.$digest(),A):angular.noop}function q(){b.tt_isOpen=!1,g.cancel(v),b.tt_animation?u=g(s,500):s()}function r(){t&&s(),t=a(b,function(){}),b.$digest()}function s(){t&&(t.remove(),t=null)}var t,u,v,w=angular.isDefined(o.appendToBody)?o.appendToBody:!1,x=n(void 0),y=!1,z=angular.isDefined(d[l+"Enable"]),A=function(){var a,d,e,f;switch(a=w?j.offset(c):j.position(c),d=t.prop("offsetWidth"),e=t.prop("offsetHeight"),b.tt_placement){case"right":f={top:a.top+a.height/2-e/2,left:a.left+a.width+10};break;case"bottom":f={top:a.top+a.height+10,left:a.left};break;case"left":f={top:a.top+a.height/2-e/2,left:a.left-d-10};break;default:f={top:a.top-e-10,left:a.left}}f.top+="px",f.left+="px",t.css(f)};b.tt_isOpen=!1,d.$observe(e,function(a){b.tt_content=a,!a&&b.tt_isOpen&&q()}),d.$observe(l+"Title",function(a){b.tt_title=a}),d.$observe(l+"Placement",function(a){b.tt_placement=angular.isDefined(a)?a:o.placement}),d.$observe(l+"PopupDelay",function(a){var c=parseInt(a,10);b.tt_popupDelay=isNaN(c)?o.popupDelay:c});var B=function(){y&&(c.unbind(x.show,k),c.unbind(x.hide,m))},C=function(){};d.$observe(l+"Trigger",function(a){B(),C(),x=n(a),angular.isFunction(x.show)?C=b.$watch(function(){return x.show(b,c,d)},function(a){return g(a?p:q)}):x.show===x.hide?c.bind(x.show,f):(c.bind(x.show,k),c.bind(x.hide,m)),y=!0});var D=b.$eval(d[l+"Animation"]);b.tt_animation=angular.isDefined(D)?!!D:o.animation,d.$observe(l+"AppendToBody",function(a){w=angular.isDefined(a)?h(a)(b):w}),w&&b.$on("$locationChangeSuccess",function(){b.tt_isOpen&&q()}),b.$on("$destroy",function(){g.cancel(u),g.cancel(v),B(),C(),s()})}}}}}]}).directive("tooltipPopup",function(){return{restrict:"EA",replace:!0,scope:{content:"@",placement:"@",animation:"&",isOpen:"&"},templateUrl:"template/tooltip/tooltip-popup.html"}}).directive("tooltip",["$tooltip",function(a){return a("tooltip","tooltip","mouseenter")}]).directive("tooltipHtmlUnsafePopup",function(){return{restrict:"EA",replace:!0,scope:{content:"@",placement:"@",animation:"&",isOpen:"&"},templateUrl:"template/tooltip/tooltip-html-unsafe-popup.html"}}).directive("tooltipHtmlUnsafe",["$tooltip",function(a){return a("tooltipHtmlUnsafe","tooltip","mouseenter")}]),angular.module("mm.foundation.popover",["mm.foundation.tooltip"]).directive("popoverPopup",function(){return{restrict:"EA",replace:!0,scope:{title:"@",content:"@",placement:"@",animation:"&",isOpen:"&"},templateUrl:"template/popover/popover.html"}}).directive("popover",["$tooltip",function(a){return a("popover","popover","click")}]),angular.module("mm.foundation.progressbar",["mm.foundation.transition"]).constant("progressConfig",{animate:!0,max:100}).controller("ProgressController",["$scope","$attrs","progressConfig","$transition",function(a,b,c,d){var e=this,f=[],g=angular.isDefined(b.max)?a.$parent.$eval(b.max):c.max,h=angular.isDefined(b.animate)?a.$parent.$eval(b.animate):c.animate;this.addBar=function(a,b){var c=0,d=a.$parent.$index;angular.isDefined(d)&&f[d]&&(c=f[d].value),f.push(a),this.update(b,a.value,c),a.$watch("value",function(a,c){a!==c&&e.update(b,a,c)}),a.$on("$destroy",function(){e.removeBar(a)})},this.update=function(a,b,c){var e=this.getPercentage(b);h?(a.css("width",this.getPercentage(c)+"%"),d(a,{width:e+"%"})):a.css({transition:"none",width:e+"%"})},this.removeBar=function(a){f.splice(f.indexOf(a),1)},this.getPercentage=function(a){return Math.round(100*a/g)}}]).directive("progress",function(){return{restrict:"EA",replace:!0,transclude:!0,controller:"ProgressController",require:"progress",scope:{},template:'<div class="progress" ng-transclude></div>'}}).directive("bar",function(){return{restrict:"EA",replace:!0,transclude:!0,require:"^progress",scope:{value:"=",type:"@"},templateUrl:"template/progressbar/bar.html",link:function(a,b,c,d){d.addBar(a,b)}}}).directive("progressbar",function(){return{restrict:"EA",replace:!0,transclude:!0,controller:"ProgressController",scope:{value:"=",type:"@"},templateUrl:"template/progressbar/progressbar.html",link:function(a,b,c,d){d.addBar(a,angular.element(b.children()[0]))}}}),angular.module("mm.foundation.rating",[]).constant("ratingConfig",{max:5,stateOn:null,stateOff:null}).controller("RatingController",["$scope","$attrs","$parse","ratingConfig",function(a,b,c,d){this.maxRange=angular.isDefined(b.max)?a.$parent.$eval(b.max):d.max,this.stateOn=angular.isDefined(b.stateOn)?a.$parent.$eval(b.stateOn):d.stateOn,this.stateOff=angular.isDefined(b.stateOff)?a.$parent.$eval(b.stateOff):d.stateOff,this.createRateObjects=function(a){for(var b={stateOn:this.stateOn,stateOff:this.stateOff},c=0,d=a.length;d>c;c++)a[c]=angular.extend({index:c},b,a[c]);return a},a.range=this.createRateObjects(angular.isDefined(b.ratingStates)?angular.copy(a.$parent.$eval(b.ratingStates)):new Array(this.maxRange)),a.rate=function(b){a.value===b||a.readonly||(a.value=b)},a.enter=function(b){a.readonly||(a.val=b),a.onHover({value:b})},a.reset=function(){a.val=angular.copy(a.value),a.onLeave()},a.$watch("value",function(b){a.val=b}),a.readonly=!1,b.readonly&&a.$parent.$watch(c(b.readonly),function(b){a.readonly=!!b})}]).directive("rating",function(){return{restrict:"EA",scope:{value:"=",onHover:"&",onLeave:"&"},controller:"RatingController",templateUrl:"template/rating/rating.html",replace:!0}}),angular.module("mm.foundation.tabs",[]).controller("TabsetController",["$scope",function(a){var b=this,c=b.tabs=a.tabs=[];b.select=function(a){angular.forEach(c,function(a){a.active=!1}),a.active=!0},b.addTab=function(a){c.push(a),(1===c.length||a.active)&&b.select(a)},b.removeTab=function(a){var d=c.indexOf(a);if(a.active&&c.length>1){var e=d==c.length-1?d-1:d+1;b.select(c[e])}c.splice(d,1)}}]).directive("tabset",function(){return{restrict:"EA",transclude:!0,replace:!0,scope:{},controller:"TabsetController",templateUrl:"template/tabs/tabset.html",link:function(a,b,c){a.vertical=angular.isDefined(c.vertical)?a.$parent.$eval(c.vertical):!1,a.justified=angular.isDefined(c.justified)?a.$parent.$eval(c.justified):!1,a.type=angular.isDefined(c.type)?a.$parent.$eval(c.type):"tabs"}}}).directive("tab",["$parse",function(a){return{require:"^tabset",restrict:"EA",replace:!0,templateUrl:"template/tabs/tab.html",transclude:!0,scope:{heading:"@",onSelect:"&select",onDeselect:"&deselect"},controller:function(){},compile:function(b,c,d){return function(b,c,e,f){var g,h;e.active?(g=a(e.active),h=g.assign,b.$parent.$watch(g,function(a,c){a!==c&&(b.active=!!a)}),b.active=g(b.$parent)):h=g=angular.noop,b.$watch("active",function(a){h(b.$parent,a),a?(f.select(b),b.onSelect()):b.onDeselect()}),b.disabled=!1,e.disabled&&b.$parent.$watch(a(e.disabled),function(a){b.disabled=!!a}),b.select=function(){b.disabled||(b.active=!0)},f.addTab(b),b.$on("$destroy",function(){f.removeTab(b)}),b.$transcludeFn=d}}}}]).directive("tabHeadingTransclude",[function(){return{restrict:"A",require:"^tab",link:function(a,b){a.$watch("headingElement",function(a){a&&(b.html(""),b.append(a))})}}}]).directive("tabContentTransclude",function(){function a(a){return a.tagName&&(a.hasAttribute("tab-heading")||a.hasAttribute("data-tab-heading")||"tab-heading"===a.tagName.toLowerCase()||"data-tab-heading"===a.tagName.toLowerCase())}return{restrict:"A",require:"^tabset",link:function(b,c,d){var e=b.$eval(d.tabContentTransclude);e.$transcludeFn(e.$parent,function(b){angular.forEach(b,function(b){a(b)?e.headingElement=b:c.append(b)})})}}}),angular.module("mm.foundation.tour",["mm.foundation.position","mm.foundation.tooltip"]).service("$tour",["$window",function(a){function b(){return parseInt(a.localStorage.getItem("mm.tour.step"),10)}function c(b){d=b,a.localStorage.setItem("mm.tour.step",b)}var d=b(),e={};this.add=function(a,b){e[a]=b},this.has=function(a){return!!e[a]},this.isActive=function(){return d>0},this.current=function(a){return a?void c(d):d},this.start=function(){c(1)},this.next=function(){c(d+1)},this.end=function(){c(0)}}]).directive("stepPopup",["$tour",function(a){return{restrict:"EA",replace:!0,scope:{title:"@",content:"@",placement:"@",animation:"&",isOpen:"&"},templateUrl:"template/tour/tour.html",link:function(b,c){b.isLastStep=function(){return!a.has(a.current()+1)},b.endTour=function(){c.remove(),a.end()},b.nextStep=function(){c.remove(),a.next()}}}}]).directive("step",["$position","$tooltip","$tour","$window",function(a,b,c,d){function e(a){var b=a[0].getBoundingClientRect();return b.top>=0&&b.left>=0&&b.bottom<=d.innerHeight-80&&b.right<=d.innerWidth}function f(b,f,g){var h=parseInt(g.stepIndex,10);if(c.isActive()&&h&&(c.add(h,g),h===c.current())){if(!e(f)){var i=a.offset(f);d.scrollTo(0,i.top-d.innerHeight/2)}return!0}return!1}return b("step","step",f)}]),angular.module("mm.foundation.typeahead",["mm.foundation.position","mm.foundation.bindHtml"]).factory("typeaheadParser",["$parse",function(a){var b=/^\s*(.*?)(?:\s+as\s+(.*?))?\s+for\s+(?:([\$\w][\$\w\d]*))\s+in\s+(.*)$/;return{parse:function(c){var d=c.match(b);if(!d)throw new Error("Expected typeahead specification in form of '_modelValue_ (as _label_)? for _item_ in _collection_' but got '"+c+"'.");return{itemName:d[3],source:a(d[4]),viewMapper:a(d[2]||d[1]),modelMapper:a(d[1])}}}}]).directive("typeahead",["$compile","$parse","$q","$timeout","$document","$position","typeaheadParser",function(a,b,c,d,e,f,g){var h=[9,13,27,38,40];return{require:"ngModel",link:function(i,j,k,l){var m,n=i.$eval(k.typeaheadMinLength)||1,o=i.$eval(k.typeaheadWaitMs)||0,p=i.$eval(k.typeaheadEditable)!==!1,q=b(k.typeaheadLoading).assign||angular.noop,r=b(k.typeaheadOnSelect),s=k.typeaheadInputFormatter?b(k.typeaheadInputFormatter):void 0,t=k.typeaheadAppendToBody?b(k.typeaheadAppendToBody):!1,u=b(k.ngModel).assign,v=g.parse(k.typeahead),w=angular.element("<div typeahead-popup></div>");w.attr({matches:"matches",active:"activeIdx",select:"select(activeIdx)",query:"query",position:"position"}),angular.isDefined(k.typeaheadTemplateUrl)&&w.attr("template-url",k.typeaheadTemplateUrl);var x=i.$new();i.$on("$destroy",function(){x.$destroy()});var y=function(){x.matches=[],x.activeIdx=-1},z=function(a){var b={$viewValue:a};q(i,!0),c.when(v.source(i,b)).then(function(c){if(a===l.$viewValue&&m){if(c.length>0){x.activeIdx=0,x.matches.length=0;for(var d=0;d<c.length;d++)b[v.itemName]=c[d],x.matches.push({label:v.viewMapper(x,b),model:c[d]});x.query=a,x.position=t?f.offset(j):f.position(j),x.position.top=x.position.top+j.prop("offsetHeight")}else y();q(i,!1)}},function(){y(),q(i,!1)})};y(),x.query=void 0;var A;l.$parsers.unshift(function(a){return m=!0,a&&a.length>=n?o>0?(A&&d.cancel(A),A=d(function(){z(a)},o)):z(a):(q(i,!1),y()),p?a:a?void l.$setValidity("editable",!1):(l.$setValidity("editable",!0),a)}),l.$formatters.push(function(a){var b,c,d={};return s?(d.$model=a,s(i,d)):(d[v.itemName]=a,b=v.viewMapper(i,d),d[v.itemName]=void 0,c=v.viewMapper(i,d),b!==c?b:a)}),x.select=function(a){var b,c,d={};d[v.itemName]=c=x.matches[a].model,b=v.modelMapper(i,d),u(i,b),l.$setValidity("editable",!0),r(i,{$item:c,$model:b,$label:v.viewMapper(i,d)}),y(),j[0].focus()},j.bind("keydown",function(a){0!==x.matches.length&&-1!==h.indexOf(a.which)&&(a.preventDefault(),40===a.which?(x.activeIdx=(x.activeIdx+1)%x.matches.length,x.$digest()):38===a.which?(x.activeIdx=(x.activeIdx?x.activeIdx:x.matches.length)-1,x.$digest()):13===a.which||9===a.which?x.$apply(function(){x.select(x.activeIdx)}):27===a.which&&(a.stopPropagation(),y(),x.$digest()))}),j.bind("blur",function(){m=!1});var B=function(a){j[0]!==a.target&&(y(),x.$digest())};e.bind("click",B),i.$on("$destroy",function(){e.unbind("click",B)});var C=a(w)(x);t?e.find("body").append(C):j.after(C)}}}]).directive("typeaheadPopup",function(){return{restrict:"EA",scope:{matches:"=",query:"=",active:"=",position:"=",select:"&"},replace:!0,templateUrl:"template/typeahead/typeahead-popup.html",link:function(a,b,c){a.templateUrl=c.templateUrl,a.isOpen=function(){return a.matches.length>0},a.isActive=function(b){return a.active==b},a.selectActive=function(b){a.active=b},a.selectMatch=function(b){a.select({activeIdx:b})}}}}).directive("typeaheadMatch",["$http","$templateCache","$compile","$parse",function(a,b,c,d){return{restrict:"EA",scope:{index:"=",match:"=",query:"="},link:function(e,f,g){var h=d(g.templateUrl)(e.$parent)||"template/typeahead/typeahead-match.html";a.get(h,{cache:b}).success(function(a){f.replaceWith(c(a.trim())(e))})}}}]).filter("typeaheadHighlight",function(){function a(a){return a.replace(/([.?*+^$[\]\\(){}|-])/g,"\\$1")}return function(b,c){return c?b.replace(new RegExp(a(c),"gi"),"<strong>$&</strong>"):b}}),angular.module("template/accordion/accordion-group.html",[]).run(["$templateCache",function(a){a.put("template/accordion/accordion-group.html",'<dd>\n  <a ng-click="isOpen = !isOpen" accordion-transclude="heading">{{heading}}</a>\n  <div class="content" ng-style="isOpen ? {display: \'block\'} : {}" ng-transclude></div>\n</dd>\n')}]),angular.module("template/accordion/accordion.html",[]).run(["$templateCache",function(a){a.put("template/accordion/accordion.html",'<dl class="accordion" ng-transclude></div>\n')}]),angular.module("template/alert/alert.html",[]).run(["$templateCache",function(a){a.put("template/alert/alert.html","<div class='alert-box' ng-class='(type || \"\")'>\n  <span ng-transclude></span>\n  <a ng-show='closeable' class='close' ng-click='close()'>&times;</a>\n</div>\n")}]),angular.module("template/modal/backdrop.html",[]).run(["$templateCache",function(a){a.put("template/modal/backdrop.html",'<div class="reveal-modal-bg fade" ng-class="{in: animate}" ng-click="close($event)" style="display: block"></div>\n')}]),angular.module("template/modal/window.html",[]).run(["$templateCache",function(a){a.put("template/modal/window.html",'<div tabindex="-1" class="reveal-modal fade {{ windowClass }}"\n  ng-class="{in: animate}" ng-click="close($event)"\n  style="display: block; position: fixed; visibility: visible">\n  <div ng-transclude></div>\n</div>\n')}]),angular.module("template/pagination/pager.html",[]).run(["$templateCache",function(a){a.put("template/pagination/pager.html",'<ul class="pagination">\n  <li ng-repeat="page in pages" class="arrow" ng-class="{unavailable: page.disabled, left: page.previous, right: page.next}"><a ng-click="selectPage(page.number)">{{page.text}}</a></li>\n</ul>\n')}]),angular.module("template/pagination/pagination.html",[]).run(["$templateCache",function(a){a.put("template/pagination/pagination.html",'<ul class="pagination">\n  <li ng-repeat="page in pages" ng-class="{arrow: $first || $last, current: page.active, unavailable: page.disabled}"><a ng-click="selectPage(page.number)">{{page.text}}</a></li>\n</ul>\n')}]),angular.module("template/tooltip/tooltip-html-unsafe-popup.html",[]).run(["$templateCache",function(a){a.put("template/tooltip/tooltip-html-unsafe-popup.html",'<span class="tooltip tip-{{placement}}"\n  ng-class="{ in: isOpen(), fade: animation() }"\n  style="width: auto">\n  <span bind-html-unsafe="content"></span>\n  <span class="nub"></span>\n</span>\n')}]),angular.module("template/tooltip/tooltip-popup.html",[]).run(["$templateCache",function(a){a.put("template/tooltip/tooltip-popup.html",'<span class="tooltip tip-{{placement}}"\n  ng-class="{ in: isOpen(), fade: animation() }"\n  style="width: auto">\n  <span ng-bind="content"></span>\n  <span class="nub"></span>\n</span>\n')}]),angular.module("template/popover/popover.html",[]).run(["$templateCache",function(a){a.put("template/popover/popover.html",'<div class="joyride-tip-guide" ng-class="{ in: isOpen(), fade: animation() }">\n  <span class="joyride-nub" ng-class="{\n    bottom: placement === \'top\',\n    left: placement === \'right\',\n    right: placement === \'left\',\n    top: placement === \'bottom\'\n  }"></span>\n  <div class="joyride-content-wrapper">\n    <h4 ng-bind="title" ng-show="title"></h4>\n    <p ng-bind="content"></p>\n  </div>\n</div>\n')}]),angular.module("template/progressbar/bar.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/bar.html",'<span class="meter" ng-transclude></span>\n')
-}]),angular.module("template/progressbar/progress.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/progress.html",'<div class="progress" ng-class="type" ng-transclude></div>\n')}]),angular.module("template/progressbar/progressbar.html",[]).run(["$templateCache",function(a){a.put("template/progressbar/progressbar.html",'<div class="progress" ng-class="type">\n  <span class="meter" ng-transclude></span>\n</div>\n')}]),angular.module("template/rating/rating.html",[]).run(["$templateCache",function(a){a.put("template/rating/rating.html",'<span ng-mouseleave="reset()">\n  <i ng-repeat="r in range" ng-mouseenter="enter($index + 1)" ng-click="rate($index + 1)" class="fa"\n    ng-class="$index < val && (r.stateOn || \'fa-star\') || (r.stateOff || \'fa-star-o\')"></i>\n</span>\n')}]),angular.module("template/tabs/tab.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tab.html",'<dd ng-class="{active: active}">\n  <a ng-click="select()" tab-heading-transclude>{{heading}}</a>\n</dd>\n')}]),angular.module("template/tabs/tabset.html",[]).run(["$templateCache",function(a){a.put("template/tabs/tabset.html",'<div class="tabbable">\n  <dl class="tabs" ng-class="{\'vertical\': vertical}" ng-transclude></dl>\n  <div class="tabs-content">\n    <div class="content" \n      ng-repeat="tab in tabs" \n      ng-class="{active: tab.active}">\n      <div tab-content-transclude="tab"></div>\n    </div>\n  </div>\n</div>\n')}]),angular.module("template/tour/tour.html",[]).run(["$templateCache",function(a){a.put("template/tour/tour.html",'<div class="joyride-tip-guide" ng-class="{ in: isOpen(), fade: animation() }">\n  <span class="joyride-nub" ng-class="{\n    bottom: placement === \'top\',\n    left: placement === \'right\',\n    right: placement === \'left\',\n    top: placement === \'bottom\'\n  }"></span>\n  <div class="joyride-content-wrapper">\n    <h4 ng-bind="title" ng-show="title"></h4>\n    <p ng-bind="content"></p>\n    <a class="small button joyride-next-tip" ng-show="!isLastStep()" ng-click="nextStep()">Next</a>\n    <a class="small button joyride-next-tip" ng-show="isLastStep()" ng-click="endTour()">End</a>\n    <a class="joyride-close-tip" ng-click="endTour()">&times;</a>\n  </div>\n</div>\n')}]),angular.module("template/typeahead/typeahead-match.html",[]).run(["$templateCache",function(a){a.put("template/typeahead/typeahead-match.html",'<a tabindex="-1" bind-html-unsafe="match.label | typeaheadHighlight:query"></a>')}]),angular.module("template/typeahead/typeahead-popup.html",[]).run(["$templateCache",function(a){a.put("template/typeahead/typeahead-popup.html","<ul class=\"f-dropdown\" ng-style=\"{display: isOpen()&&'block' || 'none', top: position.top+'px', left: position.left+'px'}\">\n"+'    <li ng-repeat="match in matches" ng-class="{active: isActive($index) }" ng-mouseenter="selectActive($index)" ng-click="selectMatch($index)">\n        <div typeahead-match index="$index" match="match" query="query" template-url="templateUrl"></div>\n    </li>\n</ul>\n')}]);
\ No newline at end of file

From 0140472fbc2240bd5dd73f62da876a836fc95434 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 21 May 2014 14:09:48 +1000
Subject: [PATCH 071/139] Adding working modals

---
 .../controllers/products/product_node_controller.js.coffee   | 2 ++
 app/assets/javascripts/darkswarm/directives/modal.js.coffee  | 5 ++++-
 app/views/modals/_producer.html.haml                         | 5 ++---
 .../products/_modal.html.haml => modals/_product.html.haml}  | 2 ++
 app/views/shop/products/_summary.html.haml                   | 5 ++---
 5 files changed, 12 insertions(+), 7 deletions(-)
 rename app/views/{shop/products/_modal.html.haml => modals/_product.html.haml} (73%)

diff --git a/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
index 4ec316e65f..3e24f006ae 100644
--- a/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
@@ -6,4 +6,6 @@ Darkswarm.controller "ProductNodeCtrl", ($scope) ->
     else
       $scope.product.price
 
+  $scope.producer = $scope.product.supplier
+
   $scope.hasVariants = $scope.product.variants.length > 0
diff --git a/app/assets/javascripts/darkswarm/directives/modal.js.coffee b/app/assets/javascripts/darkswarm/directives/modal.js.coffee
index 73217b3812..6f62c7cb45 100644
--- a/app/assets/javascripts/darkswarm/directives/modal.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/modal.js.coffee
@@ -8,7 +8,10 @@ Darkswarm.directive "ofnModal", ($modal)->
   link: (scope, elem, attrs, ctrl, transclude)->
     scope.title = attrs.title
     contents = null
-    transclude scope, (clone)->
+    
+    # We're using an isolate scope, which is a child of the original scope
+    # We have to compile the transclude against the original scope, not the isolate
+    transclude scope.$parent, (clone)->
       contents = clone
 
     elem.on "click", =>
diff --git a/app/views/modals/_producer.html.haml b/app/views/modals/_producer.html.haml
index 691e9378d3..056f9e488f 100644
--- a/app/views/modals/_producer.html.haml
+++ b/app/views/modals/_producer.html.haml
@@ -1,10 +1,9 @@
 %ofn-modal{title: "{{ producer.name }}"}
-  #producer_modal{bindonce: true}
+  #producer_modal
     .row
       .small-12.columns
-        %img{"bo-src" => "producer.promo_image"} 
+        %img{"ng-src" => "producer.promo_image"} 
         %h3 {{ producer.name }}
-
     .row
       .small-6.columns
         %p
diff --git a/app/views/shop/products/_modal.html.haml b/app/views/modals/_product.html.haml
similarity index 73%
rename from app/views/shop/products/_modal.html.haml
rename to app/views/modals/_product.html.haml
index 29a023704f..acca8f919b 100644
--- a/app/views/shop/products/_modal.html.haml
+++ b/app/views/modals/_product.html.haml
@@ -1,2 +1,4 @@
 %ofn-modal{title: "{{product.name}}"}
+
+  {{ product | json }}
   {{ product.description }}
diff --git a/app/views/shop/products/_summary.html.haml b/app/views/shop/products/_summary.html.haml
index 5e777a5dbb..e41c6ef440 100644
--- a/app/views/shop/products/_summary.html.haml
+++ b/app/views/shop/products/_summary.html.haml
@@ -6,11 +6,10 @@
     %img{"bo-src" => "product.primary_taxon.icon", 
     "ng-click" => "ordering.order = 'primary_taxon.name'",
     name: "{{product.primary_taxon.name}}"}
-    {{ product.name}}
-    -#= render partial: "shop/products/modal"
+    = render partial: "modals/product"
 
   .small-5.columns.summary-header
-    {{ product.supplier.name }}
+    = render partial: "modals/producer"
 
   .small-2.columns.summary-price.text-right.price
     %span{"ng-if" => "hasVariants"} 

From 272cb0469f1f90f1d7d9462e09a3ac99d5cfa786 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 21 May 2014 16:39:59 +1000
Subject: [PATCH 072/139] Setting up after_login redirects

---
 .../authentication/login_controller.js.coffee |  7 ++++--
 .../services/authentication_service.js.coffee |  2 +-
 .../darkswarm/services/redirections.js.coffee |  3 +++
 .../admin/overview_controller_decorator.rb    |  3 +--
 app/helpers/shared_helper.rb                  |  5 +++++
 app/views/json/_injection.html.haml           |  2 ++
 app/views/layouts/darkswarm.html.haml         |  8 +++----
 app/views/shared/_current_hub.haml            |  2 --
 app/views/shared/_current_user.haml           |  2 --
 spec/features/consumer/authentication_spec.rb | 22 ++++++++++++++++++-
 10 files changed, 42 insertions(+), 14 deletions(-)
 create mode 100644 app/assets/javascripts/darkswarm/services/redirections.js.coffee
 create mode 100644 app/views/json/_injection.html.haml
 delete mode 100644 app/views/shared/_current_hub.haml
 delete mode 100644 app/views/shared/_current_user.haml

diff --git a/app/assets/javascripts/darkswarm/controllers/authentication/login_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/authentication/login_controller.js.coffee
index c2211bc033..da625e3d34 100644
--- a/app/assets/javascripts/darkswarm/controllers/authentication/login_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/authentication/login_controller.js.coffee
@@ -1,8 +1,11 @@
-Darkswarm.controller "LoginCtrl", ($scope, $http, $location, AuthenticationService) ->
+Darkswarm.controller "LoginCtrl", ($scope, $http, AuthenticationService, Redirections) ->
   $scope.path = "/login"
 
   $scope.submit = ->
     $http.post("/user/spree_user/sign_in", {spree_user: $scope.spree_user}).success (data)->
-      location.href = location.origin + location.pathname  # Strips out hash fragments
+      if Redirections.after_login
+        location.href = location.origin + Redirections.after_login
+      else
+        location.href = location.origin + location.pathname  # Strips out hash fragments
     .error (data) ->
       $scope.errors = data.message
diff --git a/app/assets/javascripts/darkswarm/services/authentication_service.js.coffee b/app/assets/javascripts/darkswarm/services/authentication_service.js.coffee
index eada8bc44b..820d5bde9c 100644
--- a/app/assets/javascripts/darkswarm/services/authentication_service.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/authentication_service.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory "AuthenticationService", (Navigation, $modal, $location)->
+Darkswarm.factory "AuthenticationService", (Navigation, $modal, $location, Redirections)->
   new class AuthenticationService
     selectedPath: "/login"
 
diff --git a/app/assets/javascripts/darkswarm/services/redirections.js.coffee b/app/assets/javascripts/darkswarm/services/redirections.js.coffee
new file mode 100644
index 0000000000..a479964e9e
--- /dev/null
+++ b/app/assets/javascripts/darkswarm/services/redirections.js.coffee
@@ -0,0 +1,3 @@
+Darkswarm.factory "Redirections", ($location)->
+  new class Redirections
+    after_login: $location.search().after_login
diff --git a/app/controllers/spree/admin/overview_controller_decorator.rb b/app/controllers/spree/admin/overview_controller_decorator.rb
index 5c96901c1d..a6142d26c0 100644
--- a/app/controllers/spree/admin/overview_controller_decorator.rb
+++ b/app/controllers/spree/admin/overview_controller_decorator.rb
@@ -13,8 +13,7 @@ Spree::Admin::OverviewController.class_eval do
       redirect_to '/unauthorized'
     else
       store_location
-      url = respond_to?(:spree_login_path) ? spree_login_path : root_path
-      redirect_to url
+      redirect_to root_path(anchor: "login?after_login=#{spree.admin_path}")
     end
   end
 end
diff --git a/app/helpers/shared_helper.rb b/app/helpers/shared_helper.rb
index be1e0ba0f4..828277cb57 100644
--- a/app/helpers/shared_helper.rb
+++ b/app/helpers/shared_helper.rb
@@ -1,4 +1,9 @@
 module SharedHelper
+
+  def inject_json(name, partial)
+    render "json/injection", name: name, partial: partial
+  end
+
   def distributor_link_class(distributor)
     cart = current_order(true)
     @active_distributors ||= Enterprise.distributors_with_active_order_cycles
diff --git a/app/views/json/_injection.html.haml b/app/views/json/_injection.html.haml
new file mode 100644
index 0000000000..95b921406b
--- /dev/null
+++ b/app/views/json/_injection.html.haml
@@ -0,0 +1,2 @@
+:javascript
+  angular.module('Darkswarm').value("#{name.to_s}", #{render "json/#{partial.to_s}"})
diff --git a/app/views/layouts/darkswarm.html.haml b/app/views/layouts/darkswarm.html.haml
index 5c2dcaee66..edeffafeed 100644
--- a/app/views/layouts/darkswarm.html.haml
+++ b/app/views/layouts/darkswarm.html.haml
@@ -15,16 +15,16 @@
     = csrf_meta_tags
 
   %body.off-canvas{"ng-app" => "Darkswarm"}
+    = inject_json "currentHub", "current_hub"
+    = inject_json "user", "current_user"
+
     .off-canvas-wrap{offcanvas: true}
       .inner-wrap
-        = render partial: "shared/current_hub"
-        = render partial: "shared/current_user"
         = render partial: "shared/menu/menu"
+
         = display_flash_messages
         %ofn-flash
 
-        -#= render "shared/sidebar"
-
         %section{ role: "main" }
           = yield
           
diff --git a/app/views/shared/_current_hub.haml b/app/views/shared/_current_hub.haml
deleted file mode 100644
index 5a0ff7c564..0000000000
--- a/app/views/shared/_current_hub.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-:javascript
-  angular.module('Darkswarm').value('currentHub', #{render "json/current_hub"})
diff --git a/app/views/shared/_current_user.haml b/app/views/shared/_current_user.haml
deleted file mode 100644
index 9745a71313..0000000000
--- a/app/views/shared/_current_user.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-:javascript
-  angular.module('Darkswarm').value('user', #{render "json/current_user"})
diff --git a/spec/features/consumer/authentication_spec.rb b/spec/features/consumer/authentication_spec.rb
index 77b60290d1..76e4a20877 100644
--- a/spec/features/consumer/authentication_spec.rb
+++ b/spec/features/consumer/authentication_spec.rb
@@ -5,7 +5,27 @@ feature "Authentication", js: true do
   describe "login" do
     let(:user) { create(:user, password: "password", password_confirmation: "password") }
 
-    describe "newskool" do
+    describe "With redirects" do
+      scenario "logging in with a redirect set" do
+        visit groups_path(anchor: "login?after_login=#{producers_path}")
+        fill_in "Email", with: user.email
+        fill_in "Password", with: user.password
+        click_login_button
+        page.should have_content "Select a producer from the list below"
+        current_path.should == producers_path
+      end
+
+      scenario "logging into admin redirects home, then back to admin" do
+        visit spree.admin_path
+        fill_in "Email", with: user.email
+        fill_in "Password", with: user.password
+        click_login_button
+        page.should have_content "Dashboard"
+        current_path.should == spree.admin_path
+      end
+    end
+
+    describe "Loggin in from the home page" do
       before do
         visit root_path
       end

From d1b27edefe8e301a51c6a33523c97096a867dc3f Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 21 May 2014 16:54:48 +1000
Subject: [PATCH 073/139] Reworking the JS specs

---
 .../product_node_controller.js.coffee         |  1 +
 .../controllers/products_controller.js.coffee |  2 -
 .../darkswarm/services/product.js.coffee      |  3 +
 .../hub_node_controller_spec.js.coffee        | 11 ----
 .../product_node_controller_spec.js.coffee    | 24 +++++++
 .../products_controller_spec.js.coffee        | 64 ++++++-------------
 .../darkswarm/services/order_spec.js.coffee   |  2 +
 .../{ => services}/product_spec.js.coffee     |  2 +-
 8 files changed, 50 insertions(+), 59 deletions(-)
 create mode 100644 spec/javascripts/unit/darkswarm/controllers/products/product_node_controller_spec.js.coffee
 rename spec/javascripts/unit/darkswarm/{ => services}/product_spec.js.coffee (86%)

diff --git a/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
index 3e24f006ae..959423e3ca 100644
--- a/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
@@ -1,4 +1,5 @@
 Darkswarm.controller "ProductNodeCtrl", ($scope) ->
+
   $scope.price = ->
     if $scope.product.variants.length > 0
       prices = (v.price for v in $scope.product.variants)
diff --git a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
index 09df18ca38..323df2fc4e 100644
--- a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee
@@ -12,5 +12,3 @@ Darkswarm.controller "ProductsCtrl", ($scope, $rootScope, Product, OrderCycle) -
     code = e.keyCode || e.which
     if code == 13
       e.preventDefault()
-
-  $scope.productPrice = (product) ->
diff --git a/app/assets/javascripts/darkswarm/services/product.js.coffee b/app/assets/javascripts/darkswarm/services/product.js.coffee
index ca31d5e9c0..e58b83bacc 100644
--- a/app/assets/javascripts/darkswarm/services/product.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/product.js.coffee
@@ -2,6 +2,9 @@ Darkswarm.factory 'Product', ($resource) ->
   new class Product
     constructor: ->
       @update()
+    
+    # TODO: don't need to scope this into object
+    # Already on object as far as controller scope is concerned
     data: 
       products: null
       loading: true
diff --git a/spec/javascripts/unit/darkswarm/controllers/hub_node_controller_spec.js.coffee b/spec/javascripts/unit/darkswarm/controllers/hub_node_controller_spec.js.coffee
index a2d14f5811..cb77cb1703 100644
--- a/spec/javascripts/unit/darkswarm/controllers/hub_node_controller_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/controllers/hub_node_controller_spec.js.coffee
@@ -19,14 +19,3 @@ describe "HubNodeCtrl", ->
     expect(scope.current()).toEqual false
     scope.hub = {id: 99} 
     expect(scope.current()).toEqual true
-
-  it "knows whether selecting this hub will empty the cart", ->
-    CurrentHub.id = undefined
-    expect(scope.emptiesCart()).toEqual false
-
-    CurrentHub.id = 99
-    scope.hub.id = 99
-    expect(scope.emptiesCart()).toEqual false
-
-    scope.hub.id = 1
-    expect(scope.emptiesCart()).toEqual true
diff --git a/spec/javascripts/unit/darkswarm/controllers/products/product_node_controller_spec.js.coffee b/spec/javascripts/unit/darkswarm/controllers/products/product_node_controller_spec.js.coffee
new file mode 100644
index 0000000000..4b9e404b9e
--- /dev/null
+++ b/spec/javascripts/unit/darkswarm/controllers/products/product_node_controller_spec.js.coffee
@@ -0,0 +1,24 @@
+describe "ProductNodeCtrl", ->
+  ctrl = null
+  scope = null
+  product =
+    id: 99
+    price: 10.00
+    variants: []
+
+  beforeEach ->
+    module('Darkswarm')
+    inject ($controller) ->
+      scope =
+        product: product
+      ctrl = $controller 'ProductNodeCtrl', {$scope: scope}
+
+  describe "determining the price to display for a product", ->
+    it "displays the product price when the product does not have variants", ->
+      expect(scope.price()).toEqual 10.00
+
+    it "displays the minimum variant price when the product has variants", ->
+      scope.product =
+        price: 11
+        variants: [{price: 22}, {price: 33}]
+      expect(scope.price()).toEqual 22
diff --git a/spec/javascripts/unit/darkswarm/controllers/products_controller_spec.js.coffee b/spec/javascripts/unit/darkswarm/controllers/products_controller_spec.js.coffee
index 269c8385b8..685d495039 100644
--- a/spec/javascripts/unit/darkswarm/controllers/products_controller_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/controllers/products_controller_spec.js.coffee
@@ -1,47 +1,21 @@
-describe 'All controllers', ->
-  describe 'ProductsCtrl', ->
-    ctrl = null
-    scope = null
-    event = null
-    Product = null
+describe 'ProductsCtrl', ->
+  ctrl = null
+  scope = null
+  event = null
+  Product = null
 
-    beforeEach ->
-      module('Darkswarm')
-      Product = 
-        all: ->
-        update: ->
-        data: "testy mctest"
-      OrderCycle =
-        order_cycle: {}
-          
-      inject ($controller) ->
-        scope = {}
-        ctrl = $controller 'ProductsCtrl', {$scope: scope, Product: Product, OrderCycle: OrderCycle}
-
-    it 'fetches products from Product', ->
-      expect(scope.data).toEqual 'testy mctest'
-
-    describe "determining the price to display for a product", ->
-      it "displays the product price when the product does not have variants", ->
-        product = {variants: [], price: 12.34}
-        expect(scope.productPrice(product)).toEqual 12.34
-
-      it "displays the minimum variant price when the product has variants", ->
-        product =
-          price: 11
-          variants: [{price: 22}, {price: 33}]
-        expect(scope.productPrice(product)).toEqual 22
-  
-  describe 'OrderCycleCtrl', ->
-    ctrl = null
-    scope = null
-    event = null
-    product_ctrl = null
-    OrderCycle = null
-
-    beforeEach ->
-      module 'Darkswarm'
+  beforeEach ->
+    module('Darkswarm')
+    Product = 
+      all: ->
+      update: ->
+      data: "testy mctest"
+    OrderCycle =
+      order_cycle: {}
+        
+    inject ($controller) ->
       scope = {}
-      inject ($controller) ->
-        scope = {}
-        ctrl = $controller 'OrderCycleCtrl', {$scope: scope}
+      ctrl = $controller 'ProductsCtrl', {$scope: scope, Product: Product, OrderCycle: OrderCycle}
+
+  it 'fetches products from Product', ->
+    expect(scope.data).toEqual 'testy mctest'
diff --git a/spec/javascripts/unit/darkswarm/services/order_spec.js.coffee b/spec/javascripts/unit/darkswarm/services/order_spec.js.coffee
index 0462e92952..fedcf23629 100644
--- a/spec/javascripts/unit/darkswarm/services/order_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/services/order_spec.js.coffee
@@ -26,8 +26,10 @@ describe 'Order service', ->
     }
     angular.module('Darkswarm').value('order', orderData)
     module 'Darkswarm'
+
     inject ($injector, _$httpBackend_)->
       $httpBackend = _$httpBackend_
+      $httpBackend.expectGET("/shop/products").respond 200, []
       Order = $injector.get("Order")
       Navigation = $injector.get("Navigation")
       flash = $injector.get("flash")
diff --git a/spec/javascripts/unit/darkswarm/product_spec.js.coffee b/spec/javascripts/unit/darkswarm/services/product_spec.js.coffee
similarity index 86%
rename from spec/javascripts/unit/darkswarm/product_spec.js.coffee
rename to spec/javascripts/unit/darkswarm/services/product_spec.js.coffee
index 7108d819af..260074a981 100644
--- a/spec/javascripts/unit/darkswarm/product_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/services/product_spec.js.coffee
@@ -10,5 +10,5 @@ describe 'Product service', ->
 
   it "Fetches products from the backend on init", ->
     $httpBackend.expectGET("/shop/products").respond([{test : "cats"}])
-    products = Product.all()
     $httpBackend.flush()
+    expect(Product.data.products[0].test).toEqual "cats" 

From d7bc1a9b95a24dfe46c1feab73859d807bdf2434 Mon Sep 17 00:00:00 2001
From: summerscope <summerscope@gmail.com>
Date: Thu, 22 May 2014 14:40:35 +1000
Subject: [PATCH 074/139] Styling for shop page product modal

---
 app/assets/stylesheets/darkswarm/all.scss     |  3 --
 .../stylesheets/darkswarm/images.css.sass     | 21 ++++++++++
 .../stylesheets/darkswarm/overrides.css.sass  |  3 --
 .../stylesheets/darkswarm/shop.css.sass       |  3 +-
 app/views/modals/_producer.html.haml          | 40 +++++++++++++------
 app/views/modals/_producers.html.haml         |  3 +-
 app/views/modals/_product.html.haml           | 14 ++++++-
 7 files changed, 63 insertions(+), 24 deletions(-)
 create mode 100644 app/assets/stylesheets/darkswarm/images.css.sass

diff --git a/app/assets/stylesheets/darkswarm/all.scss b/app/assets/stylesheets/darkswarm/all.scss
index 80e43cdc8b..a8ac8af078 100644
--- a/app/assets/stylesheets/darkswarm/all.scss
+++ b/app/assets/stylesheets/darkswarm/all.scss
@@ -9,6 +9,3 @@
 */
 @import 'foundation-icons';
 
-ofn-modal {
-  display: block;
-}
\ No newline at end of file
diff --git a/app/assets/stylesheets/darkswarm/images.css.sass b/app/assets/stylesheets/darkswarm/images.css.sass
new file mode 100644
index 0000000000..24c1c77824
--- /dev/null
+++ b/app/assets/stylesheets/darkswarm/images.css.sass
@@ -0,0 +1,21 @@
+@import mixins
+@import variables
+@import branding
+
+.product-img
+  border-bottom: 40px white solid
+  border-top: 20px white solid
+  border-left: 20px white solid
+  border-right: 20px white solid
+  outline: 1px solid #ccc
+  @include box-shadow(0 1px 2px 1px rgba(0,0,0,0.25))
+  
+@media only screen and (max-width: 1024px)
+  .product-img
+    margin-top: 2em
+    margin-bottom: 1em
+    
+
+
+
+
diff --git a/app/assets/stylesheets/darkswarm/overrides.css.sass b/app/assets/stylesheets/darkswarm/overrides.css.sass
index 917d6dd2e3..fcec6b455d 100644
--- a/app/assets/stylesheets/darkswarm/overrides.css.sass
+++ b/app/assets/stylesheets/darkswarm/overrides.css.sass
@@ -1,5 +1,2 @@
 .row
   max-width: 74em
-
-.reveal-modal
-  position: fixed
diff --git a/app/assets/stylesheets/darkswarm/shop.css.sass b/app/assets/stylesheets/darkswarm/shop.css.sass
index 0c2972367a..e0030a7d7a 100644
--- a/app/assets/stylesheets/darkswarm/shop.css.sass
+++ b/app/assets/stylesheets/darkswarm/shop.css.sass
@@ -81,8 +81,7 @@
       padding-top: 1em
       input.button.right
         float: left
-    
-    
+
     product:hover, product:focus, product:active
       border-color: $clr-brick
       @include box-shadow(0 0 3px 0 $clr-brick-bright)
diff --git a/app/views/modals/_producer.html.haml b/app/views/modals/_producer.html.haml
index 056f9e488f..ab8764358c 100644
--- a/app/views/modals/_producer.html.haml
+++ b/app/views/modals/_producer.html.haml
@@ -1,12 +1,28 @@
-%ofn-modal{title: "{{ producer.name }}"}
-  #producer_modal
-    .row
-      .small-12.columns
-        %img{"ng-src" => "producer.promo_image"} 
-        %h3 {{ producer.name }}
-    .row
-      .small-6.columns
-        %p
-          {{ producer.description }}
-      .small-6.columns
-        Stay in touch with {{ producer.name }}
+/ %ofn-modal{title: "{{ producer.name }}"}
+/   #producer_modal
+/     .row
+/       .small-12.columns
+/         %img{"ng-src" => "producer.promo_image"} 
+/         %h3 {{ producer.name }}
+/     .row
+/       .small-6.columns
+/         %p
+/           {{ producer.description }}
+/       .small-6.columns
+/         Stay in touch with {{ producer.name }}
+/   %a.close-reveal-modal{"ng-click" => "$close()"} &#215;
+
+
+%ofn-modal{title: "{{producer.name}}"}
+  .row
+    .columns.small-12
+      %img.product-img{"ng-src" => "{{producer.promo_image.images[0].large_url}}"} 
+      %h3 {{ producer.name }}
+  .row  
+    .columns.small-12.large-6
+      %p {{ producer.description }}
+    .columns.small-12.large-6
+      Stay in touch with {{ producer.name }}
+  / %pre
+  /   {{ producer | json }}
+  %a.close-reveal-modal{"ng-click" => "$close()"} &#215;
\ No newline at end of file
diff --git a/app/views/modals/_producers.html.haml b/app/views/modals/_producers.html.haml
index 153e4dcae3..89d8ccabae 100644
--- a/app/views/modals/_producers.html.haml
+++ b/app/views/modals/_producers.html.haml
@@ -1,4 +1,3 @@
 %h2 Producers
-%h5 Our producers make the food! All the delicious! 
-%p More text goes here. 
+%p Our producers make all the delicious food you can shop for on the Open Food Network. 
 %a.close-reveal-modal{"ng-click" => "cancel()"} &#215;
\ No newline at end of file
diff --git a/app/views/modals/_product.html.haml b/app/views/modals/_product.html.haml
index acca8f919b..70137ba987 100644
--- a/app/views/modals/_product.html.haml
+++ b/app/views/modals/_product.html.haml
@@ -1,4 +1,14 @@
 %ofn-modal{title: "{{product.name}}"}
 
-  {{ product | json }}
-  {{ product.description }}
+  .row
+    .columns.small-12.large-6
+      %img.product-img{"ng-src" => "{{product.master.images[0].large_url}}"} 
+    .columns.small-12.large-6
+      %h2 
+        %img{"ng-src" => "{{product.primary_taxon.icon}}"} 
+        {{product.name}}
+      %p {{product.description}}
+  / %pre
+  /   {{ product | json }}
+  %a.close-reveal-modal{"ng-click" => "$close()"} &#215;
+ 
\ No newline at end of file

From 1a7c6f87edc17b1827b0a4ef2c41f25c73d6d706 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 22 May 2014 14:47:10 +1000
Subject: [PATCH 075/139] Adding fields to product supplier

---
 app/views/shop/products.rabl | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/views/shop/products.rabl b/app/views/shop/products.rabl
index c8b5d5398c..ee5e567285 100644
--- a/app/views/shop/products.rabl
+++ b/app/views/shop/products.rabl
@@ -10,7 +10,14 @@ node do |product|
 end
 
 child :supplier => :supplier do
-  attributes :id, :name, :description
+  attributes :id, :name, :description, :long_description, :website, :instagram, :facebook, :linkedin, :twitter
+
+  node :logo do |supplier|
+    supplier.logo.url
+  end
+  node :promo_image do |supplier|
+    supplier.promo_image.url
+  end
 end
 
 child :primary_taxon => :primary_taxon do

From 465728576961706c0137b51952476113ffdd3419 Mon Sep 17 00:00:00 2001
From: summerscope <summerscope@gmail.com>
Date: Thu, 22 May 2014 16:35:48 +1000
Subject: [PATCH 076/139] Producers modal styling and markup

---
 .../stylesheets/darkswarm/images.css.sass     | 27 ++++++++-
 app/views/modals/_producer.html.haml          | 57 ++++++++++++-------
 2 files changed, 62 insertions(+), 22 deletions(-)

diff --git a/app/assets/stylesheets/darkswarm/images.css.sass b/app/assets/stylesheets/darkswarm/images.css.sass
index 24c1c77824..927e906842 100644
--- a/app/assets/stylesheets/darkswarm/images.css.sass
+++ b/app/assets/stylesheets/darkswarm/images.css.sass
@@ -9,7 +9,32 @@
   border-right: 20px white solid
   outline: 1px solid #ccc
   @include box-shadow(0 1px 2px 1px rgba(0,0,0,0.25))
-  
+
+.producer-hero
+  position: relative
+  padding: 0
+
+.producer-hero-img
+  background-color: #999
+  width: 100%
+  height: inherit
+  max-height: 260px
+  overflow: hidden
+  margin-top: 2em    
+  margin-bottom: 1em 
+
+
+h3.producer-name
+  background-color: rgba(255,255,255,0.65)
+  height: 2.5em
+  width: 100%
+  position: absolute
+  bottom: 0 
+  padding: 0.5em
+
+.producer-logo
+  max-width: 220px
+
 @media only screen and (max-width: 1024px)
   .product-img
     margin-top: 2em
diff --git a/app/views/modals/_producer.html.haml b/app/views/modals/_producer.html.haml
index ab8764358c..6031537089 100644
--- a/app/views/modals/_producer.html.haml
+++ b/app/views/modals/_producer.html.haml
@@ -1,28 +1,43 @@
-/ %ofn-modal{title: "{{ producer.name }}"}
-/   #producer_modal
-/     .row
-/       .small-12.columns
-/         %img{"ng-src" => "producer.promo_image"} 
-/         %h3 {{ producer.name }}
-/     .row
-/       .small-6.columns
-/         %p
-/           {{ producer.description }}
-/       .small-6.columns
-/         Stay in touch with {{ producer.name }}
-/   %a.close-reveal-modal{"ng-click" => "$close()"} &#215;
-
-
 %ofn-modal{title: "{{producer.name}}"}
   .row
-    .columns.small-12
-      %img.product-img{"ng-src" => "{{producer.promo_image.images[0].large_url}}"} 
-      %h3 {{ producer.name }}
+    .columns.small-12.producer-hero
+      %img.producer-hero-img{"ng-src" => "{{producer.promo_image}}"} 
+      / Will - scale large images down to 1200px wide, crop in to img aspect ratio 60W:13H
+      %h3.producer-name {{ producer.name }}
   .row  
+    .columns.small-12.large-6{"ng-bind-html" => "{{producer.long_description}}"}
+      / Will to fix this
     .columns.small-12.large-6
-      %p {{ producer.description }}
-    .columns.small-12.large-6
-      Stay in touch with {{ producer.name }}
+      / Will needs logic to add in following only if data is available for each type:
+      / Will needs better formatting of URLs printed on-screen (minus http://www.)
+      / Will needs formatting of URLs driving %a regardless of user input (plus http://www.)
+      %img.producer-logo{"ng-src" => "{{producer.logo}}"} 
+      %h4 Stay in touch with {{ producer.name }}
+      %ul.small-block-grid-1
+        %li 
+          %a{href: "{{producer.website}}", target: "_blank" }
+            %i.fi-web
+            {{ producer.website }}
+        %li  
+          %a{href: "{{producer.twitter}}", target: "_blank"}
+            / Will needs logic to allow user to input @twitterhandle to drive a logical URL
+            %i.fi-social-twitter
+            {{ producer.twitter }}
+        %li  
+          %a{href: "{{producer.facebook}}", target: "_blank"}
+            %i.fi-social-facebook
+            {{ producer.facebook }}
+        %li  
+          %a{href: "{{producer.linkedin}}", target: "_blank"}
+            %i.fi-social-linkedin
+            {{ producer.linkedin }}
+        %li  
+          %a{href: "{{producer.instagram}}", target: "_blank"}  
+            / Will needs logic to allow user to input @instagramhandle to drive a logical URL
+            %i.fi-social-instagram
+            {{ producer.instagram }}
+
   / %pre
   /   {{ producer | json }}
+
   %a.close-reveal-modal{"ng-click" => "$close()"} &#215;
\ No newline at end of file

From 9b15c213d142c04dba147a705fba5b810a1a8caa Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 23 May 2014 11:22:04 +1000
Subject: [PATCH 077/139] When an enterprise user saves an order cycle for
 which it manages only some of the enterprises involved, do not delete the
 other exchanges

---
 .../admin/order_cycles_controller.rb          |  4 +--
 app/helpers/enterprises_helper.rb             |  4 +++
 app/models/exchange.rb                        |  4 +++
 .../order_cycle_form_applicator.rb            | 10 +++++--
 spec/features/admin/order_cycles_spec.rb      |  9 ++++++
 .../order_cycle_form_applicator_spec.rb       | 30 +++++++++++++++++++
 spec/models/exchange_spec.rb                  | 22 ++++++++++----
 7 files changed, 74 insertions(+), 9 deletions(-)

diff --git a/app/controllers/admin/order_cycles_controller.rb b/app/controllers/admin/order_cycles_controller.rb
index 46273d0eff..566c660112 100644
--- a/app/controllers/admin/order_cycles_controller.rb
+++ b/app/controllers/admin/order_cycles_controller.rb
@@ -23,7 +23,7 @@ module Admin
 
       respond_to do |format|
         if @order_cycle.save
-          OpenFoodNetwork::OrderCycleFormApplicator.new(@order_cycle).go!
+          OpenFoodNetwork::OrderCycleFormApplicator.new(@order_cycle, managed_enterprises).go!
 
           flash[:notice] = 'Your order cycle has been created.'
           format.html { redirect_to admin_order_cycles_path }
@@ -40,7 +40,7 @@ module Admin
 
       respond_to do |format|
         if @order_cycle.update_attributes(params[:order_cycle])
-          OpenFoodNetwork::OrderCycleFormApplicator.new(@order_cycle).go!
+          OpenFoodNetwork::OrderCycleFormApplicator.new(@order_cycle, managed_enterprises).go!
 
           flash[:notice] = 'Your order cycle has been updated.'
           format.html { redirect_to admin_order_cycles_path }
diff --git a/app/helpers/enterprises_helper.rb b/app/helpers/enterprises_helper.rb
index 4b0f2f4a93..ed22831589 100644
--- a/app/helpers/enterprises_helper.rb
+++ b/app/helpers/enterprises_helper.rb
@@ -2,6 +2,10 @@ module EnterprisesHelper
   def current_distributor
     @current_distributor ||= current_order(false).andand.distributor
   end
+
+  def managed_enterprises
+    Enterprise.managed_by(spree_current_user)
+  end
   
   def enterprises_options enterprises
     enterprises.map { |enterprise| [enterprise.name + ": " + enterprise.address.address1 + ", " + enterprise.address.city, enterprise.id.to_i] }
diff --git a/app/models/exchange.rb b/app/models/exchange.rb
index 18c3f81447..c491748d5d 100644
--- a/app/models/exchange.rb
+++ b/app/models/exchange.rb
@@ -54,6 +54,10 @@ class Exchange < ActiveRecord::Base
     incoming? ? 'supplier' : 'distributor'
   end
 
+  def participant
+    incoming? ? sender : receiver
+  end
+
   def to_h(core_only=false)
     h = attributes.merge({ 'variant_ids' => variant_ids.sort, 'enterprise_fee_ids' => enterprise_fee_ids.sort })
     h.reject! { |k| %w(id order_cycle_id created_at updated_at).include? k } if core_only
diff --git a/lib/open_food_network/order_cycle_form_applicator.rb b/lib/open_food_network/order_cycle_form_applicator.rb
index dc5056d53a..4ef5b44e24 100644
--- a/lib/open_food_network/order_cycle_form_applicator.rb
+++ b/lib/open_food_network/order_cycle_form_applicator.rb
@@ -5,8 +5,10 @@ module OpenFoodNetwork
   # translation is more a responsibility of Angular, so I'd be inclined to refactor this class to move
   # as much as possible (if not all) of its logic into Angular.
   class OrderCycleFormApplicator
-    def initialize(order_cycle)
+    # The applicator will only touch exchanges where a permitted enterprise is the participant
+    def initialize(order_cycle, permitted_enterprises=[])
       @order_cycle = order_cycle
+      @permitted_enterprises = permitted_enterprises
     end
 
     def go!
@@ -68,7 +70,7 @@ module OpenFoodNetwork
     end
 
     def destroy_untouched_exchanges
-      untouched_exchanges.each { |exchange| exchange.destroy }
+      with_permission(untouched_exchanges).each(&:destroy)
     end
 
     def untouched_exchanges
@@ -76,6 +78,10 @@ module OpenFoodNetwork
       @order_cycle.exchanges.reject { |ex| touched_exchange_ids.include? ex.id }
     end
 
+    def with_permission(exchanges)
+      exchanges.select { |ex| @permitted_enterprises.include? ex.participant }
+    end
+
 
     def exchange_variant_ids(exchange)
       exchange[:variants].select { |k, v| v }.keys.map { |k| k.to_i }
diff --git a/spec/features/admin/order_cycles_spec.rb b/spec/features/admin/order_cycles_spec.rb
index 6cb3a501a4..2423a6dc05 100644
--- a/spec/features/admin/order_cycles_spec.rb
+++ b/spec/features/admin/order_cycles_spec.rb
@@ -514,6 +514,15 @@ feature %q{
       # I should not see exchanges for supplier2 or distributor2
       page.all('tr.supplier').count.should == 1
       page.all('tr.distributor').count.should == 1
+
+      # When I save, then those exchanges should remain
+      click_button 'Update'
+      page.should have_content "Your order cycle has been updated."
+
+      oc.reload
+      oc.suppliers.sort.should == [supplier1, supplier2]
+      oc.coordinator.should == supplier1
+      oc.distributors.sort.should == [distributor1, distributor2]
     end
 
     scenario "cloning an order cycle" do
diff --git a/spec/lib/open_food_network/order_cycle_form_applicator_spec.rb b/spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
index 81cd925569..11b7655368 100644
--- a/spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
+++ b/spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
@@ -115,6 +115,18 @@ module OpenFoodNetwork
 
           applicator.send(:untouched_exchanges).should == []
         end
+
+        it "does not destroy exchanges involving enterprises it does not have permission to touch" do
+          applicator = OrderCycleFormApplicator.new(nil)
+          exchanges = double(:exchanges)
+          permitted_exchanges = [double(:exchange), double(:exchange)]
+
+          applicator.should_receive(:with_permission).with(exchanges) { permitted_exchanges }
+          applicator.stub(:untouched_exchanges) { exchanges }
+          permitted_exchanges.each { |ex| ex.should_receive(:destroy) }
+
+          applicator.send(:destroy_untouched_exchanges)
+        end
       end
 
       it "converts exchange variant ids hash to an array of ids" do
@@ -122,6 +134,24 @@ module OpenFoodNetwork
 
         applicator.send(:exchange_variant_ids, {:enterprise_id => 123, :variants => {'1' => true, '2' => false, '3' => true}}).should == [1, 3]
       end
+
+      describe "filtering exchanges for permission" do
+        it "returns exchanges involving enterprises we have permission to touch" do
+          e = double(:enterprise)
+          ex = double(:exchange, participant: e)
+
+          applicator = OrderCycleFormApplicator.new(nil, [e])
+          applicator.send(:with_permission, [ex]).should == [ex]
+        end
+
+        it "does not return other exchanges" do
+          e = double(:enterprise)
+          ex = double(:exchange, participant: e)
+
+          applicator = OrderCycleFormApplicator.new(nil, [])
+          applicator.send(:with_permission, [ex]).should == []
+        end
+      end
     end
 
     context "integration specs" do
diff --git a/spec/models/exchange_spec.rb b/spec/models/exchange_spec.rb
index ed6cdbfc93..0dfceadbad 100644
--- a/spec/models/exchange_spec.rb
+++ b/spec/models/exchange_spec.rb
@@ -48,7 +48,7 @@ describe Exchange do
     e.enterprise_fees.count.should == 1
   end
 
-  describe "reporting whether it is an incoming exchange" do
+  describe "exchange directionality" do
     let(:supplier) { create(:supplier_enterprise) }
     let(:coordinator) { create(:distributor_enterprise) }
     let(:distributor) { create(:distributor_enterprise) }
@@ -56,12 +56,24 @@ describe Exchange do
     let(:incoming_exchange) { oc.exchanges.create! sender: supplier, receiver: coordinator, incoming: true }
     let(:outgoing_exchange) { oc.exchanges.create! sender: coordinator, receiver: distributor, incoming: false }
 
-    it "returns true for incoming exchanges" do
-      incoming_exchange.should be_incoming
+    describe "reporting whether it is an incoming exchange" do
+      it "returns true for incoming exchanges" do
+        incoming_exchange.should be_incoming
+      end
+
+      it "returns false for outgoing exchanges" do
+        outgoing_exchange.should_not be_incoming
+      end
     end
 
-    it "returns false for outgoing exchanges" do
-      outgoing_exchange.should_not be_incoming
+    describe "finding the exchange participant (the enterprise other than the coordinator)" do
+      it "returns the sender for incoming exchanges" do
+        incoming_exchange.participant.should == supplier
+      end
+
+      it "returns the receiver for outgoing exchanges" do
+        outgoing_exchange.participant.should == distributor
+      end
     end
   end
 

From 095b9bf67a9bbcb440fee10ab807bce650fa849d Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 23 May 2014 12:05:46 +1000
Subject: [PATCH 078/139] Enterprise user can only update order cycle exchanges
 where it manages the participant enterprise

---
 .../order_cycle_form_applicator.rb            | 12 +++--
 .../order_cycle_form_applicator_spec.rb       | 53 ++++++++++++++-----
 2 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/lib/open_food_network/order_cycle_form_applicator.rb b/lib/open_food_network/order_cycle_form_applicator.rb
index 4ef5b44e24..9da681c61a 100644
--- a/lib/open_food_network/order_cycle_form_applicator.rb
+++ b/lib/open_food_network/order_cycle_form_applicator.rb
@@ -64,9 +64,11 @@ module OpenFoodNetwork
 
     def update_exchange(sender_id, receiver_id, incoming, attrs={})
       exchange = @order_cycle.exchanges.where(:sender_id => sender_id, :receiver_id => receiver_id, :incoming => incoming).first
-      exchange.update_attributes!(attrs)
 
-      @touched_exchanges << exchange
+      if permission_for(exchange)
+        exchange.update_attributes!(attrs)
+        @touched_exchanges << exchange
+      end
     end
 
     def destroy_untouched_exchanges
@@ -79,7 +81,11 @@ module OpenFoodNetwork
     end
 
     def with_permission(exchanges)
-      exchanges.select { |ex| @permitted_enterprises.include? ex.participant }
+      exchanges.select { |ex| permission_for(ex) }
+    end
+
+    def permission_for(exchange)
+      @permitted_enterprises.include? exchange.participant
     end
 
 
diff --git a/spec/lib/open_food_network/order_cycle_form_applicator_spec.rb b/spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
index 11b7655368..a6f83d77cf 100644
--- a/spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
+++ b/spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
@@ -136,20 +136,31 @@ module OpenFoodNetwork
       end
 
       describe "filtering exchanges for permission" do
-        it "returns exchanges involving enterprises we have permission to touch" do
-          e = double(:enterprise)
-          ex = double(:exchange, participant: e)
+        describe "checking permission on a single exchange" do
+          it "returns true when it has permission" do
+            e = double(:enterprise)
+            ex = double(:exchange, participant: e)
 
-          applicator = OrderCycleFormApplicator.new(nil, [e])
-          applicator.send(:with_permission, [ex]).should == [ex]
+            applicator = OrderCycleFormApplicator.new(nil, [e])
+            applicator.send(:permission_for, ex).should be_true
+          end
+
+          it "returns false otherwise" do
+            e = double(:enterprise)
+            ex = double(:exchange, participant: e)
+
+            applicator = OrderCycleFormApplicator.new(nil, [])
+            applicator.send(:permission_for, ex).should be_false
+          end
         end
 
-        it "does not return other exchanges" do
-          e = double(:enterprise)
-          ex = double(:exchange, participant: e)
-
-          applicator = OrderCycleFormApplicator.new(nil, [])
-          applicator.send(:with_permission, [ex]).should == []
+        describe "filtering many exchanges" do
+          it "returns exchanges involving enterprises we have permission to touch" do
+            ex1, ex2 = double(:exchange), double(:exchange)
+            applicator = OrderCycleFormApplicator.new(nil, [])
+            applicator.stub(:permission_for).and_return(true, false)
+            applicator.send(:with_permission, [ex1, ex2]).should == [ex1]
+          end
         end
       end
     end
@@ -197,10 +208,11 @@ module OpenFoodNetwork
       end
 
       it "updates exchanges" do
-        oc = FactoryGirl.create(:simple_order_cycle)
-        applicator = OrderCycleFormApplicator.new(oc)
         sender = FactoryGirl.create(:enterprise)
         receiver = FactoryGirl.create(:enterprise)
+        oc = FactoryGirl.create(:simple_order_cycle)
+        applicator = OrderCycleFormApplicator.new(oc, [sender, receiver])
+
         incoming = true
         variant1 = FactoryGirl.create(:variant)
         variant2 = FactoryGirl.create(:variant)
@@ -219,6 +231,21 @@ module OpenFoodNetwork
         exchange.enterprise_fees.sort.should == [enterprise_fee2, enterprise_fee3]
         applicator.send(:touched_exchanges).should == [exchange]
       end
+
+      it "does not update exchanges it is not permitted to touch" do
+        sender = FactoryGirl.create(:enterprise)
+        receiver = FactoryGirl.create(:enterprise)
+        oc = FactoryGirl.create(:simple_order_cycle)
+        applicator = OrderCycleFormApplicator.new(oc, [])
+        incoming = true
+        exchange = FactoryGirl.create(:exchange, order_cycle: oc, sender: sender, receiver: receiver, incoming: incoming)
+        variant1 = FactoryGirl.create(:variant)
+
+        applicator.send(:touched_exchanges=, [])
+        applicator.send(:update_exchange, sender.id, receiver.id, incoming, {:variant_ids => [variant1.id]})
+
+        exchange.variants.should_not == [variant1]
+      end
     end
   end
 end

From 14dee8d7fecc11c3156b65c818043131852d323b Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 23 May 2014 12:09:38 +1000
Subject: [PATCH 079/139] OrderCycleFormApplicator requires
 permitted_enterprises to be set explicitly

---
 .../order_cycle_form_applicator.rb            |  2 +-
 .../order_cycle_form_applicator_spec.rb       | 22 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/open_food_network/order_cycle_form_applicator.rb b/lib/open_food_network/order_cycle_form_applicator.rb
index 9da681c61a..11bf85a341 100644
--- a/lib/open_food_network/order_cycle_form_applicator.rb
+++ b/lib/open_food_network/order_cycle_form_applicator.rb
@@ -6,7 +6,7 @@ module OpenFoodNetwork
   # as much as possible (if not all) of its logic into Angular.
   class OrderCycleFormApplicator
     # The applicator will only touch exchanges where a permitted enterprise is the participant
-    def initialize(order_cycle, permitted_enterprises=[])
+    def initialize(order_cycle, permitted_enterprises)
       @order_cycle = order_cycle
       @permitted_enterprises = permitted_enterprises
     end
diff --git a/spec/lib/open_food_network/order_cycle_form_applicator_spec.rb b/spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
index a6f83d77cf..b11229055a 100644
--- a/spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
+++ b/spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
@@ -11,7 +11,7 @@ module OpenFoodNetwork
 
         oc = double(:order_cycle, :coordinator_id => coordinator_id, :exchanges => [], :incoming_exchanges => [incoming_exchange], :outgoing_exchanges => [])
 
-        applicator = OrderCycleFormApplicator.new(oc)
+        applicator = OrderCycleFormApplicator.new(oc, [])
 
         applicator.should_receive(:exchange_variant_ids).with(incoming_exchange).and_return([1, 3])
         applicator.should_receive(:exchange_exists?).with(supplier_id, coordinator_id, true).and_return(false)
@@ -29,7 +29,7 @@ module OpenFoodNetwork
 
         oc = double(:order_cycle, :coordinator_id => coordinator_id, :exchanges => [], :incoming_exchanges => [], :outgoing_exchanges => [outgoing_exchange])
 
-        applicator = OrderCycleFormApplicator.new(oc)
+        applicator = OrderCycleFormApplicator.new(oc, [])
 
         applicator.should_receive(:exchange_variant_ids).with(outgoing_exchange).and_return([1, 3])
         applicator.should_receive(:exchange_exists?).with(coordinator_id, distributor_id, false).and_return(false)
@@ -51,7 +51,7 @@ module OpenFoodNetwork
                     :incoming_exchanges => [incoming_exchange],
                     :outgoing_exchanges => [])
 
-        applicator = OrderCycleFormApplicator.new(oc)
+        applicator = OrderCycleFormApplicator.new(oc, [])
 
         applicator.should_receive(:exchange_variant_ids).with(incoming_exchange).and_return([1, 3])
         applicator.should_receive(:exchange_exists?).with(supplier_id, coordinator_id, true).and_return(true)
@@ -73,7 +73,7 @@ module OpenFoodNetwork
                     :incoming_exchanges => [],
                     :outgoing_exchanges => [outgoing_exchange])
 
-        applicator = OrderCycleFormApplicator.new(oc)
+        applicator = OrderCycleFormApplicator.new(oc, [])
 
         applicator.should_receive(:exchange_variant_ids).with(outgoing_exchange).and_return([1, 3])
         applicator.should_receive(:exchange_exists?).with(coordinator_id, distributor_id, false).and_return(true)
@@ -95,7 +95,7 @@ module OpenFoodNetwork
                       :incoming_exchanges => [],
                       :outgoing_exchanges => [])
 
-          applicator = OrderCycleFormApplicator.new(oc)
+          applicator = OrderCycleFormApplicator.new(oc, [])
 
           applicator.should_receive(:destroy_untouched_exchanges)
 
@@ -108,7 +108,7 @@ module OpenFoodNetwork
           e2 = double(:exchange2, id: 1, foo: 2)
           oc = double(:order_cycle, :exchanges => [e1])
 
-          applicator = OrderCycleFormApplicator.new(oc)
+          applicator = OrderCycleFormApplicator.new(oc, [])
           applicator.instance_eval do
             @touched_exchanges = [e2]
           end
@@ -117,7 +117,7 @@ module OpenFoodNetwork
         end
 
         it "does not destroy exchanges involving enterprises it does not have permission to touch" do
-          applicator = OrderCycleFormApplicator.new(nil)
+          applicator = OrderCycleFormApplicator.new(nil, [])
           exchanges = double(:exchanges)
           permitted_exchanges = [double(:exchange), double(:exchange)]
 
@@ -130,7 +130,7 @@ module OpenFoodNetwork
       end
 
       it "converts exchange variant ids hash to an array of ids" do
-        applicator = OrderCycleFormApplicator.new(nil)
+        applicator = OrderCycleFormApplicator.new(nil, [])
 
         applicator.send(:exchange_variant_ids, {:enterprise_id => 123, :variants => {'1' => true, '2' => false, '3' => true}}).should == [1, 3]
       end
@@ -173,7 +173,7 @@ module OpenFoodNetwork
       it "checks whether exchanges exist" do
         oc = FactoryGirl.create(:simple_order_cycle)
         exchange = FactoryGirl.create(:exchange, order_cycle: oc)
-        applicator = OrderCycleFormApplicator.new(oc)
+        applicator = OrderCycleFormApplicator.new(oc, [])
 
         applicator.send(:exchange_exists?, exchange.sender_id, exchange.receiver_id, exchange.incoming).should be_true
         applicator.send(:exchange_exists?, exchange.sender_id, exchange.receiver_id, !exchange.incoming).should be_false
@@ -184,10 +184,10 @@ module OpenFoodNetwork
       end
 
       it "adds exchanges" do
-        oc = FactoryGirl.create(:simple_order_cycle)
-        applicator = OrderCycleFormApplicator.new(oc)
         sender = FactoryGirl.create(:enterprise)
         receiver = FactoryGirl.create(:enterprise)
+        oc = FactoryGirl.create(:simple_order_cycle)
+        applicator = OrderCycleFormApplicator.new(oc, [sender, receiver])
         incoming = true
         variant1 = FactoryGirl.create(:variant)
         variant2 = FactoryGirl.create(:variant)

From 9e46108e9a40cbbaa7010ac6f7e44e4bb50aac62 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 23 May 2014 12:18:22 +1000
Subject: [PATCH 080/139] Enterprise user can only add order cycle exchanges
 where it manages the participant enterprise

---
 .../order_cycle_form_applicator.rb                  | 10 +++++++---
 .../order_cycle_form_applicator_spec.rb             | 13 +++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/lib/open_food_network/order_cycle_form_applicator.rb b/lib/open_food_network/order_cycle_form_applicator.rb
index 11bf85a341..6556223dac 100644
--- a/lib/open_food_network/order_cycle_form_applicator.rb
+++ b/lib/open_food_network/order_cycle_form_applicator.rb
@@ -58,14 +58,18 @@ module OpenFoodNetwork
 
     def add_exchange(sender_id, receiver_id, incoming, attrs={})
       attrs = attrs.reverse_merge(:sender_id => sender_id, :receiver_id => receiver_id, :incoming => incoming)
-      exchange = @order_cycle.exchanges.create! attrs
-      @touched_exchanges << exchange
+      exchange = @order_cycle.exchanges.build attrs
+
+      if permission_for exchange
+        exchange.save!
+        @touched_exchanges << exchange
+      end
     end
 
     def update_exchange(sender_id, receiver_id, incoming, attrs={})
       exchange = @order_cycle.exchanges.where(:sender_id => sender_id, :receiver_id => receiver_id, :incoming => incoming).first
 
-      if permission_for(exchange)
+      if permission_for exchange
         exchange.update_attributes!(attrs)
         @touched_exchanges << exchange
       end
diff --git a/spec/lib/open_food_network/order_cycle_form_applicator_spec.rb b/spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
index b11229055a..c63d1eac25 100644
--- a/spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
+++ b/spec/lib/open_food_network/order_cycle_form_applicator_spec.rb
@@ -232,6 +232,19 @@ module OpenFoodNetwork
         applicator.send(:touched_exchanges).should == [exchange]
       end
 
+      it "does not add exchanges it is not permitted to touch" do
+        sender = FactoryGirl.create(:enterprise)
+        receiver = FactoryGirl.create(:enterprise)
+        oc = FactoryGirl.create(:simple_order_cycle)
+        applicator = OrderCycleFormApplicator.new(oc, [])
+        incoming = true
+
+        expect do
+          applicator.send(:touched_exchanges=, [])
+          applicator.send(:add_exchange, sender.id, receiver.id, incoming)
+        end.to change(Exchange, :count).by(0)
+      end
+
       it "does not update exchanges it is not permitted to touch" do
         sender = FactoryGirl.create(:enterprise)
         receiver = FactoryGirl.create(:enterprise)

From 84b6f99321a328a14bfe2044dbebde702860bced Mon Sep 17 00:00:00 2001
From: summerscope <summerscope@gmail.com>
Date: Thu, 22 May 2014 14:40:35 +1000
Subject: [PATCH 081/139] Styling for shop page product modal

---
 app/assets/stylesheets/darkswarm/all.scss     |  3 --
 .../stylesheets/darkswarm/images.css.sass     | 21 ++++++++++
 .../stylesheets/darkswarm/overrides.css.sass  |  3 --
 .../stylesheets/darkswarm/shop.css.sass       |  3 +-
 app/views/modals/_producer.html.haml          | 40 +++++++++++++------
 app/views/modals/_producers.html.haml         |  3 +-
 app/views/modals/_product.html.haml           | 14 ++++++-
 7 files changed, 63 insertions(+), 24 deletions(-)
 create mode 100644 app/assets/stylesheets/darkswarm/images.css.sass

diff --git a/app/assets/stylesheets/darkswarm/all.scss b/app/assets/stylesheets/darkswarm/all.scss
index 80e43cdc8b..a8ac8af078 100644
--- a/app/assets/stylesheets/darkswarm/all.scss
+++ b/app/assets/stylesheets/darkswarm/all.scss
@@ -9,6 +9,3 @@
 */
 @import 'foundation-icons';
 
-ofn-modal {
-  display: block;
-}
\ No newline at end of file
diff --git a/app/assets/stylesheets/darkswarm/images.css.sass b/app/assets/stylesheets/darkswarm/images.css.sass
new file mode 100644
index 0000000000..24c1c77824
--- /dev/null
+++ b/app/assets/stylesheets/darkswarm/images.css.sass
@@ -0,0 +1,21 @@
+@import mixins
+@import variables
+@import branding
+
+.product-img
+  border-bottom: 40px white solid
+  border-top: 20px white solid
+  border-left: 20px white solid
+  border-right: 20px white solid
+  outline: 1px solid #ccc
+  @include box-shadow(0 1px 2px 1px rgba(0,0,0,0.25))
+  
+@media only screen and (max-width: 1024px)
+  .product-img
+    margin-top: 2em
+    margin-bottom: 1em
+    
+
+
+
+
diff --git a/app/assets/stylesheets/darkswarm/overrides.css.sass b/app/assets/stylesheets/darkswarm/overrides.css.sass
index 917d6dd2e3..fcec6b455d 100644
--- a/app/assets/stylesheets/darkswarm/overrides.css.sass
+++ b/app/assets/stylesheets/darkswarm/overrides.css.sass
@@ -1,5 +1,2 @@
 .row
   max-width: 74em
-
-.reveal-modal
-  position: fixed
diff --git a/app/assets/stylesheets/darkswarm/shop.css.sass b/app/assets/stylesheets/darkswarm/shop.css.sass
index 0c2972367a..e0030a7d7a 100644
--- a/app/assets/stylesheets/darkswarm/shop.css.sass
+++ b/app/assets/stylesheets/darkswarm/shop.css.sass
@@ -81,8 +81,7 @@
       padding-top: 1em
       input.button.right
         float: left
-    
-    
+
     product:hover, product:focus, product:active
       border-color: $clr-brick
       @include box-shadow(0 0 3px 0 $clr-brick-bright)
diff --git a/app/views/modals/_producer.html.haml b/app/views/modals/_producer.html.haml
index 056f9e488f..ab8764358c 100644
--- a/app/views/modals/_producer.html.haml
+++ b/app/views/modals/_producer.html.haml
@@ -1,12 +1,28 @@
-%ofn-modal{title: "{{ producer.name }}"}
-  #producer_modal
-    .row
-      .small-12.columns
-        %img{"ng-src" => "producer.promo_image"} 
-        %h3 {{ producer.name }}
-    .row
-      .small-6.columns
-        %p
-          {{ producer.description }}
-      .small-6.columns
-        Stay in touch with {{ producer.name }}
+/ %ofn-modal{title: "{{ producer.name }}"}
+/   #producer_modal
+/     .row
+/       .small-12.columns
+/         %img{"ng-src" => "producer.promo_image"} 
+/         %h3 {{ producer.name }}
+/     .row
+/       .small-6.columns
+/         %p
+/           {{ producer.description }}
+/       .small-6.columns
+/         Stay in touch with {{ producer.name }}
+/   %a.close-reveal-modal{"ng-click" => "$close()"} &#215;
+
+
+%ofn-modal{title: "{{producer.name}}"}
+  .row
+    .columns.small-12
+      %img.product-img{"ng-src" => "{{producer.promo_image.images[0].large_url}}"} 
+      %h3 {{ producer.name }}
+  .row  
+    .columns.small-12.large-6
+      %p {{ producer.description }}
+    .columns.small-12.large-6
+      Stay in touch with {{ producer.name }}
+  / %pre
+  /   {{ producer | json }}
+  %a.close-reveal-modal{"ng-click" => "$close()"} &#215;
\ No newline at end of file
diff --git a/app/views/modals/_producers.html.haml b/app/views/modals/_producers.html.haml
index 153e4dcae3..89d8ccabae 100644
--- a/app/views/modals/_producers.html.haml
+++ b/app/views/modals/_producers.html.haml
@@ -1,4 +1,3 @@
 %h2 Producers
-%h5 Our producers make the food! All the delicious! 
-%p More text goes here. 
+%p Our producers make all the delicious food you can shop for on the Open Food Network. 
 %a.close-reveal-modal{"ng-click" => "cancel()"} &#215;
\ No newline at end of file
diff --git a/app/views/modals/_product.html.haml b/app/views/modals/_product.html.haml
index acca8f919b..70137ba987 100644
--- a/app/views/modals/_product.html.haml
+++ b/app/views/modals/_product.html.haml
@@ -1,4 +1,14 @@
 %ofn-modal{title: "{{product.name}}"}
 
-  {{ product | json }}
-  {{ product.description }}
+  .row
+    .columns.small-12.large-6
+      %img.product-img{"ng-src" => "{{product.master.images[0].large_url}}"} 
+    .columns.small-12.large-6
+      %h2 
+        %img{"ng-src" => "{{product.primary_taxon.icon}}"} 
+        {{product.name}}
+      %p {{product.description}}
+  / %pre
+  /   {{ product | json }}
+  %a.close-reveal-modal{"ng-click" => "$close()"} &#215;
+ 
\ No newline at end of file

From 6d24a6555e217f760d8c7bd602e13d5e5a1cde87 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 22 May 2014 14:47:10 +1000
Subject: [PATCH 082/139] Adding fields to product supplier

---
 app/views/shop/products.rabl | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/views/shop/products.rabl b/app/views/shop/products.rabl
index c8b5d5398c..ee5e567285 100644
--- a/app/views/shop/products.rabl
+++ b/app/views/shop/products.rabl
@@ -10,7 +10,14 @@ node do |product|
 end
 
 child :supplier => :supplier do
-  attributes :id, :name, :description
+  attributes :id, :name, :description, :long_description, :website, :instagram, :facebook, :linkedin, :twitter
+
+  node :logo do |supplier|
+    supplier.logo.url
+  end
+  node :promo_image do |supplier|
+    supplier.promo_image.url
+  end
 end
 
 child :primary_taxon => :primary_taxon do

From fd1e7ebaa3976327f518e0ef4ee1f347adb8fa8a Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 22 May 2014 15:49:10 +1000
Subject: [PATCH 083/139] Adding primary taxon field to product

---
 app/models/enterprise.rb                          |  1 +
 app/models/spree/classification_decorator.rb      | 10 ++++++++++
 app/models/spree/product_decorator.rb             | 13 ++++++++-----
 ...0140522044009_add_primary_taxon_to_products.rb |  5 +++++
 db/schema.rb                                      |  3 ++-
 spec/factories.rb                                 |  7 +++++++
 spec/models/spree/classification_spec.rb          | 15 +++++++++++++++
 spec/models/spree/product_spec.rb                 | 11 +++++++++--
 8 files changed, 57 insertions(+), 8 deletions(-)
 create mode 100644 app/models/spree/classification_decorator.rb
 create mode 100644 db/migrate/20140522044009_add_primary_taxon_to_products.rb
 create mode 100644 spec/models/spree/classification_spec.rb

diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb
index a72c6fdbd6..5e53316607 100644
--- a/app/models/enterprise.rb
+++ b/app/models/enterprise.rb
@@ -15,6 +15,7 @@ class Enterprise < ActiveRecord::Base
   has_and_belongs_to_many :payment_methods, join_table: 'distributors_payment_methods', class_name: 'Spree::PaymentMethod', foreign_key: 'distributor_id'
   has_and_belongs_to_many :shipping_methods, join_table: 'distributors_shipping_methods', class_name: 'Spree::ShippingMethod', foreign_key: 'distributor_id'
 
+
   delegate :latitude, :longitude, :city, :state_name, :to => :address
 
   accepts_nested_attributes_for :address
diff --git a/app/models/spree/classification_decorator.rb b/app/models/spree/classification_decorator.rb
new file mode 100644
index 0000000000..7e34e6890e
--- /dev/null
+++ b/app/models/spree/classification_decorator.rb
@@ -0,0 +1,10 @@
+Spree::Classification.class_eval do
+  before_destroy :dont_destroy_if_primary_taxon
+
+  def dont_destroy_if_primary_taxon
+    if product.primary_taxon == taxon
+      errors.add :base,  "Taxon #{taxon.name} is the primary taxon of #{product.name} and cannot be deleted"
+      return false
+    end
+  end
+end
diff --git a/app/models/spree/product_decorator.rb b/app/models/spree/product_decorator.rb
index ba7cbc253d..13491f94df 100644
--- a/app/models/spree/product_decorator.rb
+++ b/app/models/spree/product_decorator.rb
@@ -6,6 +6,7 @@ Spree::Product.class_eval do
 
 
   belongs_to :supplier, :class_name => 'Enterprise'
+  belongs_to :primary_taxon, class_name: 'Spree::Taxon'
 
   has_many :product_distributions, :dependent => :destroy
   has_many :distributors, :through => :product_distributions
@@ -13,9 +14,10 @@ Spree::Product.class_eval do
   accepts_nested_attributes_for :product_distributions, :allow_destroy => true
   delegate_belongs_to :master, :unit_value, :unit_description
 
-  attr_accessible :supplier_id, :distributor_ids, :product_distributions_attributes, :group_buy, :group_buy_unit_size, :variant_unit, :variant_unit_scale, :variant_unit_name, :unit_value, :unit_description, :notes
+  attr_accessible :supplier_id, :primary_taxon_id, :distributor_ids, :product_distributions_attributes, :group_buy, :group_buy_unit_size, :variant_unit, :variant_unit_scale, :variant_unit_name, :unit_value, :unit_description, :notes
 
   validates_presence_of :supplier
+  validates_presence_of :primary_taxon
 
   validates_presence_of :variant_unit, if: :has_variants?
   validates_presence_of :variant_unit_scale,
@@ -25,6 +27,7 @@ Spree::Product.class_eval do
 
   after_initialize :set_available_on_to_now, :if => :new_record?
   after_save :update_units
+  before_save :add_primary_taxon_to_taxons
 
 
   # -- Joins
@@ -118,10 +121,6 @@ Spree::Product.class_eval do
     order_cycle.variants_distributed_by(distributor).where(product_id: self)
   end
 
-  def primary_taxon
-    self.taxons.order.first
-  end
-
   # Build a product distribution for each distributor
   def build_product_distributions_for_user user
     Enterprise.is_distributor.managed_by(user).each do |distributor|
@@ -157,6 +156,10 @@ Spree::Product.class_eval do
     end
   end
 
+  def add_primary_taxon_to_taxons
+    taxons << primary_taxon unless taxons.find_by_id(primary_taxon)
+  end
+
   def self.all_variant_unit_option_types
     Spree::OptionType.where('name LIKE ?', 'unit_%%')
   end
diff --git a/db/migrate/20140522044009_add_primary_taxon_to_products.rb b/db/migrate/20140522044009_add_primary_taxon_to_products.rb
new file mode 100644
index 0000000000..ec8e3772b1
--- /dev/null
+++ b/db/migrate/20140522044009_add_primary_taxon_to_products.rb
@@ -0,0 +1,5 @@
+class AddPrimaryTaxonToProducts < ActiveRecord::Migration
+  def change
+    add_column :spree_products, :primary_taxon_id, :integer
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 77df8baf75..69e79c2829 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140522015012) do
+ActiveRecord::Schema.define(:version => 20140522044009) do
 
   create_table "adjustment_metadata", :force => true do |t|
     t.integer "adjustment_id"
@@ -681,6 +681,7 @@ ActiveRecord::Schema.define(:version => 20140522015012) do
     t.float    "variant_unit_scale"
     t.string   "variant_unit_name"
     t.text     "notes"
+    t.integer  "primary_taxon_id"
   end
 
   add_index "spree_products", ["available_on"], :name => "index_products_on_available_on"
diff --git a/spec/factories.rb b/spec/factories.rb
index 6da7824d47..394112125a 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -2,6 +2,9 @@ require 'ffaker'
 require 'spree/core/testing_support/factories'
 
 FactoryGirl.define do
+  factory :classification, class: Spree::Classification do
+  end
+
   factory :order_cycle, :parent => :simple_order_cycle do
     coordinator_fees { [create(:enterprise_fee, enterprise: coordinator)] }
 
@@ -150,6 +153,9 @@ end
 
 
 FactoryGirl.modify do
+  factory :product do
+    primary_taxon { Spree::Taxon.first || FactoryGirl.create(:taxon) }
+  end
   factory :simple_product do
     # Fix product factory name sequence with Kernel.rand so it is not interpreted as a Spree::Product method
     # Pull request: https://github.com/spree/spree/pull/1964
@@ -157,6 +163,7 @@ FactoryGirl.modify do
     sequence(:name) { |n| "Product ##{n} - #{Kernel.rand(9999)}" }
 
     supplier { Enterprise.is_primary_producer.first || FactoryGirl.create(:supplier_enterprise) }
+    primary_taxon { Spree::Taxon.first || FactoryGirl.create(:taxon) }
     on_hand 3
 
     variant_unit 'weight'
diff --git a/spec/models/spree/classification_spec.rb b/spec/models/spree/classification_spec.rb
new file mode 100644
index 0000000000..f26f6da0c0
--- /dev/null
+++ b/spec/models/spree/classification_spec.rb
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+module Spree
+  describe Classification do
+    let(:product) { create(:simple_product) }
+    let(:taxon) { create(:taxon) }
+    let(:classification) { create(:classification, taxon: taxon, product: product) }
+
+    it "won't destroy if classification is the primary taxon" do
+      product.primary_taxon = taxon
+      classification.destroy.should be_false
+      classification.errors.messages[:base].should == ["Taxon #{taxon.name} is the primary taxon of #{product.name} and cannot be deleted"]
+    end
+  end
+end
diff --git a/spec/models/spree/product_spec.rb b/spec/models/spree/product_spec.rb
index 6d90b70761..6a50190448 100644
--- a/spec/models/spree/product_spec.rb
+++ b/spec/models/spree/product_spec.rb
@@ -5,6 +5,7 @@ module Spree
 
     describe "associations" do
       it { should belong_to(:supplier) }
+      it { should belong_to(:primary_taxon) }
       it { should have_many(:product_distributions) }
     end
 
@@ -13,6 +14,12 @@ module Spree
         create(:product).should be_valid
       end
 
+      it "requires a primary taxon" do
+        product = create(:simple_product)
+        product.primary_taxon = nil
+        product.should_not be_valid
+      end
+
       it "requires a supplier" do
         product = create(:simple_product)
         product.supplier = nil
@@ -551,10 +558,10 @@ module Spree
     describe "Taxons" do
       let(:taxon1) { create(:taxon) }
       let(:taxon2) { create(:taxon) }
-      let(:product) { create(:simple_product, taxons: [taxon1, taxon2]) }
+      let(:product) { create(:simple_product) }
 
       it "returns the first taxon as the primary taxon" do
-        product.primary_taxon.should == taxon1
+        product.taxons.should == [product.primary_taxon]
       end
     end
   end

From 110a6f2d14a8ecb09628abf76f2836a275ff6777 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 22 May 2014 16:13:47 +1000
Subject: [PATCH 084/139] Adding primary taxon to admin forms

---
 .../admin/products/_form/add_notes_field.html.haml.deface   | 1 -
 db/migrate/20140522044009_add_primary_taxon_to_products.rb  | 2 ++
 db/schema.rb                                                | 2 ++
 spec/features/admin/products_spec.rb                        | 6 ++++++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/overrides/spree/admin/products/_form/add_notes_field.html.haml.deface b/app/overrides/spree/admin/products/_form/add_notes_field.html.haml.deface
index dadebd01d4..dcc7937d6b 100644
--- a/app/overrides/spree/admin/products/_form/add_notes_field.html.haml.deface
+++ b/app/overrides/spree/admin/products/_form/add_notes_field.html.haml.deface
@@ -4,4 +4,3 @@
   = f.label :notes, t(:notes)
   = f.text_area :notes, { :class => 'fullwidth', rows: 5 }
   = f.error_message_on :notes
-
diff --git a/db/migrate/20140522044009_add_primary_taxon_to_products.rb b/db/migrate/20140522044009_add_primary_taxon_to_products.rb
index ec8e3772b1..f6ff3cfe96 100644
--- a/db/migrate/20140522044009_add_primary_taxon_to_products.rb
+++ b/db/migrate/20140522044009_add_primary_taxon_to_products.rb
@@ -1,5 +1,7 @@
 class AddPrimaryTaxonToProducts < ActiveRecord::Migration
   def change
     add_column :spree_products, :primary_taxon_id, :integer
+    add_index :spree_products, :primary_taxon_id
+    add_foreign_key :spree_products, :spree_taxons, column: :primary_taxon_id
   end
 end
diff --git a/db/schema.rb b/db/schema.rb
index 69e79c2829..6005fd7cb5 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -689,6 +689,7 @@ ActiveRecord::Schema.define(:version => 20140522044009) do
   add_index "spree_products", ["name"], :name => "index_products_on_name"
   add_index "spree_products", ["permalink"], :name => "index_products_on_permalink"
   add_index "spree_products", ["permalink"], :name => "permalink_idx_unique", :unique => true
+  add_index "spree_products", ["primary_taxon_id"], :name => "index_spree_products_on_primary_taxon_id"
 
   create_table "spree_products_promotion_rules", :id => false, :force => true do |t|
     t.integer "product_id"
@@ -1093,6 +1094,7 @@ ActiveRecord::Schema.define(:version => 20140522044009) do
   add_foreign_key "spree_products", "enterprises", name: "spree_products_supplier_id_fk", column: "supplier_id"
   add_foreign_key "spree_products", "spree_shipping_categories", name: "spree_products_shipping_category_id_fk", column: "shipping_category_id"
   add_foreign_key "spree_products", "spree_tax_categories", name: "spree_products_tax_category_id_fk", column: "tax_category_id"
+  add_foreign_key "spree_products", "spree_taxons", name: "spree_products_primary_taxon_id_fk", column: "primary_taxon_id"
 
   add_foreign_key "spree_products_promotion_rules", "spree_products", name: "spree_products_promotion_rules_product_id_fk", column: "product_id"
   add_foreign_key "spree_products_promotion_rules", "spree_promotion_rules", name: "spree_products_promotion_rules_promotion_rule_id_fk", column: "promotion_rule_id"
diff --git a/spec/features/admin/products_spec.rb b/spec/features/admin/products_spec.rb
index b9f9d7a206..b9fec1ef9f 100644
--- a/spec/features/admin/products_spec.rb
+++ b/spec/features/admin/products_spec.rb
@@ -6,6 +6,7 @@ feature %q{
 } do
   include AuthenticationWorkflow
   include WebHelper
+  let!(:taxon) { create(:taxon) }
 
   background do
     @supplier = create(:supplier_enterprise, :name => 'New supplier')
@@ -22,6 +23,7 @@ feature %q{
 
       fill_in 'product_name', with: 'A new product !!!'
       fill_in 'product_price', with: '19.99'
+      select taxon.name, from: "product_primary_taxon_id"
       select 'New supplier', from: 'product_supplier_id'
 
       click_button 'Create'
@@ -43,6 +45,8 @@ feature %q{
       
       product.reload
       product.distributors.sort.should == [@distributors[0], @distributors[2]].sort
+
+
       product.product_distributions.map { |pd| pd.enterprise_fee }.sort.should == [@enterprise_fees[0], @enterprise_fees[2]].sort
     end
 
@@ -55,6 +59,7 @@ feature %q{
 
       fill_in 'product_name', :with => 'A new product !!!'
       fill_in 'product_price', :with => '19.99'
+      select taxon.name, from: "product_primary_taxon_id"
       select 'New supplier', :from => 'product_supplier_id'
       choose 'product_group_buy_1'
       fill_in 'Group buy unit size', :with => '10'
@@ -99,6 +104,7 @@ feature %q{
 
       page.should have_selector('#product_supplier_id')
       select 'Another Supplier', :from => 'product_supplier_id'
+      select taxon.name, from: "product_primary_taxon_id"
 
       # Should only have suppliers listed which the user can manage
       within "#product_supplier_id" do

From 58112fb10597ae51e4d7744f9378493abfd217cb Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Fri, 23 May 2014 16:01:24 +1000
Subject: [PATCH 085/139] Adding primary taxon

---
 app/overrides/add_primary_taxon_to_admin_product.rb          | 4 ++++
 app/overrides/add_primary_taxon_to_admin_product_new.rb      | 4 ++++
 app/views/spree/admin/products/_primary_taxon_form.html.haml | 5 +++++
 3 files changed, 13 insertions(+)
 create mode 100644 app/overrides/add_primary_taxon_to_admin_product.rb
 create mode 100644 app/overrides/add_primary_taxon_to_admin_product_new.rb
 create mode 100644 app/views/spree/admin/products/_primary_taxon_form.html.haml

diff --git a/app/overrides/add_primary_taxon_to_admin_product.rb b/app/overrides/add_primary_taxon_to_admin_product.rb
new file mode 100644
index 0000000000..9f7c5edde5
--- /dev/null
+++ b/app/overrides/add_primary_taxon_to_admin_product.rb
@@ -0,0 +1,4 @@
+Deface::Override.new(:virtual_path => "spree/admin/products/_form",
+                     :insert_top   => "[data-hook='admin_product_form_right']",
+                     :partial      => "spree/admin/products/primary_taxon_form",
+                     :name         => "add_primary_taxon_to_admin_product")
diff --git a/app/overrides/add_primary_taxon_to_admin_product_new.rb b/app/overrides/add_primary_taxon_to_admin_product_new.rb
new file mode 100644
index 0000000000..e5c9d24e7f
--- /dev/null
+++ b/app/overrides/add_primary_taxon_to_admin_product_new.rb
@@ -0,0 +1,4 @@
+Deface::Override.new(:virtual_path  => "spree/admin/products/new",
+                     :insert_before => "[data-hook='new_product_attrs']",
+                     :partial       => "spree/admin/products/primary_taxon_form",
+                     :name          => "add_primary_taxon_to_admin_product_new")
diff --git a/app/views/spree/admin/products/_primary_taxon_form.html.haml b/app/views/spree/admin/products/_primary_taxon_form.html.haml
new file mode 100644
index 0000000000..a844f4f447
--- /dev/null
+++ b/app/views/spree/admin/products/_primary_taxon_form.html.haml
@@ -0,0 +1,5 @@
+= f.field_container :primary_taxon_id do
+  = f.label :primary_taxon_id
+  %br
+  = f.collection_select(:primary_taxon_id, Spree::Taxon.all, :id, :name, {:include_blank => true}, {:class => "select2 fullwidth"})
+  = f.error_message_on :primary_taxon_id

From aa23b03f98eec508dcd342e3a4618e97a8aa40e0 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Fri, 23 May 2014 17:29:18 +1000
Subject: [PATCH 086/139] Always showing social media

---
 app/views/modals/_producer.html.haml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/views/modals/_producer.html.haml b/app/views/modals/_producer.html.haml
index be34e3c20a..6798598f49 100644
--- a/app/views/modals/_producer.html.haml
+++ b/app/views/modals/_producer.html.haml
@@ -17,20 +17,19 @@
           %a{"bo-href" => "{{producer.website}}", target: "_blank" }
             %i.fi-web
             {{ producer.website }}
-        {{ producer.twitterific }}
-        %li{"ng-show" => "producer.twitterific"}  
+        %li  
           %a{"ng-href" => "http://twitter.com/{{producer.twitter}}", target: "_blank"}
             %i.fi-social-twitter
             {{ producer.twitter }}
-        %li{"bo-if" => "producer.facebook"} 
+        %li 
           %a{"bo-href" => "{{producer.facebook}}", target: "_blank"}
             %i.fi-social-facebook
             {{ producer.facebook }}
-        %li{"bo-if" => "producer.linkedin"} 
+        %li 
           %a{"bo-href" => "{{producer.linkedin}}", target: "_blank"}
             %i.fi-social-linkedin
             {{ producer.linkedin }}
-        %li{"bo-if" => "producer.instagram"}
+        %li
           %a{"bo-href" => "http://instagram.com/{{producer.instagram}}", target: "_blank"}  
             / Will needs logic to allow user to input @instagramhandle to drive a logical URL
             %i.fi-social-instagram

From 2987ca763db4c755ceaebf761c4c3e43f79ef929 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 23 May 2014 15:09:08 +1000
Subject: [PATCH 087/139] Add additional data sanitisation for foreign key
 migration

---
 db/migrate/20140402033428_add_foreign_keys.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/db/migrate/20140402033428_add_foreign_keys.rb b/db/migrate/20140402033428_add_foreign_keys.rb
index f072127158..fce1ffd009 100644
--- a/db/migrate/20140402033428_add_foreign_keys.rb
+++ b/db/migrate/20140402033428_add_foreign_keys.rb
@@ -32,6 +32,11 @@ class AddForeignKeys < ActiveRecord::Migration
     say "Destroying #{orphaned_exchange_variants.count} orphaned ExchangeVariants (of total #{ExchangeVariant.count})"
     orphaned_exchange_variants.destroy_all
 
+    # Remove orphaned ExchangeFee records
+    orphaned_exchange_fees = ExchangeFee.joins('LEFT OUTER JOIN enterprise_fees ON enterprise_fees.id=exchange_fees.enterprise_fee_id').where('enterprise_fees.id IS NULL')
+    say "Destroying #{orphaned_exchange_fees.count} orphaned ExchangeFees (of total #{ExchangeFee.count})"
+    orphaned_exchange_fees.destroy_all
+
     # Remove orphaned Spree::InventoryUnits
     orphaned_inventory_units = Spree::InventoryUnit.joins('LEFT OUTER JOIN spree_variants ON spree_variants.id=spree_inventory_units.variant_id').where('spree_variants.id IS NULL')
     say "Destroying #{orphaned_inventory_units.count} orphaned InventoryUnits (of total #{Spree::InventoryUnit.count})"

From 9aadc9d1ce76995f5aaedd193e873211cef436b4 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 23 May 2014 15:10:21 +1000
Subject: [PATCH 088/139] Add initial user import/export via CSV

---
 lib/tasks/users.rake | 70 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 lib/tasks/users.rake

diff --git a/lib/tasks/users.rake b/lib/tasks/users.rake
new file mode 100644
index 0000000000..0f8b8a411b
--- /dev/null
+++ b/lib/tasks/users.rake
@@ -0,0 +1,70 @@
+require 'csv'
+
+namespace :openfoodnetwork do
+
+  namespace :dev do
+    desc 'export users to CSV'
+    task export_users: :environment do
+      CSV.open('db/users.csv', 'wb') do |csv|
+        csv << header
+        # Skip some spambot users
+        users = Spree::User.all.reject { |u| u.email =~ /example.net/ }
+        users.each do |user|
+          csv << row(user)
+        end
+      end
+    end
+
+
+    desc 'import users from CSV'
+    task import_users: :environment do
+      ActionMailer::Base.delivery_method = :test
+
+      CSV.foreach('db/users.csv') do |row|
+        next if row[0] == 'encrypted_password'
+
+        create_user_from row
+      end
+    end
+
+
+    private
+
+    def header
+      ["encrypted_password", "password_salt", "email", "remember_token", "persistence_token", "reset_password_token", "perishable_token", "sign_in_count", "failed_attempts", "last_request_at", "current_sign_in_at", "last_sign_in_at", "current_sign_in_ip", "last_sign_in_ip", "login", "created_at", "updated_at", "authentication_token", "unlock_token", "locked_at", "remember_created_at", "reset_password_sent_at",
+
+       "role_name",
+
+       "ship_address_firstname", "ship_address_lastname", "ship_address_address1", "ship_address_address2", "ship_address_city", "ship_address_zipcode", "ship_address_phone", "ship_address_state", "ship_address_country", "ship_address_created_at", "ship_address_updated_at", "ship_address_company", "ship_address_latitude", "ship_address_longitude",
+
+       "bill_address_firstname", "bill_address_lastname", "bill_address_address1", "bill_address_address2", "bill_address_city", "bill_address_zipcode", "bill_address_phone", "bill_address_state", "bill_address_country", "bill_address_created_at", "bill_address_updated_at", "bill_address_company", "bill_address_latitude", "bill_address_longitude"]
+    end
+
+
+    def row(user)
+      # sa = user.ship_address
+      # ba = user.bill_address
+
+      [user.encrypted_password, user.password_salt, user.email, user.remember_token, user.persistence_token, user.reset_password_token, user.perishable_token, user.sign_in_count, user.failed_attempts, user.last_request_at, user.current_sign_in_at, user.last_sign_in_at, user.current_sign_in_ip, user.last_sign_in_ip, user.login, user.created_at, user.updated_at, user.authentication_token, user.unlock_token, user.locked_at, user.remember_created_at, user.reset_password_sent_at,
+
+       user.spree_roles.first.andand.name]
+
+       # sa.andand.firstname, sa.andand.lastname, sa.andand.address1, sa.andand.address2, sa.andand.city, sa.andand.zipcode, sa.andand.phone, sa.andand.state, sa.andand.country, sa.andand.created_at, sa.andand.updated_at, sa.andand.company, sa.andand.latitude, sa.andand.longitude,
+
+       # ba.andand.firstname, ba.andand.lastname, ba.andand.address1, ba.andand.address2, ba.andand.city, ba.andand.zipcode, ba.andand.phone, ba.andand.state, ba.andand.country, ba.andand.created_at, ba.andand.updated_at, ba.andand.company, ba.andand.latitude, ba.andand.longitude]
+    end
+
+
+    def create_user_from(row)
+      user = Spree::User.create!({password: 'changeme123', password_confirmation: 'changeme123', email: row[2], remember_token: row[3], persistence_token: row[4], reset_password_token: row[5], perishable_token: row[6], sign_in_count: row[7], failed_attempts: row[8], last_request_at: row[9], current_sign_in_at: row[10], last_sign_in_at: row[11], current_sign_in_ip: row[12], last_sign_in_ip: row[13], login: row[14], created_at: row[15], updated_at: row[16], authentication_token: row[17], unlock_token: row[18], locked_at: row[19], remember_created_at: row[20], reset_password_sent_at: row[21]}, without_protection: true)
+
+      user.update_column :encrypted_password, row[0]
+      user.update_column :password_salt, row[1]
+
+      role = Spree::Role.find_by_name row[24]
+      user.spree_roles << role if role
+    rescue ActiveRecord::RecordInvalid => e
+      puts "#{row[2]} - #{e.message}"
+    end
+  end
+end

From d1028cb912555c1909ae103660623d49c51dc724 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 23 May 2014 17:51:02 +1000
Subject: [PATCH 089/139] User import/export includes addresses

---
 lib/tasks/users.rake | 38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/lib/tasks/users.rake b/lib/tasks/users.rake
index 0f8b8a411b..323c679fb0 100644
--- a/lib/tasks/users.rake
+++ b/lib/tasks/users.rake
@@ -7,8 +7,6 @@ namespace :openfoodnetwork do
     task export_users: :environment do
       CSV.open('db/users.csv', 'wb') do |csv|
         csv << header
-        # Skip some spambot users
-        users = Spree::User.all.reject { |u| u.email =~ /example.net/ }
         users.each do |user|
           csv << row(user)
         end
@@ -30,28 +28,34 @@ namespace :openfoodnetwork do
 
     private
 
+    def users
+      # Skip some spambot users
+      Spree::User.all.reject { |u| u.email =~ /example.net/ }
+    end
+
+
     def header
       ["encrypted_password", "password_salt", "email", "remember_token", "persistence_token", "reset_password_token", "perishable_token", "sign_in_count", "failed_attempts", "last_request_at", "current_sign_in_at", "last_sign_in_at", "current_sign_in_ip", "last_sign_in_ip", "login", "created_at", "updated_at", "authentication_token", "unlock_token", "locked_at", "remember_created_at", "reset_password_sent_at",
 
        "role_name",
 
-       "ship_address_firstname", "ship_address_lastname", "ship_address_address1", "ship_address_address2", "ship_address_city", "ship_address_zipcode", "ship_address_phone", "ship_address_state", "ship_address_country", "ship_address_created_at", "ship_address_updated_at", "ship_address_company", "ship_address_latitude", "ship_address_longitude",
+       "ship_address_firstname", "ship_address_lastname", "ship_address_address1", "ship_address_address2", "ship_address_city", "ship_address_zipcode", "ship_address_phone", "ship_address_state", "ship_address_country", "ship_address_created_at", "ship_address_updated_at", "ship_address_company",
 
-       "bill_address_firstname", "bill_address_lastname", "bill_address_address1", "bill_address_address2", "bill_address_city", "bill_address_zipcode", "bill_address_phone", "bill_address_state", "bill_address_country", "bill_address_created_at", "bill_address_updated_at", "bill_address_company", "bill_address_latitude", "bill_address_longitude"]
+       "bill_address_firstname", "bill_address_lastname", "bill_address_address1", "bill_address_address2", "bill_address_city", "bill_address_zipcode", "bill_address_phone", "bill_address_state", "bill_address_country", "bill_address_created_at", "bill_address_updated_at", "bill_address_company",]
     end
 
 
     def row(user)
-      # sa = user.ship_address
-      # ba = user.bill_address
+      sa = user.orders.last.andand.ship_address
+      ba = user.orders.last.andand.bill_address
 
       [user.encrypted_password, user.password_salt, user.email, user.remember_token, user.persistence_token, user.reset_password_token, user.perishable_token, user.sign_in_count, user.failed_attempts, user.last_request_at, user.current_sign_in_at, user.last_sign_in_at, user.current_sign_in_ip, user.last_sign_in_ip, user.login, user.created_at, user.updated_at, user.authentication_token, user.unlock_token, user.locked_at, user.remember_created_at, user.reset_password_sent_at,
 
-       user.spree_roles.first.andand.name]
+       user.spree_roles.first.andand.name,
 
-       # sa.andand.firstname, sa.andand.lastname, sa.andand.address1, sa.andand.address2, sa.andand.city, sa.andand.zipcode, sa.andand.phone, sa.andand.state, sa.andand.country, sa.andand.created_at, sa.andand.updated_at, sa.andand.company, sa.andand.latitude, sa.andand.longitude,
+       sa.andand.firstname, sa.andand.lastname, sa.andand.address1, sa.andand.address2, sa.andand.city, sa.andand.zipcode, sa.andand.phone, sa.andand.state, sa.andand.country, sa.andand.created_at, sa.andand.updated_at, sa.andand.company,
 
-       # ba.andand.firstname, ba.andand.lastname, ba.andand.address1, ba.andand.address2, ba.andand.city, ba.andand.zipcode, ba.andand.phone, ba.andand.state, ba.andand.country, ba.andand.created_at, ba.andand.updated_at, ba.andand.company, ba.andand.latitude, ba.andand.longitude]
+       ba.andand.firstname, ba.andand.lastname, ba.andand.address1, ba.andand.address2, ba.andand.city, ba.andand.zipcode, ba.andand.phone, ba.andand.state, ba.andand.country, ba.andand.created_at, ba.andand.updated_at, ba.andand.company,]
     end
 
 
@@ -61,8 +65,20 @@ namespace :openfoodnetwork do
       user.update_column :encrypted_password, row[0]
       user.update_column :password_salt, row[1]
 
-      role = Spree::Role.find_by_name row[24]
-      user.spree_roles << role if role
+      # Safer if we don't make new users into admins
+      #role = Spree::Role.find_by_name row[24]
+      #user.spree_roles << role if role
+
+      sa_state = Spree::State.find_by_name row[30]
+      sa_country = Spree::Country.find_by_name row[31]
+      sa = Spree::Address.create!({firstname: row[23], lastname: row[24], address1: row[25], address2: row[26], city: row[27], zipcode: row[28], phone: row[29], state: sa_state, country: sa_country, created_at: row[32], updated_at: row[33], company: row[34]}, without_protection: true)
+      user.update_column :ship_address_id, sa.id
+
+      ba_state = Spree::State.find_by_name row[42]
+      ba_country = Spree::Country.find_by_name row[43]
+      ba = Spree::Address.create!({firstname: row[35], lastname: row[36], address1: row[37], address2: row[38], city: row[39], zipcode: row[40], phone: row[41], state: ba_state, country: ba_country, created_at: row[44], updated_at: row[45], company: row[46]}, without_protection: true)
+      user.update_column :bill_address_id, ba.id
+
     rescue ActiveRecord::RecordInvalid => e
       puts "#{row[2]} - #{e.message}"
     end

From a7566e34130a6169f98398bbe4ed63b764bdd151 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Sat, 24 May 2014 09:07:52 +1000
Subject: [PATCH 090/139] Revert "Always showing social media"

This reverts commit aa23b03f98eec508dcd342e3a4618e97a8aa40e0.
---
 app/views/modals/_producer.html.haml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/views/modals/_producer.html.haml b/app/views/modals/_producer.html.haml
index 6798598f49..be34e3c20a 100644
--- a/app/views/modals/_producer.html.haml
+++ b/app/views/modals/_producer.html.haml
@@ -17,19 +17,20 @@
           %a{"bo-href" => "{{producer.website}}", target: "_blank" }
             %i.fi-web
             {{ producer.website }}
-        %li  
+        {{ producer.twitterific }}
+        %li{"ng-show" => "producer.twitterific"}  
           %a{"ng-href" => "http://twitter.com/{{producer.twitter}}", target: "_blank"}
             %i.fi-social-twitter
             {{ producer.twitter }}
-        %li 
+        %li{"bo-if" => "producer.facebook"} 
           %a{"bo-href" => "{{producer.facebook}}", target: "_blank"}
             %i.fi-social-facebook
             {{ producer.facebook }}
-        %li 
+        %li{"bo-if" => "producer.linkedin"} 
           %a{"bo-href" => "{{producer.linkedin}}", target: "_blank"}
             %i.fi-social-linkedin
             {{ producer.linkedin }}
-        %li
+        %li{"bo-if" => "producer.instagram"}
           %a{"bo-href" => "http://instagram.com/{{producer.instagram}}", target: "_blank"}  
             / Will needs logic to allow user to input @instagramhandle to drive a logical URL
             %i.fi-social-instagram

From 7ac33beb65783c1e5fc7624427edd57ccfc5e75b Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Sat, 24 May 2014 09:07:55 +1000
Subject: [PATCH 091/139] Revert "Adding primary taxon"

This reverts commit 58112fb10597ae51e4d7744f9378493abfd217cb.
---
 app/overrides/add_primary_taxon_to_admin_product.rb          | 4 ----
 app/overrides/add_primary_taxon_to_admin_product_new.rb      | 4 ----
 app/views/spree/admin/products/_primary_taxon_form.html.haml | 5 -----
 3 files changed, 13 deletions(-)
 delete mode 100644 app/overrides/add_primary_taxon_to_admin_product.rb
 delete mode 100644 app/overrides/add_primary_taxon_to_admin_product_new.rb
 delete mode 100644 app/views/spree/admin/products/_primary_taxon_form.html.haml

diff --git a/app/overrides/add_primary_taxon_to_admin_product.rb b/app/overrides/add_primary_taxon_to_admin_product.rb
deleted file mode 100644
index 9f7c5edde5..0000000000
--- a/app/overrides/add_primary_taxon_to_admin_product.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-Deface::Override.new(:virtual_path => "spree/admin/products/_form",
-                     :insert_top   => "[data-hook='admin_product_form_right']",
-                     :partial      => "spree/admin/products/primary_taxon_form",
-                     :name         => "add_primary_taxon_to_admin_product")
diff --git a/app/overrides/add_primary_taxon_to_admin_product_new.rb b/app/overrides/add_primary_taxon_to_admin_product_new.rb
deleted file mode 100644
index e5c9d24e7f..0000000000
--- a/app/overrides/add_primary_taxon_to_admin_product_new.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-Deface::Override.new(:virtual_path  => "spree/admin/products/new",
-                     :insert_before => "[data-hook='new_product_attrs']",
-                     :partial       => "spree/admin/products/primary_taxon_form",
-                     :name          => "add_primary_taxon_to_admin_product_new")
diff --git a/app/views/spree/admin/products/_primary_taxon_form.html.haml b/app/views/spree/admin/products/_primary_taxon_form.html.haml
deleted file mode 100644
index a844f4f447..0000000000
--- a/app/views/spree/admin/products/_primary_taxon_form.html.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-= f.field_container :primary_taxon_id do
-  = f.label :primary_taxon_id
-  %br
-  = f.collection_select(:primary_taxon_id, Spree::Taxon.all, :id, :name, {:include_blank => true}, {:class => "select2 fullwidth"})
-  = f.error_message_on :primary_taxon_id

From 79393476b040707d52bcd182e26ae5fe9ddc6ce4 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Sat, 24 May 2014 09:07:56 +1000
Subject: [PATCH 092/139] Revert "Adding primary taxon to admin forms"

This reverts commit 110a6f2d14a8ecb09628abf76f2836a275ff6777.
---
 .../admin/products/_form/add_notes_field.html.haml.deface   | 1 +
 db/migrate/20140522044009_add_primary_taxon_to_products.rb  | 2 --
 db/schema.rb                                                | 2 --
 spec/features/admin/products_spec.rb                        | 6 ------
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/app/overrides/spree/admin/products/_form/add_notes_field.html.haml.deface b/app/overrides/spree/admin/products/_form/add_notes_field.html.haml.deface
index dcc7937d6b..dadebd01d4 100644
--- a/app/overrides/spree/admin/products/_form/add_notes_field.html.haml.deface
+++ b/app/overrides/spree/admin/products/_form/add_notes_field.html.haml.deface
@@ -4,3 +4,4 @@
   = f.label :notes, t(:notes)
   = f.text_area :notes, { :class => 'fullwidth', rows: 5 }
   = f.error_message_on :notes
+
diff --git a/db/migrate/20140522044009_add_primary_taxon_to_products.rb b/db/migrate/20140522044009_add_primary_taxon_to_products.rb
index f6ff3cfe96..ec8e3772b1 100644
--- a/db/migrate/20140522044009_add_primary_taxon_to_products.rb
+++ b/db/migrate/20140522044009_add_primary_taxon_to_products.rb
@@ -1,7 +1,5 @@
 class AddPrimaryTaxonToProducts < ActiveRecord::Migration
   def change
     add_column :spree_products, :primary_taxon_id, :integer
-    add_index :spree_products, :primary_taxon_id
-    add_foreign_key :spree_products, :spree_taxons, column: :primary_taxon_id
   end
 end
diff --git a/db/schema.rb b/db/schema.rb
index 6005fd7cb5..69e79c2829 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -689,7 +689,6 @@ ActiveRecord::Schema.define(:version => 20140522044009) do
   add_index "spree_products", ["name"], :name => "index_products_on_name"
   add_index "spree_products", ["permalink"], :name => "index_products_on_permalink"
   add_index "spree_products", ["permalink"], :name => "permalink_idx_unique", :unique => true
-  add_index "spree_products", ["primary_taxon_id"], :name => "index_spree_products_on_primary_taxon_id"
 
   create_table "spree_products_promotion_rules", :id => false, :force => true do |t|
     t.integer "product_id"
@@ -1094,7 +1093,6 @@ ActiveRecord::Schema.define(:version => 20140522044009) do
   add_foreign_key "spree_products", "enterprises", name: "spree_products_supplier_id_fk", column: "supplier_id"
   add_foreign_key "spree_products", "spree_shipping_categories", name: "spree_products_shipping_category_id_fk", column: "shipping_category_id"
   add_foreign_key "spree_products", "spree_tax_categories", name: "spree_products_tax_category_id_fk", column: "tax_category_id"
-  add_foreign_key "spree_products", "spree_taxons", name: "spree_products_primary_taxon_id_fk", column: "primary_taxon_id"
 
   add_foreign_key "spree_products_promotion_rules", "spree_products", name: "spree_products_promotion_rules_product_id_fk", column: "product_id"
   add_foreign_key "spree_products_promotion_rules", "spree_promotion_rules", name: "spree_products_promotion_rules_promotion_rule_id_fk", column: "promotion_rule_id"
diff --git a/spec/features/admin/products_spec.rb b/spec/features/admin/products_spec.rb
index b9fec1ef9f..b9f9d7a206 100644
--- a/spec/features/admin/products_spec.rb
+++ b/spec/features/admin/products_spec.rb
@@ -6,7 +6,6 @@ feature %q{
 } do
   include AuthenticationWorkflow
   include WebHelper
-  let!(:taxon) { create(:taxon) }
 
   background do
     @supplier = create(:supplier_enterprise, :name => 'New supplier')
@@ -23,7 +22,6 @@ feature %q{
 
       fill_in 'product_name', with: 'A new product !!!'
       fill_in 'product_price', with: '19.99'
-      select taxon.name, from: "product_primary_taxon_id"
       select 'New supplier', from: 'product_supplier_id'
 
       click_button 'Create'
@@ -45,8 +43,6 @@ feature %q{
       
       product.reload
       product.distributors.sort.should == [@distributors[0], @distributors[2]].sort
-
-
       product.product_distributions.map { |pd| pd.enterprise_fee }.sort.should == [@enterprise_fees[0], @enterprise_fees[2]].sort
     end
 
@@ -59,7 +55,6 @@ feature %q{
 
       fill_in 'product_name', :with => 'A new product !!!'
       fill_in 'product_price', :with => '19.99'
-      select taxon.name, from: "product_primary_taxon_id"
       select 'New supplier', :from => 'product_supplier_id'
       choose 'product_group_buy_1'
       fill_in 'Group buy unit size', :with => '10'
@@ -104,7 +99,6 @@ feature %q{
 
       page.should have_selector('#product_supplier_id')
       select 'Another Supplier', :from => 'product_supplier_id'
-      select taxon.name, from: "product_primary_taxon_id"
 
       # Should only have suppliers listed which the user can manage
       within "#product_supplier_id" do

From ad1f852bdda2cb9e4744ebbf26c55607b70ef523 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Sat, 24 May 2014 09:07:57 +1000
Subject: [PATCH 093/139] Revert "Adding primary taxon field to product"

This reverts commit fd1e7ebaa3976327f518e0ef4ee1f347adb8fa8a.
---
 app/models/enterprise.rb                          |  1 -
 app/models/spree/classification_decorator.rb      | 10 ----------
 app/models/spree/product_decorator.rb             | 13 +++++--------
 ...0140522044009_add_primary_taxon_to_products.rb |  5 -----
 db/schema.rb                                      |  3 +--
 spec/factories.rb                                 |  7 -------
 spec/models/spree/classification_spec.rb          | 15 ---------------
 spec/models/spree/product_spec.rb                 | 11 ++---------
 8 files changed, 8 insertions(+), 57 deletions(-)
 delete mode 100644 app/models/spree/classification_decorator.rb
 delete mode 100644 db/migrate/20140522044009_add_primary_taxon_to_products.rb
 delete mode 100644 spec/models/spree/classification_spec.rb

diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb
index 5e53316607..a72c6fdbd6 100644
--- a/app/models/enterprise.rb
+++ b/app/models/enterprise.rb
@@ -15,7 +15,6 @@ class Enterprise < ActiveRecord::Base
   has_and_belongs_to_many :payment_methods, join_table: 'distributors_payment_methods', class_name: 'Spree::PaymentMethod', foreign_key: 'distributor_id'
   has_and_belongs_to_many :shipping_methods, join_table: 'distributors_shipping_methods', class_name: 'Spree::ShippingMethod', foreign_key: 'distributor_id'
 
-
   delegate :latitude, :longitude, :city, :state_name, :to => :address
 
   accepts_nested_attributes_for :address
diff --git a/app/models/spree/classification_decorator.rb b/app/models/spree/classification_decorator.rb
deleted file mode 100644
index 7e34e6890e..0000000000
--- a/app/models/spree/classification_decorator.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-Spree::Classification.class_eval do
-  before_destroy :dont_destroy_if_primary_taxon
-
-  def dont_destroy_if_primary_taxon
-    if product.primary_taxon == taxon
-      errors.add :base,  "Taxon #{taxon.name} is the primary taxon of #{product.name} and cannot be deleted"
-      return false
-    end
-  end
-end
diff --git a/app/models/spree/product_decorator.rb b/app/models/spree/product_decorator.rb
index 13491f94df..ba7cbc253d 100644
--- a/app/models/spree/product_decorator.rb
+++ b/app/models/spree/product_decorator.rb
@@ -6,7 +6,6 @@ Spree::Product.class_eval do
 
 
   belongs_to :supplier, :class_name => 'Enterprise'
-  belongs_to :primary_taxon, class_name: 'Spree::Taxon'
 
   has_many :product_distributions, :dependent => :destroy
   has_many :distributors, :through => :product_distributions
@@ -14,10 +13,9 @@ Spree::Product.class_eval do
   accepts_nested_attributes_for :product_distributions, :allow_destroy => true
   delegate_belongs_to :master, :unit_value, :unit_description
 
-  attr_accessible :supplier_id, :primary_taxon_id, :distributor_ids, :product_distributions_attributes, :group_buy, :group_buy_unit_size, :variant_unit, :variant_unit_scale, :variant_unit_name, :unit_value, :unit_description, :notes
+  attr_accessible :supplier_id, :distributor_ids, :product_distributions_attributes, :group_buy, :group_buy_unit_size, :variant_unit, :variant_unit_scale, :variant_unit_name, :unit_value, :unit_description, :notes
 
   validates_presence_of :supplier
-  validates_presence_of :primary_taxon
 
   validates_presence_of :variant_unit, if: :has_variants?
   validates_presence_of :variant_unit_scale,
@@ -27,7 +25,6 @@ Spree::Product.class_eval do
 
   after_initialize :set_available_on_to_now, :if => :new_record?
   after_save :update_units
-  before_save :add_primary_taxon_to_taxons
 
 
   # -- Joins
@@ -121,6 +118,10 @@ Spree::Product.class_eval do
     order_cycle.variants_distributed_by(distributor).where(product_id: self)
   end
 
+  def primary_taxon
+    self.taxons.order.first
+  end
+
   # Build a product distribution for each distributor
   def build_product_distributions_for_user user
     Enterprise.is_distributor.managed_by(user).each do |distributor|
@@ -156,10 +157,6 @@ Spree::Product.class_eval do
     end
   end
 
-  def add_primary_taxon_to_taxons
-    taxons << primary_taxon unless taxons.find_by_id(primary_taxon)
-  end
-
   def self.all_variant_unit_option_types
     Spree::OptionType.where('name LIKE ?', 'unit_%%')
   end
diff --git a/db/migrate/20140522044009_add_primary_taxon_to_products.rb b/db/migrate/20140522044009_add_primary_taxon_to_products.rb
deleted file mode 100644
index ec8e3772b1..0000000000
--- a/db/migrate/20140522044009_add_primary_taxon_to_products.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddPrimaryTaxonToProducts < ActiveRecord::Migration
-  def change
-    add_column :spree_products, :primary_taxon_id, :integer
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
index 69e79c2829..77df8baf75 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140522044009) do
+ActiveRecord::Schema.define(:version => 20140522015012) do
 
   create_table "adjustment_metadata", :force => true do |t|
     t.integer "adjustment_id"
@@ -681,7 +681,6 @@ ActiveRecord::Schema.define(:version => 20140522044009) do
     t.float    "variant_unit_scale"
     t.string   "variant_unit_name"
     t.text     "notes"
-    t.integer  "primary_taxon_id"
   end
 
   add_index "spree_products", ["available_on"], :name => "index_products_on_available_on"
diff --git a/spec/factories.rb b/spec/factories.rb
index 394112125a..6da7824d47 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -2,9 +2,6 @@ require 'ffaker'
 require 'spree/core/testing_support/factories'
 
 FactoryGirl.define do
-  factory :classification, class: Spree::Classification do
-  end
-
   factory :order_cycle, :parent => :simple_order_cycle do
     coordinator_fees { [create(:enterprise_fee, enterprise: coordinator)] }
 
@@ -153,9 +150,6 @@ end
 
 
 FactoryGirl.modify do
-  factory :product do
-    primary_taxon { Spree::Taxon.first || FactoryGirl.create(:taxon) }
-  end
   factory :simple_product do
     # Fix product factory name sequence with Kernel.rand so it is not interpreted as a Spree::Product method
     # Pull request: https://github.com/spree/spree/pull/1964
@@ -163,7 +157,6 @@ FactoryGirl.modify do
     sequence(:name) { |n| "Product ##{n} - #{Kernel.rand(9999)}" }
 
     supplier { Enterprise.is_primary_producer.first || FactoryGirl.create(:supplier_enterprise) }
-    primary_taxon { Spree::Taxon.first || FactoryGirl.create(:taxon) }
     on_hand 3
 
     variant_unit 'weight'
diff --git a/spec/models/spree/classification_spec.rb b/spec/models/spree/classification_spec.rb
deleted file mode 100644
index f26f6da0c0..0000000000
--- a/spec/models/spree/classification_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-module Spree
-  describe Classification do
-    let(:product) { create(:simple_product) }
-    let(:taxon) { create(:taxon) }
-    let(:classification) { create(:classification, taxon: taxon, product: product) }
-
-    it "won't destroy if classification is the primary taxon" do
-      product.primary_taxon = taxon
-      classification.destroy.should be_false
-      classification.errors.messages[:base].should == ["Taxon #{taxon.name} is the primary taxon of #{product.name} and cannot be deleted"]
-    end
-  end
-end
diff --git a/spec/models/spree/product_spec.rb b/spec/models/spree/product_spec.rb
index 6a50190448..6d90b70761 100644
--- a/spec/models/spree/product_spec.rb
+++ b/spec/models/spree/product_spec.rb
@@ -5,7 +5,6 @@ module Spree
 
     describe "associations" do
       it { should belong_to(:supplier) }
-      it { should belong_to(:primary_taxon) }
       it { should have_many(:product_distributions) }
     end
 
@@ -14,12 +13,6 @@ module Spree
         create(:product).should be_valid
       end
 
-      it "requires a primary taxon" do
-        product = create(:simple_product)
-        product.primary_taxon = nil
-        product.should_not be_valid
-      end
-
       it "requires a supplier" do
         product = create(:simple_product)
         product.supplier = nil
@@ -558,10 +551,10 @@ module Spree
     describe "Taxons" do
       let(:taxon1) { create(:taxon) }
       let(:taxon2) { create(:taxon) }
-      let(:product) { create(:simple_product) }
+      let(:product) { create(:simple_product, taxons: [taxon1, taxon2]) }
 
       it "returns the first taxon as the primary taxon" do
-        product.taxons.should == [product.primary_taxon]
+        product.primary_taxon.should == taxon1
       end
     end
   end

From bb1b7cfa90238a8515605b571dfade30116f0298 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Sat, 24 May 2014 09:07:58 +1000
Subject: [PATCH 094/139] Revert "Adding fields to product supplier"

This reverts commit 6d24a6555e217f760d8c7bd602e13d5e5a1cde87.
---
 app/views/shop/products.rabl | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/app/views/shop/products.rabl b/app/views/shop/products.rabl
index ee5e567285..c8b5d5398c 100644
--- a/app/views/shop/products.rabl
+++ b/app/views/shop/products.rabl
@@ -10,14 +10,7 @@ node do |product|
 end
 
 child :supplier => :supplier do
-  attributes :id, :name, :description, :long_description, :website, :instagram, :facebook, :linkedin, :twitter
-
-  node :logo do |supplier|
-    supplier.logo.url
-  end
-  node :promo_image do |supplier|
-    supplier.promo_image.url
-  end
+  attributes :id, :name, :description
 end
 
 child :primary_taxon => :primary_taxon do

From 69e0e71eb617e75182e58ccacabbf12db427e71f Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Sat, 24 May 2014 09:12:24 +1000
Subject: [PATCH 095/139] Revert "Styling for shop page product modal"

This reverts commit 84b6f99321a328a14bfe2044dbebde702860bced.

Conflicts:

	app/assets/stylesheets/darkswarm/images.css.sass
	app/views/modals/_producer.html.haml
---
 app/assets/stylesheets/darkswarm/all.scss     |  3 ++
 .../stylesheets/darkswarm/images.css.sass     | 46 ----------------
 .../stylesheets/darkswarm/overrides.css.sass  |  3 ++
 .../stylesheets/darkswarm/shop.css.sass       |  3 +-
 app/views/modals/_producer.html.haml          | 52 +++++--------------
 app/views/modals/_producers.html.haml         |  3 +-
 app/views/modals/_product.html.haml           | 14 +----
 7 files changed, 24 insertions(+), 100 deletions(-)
 delete mode 100644 app/assets/stylesheets/darkswarm/images.css.sass

diff --git a/app/assets/stylesheets/darkswarm/all.scss b/app/assets/stylesheets/darkswarm/all.scss
index a8ac8af078..80e43cdc8b 100644
--- a/app/assets/stylesheets/darkswarm/all.scss
+++ b/app/assets/stylesheets/darkswarm/all.scss
@@ -9,3 +9,6 @@
 */
 @import 'foundation-icons';
 
+ofn-modal {
+  display: block;
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/darkswarm/images.css.sass b/app/assets/stylesheets/darkswarm/images.css.sass
deleted file mode 100644
index 927e906842..0000000000
--- a/app/assets/stylesheets/darkswarm/images.css.sass
+++ /dev/null
@@ -1,46 +0,0 @@
-@import mixins
-@import variables
-@import branding
-
-.product-img
-  border-bottom: 40px white solid
-  border-top: 20px white solid
-  border-left: 20px white solid
-  border-right: 20px white solid
-  outline: 1px solid #ccc
-  @include box-shadow(0 1px 2px 1px rgba(0,0,0,0.25))
-
-.producer-hero
-  position: relative
-  padding: 0
-
-.producer-hero-img
-  background-color: #999
-  width: 100%
-  height: inherit
-  max-height: 260px
-  overflow: hidden
-  margin-top: 2em    
-  margin-bottom: 1em 
-
-
-h3.producer-name
-  background-color: rgba(255,255,255,0.65)
-  height: 2.5em
-  width: 100%
-  position: absolute
-  bottom: 0 
-  padding: 0.5em
-
-.producer-logo
-  max-width: 220px
-
-@media only screen and (max-width: 1024px)
-  .product-img
-    margin-top: 2em
-    margin-bottom: 1em
-    
-
-
-
-
diff --git a/app/assets/stylesheets/darkswarm/overrides.css.sass b/app/assets/stylesheets/darkswarm/overrides.css.sass
index fcec6b455d..917d6dd2e3 100644
--- a/app/assets/stylesheets/darkswarm/overrides.css.sass
+++ b/app/assets/stylesheets/darkswarm/overrides.css.sass
@@ -1,2 +1,5 @@
 .row
   max-width: 74em
+
+.reveal-modal
+  position: fixed
diff --git a/app/assets/stylesheets/darkswarm/shop.css.sass b/app/assets/stylesheets/darkswarm/shop.css.sass
index e0030a7d7a..0c2972367a 100644
--- a/app/assets/stylesheets/darkswarm/shop.css.sass
+++ b/app/assets/stylesheets/darkswarm/shop.css.sass
@@ -81,7 +81,8 @@
       padding-top: 1em
       input.button.right
         float: left
-
+    
+    
     product:hover, product:focus, product:active
       border-color: $clr-brick
       @include box-shadow(0 0 3px 0 $clr-brick-bright)
diff --git a/app/views/modals/_producer.html.haml b/app/views/modals/_producer.html.haml
index be34e3c20a..056f9e488f 100644
--- a/app/views/modals/_producer.html.haml
+++ b/app/views/modals/_producer.html.haml
@@ -1,40 +1,12 @@
-%ofn-modal{title: "{{producer.name}}"}
-  .row
-    .columns.small-12.producer-hero
-      %img.producer-hero-img{"ng-src" => "{{producer.promo_image}}"} 
-      / Will - scale large images down to 1200px wide, crop in to img aspect ratio 60W:13H
-      %h3.producer-name {{ producer.name }}
-  .row  
-    .columns.small-12.large-6{"inject-html" => "producer.long_description"}
-    .columns.small-12.large-6
-      / Will needs logic to add in following only if data is available for each type:
-      / Will needs better formatting of URLs printed on-screen (minus http://www.)
-      / Will needs formatting of URLs driving %a regardless of user input (plus http://www.)
-      %img.producer-logo{"ng-src" => "{{producer.logo}}"} 
-      %h4 Stay in touch with {{ producer.name }}
-      %ul.small-block-grid-1{bindonce: true}
-        %li{"bo-if" => "producer.website"}
-          %a{"bo-href" => "{{producer.website}}", target: "_blank" }
-            %i.fi-web
-            {{ producer.website }}
-        {{ producer.twitterific }}
-        %li{"ng-show" => "producer.twitterific"}  
-          %a{"ng-href" => "http://twitter.com/{{producer.twitter}}", target: "_blank"}
-            %i.fi-social-twitter
-            {{ producer.twitter }}
-        %li{"bo-if" => "producer.facebook"} 
-          %a{"bo-href" => "{{producer.facebook}}", target: "_blank"}
-            %i.fi-social-facebook
-            {{ producer.facebook }}
-        %li{"bo-if" => "producer.linkedin"} 
-          %a{"bo-href" => "{{producer.linkedin}}", target: "_blank"}
-            %i.fi-social-linkedin
-            {{ producer.linkedin }}
-        %li{"bo-if" => "producer.instagram"}
-          %a{"bo-href" => "http://instagram.com/{{producer.instagram}}", target: "_blank"}  
-            / Will needs logic to allow user to input @instagramhandle to drive a logical URL
-            %i.fi-social-instagram
-            {{ producer.instagram }}
-
-
-  %a.close-reveal-modal{"ng-click" => "$close()"} &#215;
+%ofn-modal{title: "{{ producer.name }}"}
+  #producer_modal
+    .row
+      .small-12.columns
+        %img{"ng-src" => "producer.promo_image"} 
+        %h3 {{ producer.name }}
+    .row
+      .small-6.columns
+        %p
+          {{ producer.description }}
+      .small-6.columns
+        Stay in touch with {{ producer.name }}
diff --git a/app/views/modals/_producers.html.haml b/app/views/modals/_producers.html.haml
index 89d8ccabae..153e4dcae3 100644
--- a/app/views/modals/_producers.html.haml
+++ b/app/views/modals/_producers.html.haml
@@ -1,3 +1,4 @@
 %h2 Producers
-%p Our producers make all the delicious food you can shop for on the Open Food Network. 
+%h5 Our producers make the food! All the delicious! 
+%p More text goes here. 
 %a.close-reveal-modal{"ng-click" => "cancel()"} &#215;
\ No newline at end of file
diff --git a/app/views/modals/_product.html.haml b/app/views/modals/_product.html.haml
index 70137ba987..acca8f919b 100644
--- a/app/views/modals/_product.html.haml
+++ b/app/views/modals/_product.html.haml
@@ -1,14 +1,4 @@
 %ofn-modal{title: "{{product.name}}"}
 
-  .row
-    .columns.small-12.large-6
-      %img.product-img{"ng-src" => "{{product.master.images[0].large_url}}"} 
-    .columns.small-12.large-6
-      %h2 
-        %img{"ng-src" => "{{product.primary_taxon.icon}}"} 
-        {{product.name}}
-      %p {{product.description}}
-  / %pre
-  /   {{ product | json }}
-  %a.close-reveal-modal{"ng-click" => "$close()"} &#215;
- 
\ No newline at end of file
+  {{ product | json }}
+  {{ product.description }}

From 223caa046c0547dbb6e7e4110ac25204c94fcf4d Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Sat, 24 May 2014 09:15:22 +1000
Subject: [PATCH 096/139] Revert "Producers modal styling and markup"

This reverts commit 465728576961706c0137b51952476113ffdd3419.

Conflicts:

	app/assets/stylesheets/darkswarm/images.css.sass
	app/views/modals/_producer.html.haml
---
 app/views/modals/_producer.html.haml | 40 +++++++++++++++++++---------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/app/views/modals/_producer.html.haml b/app/views/modals/_producer.html.haml
index 056f9e488f..037a95398b 100644
--- a/app/views/modals/_producer.html.haml
+++ b/app/views/modals/_producer.html.haml
@@ -1,12 +1,28 @@
-%ofn-modal{title: "{{ producer.name }}"}
-  #producer_modal
-    .row
-      .small-12.columns
-        %img{"ng-src" => "producer.promo_image"} 
-        %h3 {{ producer.name }}
-    .row
-      .small-6.columns
-        %p
-          {{ producer.description }}
-      .small-6.columns
-        Stay in touch with {{ producer.name }}
+/ %ofn-modal{title: "{{ producer.name }}"}
+/   #producer_modal
+/     .row
+/       .small-12.columns
+/         %img{"ng-src" => "producer.promo_image"} 
+/         %h3 {{ producer.name }}
+/     .row
+/       .small-6.columns
+/         %p
+/           {{ producer.description }}
+/       .small-6.columns
+/         Stay in touch with {{ producer.name }}
+/   %a.close-reveal-modal{"ng-click" => "$close()"} &#215;
+
+
+%ofn-modal{title: "{{producer.name}}"}
+  .row
+    .columns.small-12
+      %img.product-img{"ng-src" => "{{producer.promo_image.images[0].large_url}}"} 
+      %h3 {{ producer.name }}
+  .row  
+    .columns.small-12.large-6
+      %p {{ producer.description }}
+    .columns.small-12.large-6
+      Stay in touch with {{ producer.name }}
+  / %pre
+  /   {{ producer | json }}
+  %a.close-reveal-modal{"ng-click" => "$close()"} &#215;

From e119192cf17ec433456c26d2cb8c15c2ad1b9315 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Sat, 24 May 2014 09:21:48 +1000
Subject: [PATCH 097/139] Manually revert merge commit "Hack patching the
 modals"

---
 Gemfile.lock                                  |  2 +-
 .../javascripts/darkswarm/all.js.coffee       |  1 -
 .../product_node_controller.js.coffee         |  9 +----
 .../javascripts/darkswarm/darkswarm.js.coffee |  1 -
 .../darkswarm/directives/modal.js.coffee      |  8 ----
 app/views/modals/_producer.html.haml          | 40 ++++++-------------
 6 files changed, 15 insertions(+), 46 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index cb0e11cced..733ef43572 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -150,7 +150,7 @@ GEM
       railties (>= 3.1)
       sprockets
       tilt
-    angularjs-rails (1.2.16)
+    angularjs-rails (1.2.13)
     ansi (1.4.2)
     arel (3.0.3)
     awesome_nested_set (2.1.5)
diff --git a/app/assets/javascripts/darkswarm/all.js.coffee b/app/assets/javascripts/darkswarm/all.js.coffee
index 3a039394ca..20d849f60c 100644
--- a/app/assets/javascripts/darkswarm/all.js.coffee
+++ b/app/assets/javascripts/darkswarm/all.js.coffee
@@ -6,7 +6,6 @@
 #= require angular
 #= require angular-cookies
 #= require angular-resource
-#= require angular-sanitize
 #= require ../shared/mm-foundation-tpls-0.2.0-SNAPSHOT
 #= require ../shared/bindonce.min.js
 #= require ../shared/ng-infinite-scroll.min.js
diff --git a/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
index fa0daababc..959423e3ca 100644
--- a/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.controller "ProductNodeCtrl", ($scope, $sce) ->
+Darkswarm.controller "ProductNodeCtrl", ($scope) ->
 
   $scope.price = ->
     if $scope.product.variants.length > 0
@@ -8,10 +8,5 @@ Darkswarm.controller "ProductNodeCtrl", ($scope, $sce) ->
       $scope.product.price
 
   $scope.producer = $scope.product.supplier
-  $scope.producer.twitterific = true
+
   $scope.hasVariants = $scope.product.variants.length > 0
-
-Darkswarm.filter "unsafe", ($sce) ->
-  (val) ->
-    $sce.trustAsHtml val
-
diff --git a/app/assets/javascripts/darkswarm/darkswarm.js.coffee b/app/assets/javascripts/darkswarm/darkswarm.js.coffee
index 8d26384c14..fe128b963a 100644
--- a/app/assets/javascripts/darkswarm/darkswarm.js.coffee
+++ b/app/assets/javascripts/darkswarm/darkswarm.js.coffee
@@ -5,7 +5,6 @@ window.Darkswarm = angular.module("Darkswarm", ["ngResource",
   'infinite-scroll', 
   'angular-flash.service', 
   'templates',
-  'ngSanitize',
   'backstretch']).config ($httpProvider, $tooltipProvider, $locationProvider, $anchorScrollProvider) ->
   $httpProvider.defaults.headers.post['X-CSRF-Token'] = $('meta[name="csrf-token"]').attr('content') 
   $httpProvider.defaults.headers.put['X-CSRF-Token'] = $('meta[name="csrf-token"]').attr('content') 
diff --git a/app/assets/javascripts/darkswarm/directives/modal.js.coffee b/app/assets/javascripts/darkswarm/directives/modal.js.coffee
index f641c29cb5..6f62c7cb45 100644
--- a/app/assets/javascripts/darkswarm/directives/modal.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/modal.js.coffee
@@ -16,11 +16,3 @@ Darkswarm.directive "ofnModal", ($modal)->
 
     elem.on "click", =>
       scope.modalInstance = $modal.open(controller: ctrl, template: contents)
-
-# TODO THIS IS TERRIBLE PLEASE FIX NG-BIND-HTML
-Darkswarm.directive "injectHtml", ->
-  restrict: 'A'
-  scope:
-    injectHtml: "="
-  link: (scope, elem, attrs, ctrl)->
-    elem.html(scope.injectHtml)
diff --git a/app/views/modals/_producer.html.haml b/app/views/modals/_producer.html.haml
index 037a95398b..056f9e488f 100644
--- a/app/views/modals/_producer.html.haml
+++ b/app/views/modals/_producer.html.haml
@@ -1,28 +1,12 @@
-/ %ofn-modal{title: "{{ producer.name }}"}
-/   #producer_modal
-/     .row
-/       .small-12.columns
-/         %img{"ng-src" => "producer.promo_image"} 
-/         %h3 {{ producer.name }}
-/     .row
-/       .small-6.columns
-/         %p
-/           {{ producer.description }}
-/       .small-6.columns
-/         Stay in touch with {{ producer.name }}
-/   %a.close-reveal-modal{"ng-click" => "$close()"} &#215;
-
-
-%ofn-modal{title: "{{producer.name}}"}
-  .row
-    .columns.small-12
-      %img.product-img{"ng-src" => "{{producer.promo_image.images[0].large_url}}"} 
-      %h3 {{ producer.name }}
-  .row  
-    .columns.small-12.large-6
-      %p {{ producer.description }}
-    .columns.small-12.large-6
-      Stay in touch with {{ producer.name }}
-  / %pre
-  /   {{ producer | json }}
-  %a.close-reveal-modal{"ng-click" => "$close()"} &#215;
+%ofn-modal{title: "{{ producer.name }}"}
+  #producer_modal
+    .row
+      .small-12.columns
+        %img{"ng-src" => "producer.promo_image"} 
+        %h3 {{ producer.name }}
+    .row
+      .small-6.columns
+        %p
+          {{ producer.description }}
+      .small-6.columns
+        Stay in touch with {{ producer.name }}

From 17f09d18528f1211aef99ce1d1676894bae48282 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 22 May 2014 15:49:10 +1000
Subject: [PATCH 098/139] Adding primary taxon field to product

---
 app/models/enterprise.rb                          |  1 +
 app/models/spree/classification_decorator.rb      | 10 ++++++++++
 app/models/spree/product_decorator.rb             | 13 ++++++++-----
 ...0140522044009_add_primary_taxon_to_products.rb |  5 +++++
 db/schema.rb                                      |  3 ++-
 spec/factories.rb                                 |  7 +++++++
 spec/models/spree/classification_spec.rb          | 15 +++++++++++++++
 spec/models/spree/product_spec.rb                 | 11 +++++++++--
 8 files changed, 57 insertions(+), 8 deletions(-)
 create mode 100644 app/models/spree/classification_decorator.rb
 create mode 100644 db/migrate/20140522044009_add_primary_taxon_to_products.rb
 create mode 100644 spec/models/spree/classification_spec.rb

diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb
index a72c6fdbd6..5e53316607 100644
--- a/app/models/enterprise.rb
+++ b/app/models/enterprise.rb
@@ -15,6 +15,7 @@ class Enterprise < ActiveRecord::Base
   has_and_belongs_to_many :payment_methods, join_table: 'distributors_payment_methods', class_name: 'Spree::PaymentMethod', foreign_key: 'distributor_id'
   has_and_belongs_to_many :shipping_methods, join_table: 'distributors_shipping_methods', class_name: 'Spree::ShippingMethod', foreign_key: 'distributor_id'
 
+
   delegate :latitude, :longitude, :city, :state_name, :to => :address
 
   accepts_nested_attributes_for :address
diff --git a/app/models/spree/classification_decorator.rb b/app/models/spree/classification_decorator.rb
new file mode 100644
index 0000000000..7e34e6890e
--- /dev/null
+++ b/app/models/spree/classification_decorator.rb
@@ -0,0 +1,10 @@
+Spree::Classification.class_eval do
+  before_destroy :dont_destroy_if_primary_taxon
+
+  def dont_destroy_if_primary_taxon
+    if product.primary_taxon == taxon
+      errors.add :base,  "Taxon #{taxon.name} is the primary taxon of #{product.name} and cannot be deleted"
+      return false
+    end
+  end
+end
diff --git a/app/models/spree/product_decorator.rb b/app/models/spree/product_decorator.rb
index ba7cbc253d..13491f94df 100644
--- a/app/models/spree/product_decorator.rb
+++ b/app/models/spree/product_decorator.rb
@@ -6,6 +6,7 @@ Spree::Product.class_eval do
 
 
   belongs_to :supplier, :class_name => 'Enterprise'
+  belongs_to :primary_taxon, class_name: 'Spree::Taxon'
 
   has_many :product_distributions, :dependent => :destroy
   has_many :distributors, :through => :product_distributions
@@ -13,9 +14,10 @@ Spree::Product.class_eval do
   accepts_nested_attributes_for :product_distributions, :allow_destroy => true
   delegate_belongs_to :master, :unit_value, :unit_description
 
-  attr_accessible :supplier_id, :distributor_ids, :product_distributions_attributes, :group_buy, :group_buy_unit_size, :variant_unit, :variant_unit_scale, :variant_unit_name, :unit_value, :unit_description, :notes
+  attr_accessible :supplier_id, :primary_taxon_id, :distributor_ids, :product_distributions_attributes, :group_buy, :group_buy_unit_size, :variant_unit, :variant_unit_scale, :variant_unit_name, :unit_value, :unit_description, :notes
 
   validates_presence_of :supplier
+  validates_presence_of :primary_taxon
 
   validates_presence_of :variant_unit, if: :has_variants?
   validates_presence_of :variant_unit_scale,
@@ -25,6 +27,7 @@ Spree::Product.class_eval do
 
   after_initialize :set_available_on_to_now, :if => :new_record?
   after_save :update_units
+  before_save :add_primary_taxon_to_taxons
 
 
   # -- Joins
@@ -118,10 +121,6 @@ Spree::Product.class_eval do
     order_cycle.variants_distributed_by(distributor).where(product_id: self)
   end
 
-  def primary_taxon
-    self.taxons.order.first
-  end
-
   # Build a product distribution for each distributor
   def build_product_distributions_for_user user
     Enterprise.is_distributor.managed_by(user).each do |distributor|
@@ -157,6 +156,10 @@ Spree::Product.class_eval do
     end
   end
 
+  def add_primary_taxon_to_taxons
+    taxons << primary_taxon unless taxons.find_by_id(primary_taxon)
+  end
+
   def self.all_variant_unit_option_types
     Spree::OptionType.where('name LIKE ?', 'unit_%%')
   end
diff --git a/db/migrate/20140522044009_add_primary_taxon_to_products.rb b/db/migrate/20140522044009_add_primary_taxon_to_products.rb
new file mode 100644
index 0000000000..ec8e3772b1
--- /dev/null
+++ b/db/migrate/20140522044009_add_primary_taxon_to_products.rb
@@ -0,0 +1,5 @@
+class AddPrimaryTaxonToProducts < ActiveRecord::Migration
+  def change
+    add_column :spree_products, :primary_taxon_id, :integer
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 77df8baf75..69e79c2829 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140522015012) do
+ActiveRecord::Schema.define(:version => 20140522044009) do
 
   create_table "adjustment_metadata", :force => true do |t|
     t.integer "adjustment_id"
@@ -681,6 +681,7 @@ ActiveRecord::Schema.define(:version => 20140522015012) do
     t.float    "variant_unit_scale"
     t.string   "variant_unit_name"
     t.text     "notes"
+    t.integer  "primary_taxon_id"
   end
 
   add_index "spree_products", ["available_on"], :name => "index_products_on_available_on"
diff --git a/spec/factories.rb b/spec/factories.rb
index 6da7824d47..394112125a 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -2,6 +2,9 @@ require 'ffaker'
 require 'spree/core/testing_support/factories'
 
 FactoryGirl.define do
+  factory :classification, class: Spree::Classification do
+  end
+
   factory :order_cycle, :parent => :simple_order_cycle do
     coordinator_fees { [create(:enterprise_fee, enterprise: coordinator)] }
 
@@ -150,6 +153,9 @@ end
 
 
 FactoryGirl.modify do
+  factory :product do
+    primary_taxon { Spree::Taxon.first || FactoryGirl.create(:taxon) }
+  end
   factory :simple_product do
     # Fix product factory name sequence with Kernel.rand so it is not interpreted as a Spree::Product method
     # Pull request: https://github.com/spree/spree/pull/1964
@@ -157,6 +163,7 @@ FactoryGirl.modify do
     sequence(:name) { |n| "Product ##{n} - #{Kernel.rand(9999)}" }
 
     supplier { Enterprise.is_primary_producer.first || FactoryGirl.create(:supplier_enterprise) }
+    primary_taxon { Spree::Taxon.first || FactoryGirl.create(:taxon) }
     on_hand 3
 
     variant_unit 'weight'
diff --git a/spec/models/spree/classification_spec.rb b/spec/models/spree/classification_spec.rb
new file mode 100644
index 0000000000..f26f6da0c0
--- /dev/null
+++ b/spec/models/spree/classification_spec.rb
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+module Spree
+  describe Classification do
+    let(:product) { create(:simple_product) }
+    let(:taxon) { create(:taxon) }
+    let(:classification) { create(:classification, taxon: taxon, product: product) }
+
+    it "won't destroy if classification is the primary taxon" do
+      product.primary_taxon = taxon
+      classification.destroy.should be_false
+      classification.errors.messages[:base].should == ["Taxon #{taxon.name} is the primary taxon of #{product.name} and cannot be deleted"]
+    end
+  end
+end
diff --git a/spec/models/spree/product_spec.rb b/spec/models/spree/product_spec.rb
index 6d90b70761..6a50190448 100644
--- a/spec/models/spree/product_spec.rb
+++ b/spec/models/spree/product_spec.rb
@@ -5,6 +5,7 @@ module Spree
 
     describe "associations" do
       it { should belong_to(:supplier) }
+      it { should belong_to(:primary_taxon) }
       it { should have_many(:product_distributions) }
     end
 
@@ -13,6 +14,12 @@ module Spree
         create(:product).should be_valid
       end
 
+      it "requires a primary taxon" do
+        product = create(:simple_product)
+        product.primary_taxon = nil
+        product.should_not be_valid
+      end
+
       it "requires a supplier" do
         product = create(:simple_product)
         product.supplier = nil
@@ -551,10 +558,10 @@ module Spree
     describe "Taxons" do
       let(:taxon1) { create(:taxon) }
       let(:taxon2) { create(:taxon) }
-      let(:product) { create(:simple_product, taxons: [taxon1, taxon2]) }
+      let(:product) { create(:simple_product) }
 
       it "returns the first taxon as the primary taxon" do
-        product.primary_taxon.should == taxon1
+        product.taxons.should == [product.primary_taxon]
       end
     end
   end

From 0a8f5d91ba50e24a6455b670b7cc790fde91395d Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 22 May 2014 16:13:47 +1000
Subject: [PATCH 099/139] Adding primary taxon to admin forms

---
 .../admin/products/_form/add_notes_field.html.haml.deface   | 1 -
 db/migrate/20140522044009_add_primary_taxon_to_products.rb  | 2 ++
 db/schema.rb                                                | 2 ++
 spec/features/admin/products_spec.rb                        | 6 ++++++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/overrides/spree/admin/products/_form/add_notes_field.html.haml.deface b/app/overrides/spree/admin/products/_form/add_notes_field.html.haml.deface
index dadebd01d4..dcc7937d6b 100644
--- a/app/overrides/spree/admin/products/_form/add_notes_field.html.haml.deface
+++ b/app/overrides/spree/admin/products/_form/add_notes_field.html.haml.deface
@@ -4,4 +4,3 @@
   = f.label :notes, t(:notes)
   = f.text_area :notes, { :class => 'fullwidth', rows: 5 }
   = f.error_message_on :notes
-
diff --git a/db/migrate/20140522044009_add_primary_taxon_to_products.rb b/db/migrate/20140522044009_add_primary_taxon_to_products.rb
index ec8e3772b1..f6ff3cfe96 100644
--- a/db/migrate/20140522044009_add_primary_taxon_to_products.rb
+++ b/db/migrate/20140522044009_add_primary_taxon_to_products.rb
@@ -1,5 +1,7 @@
 class AddPrimaryTaxonToProducts < ActiveRecord::Migration
   def change
     add_column :spree_products, :primary_taxon_id, :integer
+    add_index :spree_products, :primary_taxon_id
+    add_foreign_key :spree_products, :spree_taxons, column: :primary_taxon_id
   end
 end
diff --git a/db/schema.rb b/db/schema.rb
index 69e79c2829..6005fd7cb5 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -689,6 +689,7 @@ ActiveRecord::Schema.define(:version => 20140522044009) do
   add_index "spree_products", ["name"], :name => "index_products_on_name"
   add_index "spree_products", ["permalink"], :name => "index_products_on_permalink"
   add_index "spree_products", ["permalink"], :name => "permalink_idx_unique", :unique => true
+  add_index "spree_products", ["primary_taxon_id"], :name => "index_spree_products_on_primary_taxon_id"
 
   create_table "spree_products_promotion_rules", :id => false, :force => true do |t|
     t.integer "product_id"
@@ -1093,6 +1094,7 @@ ActiveRecord::Schema.define(:version => 20140522044009) do
   add_foreign_key "spree_products", "enterprises", name: "spree_products_supplier_id_fk", column: "supplier_id"
   add_foreign_key "spree_products", "spree_shipping_categories", name: "spree_products_shipping_category_id_fk", column: "shipping_category_id"
   add_foreign_key "spree_products", "spree_tax_categories", name: "spree_products_tax_category_id_fk", column: "tax_category_id"
+  add_foreign_key "spree_products", "spree_taxons", name: "spree_products_primary_taxon_id_fk", column: "primary_taxon_id"
 
   add_foreign_key "spree_products_promotion_rules", "spree_products", name: "spree_products_promotion_rules_product_id_fk", column: "product_id"
   add_foreign_key "spree_products_promotion_rules", "spree_promotion_rules", name: "spree_products_promotion_rules_promotion_rule_id_fk", column: "promotion_rule_id"
diff --git a/spec/features/admin/products_spec.rb b/spec/features/admin/products_spec.rb
index b9f9d7a206..b9fec1ef9f 100644
--- a/spec/features/admin/products_spec.rb
+++ b/spec/features/admin/products_spec.rb
@@ -6,6 +6,7 @@ feature %q{
 } do
   include AuthenticationWorkflow
   include WebHelper
+  let!(:taxon) { create(:taxon) }
 
   background do
     @supplier = create(:supplier_enterprise, :name => 'New supplier')
@@ -22,6 +23,7 @@ feature %q{
 
       fill_in 'product_name', with: 'A new product !!!'
       fill_in 'product_price', with: '19.99'
+      select taxon.name, from: "product_primary_taxon_id"
       select 'New supplier', from: 'product_supplier_id'
 
       click_button 'Create'
@@ -43,6 +45,8 @@ feature %q{
       
       product.reload
       product.distributors.sort.should == [@distributors[0], @distributors[2]].sort
+
+
       product.product_distributions.map { |pd| pd.enterprise_fee }.sort.should == [@enterprise_fees[0], @enterprise_fees[2]].sort
     end
 
@@ -55,6 +59,7 @@ feature %q{
 
       fill_in 'product_name', :with => 'A new product !!!'
       fill_in 'product_price', :with => '19.99'
+      select taxon.name, from: "product_primary_taxon_id"
       select 'New supplier', :from => 'product_supplier_id'
       choose 'product_group_buy_1'
       fill_in 'Group buy unit size', :with => '10'
@@ -99,6 +104,7 @@ feature %q{
 
       page.should have_selector('#product_supplier_id')
       select 'Another Supplier', :from => 'product_supplier_id'
+      select taxon.name, from: "product_primary_taxon_id"
 
       # Should only have suppliers listed which the user can manage
       within "#product_supplier_id" do

From 2db63540eee3194825e2ed39785484f81c880c56 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Fri, 23 May 2014 16:01:24 +1000
Subject: [PATCH 100/139] Adding primary taxon

---
 app/overrides/add_primary_taxon_to_admin_product.rb          | 4 ++++
 app/overrides/add_primary_taxon_to_admin_product_new.rb      | 4 ++++
 app/views/spree/admin/products/_primary_taxon_form.html.haml | 5 +++++
 3 files changed, 13 insertions(+)
 create mode 100644 app/overrides/add_primary_taxon_to_admin_product.rb
 create mode 100644 app/overrides/add_primary_taxon_to_admin_product_new.rb
 create mode 100644 app/views/spree/admin/products/_primary_taxon_form.html.haml

diff --git a/app/overrides/add_primary_taxon_to_admin_product.rb b/app/overrides/add_primary_taxon_to_admin_product.rb
new file mode 100644
index 0000000000..9f7c5edde5
--- /dev/null
+++ b/app/overrides/add_primary_taxon_to_admin_product.rb
@@ -0,0 +1,4 @@
+Deface::Override.new(:virtual_path => "spree/admin/products/_form",
+                     :insert_top   => "[data-hook='admin_product_form_right']",
+                     :partial      => "spree/admin/products/primary_taxon_form",
+                     :name         => "add_primary_taxon_to_admin_product")
diff --git a/app/overrides/add_primary_taxon_to_admin_product_new.rb b/app/overrides/add_primary_taxon_to_admin_product_new.rb
new file mode 100644
index 0000000000..e5c9d24e7f
--- /dev/null
+++ b/app/overrides/add_primary_taxon_to_admin_product_new.rb
@@ -0,0 +1,4 @@
+Deface::Override.new(:virtual_path  => "spree/admin/products/new",
+                     :insert_before => "[data-hook='new_product_attrs']",
+                     :partial       => "spree/admin/products/primary_taxon_form",
+                     :name          => "add_primary_taxon_to_admin_product_new")
diff --git a/app/views/spree/admin/products/_primary_taxon_form.html.haml b/app/views/spree/admin/products/_primary_taxon_form.html.haml
new file mode 100644
index 0000000000..a844f4f447
--- /dev/null
+++ b/app/views/spree/admin/products/_primary_taxon_form.html.haml
@@ -0,0 +1,5 @@
+= f.field_container :primary_taxon_id do
+  = f.label :primary_taxon_id
+  %br
+  = f.collection_select(:primary_taxon_id, Spree::Taxon.all, :id, :name, {:include_blank => true}, {:class => "select2 fullwidth"})
+  = f.error_message_on :primary_taxon_id

From e6461ba01eb374e3e7a82d045516393836e9bea8 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Sat, 24 May 2014 10:34:22 +1000
Subject: [PATCH 101/139] Fix enterprises spec - primary taxons change

---
 spec/models/enterprise_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/models/enterprise_spec.rb b/spec/models/enterprise_spec.rb
index f375b8890a..fac9286d9b 100644
--- a/spec/models/enterprise_spec.rb
+++ b/spec/models/enterprise_spec.rb
@@ -422,8 +422,8 @@ describe Enterprise do
     let(:supplier) { create(:supplier_enterprise) }
     let(:taxon1) { create(:taxon) }
     let(:taxon2) { create(:taxon) }
-    let(:product1) { create(:simple_product, taxons: [taxon1]) }
-    let(:product2) { create(:simple_product, taxons: [taxon1, taxon2]) }
+    let(:product1) { create(:simple_product, primary_taxon: taxon1, taxons: [taxon1]) }
+    let(:product2) { create(:simple_product, primary_taxon: taxon1, taxons: [taxon1, taxon2]) }
 
     it "gets all taxons of all distributed products" do
       Spree::Product.stub(:in_distributor).and_return [product1, product2]

From acbe49b8dea8e7bd1c8c3a91e98fd40930ed946b Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Sat, 24 May 2014 17:11:36 +1000
Subject: [PATCH 102/139] Revert primary taxons

---
 app/models/enterprise.rb                          |  1 -
 app/models/spree/classification_decorator.rb      | 10 ----------
 app/models/spree/product_decorator.rb             | 13 +++++--------
 .../add_primary_taxon_to_admin_product.rb         |  4 ----
 .../add_primary_taxon_to_admin_product_new.rb     |  4 ----
 .../_form/add_notes_field.html.haml.deface        |  1 +
 .../admin/products/_primary_taxon_form.html.haml  |  5 -----
 ...0140522044009_add_primary_taxon_to_products.rb |  7 -------
 db/schema.rb                                      |  5 +----
 spec/factories.rb                                 |  7 -------
 spec/features/admin/products_spec.rb              |  6 ------
 spec/models/enterprise_spec.rb                    |  4 ++--
 spec/models/spree/classification_spec.rb          | 15 ---------------
 spec/models/spree/product_spec.rb                 | 11 ++---------
 14 files changed, 11 insertions(+), 82 deletions(-)
 delete mode 100644 app/models/spree/classification_decorator.rb
 delete mode 100644 app/overrides/add_primary_taxon_to_admin_product.rb
 delete mode 100644 app/overrides/add_primary_taxon_to_admin_product_new.rb
 delete mode 100644 app/views/spree/admin/products/_primary_taxon_form.html.haml
 delete mode 100644 db/migrate/20140522044009_add_primary_taxon_to_products.rb
 delete mode 100644 spec/models/spree/classification_spec.rb

diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb
index 5e53316607..a72c6fdbd6 100644
--- a/app/models/enterprise.rb
+++ b/app/models/enterprise.rb
@@ -15,7 +15,6 @@ class Enterprise < ActiveRecord::Base
   has_and_belongs_to_many :payment_methods, join_table: 'distributors_payment_methods', class_name: 'Spree::PaymentMethod', foreign_key: 'distributor_id'
   has_and_belongs_to_many :shipping_methods, join_table: 'distributors_shipping_methods', class_name: 'Spree::ShippingMethod', foreign_key: 'distributor_id'
 
-
   delegate :latitude, :longitude, :city, :state_name, :to => :address
 
   accepts_nested_attributes_for :address
diff --git a/app/models/spree/classification_decorator.rb b/app/models/spree/classification_decorator.rb
deleted file mode 100644
index 7e34e6890e..0000000000
--- a/app/models/spree/classification_decorator.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-Spree::Classification.class_eval do
-  before_destroy :dont_destroy_if_primary_taxon
-
-  def dont_destroy_if_primary_taxon
-    if product.primary_taxon == taxon
-      errors.add :base,  "Taxon #{taxon.name} is the primary taxon of #{product.name} and cannot be deleted"
-      return false
-    end
-  end
-end
diff --git a/app/models/spree/product_decorator.rb b/app/models/spree/product_decorator.rb
index 13491f94df..ba7cbc253d 100644
--- a/app/models/spree/product_decorator.rb
+++ b/app/models/spree/product_decorator.rb
@@ -6,7 +6,6 @@ Spree::Product.class_eval do
 
 
   belongs_to :supplier, :class_name => 'Enterprise'
-  belongs_to :primary_taxon, class_name: 'Spree::Taxon'
 
   has_many :product_distributions, :dependent => :destroy
   has_many :distributors, :through => :product_distributions
@@ -14,10 +13,9 @@ Spree::Product.class_eval do
   accepts_nested_attributes_for :product_distributions, :allow_destroy => true
   delegate_belongs_to :master, :unit_value, :unit_description
 
-  attr_accessible :supplier_id, :primary_taxon_id, :distributor_ids, :product_distributions_attributes, :group_buy, :group_buy_unit_size, :variant_unit, :variant_unit_scale, :variant_unit_name, :unit_value, :unit_description, :notes
+  attr_accessible :supplier_id, :distributor_ids, :product_distributions_attributes, :group_buy, :group_buy_unit_size, :variant_unit, :variant_unit_scale, :variant_unit_name, :unit_value, :unit_description, :notes
 
   validates_presence_of :supplier
-  validates_presence_of :primary_taxon
 
   validates_presence_of :variant_unit, if: :has_variants?
   validates_presence_of :variant_unit_scale,
@@ -27,7 +25,6 @@ Spree::Product.class_eval do
 
   after_initialize :set_available_on_to_now, :if => :new_record?
   after_save :update_units
-  before_save :add_primary_taxon_to_taxons
 
 
   # -- Joins
@@ -121,6 +118,10 @@ Spree::Product.class_eval do
     order_cycle.variants_distributed_by(distributor).where(product_id: self)
   end
 
+  def primary_taxon
+    self.taxons.order.first
+  end
+
   # Build a product distribution for each distributor
   def build_product_distributions_for_user user
     Enterprise.is_distributor.managed_by(user).each do |distributor|
@@ -156,10 +157,6 @@ Spree::Product.class_eval do
     end
   end
 
-  def add_primary_taxon_to_taxons
-    taxons << primary_taxon unless taxons.find_by_id(primary_taxon)
-  end
-
   def self.all_variant_unit_option_types
     Spree::OptionType.where('name LIKE ?', 'unit_%%')
   end
diff --git a/app/overrides/add_primary_taxon_to_admin_product.rb b/app/overrides/add_primary_taxon_to_admin_product.rb
deleted file mode 100644
index 9f7c5edde5..0000000000
--- a/app/overrides/add_primary_taxon_to_admin_product.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-Deface::Override.new(:virtual_path => "spree/admin/products/_form",
-                     :insert_top   => "[data-hook='admin_product_form_right']",
-                     :partial      => "spree/admin/products/primary_taxon_form",
-                     :name         => "add_primary_taxon_to_admin_product")
diff --git a/app/overrides/add_primary_taxon_to_admin_product_new.rb b/app/overrides/add_primary_taxon_to_admin_product_new.rb
deleted file mode 100644
index e5c9d24e7f..0000000000
--- a/app/overrides/add_primary_taxon_to_admin_product_new.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-Deface::Override.new(:virtual_path  => "spree/admin/products/new",
-                     :insert_before => "[data-hook='new_product_attrs']",
-                     :partial       => "spree/admin/products/primary_taxon_form",
-                     :name          => "add_primary_taxon_to_admin_product_new")
diff --git a/app/overrides/spree/admin/products/_form/add_notes_field.html.haml.deface b/app/overrides/spree/admin/products/_form/add_notes_field.html.haml.deface
index dcc7937d6b..dadebd01d4 100644
--- a/app/overrides/spree/admin/products/_form/add_notes_field.html.haml.deface
+++ b/app/overrides/spree/admin/products/_form/add_notes_field.html.haml.deface
@@ -4,3 +4,4 @@
   = f.label :notes, t(:notes)
   = f.text_area :notes, { :class => 'fullwidth', rows: 5 }
   = f.error_message_on :notes
+
diff --git a/app/views/spree/admin/products/_primary_taxon_form.html.haml b/app/views/spree/admin/products/_primary_taxon_form.html.haml
deleted file mode 100644
index a844f4f447..0000000000
--- a/app/views/spree/admin/products/_primary_taxon_form.html.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-= f.field_container :primary_taxon_id do
-  = f.label :primary_taxon_id
-  %br
-  = f.collection_select(:primary_taxon_id, Spree::Taxon.all, :id, :name, {:include_blank => true}, {:class => "select2 fullwidth"})
-  = f.error_message_on :primary_taxon_id
diff --git a/db/migrate/20140522044009_add_primary_taxon_to_products.rb b/db/migrate/20140522044009_add_primary_taxon_to_products.rb
deleted file mode 100644
index f6ff3cfe96..0000000000
--- a/db/migrate/20140522044009_add_primary_taxon_to_products.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-class AddPrimaryTaxonToProducts < ActiveRecord::Migration
-  def change
-    add_column :spree_products, :primary_taxon_id, :integer
-    add_index :spree_products, :primary_taxon_id
-    add_foreign_key :spree_products, :spree_taxons, column: :primary_taxon_id
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
index 6005fd7cb5..77df8baf75 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140522044009) do
+ActiveRecord::Schema.define(:version => 20140522015012) do
 
   create_table "adjustment_metadata", :force => true do |t|
     t.integer "adjustment_id"
@@ -681,7 +681,6 @@ ActiveRecord::Schema.define(:version => 20140522044009) do
     t.float    "variant_unit_scale"
     t.string   "variant_unit_name"
     t.text     "notes"
-    t.integer  "primary_taxon_id"
   end
 
   add_index "spree_products", ["available_on"], :name => "index_products_on_available_on"
@@ -689,7 +688,6 @@ ActiveRecord::Schema.define(:version => 20140522044009) do
   add_index "spree_products", ["name"], :name => "index_products_on_name"
   add_index "spree_products", ["permalink"], :name => "index_products_on_permalink"
   add_index "spree_products", ["permalink"], :name => "permalink_idx_unique", :unique => true
-  add_index "spree_products", ["primary_taxon_id"], :name => "index_spree_products_on_primary_taxon_id"
 
   create_table "spree_products_promotion_rules", :id => false, :force => true do |t|
     t.integer "product_id"
@@ -1094,7 +1092,6 @@ ActiveRecord::Schema.define(:version => 20140522044009) do
   add_foreign_key "spree_products", "enterprises", name: "spree_products_supplier_id_fk", column: "supplier_id"
   add_foreign_key "spree_products", "spree_shipping_categories", name: "spree_products_shipping_category_id_fk", column: "shipping_category_id"
   add_foreign_key "spree_products", "spree_tax_categories", name: "spree_products_tax_category_id_fk", column: "tax_category_id"
-  add_foreign_key "spree_products", "spree_taxons", name: "spree_products_primary_taxon_id_fk", column: "primary_taxon_id"
 
   add_foreign_key "spree_products_promotion_rules", "spree_products", name: "spree_products_promotion_rules_product_id_fk", column: "product_id"
   add_foreign_key "spree_products_promotion_rules", "spree_promotion_rules", name: "spree_products_promotion_rules_promotion_rule_id_fk", column: "promotion_rule_id"
diff --git a/spec/factories.rb b/spec/factories.rb
index 394112125a..6da7824d47 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -2,9 +2,6 @@ require 'ffaker'
 require 'spree/core/testing_support/factories'
 
 FactoryGirl.define do
-  factory :classification, class: Spree::Classification do
-  end
-
   factory :order_cycle, :parent => :simple_order_cycle do
     coordinator_fees { [create(:enterprise_fee, enterprise: coordinator)] }
 
@@ -153,9 +150,6 @@ end
 
 
 FactoryGirl.modify do
-  factory :product do
-    primary_taxon { Spree::Taxon.first || FactoryGirl.create(:taxon) }
-  end
   factory :simple_product do
     # Fix product factory name sequence with Kernel.rand so it is not interpreted as a Spree::Product method
     # Pull request: https://github.com/spree/spree/pull/1964
@@ -163,7 +157,6 @@ FactoryGirl.modify do
     sequence(:name) { |n| "Product ##{n} - #{Kernel.rand(9999)}" }
 
     supplier { Enterprise.is_primary_producer.first || FactoryGirl.create(:supplier_enterprise) }
-    primary_taxon { Spree::Taxon.first || FactoryGirl.create(:taxon) }
     on_hand 3
 
     variant_unit 'weight'
diff --git a/spec/features/admin/products_spec.rb b/spec/features/admin/products_spec.rb
index b9fec1ef9f..b9f9d7a206 100644
--- a/spec/features/admin/products_spec.rb
+++ b/spec/features/admin/products_spec.rb
@@ -6,7 +6,6 @@ feature %q{
 } do
   include AuthenticationWorkflow
   include WebHelper
-  let!(:taxon) { create(:taxon) }
 
   background do
     @supplier = create(:supplier_enterprise, :name => 'New supplier')
@@ -23,7 +22,6 @@ feature %q{
 
       fill_in 'product_name', with: 'A new product !!!'
       fill_in 'product_price', with: '19.99'
-      select taxon.name, from: "product_primary_taxon_id"
       select 'New supplier', from: 'product_supplier_id'
 
       click_button 'Create'
@@ -45,8 +43,6 @@ feature %q{
       
       product.reload
       product.distributors.sort.should == [@distributors[0], @distributors[2]].sort
-
-
       product.product_distributions.map { |pd| pd.enterprise_fee }.sort.should == [@enterprise_fees[0], @enterprise_fees[2]].sort
     end
 
@@ -59,7 +55,6 @@ feature %q{
 
       fill_in 'product_name', :with => 'A new product !!!'
       fill_in 'product_price', :with => '19.99'
-      select taxon.name, from: "product_primary_taxon_id"
       select 'New supplier', :from => 'product_supplier_id'
       choose 'product_group_buy_1'
       fill_in 'Group buy unit size', :with => '10'
@@ -104,7 +99,6 @@ feature %q{
 
       page.should have_selector('#product_supplier_id')
       select 'Another Supplier', :from => 'product_supplier_id'
-      select taxon.name, from: "product_primary_taxon_id"
 
       # Should only have suppliers listed which the user can manage
       within "#product_supplier_id" do
diff --git a/spec/models/enterprise_spec.rb b/spec/models/enterprise_spec.rb
index fac9286d9b..f375b8890a 100644
--- a/spec/models/enterprise_spec.rb
+++ b/spec/models/enterprise_spec.rb
@@ -422,8 +422,8 @@ describe Enterprise do
     let(:supplier) { create(:supplier_enterprise) }
     let(:taxon1) { create(:taxon) }
     let(:taxon2) { create(:taxon) }
-    let(:product1) { create(:simple_product, primary_taxon: taxon1, taxons: [taxon1]) }
-    let(:product2) { create(:simple_product, primary_taxon: taxon1, taxons: [taxon1, taxon2]) }
+    let(:product1) { create(:simple_product, taxons: [taxon1]) }
+    let(:product2) { create(:simple_product, taxons: [taxon1, taxon2]) }
 
     it "gets all taxons of all distributed products" do
       Spree::Product.stub(:in_distributor).and_return [product1, product2]
diff --git a/spec/models/spree/classification_spec.rb b/spec/models/spree/classification_spec.rb
deleted file mode 100644
index f26f6da0c0..0000000000
--- a/spec/models/spree/classification_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-module Spree
-  describe Classification do
-    let(:product) { create(:simple_product) }
-    let(:taxon) { create(:taxon) }
-    let(:classification) { create(:classification, taxon: taxon, product: product) }
-
-    it "won't destroy if classification is the primary taxon" do
-      product.primary_taxon = taxon
-      classification.destroy.should be_false
-      classification.errors.messages[:base].should == ["Taxon #{taxon.name} is the primary taxon of #{product.name} and cannot be deleted"]
-    end
-  end
-end
diff --git a/spec/models/spree/product_spec.rb b/spec/models/spree/product_spec.rb
index 6a50190448..6d90b70761 100644
--- a/spec/models/spree/product_spec.rb
+++ b/spec/models/spree/product_spec.rb
@@ -5,7 +5,6 @@ module Spree
 
     describe "associations" do
       it { should belong_to(:supplier) }
-      it { should belong_to(:primary_taxon) }
       it { should have_many(:product_distributions) }
     end
 
@@ -14,12 +13,6 @@ module Spree
         create(:product).should be_valid
       end
 
-      it "requires a primary taxon" do
-        product = create(:simple_product)
-        product.primary_taxon = nil
-        product.should_not be_valid
-      end
-
       it "requires a supplier" do
         product = create(:simple_product)
         product.supplier = nil
@@ -558,10 +551,10 @@ module Spree
     describe "Taxons" do
       let(:taxon1) { create(:taxon) }
       let(:taxon2) { create(:taxon) }
-      let(:product) { create(:simple_product) }
+      let(:product) { create(:simple_product, taxons: [taxon1, taxon2]) }
 
       it "returns the first taxon as the primary taxon" do
-        product.taxons.should == [product.primary_taxon]
+        product.primary_taxon.should == taxon1
       end
     end
   end

From 403e957111a594bbb7a07219b5705e5af5d52574 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Sat, 24 May 2014 11:14:14 +1000
Subject: [PATCH 103/139] Further removal of references to 'Admin' from global
 namespace

---
 .../controllers/enterprise_relationships_controller.js.coffee   | 2 +-
 .../admin/services/enterprise_relationships.js.coffee           | 2 +-
 app/assets/javascripts/admin/services/enterprises.js.coffee     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee b/app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee
index c66e79c046..665753a522 100644
--- a/app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee
+++ b/app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee
@@ -1,4 +1,4 @@
-Admin.controller "AdminEnterpriseRelationshipsCtrl", ($scope, EnterpriseRelationships, Enterprises) ->
+angular.module("ofn.admin").controller "AdminEnterpriseRelationshipsCtrl", ($scope, EnterpriseRelationships, Enterprises) ->
   $scope.EnterpriseRelationships = EnterpriseRelationships
   $scope.Enterprises = Enterprises
 
diff --git a/app/assets/javascripts/admin/services/enterprise_relationships.js.coffee b/app/assets/javascripts/admin/services/enterprise_relationships.js.coffee
index 0469aa5637..e07b992112 100644
--- a/app/assets/javascripts/admin/services/enterprise_relationships.js.coffee
+++ b/app/assets/javascripts/admin/services/enterprise_relationships.js.coffee
@@ -1,4 +1,4 @@
-Admin.factory 'EnterpriseRelationships', ($http, enterprise_relationships) ->
+angular.module("ofn.admin").factory 'EnterpriseRelationships', ($http, enterprise_relationships) ->
   new class EnterpriseRelationships
     create_errors: ""
 
diff --git a/app/assets/javascripts/admin/services/enterprises.js.coffee b/app/assets/javascripts/admin/services/enterprises.js.coffee
index 778a915c22..5b5fd6a009 100644
--- a/app/assets/javascripts/admin/services/enterprises.js.coffee
+++ b/app/assets/javascripts/admin/services/enterprises.js.coffee
@@ -1,4 +1,4 @@
-Admin.factory 'Enterprises', (my_enterprises, all_enterprises) ->
+angular.module("ofn.admin").factory 'Enterprises', (my_enterprises, all_enterprises) ->
   new class Enterprises
     constructor: ->
       @my_enterprises = my_enterprises

From cc2498bb9bae1f514217aa8686b6cc7d02bbb0b4 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Sat, 24 May 2014 18:26:02 +1000
Subject: [PATCH 104/139] Fix spec fails - group buy and available on removed
 from new product form

---
 spec/features/admin/bulk_product_update_spec.rb |  2 --
 spec/features/admin/products_spec.rb            | 15 ++++++---------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb
index 7174da9758..d89280df80 100644
--- a/spec/features/admin/bulk_product_update_spec.rb
+++ b/spec/features/admin/bulk_product_update_spec.rb
@@ -236,9 +236,7 @@ feature %q{
 
     fill_in 'product_name', :with => 'Big Bag Of Apples'
     select(s.name, :from => 'product_supplier_id')
-    choose('product_group_buy_0')
     fill_in 'product_price', :with => '10.00'
-    fill_in 'product_available_on', :with => Date.today.strftime("%Y/%m/%d")
     click_button 'Create'
 
     URI.parse(current_url).path.should == '/admin/products/bulk_edit'
diff --git a/spec/features/admin/products_spec.rb b/spec/features/admin/products_spec.rb
index b9f9d7a206..efe531224d 100644
--- a/spec/features/admin/products_spec.rb
+++ b/spec/features/admin/products_spec.rb
@@ -46,23 +46,20 @@ feature %q{
       product.product_distributions.map { |pd| pd.enterprise_fee }.sort.should == [@enterprise_fees[0], @enterprise_fees[2]].sort
     end
 
+    scenario "making a product into a group buy product" do
+      product = create(:simple_product, name: 'group buy product')
 
-    scenario "creating a group buy product" do
       login_to_admin_section
 
-      click_link 'Products'
-      click_link 'New Product'
+      visit spree.edit_admin_product_path(product)
 
-      fill_in 'product_name', :with => 'A new product !!!'
-      fill_in 'product_price', :with => '19.99'
-      select 'New supplier', :from => 'product_supplier_id'
       choose 'product_group_buy_1'
       fill_in 'Group buy unit size', :with => '10'
 
-      click_button 'Create'
+      click_button 'Update'
 
-      flash_message.should == 'Product "A new product !!!" has been successfully created!'
-      product = Spree::Product.find_by_name('A new product !!!')
+      flash_message.should == 'Product "group buy product" has been successfully updated!'
+      product.reload
       product.group_buy.should be_true
       product.group_buy_unit_size.should == 10.0
     end

From 2130470eafb8d36cf21d1b9b725dddd82a5a4cac Mon Sep 17 00:00:00 2001
From: summerscope <summerscope@gmail.com>
Date: Tue, 27 May 2014 17:11:42 +1000
Subject: [PATCH 105/139] Styling for groups page

---
 .../stylesheets/darkswarm/groups.css.sass     | 39 +++++++++++++++++++
 app/views/groups/index.html.haml              | 39 ++++++++++++++-----
 app/views/modals/_groups.html.haml            |  4 ++
 3 files changed, 72 insertions(+), 10 deletions(-)
 create mode 100644 app/assets/stylesheets/darkswarm/groups.css.sass
 create mode 100644 app/views/modals/_groups.html.haml

diff --git a/app/assets/stylesheets/darkswarm/groups.css.sass b/app/assets/stylesheets/darkswarm/groups.css.sass
new file mode 100644
index 0000000000..90f4af2a74
--- /dev/null
+++ b/app/assets/stylesheets/darkswarm/groups.css.sass
@@ -0,0 +1,39 @@
+@import branding
+@import mixins
+
+#groups
+  background-color: $clr-brick-light
+
+.group
+  .group_footer
+    margin-bottom: 1em
+    hr
+      border-bottom: 10px solid white
+      outline: none
+      border-top: none
+      margin-top: none
+
+.group-hero
+  position: relative
+  padding: 0
+  border: 10px solid white
+  background: white
+
+h3.group-name
+  margin-top: 0.5em
+  margin-bottom: 0.15em
+
+img.group-logo
+  max-width: 220px
+  max-height: 86px
+  float: right
+  padding-top: 10px
+
+
+img.group-hero-img
+  background-color: black
+  width: 100%
+  height: inherit
+  max-height: 260px
+  min-height: 120px
+  overflow: hidden
\ No newline at end of file
diff --git a/app/views/groups/index.html.haml b/app/views/groups/index.html.haml
index 552e45fd48..fdbf8c5ee6 100644
--- a/app/views/groups/index.html.haml
+++ b/app/views/groups/index.html.haml
@@ -1,10 +1,15 @@
 #groups{"ng-controller" => "GroupsCtrl"}
   :javascript
     angular.module('Darkswarm').value('groups', #{render partial: "json/groups", object: @groups})
-  .row
+  .row.pad-top
     .small-12.columns.text-center
       %h1 Groups / Regions
-      %h3 Check out our food groups below
+      %div 
+        Check out our 
+        %ofn-modal{title: "food groups"}
+          = render partial: "modals/groups"  
+        below
+      %p
 
       %input{type: :text, 
       "ng-model" => "query", 
@@ -12,14 +17,28 @@
       "ng-debounce" => "150",
       "ofn-disable-enter" => true}
 
-  .row.group_table{bindonce: true}
-    .small.12.columns
-      .group{"ng-repeat" => "group in Groups.groups | filter:query | orderBy:order"}
-        %h2 {{ group.name }}
-        %p {{ group.description }}
+  .group{"ng-repeat" => "group in Groups.groups | filter:query | orderBy:order"}
+    
+    .row.pad-top{bindonce: true}
+      .small-12.columns
+        .group-hero
+          %img.group-hero-img{"bo-src" => "{{group.promo_image}}"} 
+          %img.group-logo{"bo-src" => "group.logo"}
+          %h3.group-name {{ group.name }}
+          %h5.group-description {{ group.description }}
+          / Will - scale large images down to 1200px wide, crop in to img aspect ratio 60W:13H
+          
+    .row.pad-top{bindonce: true}
+      .small-6.columns
         %p {{ group.long_description }}
-        %img{"bo-src" => "group.logo"}
-
-        %ul
+      .small-6.columns
+        %h5 Our hubs & producers
+        %ul.small-block-grid-2
           %li{"ng-repeat" => "enterprise in group.enterprises"}
             %a{"bo-href" => "enterprise.path"} {{ enterprise.name }}
+
+    .row.group_footer
+      .small-12.columns
+        %hr
+
+= render partial: "shared/footer"
diff --git a/app/views/modals/_groups.html.haml b/app/views/modals/_groups.html.haml
new file mode 100644
index 0000000000..80e210c98a
--- /dev/null
+++ b/app/views/modals/_groups.html.haml
@@ -0,0 +1,4 @@
+%h2 Groups / Regions
+%p These are the organisations and relationships between hubs which make up the Open Food Network. 
+%p Some groups are clustered by location or council, others by non-geographic similarities. 
+%a.close-reveal-modal{"ng-click" => "cancel()"} &#215;
\ No newline at end of file

From 9fe4bef7df91391f25422907eb6a5fecbd210393 Mon Sep 17 00:00:00 2001
From: summerscope <summerscope@gmail.com>
Date: Tue, 27 May 2014 17:55:51 +1000
Subject: [PATCH 106/139] Adding groups icon into background for visual
 consistency

---
 app/assets/images/groups.svg                  | 1565 +++++++++++++++++
 .../stylesheets/darkswarm/groups.css.sass     |    3 +
 2 files changed, 1568 insertions(+)
 create mode 100644 app/assets/images/groups.svg

diff --git a/app/assets/images/groups.svg b/app/assets/images/groups.svg
new file mode 100644
index 0000000000..f4ca32ec27
--- /dev/null
+++ b/app/assets/images/groups.svg
@@ -0,0 +1,1565 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="922px" height="922px" viewBox="-61 -61 922 922" enable-background="new -61 -61 922 922" xml:space="preserve">
+<g opacity="0.06">
+	<path fill="none" d="M277.456,400c0-6.192,0.219-12.494,0.619-18.819c-11.113,4.884-21.536,11.163-31.094,18.819
+		c9.562,7.656,19.981,13.938,31.094,18.823C277.675,412.494,277.456,406.192,277.456,400z"/>
+	<path fill="none" d="M400,522.544c-6.188,0-12.49-0.219-18.819-0.619c4.884,11.117,11.166,21.538,18.823,31.094
+		c7.656-9.558,13.938-19.981,18.823-31.094C412.496,522.325,406.194,522.544,400,522.544z"/>
+	<path fill="none" d="M409.019,390.975c-4.213-2.658-8.581-5.112-13.057-7.312c-9.033,12.461-15.846,26.099-20.331,40.705
+		c14.609-4.487,28.246-11.297,40.703-20.327C414.137,399.565,411.683,395.191,409.019,390.975z"/>
+	<path fill="#9B3C2F" d="M371.801,439.949c-0.195,1.051-0.391,2.098-0.563,3.151c-0.245,1.494-0.449,2.991-0.645,4.491
+		c-0.131,1.01-0.277,2.022-0.388,3.032c-0.181,1.654-0.307,3.311-0.429,4.966c-0.061,0.849-0.149,1.698-0.195,2.547
+		c-0.137,2.498-0.216,4.995-0.216,7.487c0,0.008,0,0.018,0,0.023c0,1.973,0.047,3.942,0.125,5.905
+		c0.026,0.648,0.082,1.293,0.117,1.938c0.073,1.316,0.146,2.631,0.254,3.942c0.064,0.764,0.152,1.523,0.228,2.282
+		c0.119,1.19,0.236,2.378,0.385,3.563c0.102,0.809,0.225,1.611,0.342,2.416c0.164,1.129,0.326,2.258,0.516,3.381
+		c0.14,0.832,0.297,1.66,0.453,2.489c0.205,1.092,0.414,2.18,0.645,3.264c0.178,0.844,0.371,1.684,0.566,2.524
+		c0.245,1.062,0.502,2.121,0.773,3.174c0.219,0.849,0.443,1.698,0.68,2.541c0.285,1.036,0.59,2.069,0.899,3.098
+		c0.256,0.852,0.516,1.701,0.791,2.547c0.129,0.397,0.268,0.791,0.4,1.188c15.793,1.284,31.161,1.284,46.917,0
+		c0.131-0.391,0.271-0.782,0.397-1.176c0.274-0.852,0.537-1.707,0.797-2.561c0.312-1.027,0.613-2.06,0.899-3.092
+		c0.233-0.846,0.461-1.692,0.68-2.541c0.271-1.057,0.528-2.118,0.773-3.18c0.195-0.838,0.385-1.678,0.566-2.518
+		c0.23-1.086,0.441-2.176,0.645-3.268c0.154-0.828,0.312-1.657,0.453-2.489c0.19-1.121,0.353-2.244,0.514-3.367
+		c0.117-0.811,0.242-1.622,0.344-2.44c0.149-1.176,0.266-2.354,0.383-3.534c0.076-0.77,0.166-1.535,0.23-2.309
+		c0.108-1.305,0.181-2.612,0.254-3.918c0.035-0.654,0.09-1.305,0.117-1.961c0.082-1.963,0.125-3.933,0.125-5.905
+		c0-2.348-0.067-4.688-0.184-7.02c-0.037-0.762-0.108-1.52-0.158-2.279c-0.102-1.57-0.213-3.137-0.371-4.698
+		c-0.088-0.893-0.205-1.783-0.309-2.672c-0.17-1.42-0.35-2.842-0.563-4.254c-0.14-0.93-0.295-1.858-0.455-2.786
+		c-0.236-1.374-0.49-2.743-0.768-4.108c-0.187-0.924-0.379-1.85-0.586-2.77c-0.309-1.377-0.645-2.746-0.995-4.114
+		c-0.228-0.887-0.449-1.774-0.691-2.655c-0.402-1.447-0.844-2.885-1.293-4.321c-0.245-0.782-0.473-1.57-0.729-2.346
+		c-0.607-1.824-1.264-3.635-1.946-5.438c-0.143-0.377-0.266-0.758-0.412-1.135c-0.006-0.018-0.014-0.035-0.023-0.055
+		c-14.869,10.41-31.26,17.953-48.854,22.478C372.129,438.3,371.955,439.124,371.801,439.949z"/>
+	<path fill="#9B3C2F" d="M287.014,475.008c-0.222-0.852-0.42-1.713-0.637-2.567c-0.475-1.899-0.936-3.801-1.375-5.71
+		c-0.248-1.08-0.484-2.165-0.717-3.247c-0.383-1.754-0.744-3.513-1.094-5.276c-0.211-1.057-0.424-2.115-0.621-3.174
+		c-0.397-2.127-0.768-4.26-1.117-6.396c-0.108-0.662-0.233-1.319-0.336-1.981c-0.429-2.723-0.814-5.45-1.167-8.187
+		c-0.125-0.965-0.23-1.938-0.348-2.906c-0.143-1.19-0.297-2.378-0.426-3.571l-0.029-0.012l-0.006-0.053
+		c-14.877-5.809-28.66-13.908-41.082-24.138c-0.123,0.117-0.25,0.228-0.373,0.344c-2.211,2.11-4.339,4.292-6.399,6.53
+		c-0.432,0.467-0.855,0.942-1.278,1.418c-2.074,2.317-4.094,4.677-6.005,7.12c-0.076,0.096-0.146,0.199-0.222,0.297
+		c-1.862,2.393-3.624,4.858-5.325,7.37c-0.332,0.487-0.668,0.971-0.995,1.467c-1.678,2.541-3.274,5.138-4.788,7.796
+		c-0.105,0.184-0.201,0.371-0.307,0.555c23.599,20.555,50.03,36.903,78.77,48.726c-0.397-1.258-0.762-2.527-1.141-3.79
+		c-0.274-0.916-0.56-1.826-0.826-2.743C288.42,480.267,287.697,477.643,287.014,475.008z"/>
+	<path fill="#9B3C2F" d="M147.401,112.619c1.346-0.362,2.702-0.68,4.053-1.024c2.585-0.656,5.173-1.301,7.776-1.891
+		c1.549-0.35,3.108-0.666,4.663-0.989c2.43-0.508,4.864-0.995,7.309-1.441c1.628-0.297,3.256-0.574,4.89-0.844
+		c2.413-0.4,4.829-0.768,7.251-1.106c1.633-0.228,3.268-0.453,4.905-0.654c2.489-0.307,4.987-0.566,7.487-0.811
+		c1.567-0.152,3.131-0.318,4.7-0.447c2.731-0.222,5.473-0.383,8.216-0.531c1.34-0.073,2.676-0.172,4.018-0.228
+		c4.082-0.166,8.169-0.262,12.271-0.262c3.432,0,6.856,0.059,10.277,0.178c1.053,0.035,2.104,0.113,3.157,0.164
+		c2.363,0.105,4.727,0.205,7.085,0.365c1.231,0.084,2.457,0.216,3.686,0.315c2.17,0.175,4.342,0.336,6.503,0.56
+		c1.348,0.14,2.69,0.326,4.036,0.484c2.034,0.239,4.071,0.459,6.098,0.735c1.391,0.193,2.772,0.435,4.161,0.645
+		c1.973,0.301,3.95,0.58,5.917,0.922c1.377,0.239,2.743,0.525,4.114,0.782c1.963,0.367,3.933,0.717,5.888,1.127
+		c1.377,0.285,2.746,0.625,4.117,0.93c1.938,0.432,3.875,0.846,5.803,1.316c1.383,0.338,2.752,0.723,4.131,1.082
+		c1.902,0.493,3.811,0.969,5.704,1.502c1.381,0.388,2.746,0.823,4.12,1.231c1.873,0.557,3.752,1.094,5.616,1.686
+		c1.391,0.443,2.766,0.934,4.149,1.397c1.826,0.613,3.662,1.205,5.477,1.852c1.395,0.498,2.774,1.041,4.161,1.561
+		c1.785,0.668,3.58,1.316,5.354,2.016c1.406,0.557,2.795,1.161,4.196,1.739c1.733,0.717,3.472,1.412,5.19,2.162
+		c1.42,0.621,2.824,1.287,4.239,1.932c1.674,0.762,3.358,1.506,5.022,2.299c1.426,0.68,2.83,1.409,4.245,2.112
+		c1.625,0.808,3.259,1.596,4.87,2.436c1.441,0.75,2.856,1.547,4.286,2.319c1.561,0.846,3.133,1.672,4.68,2.547
+		c1.453,0.82,2.883,1.69,4.321,2.536c1.389,0.817,2.792,1.605,4.167,2.445l0.014,0.006l0.018,0.012
+		c8.503,2.661,16.821,6.112,24.786,10.277l0.041-0.029l0.026,0.014c1.074-0.752,2.174-1.453,3.259-2.192
+		c1.602-1.092,3.204-2.186,4.823-3.245c1.613-1.053,3.241-2.069,4.87-3.09c1.625-1.018,3.247-2.039,4.887-3.026
+		c1.657-0.992,3.329-1.946,5.001-2.906c1.645-0.942,3.286-1.893,4.946-2.807c1.698-0.93,3.417-1.821,5.129-2.717
+		c1.666-0.873,3.329-1.754,5.01-2.594c1.736-0.867,3.489-1.69,5.243-2.521c1.686-0.799,3.367-1.613,5.069-2.381
+		c1.774-0.803,3.569-1.555,5.356-2.323c1.704-0.729,3.402-1.473,5.118-2.17c1.815-0.735,3.647-1.424,5.474-2.124
+		c1.715-0.656,3.426-1.33,5.153-1.955c1.858-0.672,3.731-1.289,5.602-1.922c1.721-0.584,3.44-1.188,5.173-1.739
+		c1.902-0.604,3.819-1.156,5.733-1.721c1.725-0.51,3.443-1.045,5.179-1.523c1.949-0.537,3.915-1.018,5.876-1.518
+		c1.719-0.438,3.432-0.899,5.161-1.305c2.004-0.469,4.026-0.881,6.042-1.31c1.704-0.362,3.402-0.752,5.118-1.086
+		c2.055-0.4,4.126-0.735,6.192-1.092c1.695-0.291,3.381-0.615,5.083-0.879c2.13-0.33,4.278-0.592,6.417-0.875
+		c1.649-0.219,3.291-0.469,4.948-0.662c2.276-0.262,4.569-0.453,6.854-0.666c1.535-0.14,3.061-0.318,4.601-0.438
+		c2.565-0.195,5.141-0.315,7.718-0.447c1.275-0.064,2.544-0.17,3.825-0.216c3.86-0.14,7.729-0.216,11.613-0.216
+		c4.102,0,8.19,0.096,12.271,0.262c1.342,0.055,2.676,0.154,4.014,0.228c2.746,0.149,5.489,0.309,8.222,0.531
+		c1.567,0.129,3.128,0.291,4.692,0.447c2.504,0.245,5.004,0.504,7.495,0.811c1.633,0.201,3.264,0.426,4.896,0.654
+		c2.424,0.338,4.846,0.706,7.262,1.106c1.631,0.268,3.256,0.545,4.881,0.844c2.448,0.447,4.884,0.936,7.318,1.444
+		c1.553,0.324,3.108,0.639,4.653,0.989c2.606,0.586,5.196,1.234,7.788,1.893c1.348,0.342,2.699,0.66,4.041,1.021
+		c3.387,0.914,6.761,1.897,10.119,2.932c0.522,0.16,1.047,0.297,1.57,0.461c0.061,0.02,0.125,0.035,0.187,0.055
+		C620.626,9.662,515.877-61,400-61S179.371,9.662,135.526,116.067c0.061-0.02,0.125-0.035,0.187-0.055
+		c0.525-0.166,1.057-0.303,1.584-0.463C140.65,114.516,144.016,113.532,147.401,112.619z"/>
+	<path fill="#9B3C2F" d="M632.315,410.921c-1.004,1.252-2.028,2.483-3.051,3.72c-1.223,1.477-2.445,2.95-3.694,4.399
+		c-1.057,1.225-2.127,2.436-3.201,3.645c-1.258,1.415-2.518,2.821-3.802,4.21c-1.1,1.193-2.215,2.372-3.335,3.545
+		c-1.299,1.363-2.608,2.713-3.93,4.05c-1.141,1.152-2.291,2.293-3.446,3.422c-1.342,1.313-2.699,2.612-4.065,3.895
+		c-1.178,1.109-2.36,2.209-3.553,3.297c-1.389,1.266-2.795,2.512-4.208,3.752c-1.205,1.057-2.41,2.112-3.633,3.149
+		c-1.447,1.229-2.912,2.43-4.382,3.633c-1.225,1-2.448,2.004-3.69,2.985c-1.508,1.193-3.04,2.354-4.573,3.518
+		c-1.237,0.936-2.465,1.885-3.714,2.803c-1.596,1.172-3.215,2.307-4.832,3.446c-1.223,0.861-2.434,1.733-3.67,2.576
+		c-1.721,1.172-3.471,2.305-5.217,3.443c-1.164,0.758-2.317,1.535-3.489,2.279c-1.987,1.254-4.009,2.463-6.025,3.67
+		c-0.963,0.578-1.911,1.178-2.883,1.745c-3.002,1.75-6.034,3.452-9.097,5.097c-0.359,0.193-0.729,0.371-1.092,0.563
+		c-2.717,1.444-5.45,2.86-8.214,4.219c-1.071,0.528-2.165,1.018-3.245,1.535c-2.072,0.989-4.143,1.981-6.241,2.924
+		c-1.269,0.569-2.555,1.103-3.831,1.654c-1.938,0.838-3.872,1.68-5.829,2.477c-1.365,0.557-2.748,1.08-4.126,1.617
+		c-1.447,0.566-2.879,1.158-4.336,1.701l-0.003,0.012l-0.012,0.006c-0.149,0.4-0.326,0.791-0.475,1.19
+		c-1.43,3.787-2.93,7.554-4.516,11.286c-0.248,0.584-0.508,1.164-0.762,1.748c-1.663,3.84-3.393,7.65-5.217,11.417
+		c-0.195,0.402-0.4,0.799-0.598,1.199c-1.926,3.93-3.921,7.829-6.019,11.671c-0.073,0.137-0.152,0.268-0.228,0.402
+		c-2.089,3.811-4.268,7.571-6.518,11.283c-0.137,0.225-0.256,0.458-0.394,0.682c-4.628,14.784-11.472,28.684-20.395,41.429
+		c0.043,0.018,0.088,0.037,0.131,0.055c0.055,0.023,0.113,0.041,0.17,0.061c2.118,0.82,4.254,1.578,6.401,2.293
+		c0.656,0.219,1.322,0.408,1.981,0.615c1.559,0.49,3.119,0.969,4.688,1.403c0.803,0.222,1.611,0.424,2.416,0.631
+		c1.45,0.373,2.903,0.732,4.362,1.057c0.855,0.19,1.713,0.367,2.571,0.543c1.441,0.291,2.885,0.563,4.336,0.809
+		c0.861,0.146,1.721,0.291,2.582,0.42c1.496,0.225,2.999,0.418,4.505,0.596c0.811,0.096,1.622,0.201,2.436,0.283
+		c1.678,0.166,3.364,0.289,5.053,0.397c0.645,0.041,1.284,0.102,1.928,0.135c2.352,0.117,4.712,0.184,7.085,0.184
+		c77.226,0,140.05-62.825,140.05-140.05c0-0.049-0.003-0.096-0.003-0.146c-0.004-1.69-0.032-3.379-0.094-5.063
+		c-0.02-0.58-0.067-1.158-0.096-1.736c-0.055-1.149-0.108-2.301-0.193-3.449c-0.053-0.697-0.129-1.395-0.193-2.092
+		c-0.09-1.027-0.172-2.055-0.286-3.078c-0.082-0.729-0.187-1.453-0.28-2.18c-0.125-0.986-0.242-1.975-0.388-2.959
+		c-0.111-0.752-0.25-1.5-0.373-2.25c-0.158-0.951-0.307-1.905-0.481-2.854c-0.146-0.782-0.318-1.561-0.479-2.342
+		c-0.184-0.904-0.362-1.812-0.563-2.713c-0.184-0.817-0.394-1.628-0.592-2.44c-0.211-0.861-0.412-1.721-0.636-2.579
+		c-0.225-0.852-0.475-1.698-0.717-2.547c-0.201-0.709-0.397-1.42-0.61-2.127c-3.221-5.214-6.626-10.361-10.183-15.373
+		C632.977,410.128,632.639,410.519,632.315,410.921z"/>
+	<path fill="#9B3C2F" d="M212.668,359.846c1.518,2.661,3.119,5.266,4.797,7.814c0.326,0.496,0.666,0.98,0.998,1.471
+		c1.692,2.498,3.446,4.952,5.296,7.329c0.088,0.111,0.166,0.228,0.254,0.338c1.905,2.436,3.918,4.788,5.987,7.099
+		c0.432,0.481,0.861,0.963,1.299,1.438c2.057,2.232,4.181,4.411,6.387,6.515c0.123,0.117,0.25,0.23,0.377,0.348
+		c12.421-10.226,26.207-18.327,41.082-24.138l0.006-0.053l0.029-0.012c0.277-2.59,0.625-5.173,0.969-7.753
+		c0.111-0.84,0.195-1.686,0.315-2.527c0.578-4.055,1.246-8.097,1.987-12.117c0.225-1.219,0.487-2.424,0.727-3.639
+		c0.566-2.871,1.164-5.731,1.812-8.575c0.33-1.45,0.677-2.891,1.03-4.336c0.274-1.127,0.516-2.264,0.805-3.387
+		c-0.135,0.004-0.266,0.004-0.4,0.008c-2.784,0.082-5.561,0.25-8.327,0.496c-0.408,0.035-0.817,0.073-1.225,0.113
+		c-2.766,0.271-5.524,0.615-8.266,1.047c-0.336,0.053-0.668,0.113-1,0.17c-2.842,0.469-5.672,1.01-8.476,1.654
+		c-0.067,0.014-0.135,0.035-0.205,0.049c-2.844,0.66-5.669,1.415-8.473,2.252c-0.137,0.041-0.277,0.078-0.414,0.119
+		c-13.234,8.169-25.883,17.486-37.665,27.738C212.472,359.49,212.566,359.671,212.668,359.846z"/>
+	<path fill="#9B3C2F" d="M652.599,687.381c-1.342,0.362-2.693,0.677-4.041,1.021c-2.588,0.66-5.179,1.305-7.784,1.891
+		c-1.553,0.35-3.11,0.666-4.668,0.992c-2.428,0.508-4.855,0.995-7.294,1.438c-1.631,0.297-3.264,0.575-4.899,0.846
+		c-2.407,0.397-4.821,0.764-7.239,1.103c-1.639,0.231-3.276,0.455-4.919,0.656c-2.486,0.307-4.977,0.566-7.472,0.808
+		c-1.57,0.152-3.133,0.318-4.706,0.447c-2.731,0.221-5.471,0.383-8.214,0.531c-1.342,0.073-2.678,0.176-4.02,0.228
+		c-4.082,0.166-8.169,0.262-12.271,0.262c-3.883,0-7.753-0.076-11.613-0.225c-1.295-0.049-2.582-0.154-3.875-0.219
+		c-2.555-0.131-5.118-0.248-7.661-0.443c-1.558-0.119-3.104-0.297-4.659-0.443c-2.27-0.211-4.543-0.4-6.802-0.66
+		c-1.645-0.19-3.276-0.441-4.917-0.656c-2.153-0.286-4.309-0.549-6.454-0.879c-1.69-0.262-3.364-0.58-5.048-0.873
+		c-2.075-0.359-4.157-0.695-6.221-1.097c-1.713-0.332-3.408-0.723-5.112-1.086c-2.02-0.429-4.041-0.84-6.048-1.31
+		c-1.721-0.406-3.428-0.863-5.141-1.299c-1.969-0.498-3.942-0.981-5.899-1.523c-1.719-0.475-3.42-1-5.13-1.508
+		c-1.932-0.572-3.869-1.127-5.788-1.736c-1.709-0.543-3.399-1.138-5.097-1.713c-1.897-0.642-3.799-1.27-5.681-1.952
+		c-1.692-0.613-3.367-1.272-5.048-1.914c-1.867-0.715-3.737-1.415-5.587-2.168c-1.674-0.68-3.332-1.406-4.995-2.118
+		c-1.83-0.782-3.665-1.555-5.479-2.375c-1.657-0.75-3.297-1.543-4.942-2.323c-1.795-0.852-3.594-1.695-5.374-2.585
+		c-1.628-0.814-3.239-1.669-4.852-2.512c-1.768-0.924-3.542-1.844-5.292-2.803c-1.602-0.879-3.186-1.797-4.774-2.708
+		c-1.733-0.992-3.469-1.981-5.185-3.011c-1.578-0.948-3.139-1.932-4.7-2.909c-1.692-1.059-3.387-2.115-5.063-3.209
+		c-1.553-1.016-3.084-2.063-4.622-3.108c-1.133-0.77-2.282-1.506-3.405-2.291l-0.02,0.012l-0.037-0.029
+		c-7.986,4.175-16.313,7.63-24.806,10.285c-1.573,0.959-3.178,1.867-4.764,2.795c-1.237,0.723-2.459,1.471-3.706,2.174
+		c-1.704,0.965-3.434,1.876-5.159,2.807c-1.275,0.689-2.535,1.397-3.819,2.066c-1.701,0.887-3.428,1.721-5.147,2.573
+		c-1.33,0.66-2.649,1.346-3.989,1.984c-1.698,0.811-3.417,1.57-5.126,2.346c-1.381,0.627-2.748,1.278-4.137,1.885
+		c-1.713,0.747-3.446,1.442-5.173,2.156c-1.409,0.584-2.807,1.19-4.222,1.75c-1.736,0.686-3.489,1.319-5.237,1.973
+		c-1.426,0.534-2.844,1.094-4.278,1.604c-1.771,0.631-3.559,1.207-5.342,1.807c-1.43,0.479-2.848,0.983-4.284,1.441
+		c-1.791,0.569-3.598,1.086-5.397,1.622c-1.447,0.432-2.885,0.89-4.342,1.299c-1.801,0.504-3.618,0.957-5.427,1.43
+		c-1.467,0.383-2.93,0.793-4.405,1.152c-1.846,0.453-3.708,0.846-5.561,1.26c-1.453,0.326-2.897,0.68-4.356,0.983
+		c-1.856,0.388-3.725,0.717-5.593,1.068c-1.473,0.277-2.938,0.584-4.415,0.84c-1.84,0.318-3.694,0.58-5.544,0.863
+		c-1.512,0.231-3.014,0.493-4.528,0.703c-1.92,0.266-3.852,0.47-5.78,0.697c-1.45,0.172-2.897,0.373-4.35,0.522
+		c-2.086,0.216-4.181,0.367-6.273,0.539c-1.307,0.108-2.606,0.246-3.916,0.336c-2.319,0.16-4.645,0.254-6.97,0.359
+		c-1.092,0.049-2.176,0.131-3.268,0.166c-3.436,0.129-6.862,0.187-10.294,0.187c-4.102,0-8.193-0.096-12.271-0.262
+		c-1.342-0.055-2.678-0.154-4.018-0.228c-2.743-0.149-5.485-0.309-8.216-0.531c-1.573-0.129-3.137-0.295-4.704-0.447
+		c-2.498-0.242-4.989-0.502-7.475-0.809c-1.643-0.201-3.28-0.426-4.917-0.656c-2.419-0.338-4.832-0.706-7.239-1.103
+		c-1.637-0.271-3.27-0.549-4.901-0.846c-2.436-0.443-4.864-0.93-7.286-1.438c-1.561-0.326-3.125-0.642-4.683-0.995
+		c-2.594-0.586-5.176-1.229-7.755-1.885c-1.357-0.344-2.719-0.666-4.071-1.027c-3.373-0.908-6.728-1.891-10.072-2.918
+		c-0.537-0.166-1.08-0.307-1.613-0.475c-0.061-0.018-0.123-0.035-0.181-0.053C179.374,790.336,284.125,861,400,861
+		c115.877,0,220.626-70.664,264.474-177.067c-0.064,0.02-0.129,0.035-0.193,0.055c-0.504,0.158-1.016,0.291-1.52,0.447
+		C659.389,685.476,656.001,686.465,652.599,687.381z"/>
+	<path fill="#9B3C2F" d="M197.791,443.32l-0.053-0.047l0.014-0.029c-1.893-1.756-3.735-3.569-5.581-5.374
+		c-0.674-0.66-1.369-1.295-2.037-1.961c-3.133-3.119-6.198-6.308-9.191-9.558c-0.721-0.785-1.412-1.594-2.127-2.383
+		c-2.262-2.512-4.485-5.051-6.659-7.632c-0.942-1.121-1.867-2.25-2.792-3.385c-0.885-1.082-1.801-2.139-2.667-3.229
+		c-3.545,5.001-6.952,10.142-10.174,15.362c-0.301,0.995-0.584,1.998-0.861,2.999c-0.146,0.525-0.303,1.045-0.443,1.57
+		c-0.315,1.182-0.598,2.369-0.881,3.559c-0.117,0.49-0.245,0.977-0.356,1.471c-0.28,1.237-0.528,2.477-0.773,3.72
+		c-0.09,0.453-0.19,0.899-0.274,1.351c-0.248,1.319-0.461,2.643-0.672,3.968c-0.061,0.379-0.131,0.758-0.19,1.138
+		c-0.216,1.438-0.397,2.883-0.566,4.327c-0.032,0.271-0.073,0.543-0.105,0.814c-0.187,1.684-0.344,3.37-0.469,5.059
+		c-0.002,0.035-0.006,0.07-0.008,0.105c-0.26,3.481-0.388,6.979-0.388,10.486c0,2.766,0.099,5.514,0.26,8.255
+		c0.047,0.785,0.123,1.564,0.181,2.348c0.146,1.957,0.326,3.91,0.555,5.85c0.105,0.902,0.222,1.801,0.344,2.696
+		c0.256,1.879,0.555,3.747,0.887,5.605c0.149,0.832,0.286,1.666,0.449,2.495c0.441,2.235,0.936,4.452,1.485,6.655
+		c0.099,0.397,0.178,0.803,0.28,1.196c0.674,2.617,1.43,5.206,2.25,7.77c0.193,0.604,0.414,1.196,0.615,1.797
+		c0.651,1.938,1.334,3.86,2.066,5.765c0.312,0.814,0.645,1.619,0.971,2.424c0.697,1.709,1.426,3.405,2.188,5.085
+		c0.362,0.797,0.723,1.596,1.1,2.387c0.867,1.815,1.78,3.606,2.725,5.38c0.309,0.58,0.598,1.17,0.914,1.745
+		c1.289,2.342,2.637,4.653,4.061,6.921c0.211,0.332,0.438,0.654,0.651,0.986c1.219,1.905,2.48,3.782,3.793,5.628
+		c0.493,0.695,1.006,1.371,1.514,2.057c1.094,1.482,2.217,2.947,3.37,4.388c0.574,0.717,1.156,1.432,1.745,2.139
+		c1.205,1.441,2.445,2.856,3.711,4.254c0.549,0.607,1.086,1.223,1.645,1.821c1.803,1.922,3.653,3.807,5.569,5.634
+		c0.032,0.029,0.059,0.061,0.09,0.09c0.012,0.012,0.023,0.02,0.035,0.029c-7.484-18.184-11.367-37.718-11.367-57.633
+		C182.63,486.578,187.862,463.825,197.791,443.32z"/>
+	<path fill="#9B3C2F" d="M197.752,443.244l-0.014,0.029l0.053,0.047c0.006-0.008,0.008-0.02,0.014-0.029
+		C197.785,443.275,197.77,443.258,197.752,443.244z"/>
+	<path fill="#9B3C2F" d="M208.405,424.912c0.429-0.639,0.858-1.281,1.299-1.914c1.739-2.51,3.536-4.977,5.424-7.372
+		c0.213-0.271,0.443-0.531,0.66-0.803c1.733-2.168,3.534-4.28,5.383-6.352c0.516-0.578,1.03-1.155,1.555-1.725
+		c2.072-2.25,4.196-4.456,6.407-6.585c0.055-0.053,0.105-0.111,0.158-0.164c-0.053-0.053-0.102-0.108-0.154-0.16
+		c-2.215-2.133-4.342-4.339-6.413-6.591c-0.522-0.566-1.033-1.141-1.547-1.715c-1.852-2.075-3.659-4.19-5.392-6.36
+		c-0.213-0.268-0.441-0.525-0.654-0.797c-1.887-2.395-3.682-4.864-5.421-7.37c-0.443-0.639-0.873-1.281-1.307-1.926
+		c-1.529-2.279-3.005-4.592-4.415-6.958c-0.14-0.233-0.297-0.455-0.438-0.688c-0.965,0.914-1.946,1.809-2.897,2.734
+		c-1.082,1.053-2.168,2.11-3.233,3.18c-2.215,2.223-4.382,4.491-6.521,6.784c-0.764,0.817-1.549,1.616-2.303,2.442
+		c-2.827,3.102-5.585,6.261-8.269,9.48c-0.686,0.82-1.336,1.663-2.01,2.492c-1.467,1.797-2.891,3.627-4.313,5.456
+		c1.412,1.821,2.827,3.635,4.286,5.424c0.683,0.838,1.34,1.69,2.031,2.518c2.696,3.229,5.465,6.405,8.304,9.517
+		c0.694,0.762,1.418,1.496,2.121,2.252c2.209,2.369,4.446,4.709,6.734,7.003c1.018,1.021,2.055,2.028,3.087,3.034
+		c0.98,0.954,1.99,1.876,2.982,2.815c0.123-0.207,0.262-0.4,0.385-0.607C205.359,429.565,206.855,427.219,208.405,424.912z"/>
+	<path fill="#9B3C2F" d="M190.896,380.13c2.139-2.293,4.307-4.561,6.521-6.784C195.202,375.573,193.037,377.837,190.896,380.13z"/>
+	<path fill="#9B3C2F" d="M178.314,394.544c-1.461,1.791-2.941,3.574-4.356,5.397c0.014,0.02,0.032,0.037,0.047,0.059
+		C175.426,398.17,176.85,396.341,178.314,394.544z"/>
+	<path fill="#9B3C2F" d="M188.594,382.576c-2.827,3.102-5.585,6.261-8.269,9.48C183.012,388.837,185.77,385.677,188.594,382.576z"/>
+	<path fill="#9B3C2F" d="M200.653,370.166c0.951-0.928,1.932-1.821,2.897-2.734c-0.014-0.023-0.029-0.047-0.043-0.07
+		C202.534,368.279,201.606,369.238,200.653,370.166z"/>
+	<path fill="#9B3C2F" d="M222.726,406.745c2.072-2.25,4.196-4.456,6.407-6.585C226.92,402.293,224.797,404.499,222.726,406.745z"/>
+	<path fill="#9B3C2F" d="M208.405,424.912c-1.549,2.307-3.046,4.653-4.473,7.05C205.359,429.565,206.855,427.219,208.405,424.912z"
+		/>
+	<path fill="#9B3C2F" d="M221.169,408.47c-1.85,2.072-3.653,4.184-5.383,6.352C217.517,412.654,219.32,410.542,221.169,408.47z"/>
+	<path fill="#9B3C2F" d="M215.127,415.625c-1.887,2.399-3.682,4.864-5.424,7.372C211.443,420.489,213.236,418.02,215.127,415.625z"
+		/>
+	<path fill="#9B3C2F" d="M215.127,384.379c-1.887-2.395-3.682-4.864-5.421-7.37C211.445,379.515,213.24,381.98,215.127,384.379z"/>
+	<path fill="#9B3C2F" d="M208.4,375.08c-1.529-2.279-3.005-4.592-4.415-6.958C205.394,370.488,206.87,372.801,208.4,375.08z"/>
+	<path fill="#9B3C2F" d="M221.173,391.536c-1.852-2.074-3.659-4.19-5.392-6.36C217.514,387.342,219.32,389.461,221.173,391.536z"/>
+	<path fill="#9B3C2F" d="M229.135,399.84c-2.215-2.13-4.342-4.339-6.413-6.591C224.794,395.501,226.92,397.709,229.135,399.84z"/>
+	<path fill="#9B3C2F" d="M188.626,417.463c-2.839-3.113-5.608-6.288-8.304-9.517C183.018,411.175,185.787,414.346,188.626,417.463z"
+		/>
+	<path fill="#9B3C2F" d="M203.503,432.641c0.014-0.023,0.032-0.047,0.047-0.073c-0.992-0.94-2.002-1.862-2.982-2.815
+		C201.551,430.709,202.508,431.695,203.503,432.641z"/>
+	<path fill="#9B3C2F" d="M197.481,426.718c-2.287-2.293-4.526-4.633-6.734-7.003C192.956,422.085,195.193,424.421,197.481,426.718z"
+		/>
+	<path fill="#9B3C2F" d="M173.958,400.059c1.409,1.815,2.877,3.586,4.333,5.368c-1.459-1.789-2.874-3.604-4.286-5.424
+		C173.991,400.02,173.973,400.037,173.958,400.059z"/>
+	<path fill="#9B3C2F" d="M173.958,399.941c-0.014,0.02-0.032,0.037-0.047,0.059c0.014,0.02,0.032,0.037,0.047,0.059
+		c0.014-0.02,0.029-0.037,0.043-0.059C173.991,399.982,173.973,399.963,173.958,399.941z"/>
+	<path fill="#9B3C2F" d="M514.424,330.83c0.469,1.979,0.93,3.956,1.36,5.944c0.277,1.278,0.537,2.559,0.797,3.842
+		c0.4,1.967,0.782,3.936,1.138,5.915c0.236,1.301,0.463,2.606,0.683,3.91c0.33,1.969,0.639,3.942,0.928,5.92
+		c0.193,1.316,0.385,2.629,0.56,3.944c0.266,1.987,0.502,3.979,0.727,5.973c0.149,1.307,0.301,2.614,0.432,3.921
+		c0.205,2.049,0.371,4.102,0.534,6.159c0.099,1.254,0.211,2.504,0.295,3.761c0.149,2.238,0.25,4.479,0.347,6.72
+		c0.047,1.074,0.117,2.141,0.152,3.215c0.108,3.303,0.17,6.608,0.172,9.917c0,0.008,0,0.018,0,0.026l0,0c0,0,0,0,0,0.004
+		c0,4.102-0.096,8.193-0.262,12.275c-0.055,1.346-0.154,2.684-0.227,4.03c-0.149,2.737-0.307,5.471-0.528,8.196
+		c-0.129,1.588-0.297,3.169-0.449,4.75c-0.242,2.477-0.498,4.952-0.803,7.417c-0.205,1.663-0.432,3.321-0.666,4.981
+		c-0.336,2.393-0.697,4.776-1.092,7.157c-0.274,1.666-0.557,3.329-0.861,4.987c-0.438,2.395-0.916,4.78-1.412,7.163
+		c-0.336,1.608-0.662,3.215-1.021,4.815c-0.569,2.516-1.193,5.016-1.826,7.516c-0.365,1.438-0.703,2.88-1.092,4.313
+		c-0.864,3.201-1.797,6.381-2.77,9.552c-0.216,0.703-0.402,1.415-0.621,2.118c-0.012,0.035-0.02,0.07-0.032,0.108
+		c1.832-0.752,3.651-1.532,5.465-2.323c0.887-0.388,1.786-0.752,2.67-1.149c3.022-1.354,6.022-2.758,8.99-4.213
+		c0.242-0.119,0.479-0.248,0.723-0.367c2.711-1.34,5.401-2.719,8.065-4.143c0.928-0.496,1.838-1.018,2.76-1.526
+		c1.961-1.076,3.918-2.159,5.85-3.28c1.076-0.625,2.139-1.272,3.209-1.911c1.756-1.047,3.507-2.104,5.237-3.19
+		c1.117-0.7,2.221-1.418,3.326-2.133c1.663-1.074,3.317-2.162,4.954-3.27c1.109-0.75,2.211-1.512,3.311-2.279
+		c1.611-1.123,3.209-2.268,4.8-3.422c1.082-0.787,2.162-1.578,3.233-2.383c1.594-1.196,3.169-2.416,4.735-3.645
+		c1.024-0.803,2.051-1.602,3.063-2.416c1.622-1.307,3.218-2.647,4.815-3.989c0.922-0.776,1.852-1.541,2.766-2.331
+		c1.789-1.547,3.548-3.133,5.302-4.727c0.682-0.619,1.377-1.223,2.055-1.846c2.428-2.25,4.821-4.537,7.171-6.874
+		c0.201-0.201,0.397-0.412,0.598-0.613c2.127-2.127,4.227-4.286,6.29-6.483c0.732-0.779,1.444-1.584,2.168-2.372
+		c1.514-1.649,3.022-3.303,4.502-4.987c0.826-0.942,1.633-1.905,2.448-2.86c1.346-1.573,2.682-3.154,3.995-4.759
+		c0.838-1.024,1.66-2.065,2.486-3.104c0.727-0.914,1.438-1.842,2.153-2.764c-1.021-1.316-2.051-2.626-3.092-3.924
+		c-1.237-1.541-2.465-3.087-3.731-4.598c-1.584-1.893-3.215-3.741-4.846-5.587c-1.284-1.453-2.553-2.924-3.864-4.348
+		c-1.704-1.852-3.458-3.653-5.206-5.459c-1.305-1.348-2.591-2.713-3.921-4.036c-1.846-1.832-3.749-3.61-5.646-5.389
+		c-1.301-1.223-2.576-2.469-3.899-3.665c-2.055-1.858-4.169-3.651-6.279-5.45c-1.229-1.047-2.424-2.127-3.67-3.151
+		c-2.483-2.045-5.03-4.014-7.583-5.979c-0.928-0.715-1.824-1.461-2.764-2.165c-3.539-2.653-7.14-5.229-10.808-7.724
+		c-0.078-0.053-0.164-0.102-0.242-0.158c-3.458-2.346-6.976-4.612-10.548-6.816c-0.205-0.061-0.412-0.117-0.615-0.178
+		c-2.631-0.782-5.282-1.491-7.954-2.112c-0.193-0.043-0.383-0.096-0.572-0.143c-2.719-0.621-5.459-1.144-8.21-1.602
+		c-0.426-0.07-0.849-0.149-1.275-0.216c-2.667-0.42-5.351-0.756-8.044-1.021c-0.487-0.047-0.975-0.094-1.461-0.137
+		c-2.702-0.236-5.409-0.406-8.128-0.484c-0.158-0.006-0.318-0.006-0.475-0.008c0.123,0.473,0.225,0.951,0.342,1.426
+		C513.838,328.334,514.127,329.584,514.424,330.83z"/>
+	<path fill="#9B3C2F" d="M605.28,376.101c1.748,1.807,3.501,3.606,5.206,5.459C608.78,379.708,607.026,377.907,605.28,376.101z"/>
+	<path fill="#9B3C2F" d="M585.535,357.562c2.11,1.801,4.225,3.592,6.279,5.45C589.756,361.151,587.641,359.359,585.535,357.562z"/>
+	<path fill="#9B3C2F" d="M595.712,366.677c1.897,1.783,3.799,3.557,5.646,5.389C599.511,370.23,597.609,368.459,595.712,366.677z"/>
+	<path fill="#9B3C2F" d="M574.281,348.429c2.553,1.963,5.103,3.933,7.583,5.979C579.382,352.363,576.834,350.393,574.281,348.429z"
+		/>
+	<path fill="#9B3C2F" d="M560.711,338.541c3.668,2.495,7.268,5.071,10.808,7.724C567.979,343.612,564.378,341.035,560.711,338.541z"
+		/>
+	<path fill="#9B3C2F" d="M614.347,385.91c1.631,1.846,3.259,3.694,4.846,5.587C617.606,389.604,615.979,387.758,614.347,385.91z"/>
+	<path fill="#9B3C2F" d="M626.062,399.963c-1.018-1.316-2.098-2.571-3.137-3.866c1.041,1.299,2.072,2.606,3.092,3.924
+		C626.033,400,626.048,399.982,626.062,399.963z"/>
+	<path fill="#9B3C2F" d="M560.469,338.384c-3.44-2.334-6.935-4.604-10.486-6.798c-0.02-0.006-0.041-0.012-0.061-0.018
+		C553.493,333.774,557.011,336.038,560.469,338.384z"/>
+	<path fill="#9B3C2F" d="M601.375,427.957c-2.352,2.337-4.745,4.624-7.171,6.874C596.63,432.582,599.023,430.295,601.375,427.957z"
+		/>
+	<path fill="#9B3C2F" d="M526.726,481.323c2.711-1.34,5.401-2.719,8.064-4.143C532.126,478.604,529.436,479.984,526.726,481.323z"/>
+	<path fill="#9B3C2F" d="M586.851,441.406c1.789-1.547,3.548-3.133,5.302-4.727C590.399,438.275,588.639,439.859,586.851,441.406z"
+		/>
+	<path fill="#9B3C2F" d="M601.973,427.345c2.127-2.127,4.227-4.286,6.29-6.483C606.198,423.058,604.1,425.218,601.973,427.345z"/>
+	<path fill="#9B3C2F" d="M555.173,465.141c1.663-1.074,3.317-2.162,4.954-3.27C558.488,462.979,556.834,464.067,555.173,465.141z"/>
+	<path fill="#9B3C2F" d="M546.606,470.463c1.756-1.047,3.507-2.104,5.237-3.19C550.114,468.359,548.364,469.416,546.606,470.463z"/>
+	<path fill="#9B3C2F" d="M617.381,410.644c1.346-1.573,2.682-3.154,3.995-4.759C620.063,407.49,618.727,409.071,617.381,410.644z"/>
+	<path fill="#9B3C2F" d="M610.432,418.489c1.514-1.649,3.022-3.303,4.502-4.987C613.455,415.19,611.947,416.841,610.432,418.489z"/>
+	<path fill="#9B3C2F" d="M537.548,475.657c1.961-1.076,3.919-2.159,5.85-3.28C541.466,473.498,539.508,474.58,537.548,475.657z"/>
+	<path fill="#9B3C2F" d="M626.019,400.018c-0.715,0.922-1.43,1.85-2.153,2.764c0.723-0.91,1.471-1.803,2.186-2.725
+		C626.036,400.043,626.027,400.032,626.019,400.018z"/>
+	<path fill="#9B3C2F" d="M571.472,453.785c1.594-1.196,3.168-2.416,4.735-3.645C574.641,451.372,573.065,452.591,571.472,453.785z"
+		/>
+	<path fill="#9B3C2F" d="M563.439,459.592c1.61-1.123,3.209-2.268,4.8-3.422C566.652,457.328,565.052,458.469,563.439,459.592z"/>
+	<path fill="#9B3C2F" d="M517.012,485.904c3.022-1.354,6.022-2.758,8.99-4.213C523.034,483.15,520.036,484.55,517.012,485.904z"/>
+	<path fill="#9B3C2F" d="M579.271,447.725c1.622-1.307,3.219-2.647,4.815-3.989C582.492,445.082,580.893,446.418,579.271,447.725z"
+		/>
+	<path fill="#9B3C2F" d="M514.342,487.053c-1.812,0.791-3.633,1.57-5.465,2.323c-0.004,0.012-0.006,0.023-0.012,0.035
+		C510.707,488.655,512.521,487.85,514.342,487.053z"/>
+	<path fill="#9B3C2F" d="M626.048,400.055c0.014-0.02,0.029-0.037,0.047-0.055c-0.008-0.012-0.02-0.026-0.032-0.037
+		c-0.014,0.02-0.029,0.037-0.043,0.055C626.027,400.032,626.036,400.043,626.048,400.055z"/>
+	<path fill="#9B3C2F" d="M466.716,514.988c-2.944,0.674-5.905,1.293-8.876,1.876c-1.127,0.222-2.247,0.463-3.379,0.674
+		c-4.067,0.75-8.152,1.426-12.254,2.01c-0.688,0.096-1.377,0.166-2.066,0.26c-2.713,0.365-5.424,0.729-8.146,1.021l-0.008,0.023
+		l-0.049,0.006c-5.812,14.877-13.912,28.66-24.138,41.084c0.129,0.135,0.25,0.277,0.379,0.412c2.086,2.186,4.243,4.289,6.454,6.325
+		c0.496,0.459,0.998,0.904,1.5,1.354c2.293,2.051,4.628,4.053,7.05,5.944c0.137,0.108,0.283,0.207,0.42,0.315
+		c2.342,1.818,4.756,3.542,7.21,5.211c0.522,0.356,1.041,0.717,1.57,1.065c2.512,1.657,5.079,3.235,7.702,4.733
+		c0.199,0.113,0.402,0.222,0.604,0.332c10.241-11.767,19.552-24.41,27.727-37.65c0.061-0.205,0.117-0.412,0.178-0.615
+		c0.793-2.67,1.512-5.36,2.141-8.068c0.037-0.166,0.084-0.332,0.123-0.498c0.625-2.729,1.149-5.479,1.611-8.243
+		c0.07-0.42,0.146-0.84,0.213-1.26c0.42-2.664,0.756-5.345,1.018-8.036c0.049-0.496,0.096-0.995,0.14-1.491
+		c0.236-2.684,0.402-5.374,0.484-8.076c0.006-0.17,0.006-0.342,0.008-0.51c-1.164,0.297-2.342,0.549-3.51,0.834
+		C469.453,514.346,468.088,514.676,466.716,514.988z"/>
+	<path fill="#9B3C2F" d="M431.938,520.855l0.049-0.006l0.008-0.023c-0.018,0.003-0.032,0.003-0.049,0.006
+		C431.944,520.841,431.94,520.846,431.938,520.855z"/>
+	<path fill="#9B3C2F" d="M245.856,320.463c3.805-2.307,7.653-4.54,11.56-6.676c0.032-0.018,0.064-0.037,0.096-0.055
+		c3.938-2.151,7.933-4.198,11.966-6.171c0.297-0.146,0.59-0.297,0.887-0.441c3.858-1.87,7.761-3.641,11.695-5.342
+		c0.484-0.211,0.969-0.426,1.453-0.633c3.828-1.631,7.688-3.168,11.574-4.633c0.336-0.129,0.666-0.274,1.004-0.402l0.006-0.018
+		l0.014-0.006c0.56-1.506,1.17-2.985,1.756-4.475c0.514-1.316,1.012-2.637,1.547-3.942c0.828-2.031,1.698-4.038,2.567-6.046
+		c0.522-1.208,1.027-2.424,1.564-3.624c0.989-2.206,2.031-4.382,3.073-6.559c0.467-0.971,0.908-1.958,1.383-2.926
+		c1.506-3.055,3.057-6.083,4.665-9.08c0.041-0.073,0.076-0.149,0.113-0.222c1.657-3.087,3.37-6.139,5.135-9.161
+		c0.496-0.849,1.021-1.678,1.526-2.521c1.278-2.141,2.561-4.284,3.893-6.393c0.688-1.092,1.412-2.159,2.115-3.241
+		c1.193-1.836,2.381-3.67,3.615-5.477c0.793-1.164,1.616-2.305,2.428-3.458c1.19-1.692,2.378-3.381,3.6-5.048
+		c0.873-1.19,1.774-2.358,2.667-3.534c1.207-1.596,2.418-3.19,3.662-4.759c0.94-1.188,1.899-2.358,2.856-3.53
+		c1.246-1.526,2.495-3.049,3.77-4.549c0.992-1.167,2.002-2.319,3.011-3.475c1.289-1.473,2.588-2.936,3.907-4.382
+		c1.035-1.138,2.086-2.264,3.143-3.385c1.342-1.426,2.696-2.842,4.067-4.243c1.08-1.103,2.165-2.197,3.262-3.285
+		c1.395-1.383,2.803-2.748,4.227-4.102c1.115-1.062,2.232-2.121,3.364-3.166c1.459-1.346,2.936-2.672,4.423-3.991
+		c1.138-1.01,2.276-2.022,3.432-3.016c1.532-1.319,3.09-2.612,4.651-3.904c1.152-0.951,2.299-1.908,3.466-2.844
+		c0.432-0.348,0.849-0.709,1.284-1.053c-4.995-3.542-10.136-6.947-15.359-10.174c-1.012-0.307-2.031-0.592-3.051-0.875
+		c-0.504-0.14-1.01-0.291-1.518-0.429c-1.182-0.315-2.372-0.598-3.563-0.881c-0.493-0.117-0.981-0.245-1.477-0.359
+		c-1.234-0.28-2.475-0.525-3.714-0.77c-0.453-0.09-0.902-0.193-1.357-0.277c-1.313-0.245-2.635-0.461-3.954-0.668
+		c-0.385-0.061-0.768-0.135-1.155-0.193c-1.426-0.213-2.856-0.394-4.289-0.56c-0.285-0.032-0.566-0.078-0.852-0.111
+		c-1.637-0.184-3.28-0.332-4.922-0.459c-0.082-0.006-0.164-0.018-0.245-0.023c-3.477-0.26-6.973-0.388-10.478-0.388
+		c-77.223,0-140.05,62.827-140.05,140.05c0,0.008,0,0.014,0,0.023c0,2.34,0.067,4.671,0.181,6.993
+		c0.037,0.776,0.108,1.549,0.16,2.323c0.102,1.553,0.213,3.102,0.365,4.645c0.09,0.908,0.207,1.812,0.315,2.717
+		c0.166,1.406,0.348,2.809,0.555,4.208c0.143,0.948,0.301,1.891,0.461,2.833c0.23,1.354,0.484,2.702,0.756,4.044
+		c0.193,0.948,0.388,1.893,0.601,2.836c0.303,1.348,0.633,2.69,0.977,4.03c0.233,0.91,0.461,1.824,0.711,2.731
+		c0.394,1.42,0.828,2.833,1.272,4.243c0.25,0.803,0.484,1.611,0.75,2.41c0.604,1.818,1.26,3.624,1.943,5.424
+		c0.143,0.379,0.266,0.762,0.414,1.138c0.006,0.018,0.014,0.035,0.02,0.053c12.744-8.923,26.648-15.77,41.429-20.397
+		C245.425,320.704,245.647,320.591,245.856,320.463z"/>
+	<path fill="#9B3C2F" d="M375.897,621.059c-0.729-0.66-1.477-1.295-2.2-1.961c-3.282-3.016-6.497-6.106-9.64-9.269
+		c-0.607-0.613-1.19-1.246-1.795-1.864c-1.85-1.893-3.708-3.778-5.506-5.719l-0.032,0.018l-0.047-0.053
+		c-20.497,9.929-43.25,15.158-66.095,15.158c-19.911,0-39.447-3.887-57.637-11.371c0.012,0.012,0.023,0.026,0.035,0.037
+		c0.023,0.026,0.049,0.049,0.076,0.076c1.826,1.92,3.714,3.77,5.64,5.573c0.61,0.572,1.24,1.121,1.862,1.684
+		c1.377,1.246,2.772,2.469,4.192,3.656c0.729,0.61,1.465,1.208,2.206,1.801c1.406,1.127,2.839,2.223,4.286,3.291
+		c0.717,0.531,1.43,1.071,2.159,1.588c1.766,1.254,3.563,2.457,5.38,3.627c0.414,0.266,0.817,0.555,1.237,0.817
+		c2.235,1.403,4.514,2.734,6.825,4.006c0.656,0.362,1.33,0.695,1.996,1.045c1.686,0.893,3.385,1.762,5.106,2.585
+		c0.855,0.408,1.715,0.799,2.579,1.188c1.602,0.727,3.221,1.42,4.849,2.089c0.875,0.356,1.748,0.715,2.629,1.057
+		c1.803,0.695,3.624,1.34,5.459,1.957c0.694,0.233,1.381,0.49,2.08,0.715c2.524,0.808,5.073,1.549,7.647,2.215
+		c0.522,0.135,1.053,0.239,1.578,0.367c2.075,0.51,4.161,0.98,6.261,1.397c0.899,0.178,1.807,0.33,2.711,0.49
+		c1.777,0.315,3.559,0.601,5.354,0.846c0.963,0.131,1.928,0.26,2.897,0.373c1.856,0.216,3.72,0.385,5.593,0.528
+		c0.858,0.064,1.713,0.149,2.573,0.199c2.717,0.158,5.444,0.256,8.19,0.256c1.739,0,3.477-0.032,5.211-0.096
+		c0.498-0.018,0.995-0.058,1.494-0.082c1.234-0.058,2.469-0.117,3.7-0.207c0.61-0.043,1.217-0.113,1.826-0.166
+		c1.115-0.096,2.229-0.187,3.341-0.312c0.662-0.073,1.322-0.172,1.981-0.254c1.053-0.131,2.11-0.256,3.16-0.414
+		c0.686-0.102,1.369-0.228,2.055-0.342c1.018-0.166,2.039-0.326,3.051-0.516c0.711-0.131,1.418-0.289,2.127-0.435
+		c0.981-0.199,1.961-0.391,2.938-0.61c0.744-0.166,1.482-0.359,2.223-0.539c0.93-0.228,1.864-0.443,2.792-0.688
+		c0.791-0.211,1.576-0.443,2.363-0.666c0.764-0.216,1.532-0.429,2.293-0.66c5.217-3.218,10.364-6.63,15.371-10.183
+		c-1.103-0.875-2.17-1.801-3.262-2.69c-1.109-0.904-2.211-1.809-3.309-2.729C381.067,625.654,378.468,623.374,375.897,621.059z"/>
+	<path fill="#9B3C2F" d="M112.619,652.596c-0.362-1.342-0.68-2.693-1.021-4.041c-0.66-2.588-1.305-5.182-1.893-7.788
+		c-0.35-1.547-0.666-3.102-0.989-4.653c-0.508-2.434-0.998-4.87-1.444-7.318c-0.297-1.625-0.572-3.25-0.844-4.881
+		c-0.4-2.416-0.768-4.835-1.106-7.263c-0.228-1.631-0.453-3.262-0.654-4.896c-0.307-2.492-0.566-4.993-0.811-7.495
+		c-0.152-1.564-0.318-3.125-0.447-4.692c-0.222-2.734-0.383-5.477-0.531-8.222c-0.073-1.34-0.172-2.672-0.228-4.014
+		c-0.166-4.082-0.262-8.169-0.262-12.271c0-3.432,0.059-6.856,0.178-10.277c0.035-1.045,0.113-2.086,0.16-3.131
+		c0.105-2.372,0.205-4.745,0.367-7.11c0.084-1.231,0.216-2.457,0.315-3.688c0.175-2.17,0.336-4.342,0.56-6.503
+		c0.14-1.348,0.326-2.69,0.484-4.038c0.239-2.034,0.459-4.071,0.735-6.098c0.193-1.387,0.432-2.764,0.642-4.147
+		c0.301-1.979,0.584-3.962,0.924-5.932c0.236-1.369,0.522-2.729,0.779-4.09c0.371-1.973,0.721-3.948,1.129-5.911
+		c0.283-1.354,0.613-2.696,0.914-4.047c0.438-1.961,0.858-3.927,1.334-5.88c0.326-1.334,0.7-2.652,1.045-3.983
+		c0.504-1.952,0.995-3.91,1.541-5.853c0.377-1.336,0.797-2.658,1.19-3.989c0.569-1.917,1.117-3.84,1.725-5.748
+		c0.424-1.33,0.893-2.647,1.336-3.971c0.631-1.891,1.246-3.784,1.914-5.663c0.469-1.319,0.986-2.623,1.477-3.936
+		c0.694-1.862,1.371-3.729,2.1-5.579c0.525-1.328,1.094-2.635,1.639-3.956c0.75-1.815,1.479-3.635,2.264-5.436
+		c0.574-1.322,1.196-2.623,1.791-3.936c0.805-1.777,1.596-3.563,2.44-5.327c0.631-1.319,1.307-2.62,1.955-3.93
+		c0.858-1.73,1.701-3.469,2.594-5.184c0.691-1.324,1.424-2.629,2.135-3.944c0.908-1.678,1.797-3.364,2.737-5.028
+		c0.741-1.313,1.529-2.602,2.291-3.904c0.893-1.523,1.76-3.057,2.678-4.567l0.002-0.008l0.008-0.012
+		c2.664-8.505,6.112-16.824,10.279-24.792l-0.029-0.041l0.014-0.026c-0.752-1.074-1.453-2.17-2.188-3.253
+		c-1.094-1.605-2.192-3.209-3.25-4.832c-1.047-1.605-2.06-3.227-3.075-4.849c-1.024-1.633-2.051-3.264-3.04-4.913
+		c-0.986-1.645-1.932-3.309-2.885-4.969c-0.951-1.657-1.908-3.309-2.824-4.983c-0.924-1.684-1.807-3.387-2.693-5.085
+		c-0.881-1.68-1.771-3.358-2.617-5.053c-0.858-1.719-1.672-3.457-2.495-5.19c-0.809-1.704-1.631-3.402-2.407-5.118
+		c-0.793-1.756-1.541-3.534-2.299-5.304c-0.738-1.721-1.488-3.438-2.194-5.173c-0.729-1.797-1.409-3.61-2.1-5.419
+		c-0.666-1.733-1.346-3.461-1.975-5.208c-0.666-1.838-1.278-3.696-1.905-5.546c-0.59-1.742-1.199-3.475-1.756-5.225
+		c-0.598-1.881-1.141-3.778-1.704-5.672c-0.516-1.745-1.057-3.483-1.541-5.237c-0.534-1.932-1.01-3.881-1.502-5.821
+		c-0.441-1.736-0.908-3.466-1.316-5.214c-0.467-1.99-0.873-3.995-1.299-5.995c-0.367-1.721-0.762-3.434-1.098-5.165
+		c-0.397-2.039-0.729-4.096-1.082-6.147c-0.295-1.709-0.619-3.408-0.885-5.124c-0.326-2.118-0.586-4.251-0.869-6.378
+		c-0.219-1.663-0.473-3.317-0.666-4.987c-0.262-2.268-0.453-4.549-0.662-6.827c-0.143-1.543-0.321-3.078-0.441-4.628
+		c-0.195-2.559-0.315-5.132-0.447-7.706c-0.064-1.281-0.17-2.553-0.219-3.837c-0.137-3.846-0.213-7.714-0.213-11.598
+		c0-4.102,0.096-8.19,0.262-12.271c0.055-1.342,0.154-2.678,0.228-4.018c0.149-2.743,0.309-5.485,0.531-8.216
+		c0.129-1.57,0.291-3.133,0.447-4.698c0.242-2.5,0.504-4.998,0.811-7.487c0.201-1.637,0.426-3.27,0.654-4.905
+		c0.338-2.422,0.706-4.84,1.106-7.251c0.271-1.631,0.545-3.262,0.844-4.89c0.447-2.442,0.934-4.878,1.441-7.309
+		c0.324-1.555,0.639-3.11,0.989-4.663c0.586-2.602,1.234-5.19,1.891-7.779c0.344-1.351,0.662-2.705,1.024-4.05
+		c0.91-3.385,1.897-6.751,2.926-10.105c0.164-0.525,0.301-1.059,0.463-1.584c0.02-0.061,0.035-0.125,0.055-0.187
+		C9.662,179.371-61,284.123-61,400S9.662,620.626,116.067,664.474c-0.02-0.061-0.035-0.125-0.055-0.187
+		c-0.164-0.519-0.301-1.047-0.461-1.567C114.518,659.359,113.532,655.986,112.619,652.596z"/>
+	<polygon fill="#9B3C2F" points="156.047,395.41 156.032,395.437 156.061,395.48 156.072,395.454 	"/>
+	<circle fill="#9B3C2F" cx="145.776" cy="420.282" r="0.012"/>
+	<path fill="#9B3C2F" d="M166.127,378.893c1.281-1.836,2.606-3.633,3.962-5.407c0.406-0.531,0.823-1.051,1.237-1.576
+		c1.065-1.354,2.151-2.688,3.262-4.003c0.453-0.537,0.904-1.074,1.363-1.602c1.281-1.473,2.588-2.924,3.927-4.348
+		c0.266-0.283,0.522-0.578,0.791-0.858c1.619-1.701,3.285-3.362,4.989-4.989c0.394-0.379,0.805-0.741,1.205-1.117
+		c1.325-1.24,2.672-2.459,4.047-3.656c0.555-0.481,1.112-0.959,1.672-1.432c0.525-0.443,1.035-0.904,1.567-1.342
+		c-0.242-0.584-0.447-1.176-0.68-1.76c-0.426-1.065-0.838-2.135-1.24-3.209c-0.508-1.354-0.992-2.713-1.459-4.076
+		c-0.371-1.082-0.732-2.168-1.076-3.256c-0.435-1.374-0.844-2.758-1.24-4.143c-0.312-1.092-0.621-2.18-0.908-3.276
+		c-0.367-1.409-0.7-2.824-1.027-4.245c-0.25-1.086-0.504-2.168-0.732-3.256c-0.301-1.459-0.563-2.926-0.82-4.394
+		c-0.187-1.062-0.388-2.121-0.551-3.19c-0.236-1.541-0.424-3.092-0.613-4.645c-0.123-1.004-0.268-2.004-0.371-3.014
+		c-0.176-1.719-0.291-3.446-0.406-5.173c-0.059-0.852-0.143-1.701-0.187-2.559c-0.131-2.585-0.201-5.182-0.201-7.788l0,0l0,0
+		c0-83.66,68.062-151.722,151.722-151.722c2.311,0,4.618,0.07,6.921,0.175c0.199,0.008,0.4,0.006,0.598,0.014
+		c-0.473-0.213-0.942-0.438-1.418-0.648c-0.861-0.379-1.727-0.75-2.594-1.123c-1.938-0.834-3.887-1.645-5.841-2.434
+		c-0.863-0.348-1.725-0.7-2.59-1.041c-2.51-0.983-5.03-1.938-7.566-2.85c-0.242-0.088-0.484-0.184-0.727-0.271
+		c-2.76-0.986-5.538-1.917-8.327-2.815c-0.858-0.277-1.721-0.539-2.582-0.808c-2.01-0.627-4.026-1.234-6.048-1.815
+		c-0.942-0.271-1.885-0.543-2.83-0.803c-2.223-0.615-4.458-1.202-6.696-1.762c-0.639-0.16-1.272-0.332-1.914-0.49
+		c-2.839-0.691-5.692-1.336-8.554-1.94c-0.776-0.164-1.555-0.309-2.331-0.467c-2.151-0.435-4.307-0.849-6.468-1.234
+		c-0.971-0.172-1.943-0.342-2.915-0.504c-2.145-0.359-4.295-0.692-6.452-1.004c-0.814-0.117-1.625-0.245-2.44-0.356
+		c-2.918-0.397-5.841-0.752-8.771-1.059c-0.545-0.059-1.094-0.099-1.639-0.152c-2.422-0.239-4.849-0.449-7.28-0.627
+		c-0.951-0.07-1.903-0.129-2.854-0.19c-2.145-0.135-4.292-0.245-6.442-0.332c-0.899-0.037-1.801-0.078-2.702-0.108
+		c-2.988-0.088-5.973-0.149-8.96-0.149c-4.123,0-8.234,0.09-12.333,0.266c-1.354,0.059-2.696,0.178-4.047,0.254
+		c-2.743,0.154-5.485,0.297-8.216,0.531c-1.611,0.137-3.213,0.342-4.817,0.508c-2.457,0.25-4.917,0.481-7.362,0.797
+		c-1.709,0.219-3.408,0.508-5.114,0.758c-2.328,0.342-4.659,0.666-6.979,1.065c-1.754,0.301-3.493,0.668-5.237,1.004
+		c-2.252,0.432-4.511,0.846-6.751,1.334c-1.774,0.385-3.536,0.832-5.304,1.252c-2.194,0.52-4.391,1.024-6.571,1.596
+		c-1.789,0.469-3.565,0.998-5.345,1.502c-2.135,0.607-4.278,1.199-6.401,1.856c-1.797,0.555-3.58,1.167-5.368,1.76
+		c-1.637,0.543-3.27,1.082-4.899,1.654c-0.572,1.628-1.112,3.262-1.654,4.899c-0.592,1.789-1.202,3.571-1.76,5.368
+		c-0.656,2.124-1.248,4.266-1.856,6.401c-0.504,1.78-1.033,3.557-1.502,5.345c-0.572,2.18-1.076,4.377-1.596,6.571
+		c-0.42,1.768-0.867,3.528-1.252,5.304c-0.487,2.241-0.899,4.499-1.334,6.751c-0.336,1.745-0.703,3.483-1.004,5.237
+		c-0.4,2.317-0.721,4.651-1.065,6.979c-0.25,1.704-0.537,3.403-0.758,5.114c-0.315,2.445-0.545,4.905-0.797,7.362
+		c-0.164,1.608-0.371,3.207-0.508,4.817c-0.234,2.731-0.377,5.473-0.531,8.216c-0.076,1.351-0.195,2.693-0.254,4.047
+		c-0.166,4.09-0.256,8.202-0.256,12.324c0,3.674,0.073,7.339,0.211,10.991c0.047,1.223,0.14,2.44,0.201,3.659
+		c0.123,2.424,0.239,4.852,0.42,7.268c0.108,1.447,0.268,2.885,0.397,4.33c0.199,2.18,0.385,4.36,0.633,6.527
+		c0.175,1.529,0.394,3.049,0.592,4.575c0.268,2.069,0.531,4.137,0.844,6.194c0.239,1.57,0.52,3.131,0.785,4.698
+		c0.338,1.998,0.674,3.995,1.053,5.981c0.303,1.584,0.645,3.163,0.975,4.741c0.408,1.952,0.817,3.904,1.266,5.847
+		c0.367,1.584,0.764,3.16,1.158,4.735c0.479,1.917,0.963,3.831,1.479,5.737c0.429,1.578,0.885,3.149,1.342,4.721
+		c0.549,1.885,1.106,3.766,1.692,5.64c0.49,1.564,1,3.122,1.52,4.677c0.619,1.862,1.252,3.714,1.911,5.564
+		c0.549,1.543,1.115,3.081,1.692,4.616c0.691,1.838,1.401,3.67,2.13,5.497c0.607,1.518,1.225,3.032,1.858,4.54
+		c0.764,1.821,1.555,3.633,2.358,5.438c0.66,1.482,1.325,2.965,2.01,4.438c0.844,1.812,1.715,3.612,2.6,5.407
+		c0.709,1.441,1.418,2.883,2.153,4.315c0.928,1.807,1.887,3.598,2.854,5.386c0.752,1.391,1.5,2.789,2.279,4.169
+		c1.016,1.809,2.072,3.6,3.131,5.389c0.787,1.334,1.567,2.67,2.375,3.991c1.121,1.826,2.285,3.635,3.449,5.442
+		c0.809,1.252,1.599,2.512,2.428,3.755c0.228,0.344,0.473,0.677,0.703,1.018c1.098-1.725,2.229-3.42,3.391-5.094
+		C166.011,379.05,166.072,378.975,166.127,378.893z"/>
+	<path fill="#9B3C2F" d="M185.658,356.111c0.394-0.379,0.805-0.744,1.205-1.117C186.463,355.367,186.053,355.732,185.658,356.111z"
+		/>
+	<path fill="#9B3C2F" d="M166.127,378.893c-0.055,0.082-0.117,0.158-0.172,0.239C166.011,379.05,166.072,378.975,166.127,378.893z"
+		/>
+	<path fill="#9B3C2F" d="M192.582,349.905c-0.56,0.475-1.121,0.951-1.672,1.432C191.462,350.857,192.019,350.378,192.582,349.905z"
+		/>
+	<path fill="#9B3C2F" d="M175.952,366.306c-0.461,0.531-0.91,1.068-1.363,1.602C175.04,367.374,175.493,366.837,175.952,366.306z"/>
+	<path fill="#9B3C2F" d="M180.669,361.1c-0.268,0.283-0.525,0.574-0.791,0.858C180.144,361.676,180.4,361.381,180.669,361.1z"/>
+	<path fill="#9B3C2F" d="M171.326,371.911c-0.414,0.525-0.832,1.045-1.237,1.576C170.498,372.959,170.915,372.436,171.326,371.911z"
+		/>
+	<path fill="#9B3C2F" d="M275.381,118.548c2.162,0.385,4.315,0.799,6.468,1.234C279.699,119.347,277.544,118.933,275.381,118.548z"
+		/>
+	<path fill="#9B3C2F" d="M284.181,120.249c2.862,0.604,5.716,1.248,8.554,1.94C289.894,121.497,287.043,120.853,284.181,120.249z"/>
+	<path fill="#9B3C2F" d="M312.81,127.867c2.789,0.899,5.567,1.83,8.327,2.815C318.377,129.7,315.6,128.768,312.81,127.867z"/>
+	<path fill="#9B3C2F" d="M341.957,139.051c-0.498-0.225-1.004-0.429-1.502-0.651c0.475,0.211,0.942,0.435,1.418,0.648
+		C341.9,139.051,341.928,139.051,341.957,139.051z"/>
+	<path fill="#9B3C2F" d="M332.02,134.843c1.955,0.791,3.904,1.602,5.841,2.434C335.921,136.445,333.975,135.634,332.02,134.843z"/>
+	<path fill="#9B3C2F" d="M321.863,130.954c2.535,0.914,5.057,1.864,7.566,2.85C326.92,132.819,324.4,131.868,321.863,130.954z"/>
+	<path fill="#9B3C2F" d="M140.459,126.779c2.124-0.656,4.266-1.248,6.401-1.856C144.723,125.529,142.584,126.123,140.459,126.779z"
+		/>
+	<path fill="#9B3C2F" d="M224.937,114.063c2.988,0,5.973,0.061,8.952,0.154C230.909,114.125,227.924,114.063,224.937,114.063z"/>
+	<path fill="#9B3C2F" d="M176.071,118.235c2.317-0.4,4.651-0.721,6.979-1.065C180.718,117.515,178.388,117.836,176.071,118.235z"/>
+	<path fill="#9B3C2F" d="M236.59,114.323c2.151,0.088,4.298,0.199,6.442,0.332C240.888,114.522,238.74,114.411,236.59,114.323z"/>
+	<path fill="#9B3C2F" d="M304.176,125.244c2.025,0.584,4.041,1.19,6.048,1.815C308.214,126.434,306.198,125.828,304.176,125.244z"/>
+	<path fill="#9B3C2F" d="M188.162,116.415c2.445-0.315,4.905-0.545,7.362-0.797C193.066,115.87,190.607,116.102,188.162,116.415z"/>
+	<path fill="#9B3C2F" d="M200.344,115.114c2.731-0.233,5.473-0.377,8.216-0.531C205.817,114.737,203.071,114.88,200.344,115.114z"/>
+	<path fill="#9B3C2F" d="M266.015,117.04c2.153,0.312,4.307,0.645,6.452,1.004C270.322,117.681,268.172,117.348,266.015,117.04z"/>
+	<path fill="#9B3C2F" d="M254.805,115.624c2.932,0.307,5.856,0.662,8.771,1.059C260.661,116.286,257.738,115.93,254.805,115.624z"/>
+	<path fill="#9B3C2F" d="M245.883,114.846c2.43,0.178,4.858,0.388,7.28,0.627C250.741,115.233,248.317,115.024,245.883,114.846z"/>
+	<path fill="#9B3C2F" d="M164.081,120.573c2.241-0.487,4.499-0.899,6.751-1.334C168.58,119.671,166.322,120.085,164.081,120.573z"/>
+	<path fill="#9B3C2F" d="M294.647,122.679c2.241,0.56,4.473,1.147,6.696,1.762C299.119,123.826,296.888,123.24,294.647,122.679z"/>
+	<path fill="#9B3C2F" d="M152.207,123.42c2.18-0.572,4.377-1.076,6.571-1.596C156.584,122.343,154.386,122.849,152.207,123.42z"/>
+	<path fill="#9B3C2F" d="M212.604,114.329c4.1-0.175,8.21-0.266,12.334-0.266C220.814,114.063,216.703,114.154,212.604,114.329z"/>
+	<path fill="#9B3C2F" d="M135.091,128.538c-1.625,0.537-3.262,1.03-4.881,1.599c-0.006,0.018-0.012,0.037-0.018,0.055
+		C131.821,129.621,133.454,129.078,135.091,128.538z"/>
+	<path fill="#9B3C2F" d="M183.797,309.116c-0.123-1.004-0.268-2.004-0.371-3.014C183.529,307.111,183.674,308.112,183.797,309.116z"
+		/>
+	<path fill="#9B3C2F" d="M183.021,300.928c-0.059-0.852-0.143-1.701-0.187-2.559C182.875,299.228,182.963,300.077,183.021,300.928z"
+		/>
+	<path fill="#9B3C2F" d="M186.514,324.601c-0.25-1.086-0.504-2.168-0.732-3.256C186.006,322.433,186.262,323.515,186.514,324.601z"
+		/>
+	<path fill="#9B3C2F" d="M334.351,138.863c2.313,0,4.618,0.067,6.921,0.172C338.97,138.931,336.662,138.861,334.351,138.863
+		c-83.66-0.002-151.72,68.06-151.72,151.719l0,0C182.63,206.925,250.691,138.863,334.351,138.863z"/>
+	<path fill="#9B3C2F" d="M184.961,316.947c-0.187-1.062-0.388-2.121-0.551-3.19C184.573,314.826,184.774,315.885,184.961,316.947z"
+		/>
+	<path fill="#9B3C2F" d="M190.767,339.519c-0.371-1.082-0.732-2.168-1.076-3.256C190.034,337.351,190.397,338.437,190.767,339.519z"
+		/>
+	<path fill="#9B3C2F" d="M188.45,332.119c-0.312-1.092-0.621-2.18-0.908-3.276C187.829,329.94,188.139,331.031,188.45,332.119z"/>
+	<path fill="#9B3C2F" d="M193.468,346.804c-0.426-1.065-0.838-2.135-1.24-3.209C192.628,344.668,193.04,345.737,193.468,346.804z"/>
+	<path fill="#9B3C2F" d="M117.364,268.484c-0.312-2.057-0.574-4.126-0.844-6.194C116.788,264.355,117.051,266.423,117.364,268.484z"
+		/>
+	<path fill="#9B3C2F" d="M159.434,379.45c-1.164-1.807-2.328-3.612-3.449-5.442C157.106,375.838,158.27,377.644,159.434,379.45z"/>
+	<path fill="#9B3C2F" d="M162.542,384.259c0.008-0.012,0.014-0.023,0.023-0.035c-0.231-0.342-0.475-0.677-0.703-1.018
+		C162.092,383.556,162.308,383.912,162.542,384.259z"/>
+	<path fill="#9B3C2F" d="M119.202,279.163c-0.379-1.987-0.715-3.985-1.053-5.981C118.487,275.177,118.822,277.175,119.202,279.163z"
+		/>
+	<path fill="#9B3C2F" d="M115.928,257.715c-0.248-2.168-0.435-4.35-0.633-6.527C115.493,253.365,115.68,255.543,115.928,257.715z"/>
+	<path fill="#9B3C2F" d="M114.274,235.927c-0.137-3.653-0.211-7.318-0.211-10.991C114.063,228.61,114.137,232.274,114.274,235.927z"
+		/>
+	<path fill="#9B3C2F" d="M114.063,224.937c0-4.123,0.09-8.234,0.266-12.334C114.154,216.703,114.063,220.814,114.063,224.937z"/>
+	<path fill="#9B3C2F" d="M114.897,246.854c-0.181-2.416-0.297-4.84-0.42-7.268C114.598,242.014,114.714,244.442,114.897,246.854z"/>
+	<path fill="#9B3C2F" d="M153.607,370.017c-1.059-1.789-2.112-3.58-3.131-5.389C151.495,366.437,152.548,368.228,153.607,370.017z"
+		/>
+	<path fill="#9B3C2F" d="M138.584,340.916c-0.805-1.807-1.594-3.618-2.358-5.438C136.991,337.298,137.779,339.107,138.584,340.916z"
+		/>
+	<path fill="#9B3C2F" d="M127.114,310.584c-0.586-1.873-1.144-3.755-1.692-5.64C125.971,306.829,126.528,308.71,127.114,310.584z"/>
+	<path fill="#9B3C2F" d="M134.368,330.934c-0.729-1.824-1.438-3.656-2.13-5.497C132.927,327.279,133.638,329.111,134.368,330.934z"
+		/>
+	<path fill="#9B3C2F" d="M124.08,300.223c-0.52-1.905-1-3.819-1.479-5.737C123.079,296.404,123.564,298.318,124.08,300.223z"/>
+	<path fill="#9B3C2F" d="M148.2,360.459c-0.965-1.789-1.926-3.58-2.854-5.386C146.272,356.879,147.232,358.67,148.2,360.459z"/>
+	<path fill="#9B3C2F" d="M121.443,289.748c-0.449-1.943-0.858-3.895-1.266-5.847C120.585,285.856,120.993,287.807,121.443,289.748z"
+		/>
+	<path fill="#9B3C2F" d="M143.194,350.757c-0.885-1.795-1.756-3.594-2.6-5.407C141.438,347.163,142.309,348.964,143.194,350.757z"/>
+	<path fill="#9B3C2F" d="M121.824,158.778c0.52-2.194,1.024-4.391,1.596-6.571C122.849,154.386,122.343,156.584,121.824,158.778z"/>
+	<path fill="#9B3C2F" d="M130.546,320.825c-0.656-1.846-1.293-3.702-1.911-5.564C129.253,317.122,129.886,318.977,130.546,320.825z"
+		/>
+	<path fill="#9B3C2F" d="M114.582,208.556c0.154-2.743,0.297-5.485,0.531-8.216C114.88,203.071,114.737,205.817,114.582,208.556z"/>
+	<path fill="#9B3C2F" d="M130.192,130.192c-0.018,0.006-0.037,0.012-0.055,0.018c-0.569,1.616-1.062,3.256-1.599,4.881
+		C129.078,133.454,129.621,131.821,130.192,130.192z"/>
+	<path fill="#9B3C2F" d="M124.923,146.862c0.607-2.135,1.199-4.278,1.856-6.401C126.123,142.584,125.529,144.723,124.923,146.862z"
+		/>
+	<path fill="#9B3C2F" d="M115.618,195.523c0.25-2.457,0.481-4.917,0.797-7.362C116.102,190.607,115.87,193.066,115.618,195.523z"/>
+	<path fill="#9B3C2F" d="M117.174,183.05c0.342-2.328,0.666-4.659,1.065-6.979C117.836,178.388,117.515,180.718,117.174,183.05z"/>
+	<path fill="#9B3C2F" d="M119.239,170.834c0.432-2.252,0.846-4.511,1.334-6.751C120.085,166.322,119.671,168.58,119.239,170.834z"/>
+	<path fill="#9B3C2F" d="M130.21,130.137c-0.018,0.006-0.037,0.012-0.055,0.018c-0.006,0.018-0.012,0.037-0.018,0.055
+		c0.018-0.006,0.037-0.012,0.055-0.018C130.198,130.172,130.204,130.155,130.21,130.137z"/>
+	<path fill="#9B3C2F" d="M432.751,412.759c0.51,1.369,1.006,2.743,1.477,4.123c0.365,1.065,0.715,2.135,1.053,3.207
+		c0.438,1.383,0.852,2.774,1.248,4.169c0.307,1.076,0.61,2.156,0.89,3.239c0.367,1.412,0.703,2.83,1.03,4.251
+		c0.248,1.08,0.498,2.156,0.721,3.239c0.301,1.453,0.56,2.918,0.817,4.38c0.187,1.059,0.383,2.115,0.545,3.18
+		c0.236,1.535,0.424,3.078,0.61,4.622c0.123,1.004,0.266,2.004,0.367,3.014c0.172,1.707,0.289,3.426,0.406,5.144
+		c0.059,0.855,0.143,1.704,0.187,2.561c0.129,2.576,0.201,5.165,0.201,7.761c0,2.049-0.049,4.094-0.131,6.13
+		c-0.026,0.648-0.07,1.295-0.105,1.943c-0.073,1.395-0.16,2.789-0.271,4.178c-0.061,0.752-0.131,1.502-0.201,2.256
+		c-0.125,1.313-0.268,2.626-0.426,3.933c-0.09,0.738-0.178,1.477-0.277,2.211c-0.195,1.424-0.418,2.842-0.651,4.26
+		c-0.099,0.59-0.184,1.182-0.289,1.771c-0.353,1.979-0.738,3.95-1.17,5.911c-0.088,0.402-0.193,0.799-0.285,1.199
+		c-0.359,1.573-0.735,3.139-1.144,4.7c-0.181,0.695-0.379,1.383-0.572,2.077c-0.213,0.768-0.412,1.541-0.637,2.305
+		c0.834-0.105,1.672-0.181,2.506-0.295c1.188-0.16,2.369-0.336,3.553-0.508c2.953-0.438,5.897-0.922,8.829-1.447
+		c1.004-0.181,2.01-0.344,3.008-0.534c3.817-0.729,7.615-1.526,11.388-2.407c0.758-0.178,1.512-0.383,2.27-0.566
+		c2.133-0.516,4.245-1.088,6.36-1.654c-0.026-0.449-0.041-0.902-0.07-1.351c-0.073-1.039-0.164-2.075-0.26-3.114
+		c-0.117-1.264-0.245-2.527-0.397-3.784c-0.125-1.051-0.262-2.098-0.412-3.143c-0.178-1.237-0.373-2.469-0.584-3.7
+		c-0.178-1.051-0.362-2.098-0.563-3.143c-0.236-1.217-0.498-2.424-0.768-3.633c-0.23-1.039-0.457-2.08-0.711-3.113
+		c-0.297-1.211-0.631-2.413-0.959-3.615c-0.277-1.01-0.543-2.022-0.84-3.022c-0.371-1.24-0.782-2.469-1.184-3.696
+		c-0.312-0.945-0.604-1.897-0.934-2.836c-0.498-1.412-1.045-2.807-1.588-4.202c-0.285-0.735-0.545-1.482-0.844-2.211
+		c-0.844-2.069-1.742-4.114-2.682-6.139c-0.391-0.844-0.823-1.668-1.231-2.504c-0.596-1.219-1.184-2.44-1.815-3.641
+		c-0.475-0.908-0.986-1.795-1.482-2.69c-0.613-1.106-1.219-2.215-1.864-3.303c-0.537-0.91-1.103-1.807-1.66-2.707
+		c-0.651-1.047-1.299-2.092-1.975-3.122c-0.59-0.899-1.202-1.783-1.812-2.667c-0.695-1.004-1.395-2.004-2.115-2.994
+		c-0.637-0.873-1.287-1.736-1.946-2.594c-0.744-0.971-1.5-1.934-2.27-2.885c-0.677-0.838-1.36-1.668-2.057-2.492
+		c-0.799-0.945-1.619-1.876-2.445-2.798c-0.711-0.797-1.424-1.59-2.153-2.369c-0.863-0.924-1.754-1.826-2.647-2.729
+		c-0.735-0.744-1.465-1.491-2.217-2.217c-0.199-0.19-0.406-0.371-0.604-0.56c0.201,0.49,0.373,0.992,0.569,1.485
+		C431.963,410.661,432.36,411.709,432.751,412.759z"/>
+	<path fill="#9B3C2F" d="M440.536,442.547c-0.164-1.065-0.362-2.121-0.545-3.18C440.177,440.425,440.373,441.482,440.536,442.547z"
+		/>
+	<path fill="#9B3C2F" d="M442.105,457.887c-0.043-0.858-0.129-1.707-0.187-2.561C441.977,456.178,442.062,457.029,442.105,457.887z"
+		/>
+	<path fill="#9B3C2F" d="M436.786,506.22c0.193-0.692,0.391-1.383,0.572-2.078C437.177,504.84,436.979,505.528,436.786,506.22z"/>
+	<path fill="#9B3C2F" d="M441.513,450.182c-0.102-1.01-0.245-2.008-0.367-3.014C441.271,448.171,441.412,449.173,441.513,450.182z"
+		/>
+	<path fill="#9B3C2F" d="M440.894,486.303c0.099-0.735,0.187-1.473,0.277-2.211C441.084,484.83,440.997,485.568,440.894,486.303z"/>
+	<path fill="#9B3C2F" d="M442.07,473.725c0.035-0.648,0.078-1.295,0.105-1.943C442.15,472.43,442.105,473.074,442.07,473.725z"/>
+	<path fill="#9B3C2F" d="M441.601,480.159c0.07-0.75,0.14-1.502,0.201-2.256C441.74,478.655,441.671,479.405,441.601,480.159z"/>
+	<path fill="#9B3C2F" d="M435.281,420.089c-0.338-1.071-0.691-2.141-1.053-3.207C434.593,417.947,434.942,419.014,435.281,420.089z"
+		/>
+	<path fill="#9B3C2F" d="M438.502,499.445c0.09-0.4,0.195-0.799,0.285-1.199C438.701,498.646,438.595,499.042,438.502,499.445z"/>
+	<path fill="#9B3C2F" d="M432.751,412.759c-0.391-1.051-0.787-2.098-1.205-3.139C431.963,410.661,432.36,411.709,432.751,412.759z"
+		/>
+	<path fill="#9B3C2F" d="M439.958,492.331c0.105-0.59,0.19-1.182,0.289-1.771C440.148,491.149,440.064,491.745,439.958,492.331z"/>
+	<path fill="#9B3C2F" d="M437.419,427.494c-0.283-1.082-0.584-2.162-0.89-3.239C436.837,425.335,437.14,426.412,437.419,427.494z"/>
+	<path fill="#9B3C2F" d="M439.173,434.983c-0.225-1.086-0.475-2.162-0.721-3.239C438.698,432.825,438.949,433.901,439.173,434.983z"
+		/>
+	<path fill="#9B3C2F" d="M451.04,506.275c-2.932,0.528-5.876,1.012-8.829,1.447C445.164,507.288,448.108,506.803,451.04,506.275z"/>
+	<path fill="#9B3C2F" d="M467.706,502.768c2.127-0.516,4.257-1.021,6.366-1.584c0-0.023-0.004-0.047-0.004-0.07
+		C471.951,501.676,469.839,502.252,467.706,502.768z"/>
+	<path fill="#9B3C2F" d="M465.436,503.331c-3.772,0.881-7.571,1.678-11.388,2.407C457.867,505.012,461.666,504.212,465.436,503.331z
+		"/>
+	<path fill="#9B3C2F" d="M436.133,508.595c0.844-0.105,1.68-0.248,2.524-0.362c-0.834,0.113-1.672,0.19-2.506,0.295
+		C436.145,508.548,436.139,508.571,436.133,508.595z"/>
+	<path fill="#9B3C2F" d="M334.351,661.137c-3.224,0-6.431-0.102-9.62-0.301c-1.065-0.067-2.112-0.211-3.172-0.297
+		c-2.112-0.178-4.231-0.336-6.323-0.598c-1.33-0.166-2.637-0.42-3.959-0.621c-1.803-0.274-3.612-0.516-5.397-0.855
+		c-1.403-0.266-2.778-0.619-4.169-0.922c-1.678-0.367-3.367-0.697-5.03-1.123c-1.438-0.367-2.848-0.817-4.272-1.225
+		c-1.582-0.453-3.174-0.867-4.735-1.371c-1.456-0.469-2.879-1.021-4.319-1.535c-1.496-0.534-3.008-1.03-4.487-1.608
+		c-1.447-0.569-2.856-1.217-4.286-1.83c-1.43-0.613-2.877-1.188-4.286-1.844c-1.432-0.668-2.827-1.412-4.237-2.124
+		c-1.363-0.689-2.743-1.34-4.085-2.069c-1.401-0.762-2.758-1.596-4.131-2.401c-1.307-0.764-2.631-1.494-3.919-2.299
+		c-1.36-0.852-2.672-1.777-4.006-2.672c-1.248-0.84-2.518-1.645-3.743-2.524c-1.316-0.942-2.579-1.952-3.866-2.938
+		c-1.19-0.91-2.401-1.791-3.565-2.74c-1.26-1.024-2.465-2.118-3.694-3.186c-1.135-0.986-2.291-1.943-3.397-2.965
+		c-1.199-1.106-2.342-2.276-3.507-3.422c-1.076-1.059-2.174-2.089-3.221-3.184c-1.133-1.182-2.209-2.428-3.305-3.651
+		c-1.016-1.133-2.055-2.238-3.037-3.403c-1.059-1.254-2.06-2.567-3.084-3.864c-0.954-1.205-1.932-2.387-2.85-3.627
+		c-0.983-1.322-1.903-2.699-2.848-4.059c-0.779-1.121-1.596-2.203-2.348-3.346c-1.156-0.758-2.25-1.584-3.381-2.372
+		c-1.346-0.934-2.711-1.846-4.02-2.819c-1.246-0.928-2.436-1.908-3.651-2.868c-1.287-1.018-2.594-2.014-3.842-3.067
+		c-1.164-0.983-2.27-2.022-3.403-3.037c-1.223-1.097-2.469-2.174-3.653-3.305c-1.082-1.035-2.1-2.121-3.149-3.186
+		c-1.161-1.178-2.346-2.337-3.463-3.548c-0.992-1.076-1.922-2.2-2.883-3.303c-1.098-1.26-2.217-2.5-3.27-3.793
+		c-0.908-1.115-1.748-2.273-2.62-3.411c-1.027-1.336-2.08-2.655-3.057-4.026c-0.82-1.147-1.573-2.334-2.36-3.501
+		c-0.954-1.415-1.934-2.809-2.839-4.254c-0.732-1.17-1.395-2.378-2.092-3.565c-0.879-1.491-1.783-2.967-2.608-4.487
+		c-0.642-1.184-1.217-2.404-1.826-3.606c-0.797-1.57-1.625-3.122-2.366-4.718c-0.557-1.196-1.039-2.424-1.564-3.635
+		c-0.711-1.643-1.453-3.27-2.106-4.94c-0.469-1.196-0.863-2.424-1.301-3.633c-0.625-1.721-1.278-3.428-1.838-5.176
+		c-0.379-1.182-0.686-2.393-1.039-3.586c-0.531-1.803-1.092-3.598-1.559-5.424c-0.295-1.155-0.514-2.331-0.779-3.495
+		c-0.435-1.897-0.899-3.784-1.26-5.704c-0.199-1.041-0.324-2.1-0.498-3.149c-0.348-2.063-0.711-4.123-0.975-6.209
+		c-0.102-0.82-0.143-1.654-0.233-2.48c-0.596-5.474-0.957-11.003-0.957-16.59c0-2.313,0.07-4.618,0.175-6.923
+		c0.008-0.199,0.006-0.4,0.014-0.596c-0.211,0.467-0.432,0.928-0.639,1.395c-0.388,0.881-0.768,1.768-1.147,2.652
+		c-0.823,1.914-1.625,3.84-2.404,5.771c-0.356,0.885-0.717,1.762-1.065,2.649c-0.969,2.469-1.905,4.948-2.803,7.443
+		c-0.102,0.28-0.213,0.56-0.312,0.84c-0.98,2.752-1.908,5.518-2.803,8.298c-0.283,0.875-0.549,1.754-0.823,2.631
+		c-0.621,1.993-1.223,3.991-1.801,5.995c-0.274,0.954-0.549,1.908-0.814,2.868c-0.61,2.209-1.193,4.426-1.75,6.649
+		c-0.164,0.651-0.342,1.301-0.498,1.952c-0.692,2.836-1.334,5.684-1.938,8.543c-0.164,0.779-0.312,1.561-0.469,2.342
+		c-0.435,2.147-0.849,4.298-1.234,6.456c-0.175,0.971-0.342,1.946-0.504,2.918c-0.359,2.145-0.692,4.295-1.004,6.448
+		c-0.117,0.814-0.245,1.625-0.356,2.44c-0.397,2.918-0.752,5.841-1.059,8.773c-0.059,0.545-0.096,1.094-0.152,1.639
+		c-0.239,2.424-0.449,4.85-0.627,7.282c-0.07,0.951-0.129,1.899-0.19,2.85c-0.135,2.145-0.245,4.292-0.332,6.442
+		c-0.037,0.899-0.078,1.801-0.108,2.699c-0.084,2.982-0.146,5.967-0.146,8.954c0,4.123,0.09,8.234,0.266,12.333
+		c0.055,1.34,0.175,2.67,0.25,4.009c0.154,2.754,0.301,5.512,0.534,8.255c0.137,1.596,0.338,3.184,0.502,4.776
+		c0.25,2.471,0.484,4.946,0.803,7.405c0.219,1.695,0.502,3.381,0.75,5.071c0.344,2.342,0.668,4.688,1.071,7.02
+		c0.301,1.745,0.666,3.475,0.998,5.211c0.435,2.262,0.849,4.526,1.336,6.778c0.385,1.774,0.832,3.534,1.252,5.299
+		c0.52,2.194,1.024,4.391,1.596,6.573c0.473,1.797,1.004,3.577,1.508,5.366c0.604,2.127,1.193,4.26,1.846,6.376
+		c0.56,1.815,1.178,3.612,1.774,5.415c0.537,1.622,1.074,3.245,1.639,4.858c1.645,0.578,3.297,1.127,4.952,1.672
+		c1.766,0.584,3.524,1.188,5.299,1.736c2.159,0.668,4.333,1.27,6.503,1.885c1.748,0.496,3.487,1.016,5.243,1.473
+		c2.221,0.584,4.458,1.097,6.69,1.625c1.727,0.408,3.449,0.846,5.184,1.223c2.287,0.496,4.59,0.92,6.886,1.36
+		c1.701,0.326,3.397,0.683,5.103,0.977c2.372,0.408,4.759,0.738,7.14,1.088c1.651,0.242,3.297,0.519,4.952,0.732
+		c2.489,0.321,4.993,0.557,7.493,0.811c1.567,0.16,3.128,0.359,4.698,0.493c2.746,0.233,5.506,0.379,8.263,0.534
+		c1.336,0.076,2.667,0.195,4.006,0.25c4.1,0.176,8.214,0.266,12.334,0.266c2.985,0,5.967-0.061,8.946-0.154
+		c0.908-0.029,1.815-0.07,2.719-0.108c2.141-0.088,4.284-0.195,6.422-0.332c0.957-0.061,1.911-0.119,2.865-0.19
+		c2.434-0.178,4.864-0.388,7.286-0.627c0.543-0.053,1.086-0.094,1.625-0.152c2.932-0.307,5.858-0.662,8.777-1.059
+		c0.814-0.111,1.625-0.239,2.436-0.356c2.153-0.312,4.303-0.645,6.448-1.004c0.975-0.164,1.952-0.332,2.926-0.504
+		c2.153-0.385,4.301-0.797,6.442-1.231c0.785-0.158,1.573-0.307,2.358-0.473c2.856-0.604,5.707-1.246,8.54-1.938
+		c0.651-0.158,1.295-0.336,1.946-0.496c2.227-0.557,4.446-1.141,6.655-1.75c0.957-0.266,1.911-0.539,2.865-0.814
+		c2.004-0.578,4-1.178,5.99-1.797c0.881-0.274,1.762-0.543,2.641-0.826c2.774-0.896,5.54-1.821,8.286-2.801
+		c0.291-0.105,0.58-0.219,0.873-0.324c2.483-0.896,4.952-1.826,7.408-2.792c0.896-0.35,1.785-0.715,2.676-1.076
+		c1.92-0.776,3.831-1.57,5.733-2.389c0.896-0.385,1.795-0.768,2.688-1.164c0.463-0.205,0.92-0.426,1.381-0.633
+		c-0.233,0.012-0.469,0.006-0.703,0.018C338.903,661.069,336.63,661.137,334.351,661.137z"/>
+	<path fill="#9B3C2F" d="M321.116,669.323c-2.746,0.981-5.512,1.905-8.286,2.801C315.605,671.232,318.368,670.304,321.116,669.323z"
+		/>
+	<path fill="#9B3C2F" d="M310.187,672.949c-1.99,0.621-3.989,1.223-5.989,1.797C306.201,674.172,308.197,673.572,310.187,672.949z"
+		/>
+	<path fill="#9B3C2F" d="M301.328,675.565c-2.211,0.613-4.432,1.193-6.655,1.75C296.9,676.758,299.117,676.174,301.328,675.565z"/>
+	<path fill="#9B3C2F" d="M337.806,662.747c-1.902,0.817-3.813,1.614-5.733,2.389C333.993,664.358,335.903,663.563,337.806,662.747z"
+		/>
+	<path fill="#9B3C2F" d="M341.957,660.949c-0.029,0-0.055,0-0.084,0.003c-0.461,0.207-0.92,0.429-1.381,0.633
+		C340.98,661.367,341.471,661.165,341.957,660.949z"/>
+	<path fill="#9B3C2F" d="M281.83,680.221c-2.141,0.432-4.289,0.846-6.442,1.231C277.54,681.067,279.685,680.655,281.83,680.221z"/>
+	<path fill="#9B3C2F" d="M329.397,666.21c-2.457,0.963-4.925,1.897-7.408,2.792C324.472,668.107,326.94,667.173,329.397,666.21z"/>
+	<path fill="#9B3C2F" d="M243.024,685.345c-2.139,0.135-4.278,0.246-6.422,0.332C238.744,685.59,240.885,685.478,243.024,685.345z"
+		/>
+	<path fill="#9B3C2F" d="M233.882,685.783c-2.977,0.094-5.958,0.154-8.946,0.154C227.922,685.937,230.903,685.875,233.882,685.783z"
+		/>
+	<path fill="#9B3C2F" d="M183.193,682.849c-2.383-0.35-4.77-0.68-7.14-1.088C178.423,682.169,180.809,682.499,183.193,682.849z"/>
+	<path fill="#9B3C2F" d="M224.937,685.937c-4.123,0-8.234-0.09-12.334-0.266C216.703,685.846,220.814,685.937,224.937,685.937z"/>
+	<path fill="#9B3C2F" d="M253.174,684.527c-2.424,0.239-4.852,0.449-7.286,0.627C248.323,684.976,250.75,684.767,253.174,684.527z"
+		/>
+	<path fill="#9B3C2F" d="M263.579,683.316c-2.918,0.397-5.844,0.752-8.777,1.059C257.735,684.07,260.661,683.714,263.579,683.316z"
+		/>
+	<path fill="#9B3C2F" d="M272.461,681.957c-2.145,0.359-4.292,0.691-6.448,1.004C268.168,682.652,270.316,682.319,272.461,681.957z"
+		/>
+	<path fill="#9B3C2F" d="M208.597,685.42c-2.758-0.154-5.518-0.301-8.263-0.534C203.08,685.12,205.841,685.265,208.597,685.42z"/>
+	<path fill="#9B3C2F" d="M195.637,684.394c-2.5-0.254-5.004-0.49-7.493-0.811C190.633,683.904,193.136,684.14,195.637,684.394z"/>
+	<path fill="#9B3C2F" d="M130.192,669.808c0.006,0.018,0.012,0.037,0.018,0.055c1.633,0.575,3.288,1.074,4.931,1.616
+		C133.489,670.931,131.835,670.382,130.192,669.808z"/>
+	<path fill="#9B3C2F" d="M292.727,677.813c-2.836,0.692-5.684,1.334-8.54,1.938C287.043,679.147,289.891,678.503,292.727,677.813z"
+		/>
+	<path fill="#9B3C2F" d="M170.947,680.784c-2.299-0.441-4.602-0.863-6.886-1.36C166.346,679.921,168.648,680.343,170.947,680.784z"
+		/>
+	<path fill="#9B3C2F" d="M146.943,675.1c-2.17-0.615-4.344-1.217-6.503-1.885C142.598,673.881,144.772,674.484,146.943,675.1z"/>
+	<path fill="#9B3C2F" d="M158.877,678.199c-2.232-0.528-4.47-1.041-6.69-1.625C154.406,677.157,156.645,677.671,158.877,678.199z"/>
+	<path fill="#9B3C2F" d="M182.361,571.883c-1.161-1.178-2.346-2.337-3.463-3.548C180.015,569.549,181.201,570.705,182.361,571.883z"
+		/>
+	<path fill="#9B3C2F" d="M155.344,534.387c-0.797-1.57-1.625-3.122-2.366-4.718C153.718,531.262,154.547,532.817,155.344,534.387z"
+		/>
+	<path fill="#9B3C2F" d="M148.003,517.459c-0.625-1.721-1.278-3.432-1.838-5.176C146.724,514.027,147.378,515.737,148.003,517.459z"
+		/>
+	<path fill="#9B3C2F" d="M151.413,526.031c-0.711-1.643-1.453-3.27-2.106-4.94C149.957,522.761,150.698,524.388,151.413,526.031z"/>
+	<path fill="#9B3C2F" d="M145.126,508.697c-0.531-1.803-1.092-3.598-1.559-5.424C144.032,505.102,144.592,506.893,145.126,508.697z"
+		/>
+	<path fill="#9B3C2F" d="M142.788,499.781c-0.435-1.897-0.899-3.784-1.26-5.704C141.889,495.993,142.35,497.881,142.788,499.781z"/>
+	<path fill="#9B3C2F" d="M141.026,490.925c-0.348-2.063-0.711-4.123-0.975-6.209C140.314,486.803,140.682,488.862,141.026,490.925z"
+		/>
+	<path fill="#9B3C2F" d="M204.077,590.168c-1.346-0.934-2.711-1.846-4.02-2.819C201.364,588.322,202.733,589.235,204.077,590.168z"
+		/>
+	<path fill="#9B3C2F" d="M196.408,584.478c-1.287-1.018-2.594-2.014-3.842-3.067C193.814,582.468,195.121,583.464,196.408,584.478z"
+		/>
+	<path fill="#9B3C2F" d="M189.163,578.375c-1.223-1.097-2.469-2.174-3.653-3.305C186.694,576.201,187.94,577.278,189.163,578.375z"
+		/>
+	<path fill="#9B3C2F" d="M139.037,458.725c-0.105,2.303-0.175,4.61-0.175,6.923c0,5.587,0.362,11.117,0.957,16.59
+		c-0.596-5.474-0.954-11.003-0.954-16.59C138.863,463.335,138.931,461.027,139.037,458.725z"/>
+	<path fill="#9B3C2F" d="M176.015,565.032c-1.098-1.26-2.217-2.5-3.27-3.793C173.798,562.532,174.921,563.772,176.015,565.032z"/>
+	<path fill="#9B3C2F" d="M170.127,557.828c-1.027-1.336-2.08-2.655-3.057-4.026C168.047,555.17,169.1,556.49,170.127,557.828z"/>
+	<path fill="#9B3C2F" d="M164.709,550.3c-0.954-1.415-1.934-2.809-2.839-4.254C162.775,547.491,163.755,548.885,164.709,550.3z"/>
+	<path fill="#9B3C2F" d="M159.778,542.481c-0.879-1.491-1.783-2.967-2.608-4.487C157.995,539.513,158.899,540.99,159.778,542.481z"
+		/>
+	<path fill="#9B3C2F" d="M292.411,655.195c1.424,0.408,2.833,0.861,4.272,1.225C295.245,656.054,293.835,655.601,292.411,655.195z"
+		/>
+	<path fill="#9B3C2F" d="M283.359,652.29c1.438,0.514,2.862,1.065,4.319,1.535C286.221,653.355,284.799,652.8,283.359,652.29z"/>
+	<path fill="#9B3C2F" d="M301.713,657.541c1.391,0.303,2.766,0.656,4.169,0.922C304.479,658.197,303.102,657.848,301.713,657.541z"
+		/>
+	<path fill="#9B3C2F" d="M274.588,648.852c1.426,0.613,2.839,1.26,4.286,1.83C277.427,650.112,276.014,649.462,274.588,648.852z"/>
+	<path fill="#9B3C2F" d="M224.931,614.488c-1.133-1.182-2.209-2.428-3.305-3.651C222.722,612.06,223.799,613.306,224.931,614.488z"
+		/>
+	<path fill="#9B3C2F" d="M334.351,661.137c2.279,0,4.552-0.067,6.819-0.17C338.903,661.069,336.63,661.137,334.351,661.137z"/>
+	<path fill="#9B3C2F" d="M209.806,595.888c0.942,1.36,1.864,2.737,2.848,4.059C211.67,598.627,210.751,597.247,209.806,595.888z"/>
+	<path fill="#9B3C2F" d="M321.56,660.538c1.059,0.088,2.106,0.231,3.172,0.297C323.669,660.768,322.619,660.625,321.56,660.538z"/>
+	<path fill="#9B3C2F" d="M311.277,659.318c1.322,0.201,2.629,0.455,3.959,0.621C313.906,659.773,312.6,659.52,311.277,659.318z"/>
+	<path fill="#9B3C2F" d="M266.065,644.881c1.412,0.711,2.803,1.459,4.237,2.124C268.869,646.34,267.477,645.594,266.065,644.881z"/>
+	<path fill="#9B3C2F" d="M242.318,629.984c1.287,0.983,2.55,1.996,3.866,2.938C244.868,631.979,243.602,630.967,242.318,629.984z"/>
+	<path fill="#9B3C2F" d="M249.927,635.442c1.334,0.896,2.647,1.821,4.006,2.672C252.574,637.263,251.261,636.339,249.927,635.442z"
+		/>
+	<path fill="#9B3C2F" d="M235.056,624.058c1.229,1.068,2.436,2.159,3.694,3.186C237.492,626.216,236.284,625.126,235.056,624.058z"
+		/>
+	<path fill="#9B3C2F" d="M228.152,617.67c1.164,1.147,2.307,2.317,3.507,3.422C230.46,619.987,229.317,618.817,228.152,617.67z"/>
+	<path fill="#9B3C2F" d="M215.504,603.572c1.024,1.293,2.025,2.608,3.084,3.864C217.528,606.181,216.528,604.865,215.504,603.572z"
+		/>
+	<path fill="#9B3C2F" d="M257.852,640.414c1.375,0.805,2.731,1.639,4.131,2.401C260.583,642.054,259.225,641.216,257.852,640.414z"
+		/>
+	<path fill="#9B3C2F" d="M114.329,587.396c-0.175-4.1-0.266-8.21-0.266-12.333C114.063,579.186,114.154,583.297,114.329,587.396z"/>
+	<path fill="#9B3C2F" d="M139.051,458.045c-0.219,0.49-0.424,0.989-0.639,1.479c0.207-0.467,0.429-0.928,0.639-1.395
+		C139.051,458.1,139.051,458.072,139.051,458.045z"/>
+	<path fill="#9B3C2F" d="M118.548,524.616c0.385-2.159,0.799-4.309,1.234-6.456C119.347,520.307,118.933,522.46,118.548,524.616z"/>
+	<path fill="#9B3C2F" d="M134.861,467.945c0.779-1.932,1.582-3.854,2.404-5.771C136.443,464.091,135.64,466.013,134.861,467.945z"/>
+	<path fill="#9B3C2F" d="M120.249,515.816c0.604-2.86,1.248-5.708,1.938-8.543C121.497,510.112,120.853,512.959,120.249,515.816z"/>
+	<path fill="#9B3C2F" d="M116.415,611.841c-0.315-2.459-0.549-4.934-0.803-7.405C115.866,606.907,116.1,609.382,116.415,611.841z"/>
+	<path fill="#9B3C2F" d="M114.323,563.413c0.088-2.151,0.199-4.298,0.332-6.442C114.522,559.112,114.411,561.262,114.323,563.413z"
+		/>
+	<path fill="#9B3C2F" d="M117.04,533.985c0.312-2.153,0.645-4.303,1.004-6.448C117.681,529.681,117.352,531.828,117.04,533.985z"/>
+	<path fill="#9B3C2F" d="M118.239,623.935c-0.402-2.331-0.727-4.677-1.071-7.02C117.512,619.255,117.836,621.601,118.239,623.935z"
+		/>
+	<path fill="#9B3C2F" d="M123.42,647.793c-0.572-2.182-1.076-4.38-1.596-6.573C122.343,643.414,122.849,645.611,123.42,647.793z"/>
+	<path fill="#9B3C2F" d="M126.776,659.531c-0.654-2.115-1.243-4.248-1.846-6.376C125.533,655.286,126.123,657.416,126.776,659.531z"
+		/>
+	<path fill="#9B3C2F" d="M120.573,635.921c-0.487-2.25-0.904-4.514-1.336-6.778C119.669,631.404,120.085,633.672,120.573,635.921z"
+		/>
+	<path fill="#9B3C2F" d="M115.624,545.195c0.307-2.932,0.662-5.856,1.059-8.774C116.286,539.339,115.93,542.262,115.624,545.195z"/>
+	<path fill="#9B3C2F" d="M122.689,505.321c0.557-2.223,1.138-4.44,1.75-6.649C123.826,500.881,123.246,503.098,122.689,505.321z"/>
+	<path fill="#9B3C2F" d="M114.063,575.063c0-2.987,0.061-5.973,0.154-8.952C114.125,569.091,114.063,572.076,114.063,575.063z"/>
+	<path fill="#9B3C2F" d="M127.873,487.176c0.896-2.778,1.824-5.546,2.803-8.298C129.696,481.629,128.768,484.398,127.873,487.176z"
+		/>
+	<path fill="#9B3C2F" d="M115.114,599.66c-0.233-2.743-0.379-5.5-0.534-8.255C114.735,594.159,114.88,596.917,115.114,599.66z"/>
+	<path fill="#9B3C2F" d="M130.989,478.038c0.899-2.495,1.836-4.975,2.803-7.443C132.827,473.063,131.888,475.546,130.989,478.038z"
+		/>
+	<path fill="#9B3C2F" d="M125.25,495.804c0.578-2.008,1.178-4.006,1.801-5.995C126.428,491.8,125.828,493.799,125.25,495.804z"/>
+	<path fill="#9B3C2F" d="M114.846,554.117c0.178-2.434,0.388-4.86,0.627-7.282C115.233,549.256,115.024,551.683,114.846,554.117z"/>
+	<path fill="#9B3C2F" d="M128.549,664.95c0.534,1.611,1.021,3.235,1.584,4.841c0.018,0.006,0.035,0.012,0.055,0.018
+		C129.624,668.191,129.086,666.571,128.549,664.95z"/>
+	<path fill="#9B3C2F" d="M130.137,669.787c0.006,0.018,0.012,0.037,0.018,0.055c0.018,0.006,0.037,0.012,0.055,0.018
+		c-0.006-0.018-0.012-0.037-0.018-0.055C130.172,669.798,130.155,669.793,130.137,669.787z"/>
+	<path fill="#9B3C2F" d="M290.063,313.912h0.037c0.332-1.098,0.672-2.197,1.016-3.294c-0.277,0.113-0.555,0.222-0.832,0.338
+		c-2.077,0.863-4.143,1.756-6.2,2.67c-0.371,0.166-0.746,0.321-1.117,0.487c0.301-0.014,0.601-0.012,0.902-0.023
+		c1.625-0.07,3.25-0.108,4.878-0.129c0.438-0.006,0.869-0.032,1.307-0.035L290.063,313.912z"/>
+	<path fill="#9B3C2F" d="M288.753,313.963c-1.628,0.02-3.256,0.058-4.878,0.129C285.496,314.018,287.125,313.98,288.753,313.963z"/>
+	<path fill="#9B3C2F" d="M290.288,310.957c0.277-0.113,0.555-0.225,0.832-0.338c0.002-0.008,0.006-0.014,0.008-0.023
+		C290.845,310.712,290.567,310.84,290.288,310.957z"/>
+	<path fill="#9B3C2F" d="M282.97,314.114c0.371-0.166,0.746-0.321,1.117-0.487c-0.377,0.166-0.756,0.318-1.133,0.487
+		C282.961,314.114,282.965,314.114,282.97,314.114z"/>
+	<path fill="#9B3C2F" d="M486.094,509.934l-0.02,0.006c0,0.35-0.023,0.697-0.029,1.047c-0.018,1.766-0.061,3.524-0.14,5.284
+		c-0.012,0.256-0.008,0.514-0.02,0.768c0.014-0.032,0.026-0.064,0.041-0.096c1.094-2.436,2.145-4.893,3.172-7.358
+		c0.099-0.236,0.19-0.475,0.289-0.711c-1.098,0.348-2.197,0.686-3.291,1.016v0.046H486.094z"/>
+	<path fill="#9B3C2F" d="M485.883,517.041c0.014-0.032,0.026-0.064,0.041-0.096C485.91,516.977,485.895,517.01,485.883,517.041
+		L485.883,517.041z"/>
+	<path fill="#9B3C2F" d="M489.405,508.869c-0.006,0.004-0.014,0.004-0.02,0.006c-0.096,0.236-0.19,0.475-0.289,0.711
+		C489.195,509.347,489.305,509.111,489.405,508.869z"/>
+	<path fill="#9B3C2F" d="M486.043,510.987c-0.018,1.762-0.061,3.524-0.14,5.284C485.982,514.515,486.026,512.752,486.043,510.987z"
+		/>
+	<rect x="486.07" y="509.896" fill="#9B3C2F" width="0.02" height="0.041"/>
+	<path fill="#9B3C2F" d="M412.365,375.241c0.359,0.481,0.706,0.969,1.057,1.453c1.178,1.628,2.328,3.276,3.443,4.948
+		c0.199,0.297,0.418,0.584,0.613,0.881c0.315,0.207,0.613,0.435,0.924,0.645c1.637,1.092,3.253,2.215,4.846,3.37
+		c0.516,0.373,1.033,0.744,1.543,1.123c1.946,1.447,3.863,2.926,5.731,4.458c0.041,0.032,0.084,0.064,0.123,0.096
+		c0.064-0.061,0.131-0.119,0.195-0.181c1.887-1.795,3.702-3.645,5.479-5.526c0.435-0.457,0.867-0.92,1.293-1.383
+		c1.725-1.876,3.399-3.79,5.013-5.748c0.332-0.406,0.654-0.82,0.983-1.229c1.494-1.858,2.944-3.747,4.336-5.672
+		c0.213-0.295,0.435-0.58,0.648-0.875c1.491-2.098,2.909-4.243,4.28-6.417c0.318-0.508,0.639-1.012,0.951-1.523
+		c1.334-2.174,2.614-4.38,3.825-6.626c0.219-0.408,0.426-0.823,0.642-1.231c1.127-2.141,2.2-4.309,3.215-6.509
+		c0.146-0.315,0.301-0.627,0.447-0.942c1.071-2.369,2.06-4.78,2.999-7.212c0.201-0.525,0.402-1.053,0.601-1.582
+		c0.908-2.44,1.76-4.905,2.532-7.402c0.035-0.111,0.064-0.222,0.096-0.332c-0.096,0.029-0.193,0.055-0.285,0.084
+		c-2.535,0.782-5.036,1.645-7.511,2.567c-0.484,0.181-0.969,0.365-1.45,0.551c-2.471,0.951-4.919,1.958-7.327,3.046
+		c-0.256,0.117-0.508,0.242-0.764,0.362c-2.287,1.053-4.546,2.17-6.769,3.344c-0.344,0.181-0.695,0.356-1.039,0.539
+		c-2.299,1.237-4.557,2.549-6.784,3.915c-0.443,0.271-0.881,0.549-1.322,0.826c-2.235,1.406-4.444,2.865-6.597,4.399
+		c-0.201,0.143-0.397,0.297-0.598,0.441c-2.055,1.479-4.065,3.022-6.04,4.616c-0.326,0.262-0.66,0.52-0.983,0.785
+		c-2.022,1.66-3.997,3.391-5.932,5.17c-0.394,0.362-0.782,0.727-1.17,1.094c-1.943,1.83-3.852,3.702-5.702,5.649
+		c-0.041,0.043-0.082,0.09-0.123,0.135c0.026,0.032,0.053,0.067,0.078,0.102C409.413,371.34,410.906,373.274,412.365,375.241z"/>
+	<path fill="#9B3C2F" d="M412.365,375.241c-1.459-1.967-2.956-3.901-4.505-5.788C409.41,371.336,410.906,373.274,412.365,375.241z"
+		/>
+	<path fill="#9B3C2F" d="M416.864,381.642c-1.115-1.672-2.262-3.321-3.443-4.948C414.603,378.321,415.75,379.97,416.864,381.642z"/>
+	<path fill="#9B3C2F" d="M418.405,383.168c1.637,1.092,3.253,2.215,4.846,3.37C421.655,385.383,420.042,384.259,418.405,383.168z"/>
+	<path fill="#9B3C2F" d="M424.795,387.661c1.943,1.444,3.864,2.926,5.731,4.458C428.655,390.587,426.74,389.108,424.795,387.661z"/>
+	<path fill="#9B3C2F" d="M499.436,326.015c-0.531,0.037-1.059,0.078-1.59,0.119c-1.908,0.154-3.813,0.344-5.71,0.578
+		c-0.222,0.026-0.447,0.047-0.668,0.076c-2.1,0.268-4.19,0.592-6.27,0.954c-0.502,0.088-1.004,0.187-1.506,0.28
+		c-0.82,0.152-1.633,0.332-2.448,0.502c-0.094,0.365-0.205,0.723-0.301,1.088c-0.207,0.787-0.426,1.57-0.648,2.352
+		c-0.289,1.024-0.586,2.045-0.896,3.061c-0.242,0.793-0.487,1.584-0.741,2.372c-0.321,0.995-0.656,1.981-0.995,2.967
+		c-0.271,0.787-0.543,1.576-0.828,2.358c-0.359,0.983-0.735,1.958-1.112,2.932c-0.297,0.764-0.586,1.529-0.896,2.287
+		c-0.414,1.018-0.852,2.025-1.289,3.034c-0.301,0.695-0.59,1.397-0.902,2.086c-0.613,1.357-1.252,2.699-1.905,4.036
+		c-0.426,0.873-0.867,1.739-1.307,2.602c-0.537,1.051-1.071,2.1-1.631,3.137c-0.406,0.75-0.834,1.488-1.254,2.232
+		c-0.487,0.864-0.969,1.727-1.473,2.579c-0.459,0.776-0.934,1.541-1.403,2.305c-0.493,0.803-0.989,1.608-1.496,2.401
+		c-0.496,0.773-1.006,1.541-1.518,2.309c-0.514,0.77-1.033,1.537-1.561,2.299c-0.531,0.764-1.068,1.523-1.613,2.276
+		c-0.539,0.744-1.086,1.485-1.637,2.221c-0.563,0.75-1.127,1.496-1.704,2.238c-0.563,0.721-1.141,1.436-1.715,2.147
+		c-0.592,0.732-1.182,1.465-1.789,2.186c-0.601,0.711-1.217,1.412-1.832,2.115c-0.61,0.697-1.211,1.401-1.832,2.089
+		c-0.668,0.738-1.363,1.461-2.045,2.188c-1.018,1.08-2.051,2.147-3.102,3.201c-0.764,0.768-1.523,1.537-2.307,2.291l0.105,0.094
+		l-0.108,0.094c0.17,0.16,0.324,0.332,0.493,0.496c0.584,0.566,1.144,1.152,1.719,1.731c1.184,1.19,2.36,2.387,3.501,3.615
+		c0.615,0.66,1.211,1.334,1.812,2.002c1.065,1.184,2.115,2.381,3.139,3.594c0.596,0.706,1.178,1.418,1.76,2.133
+		c0.998,1.229,1.975,2.471,2.936,3.731c0.549,0.721,1.094,1.438,1.628,2.168c0.963,1.313,1.897,2.643,2.819,3.985
+		c0.479,0.697,0.963,1.387,1.426,2.089c0.977,1.477,1.914,2.973,2.836,4.481c0.365,0.592,0.741,1.176,1.098,1.774
+		c1.176,1.979,2.305,3.983,3.387,6.011c0.073,0.137,0.154,0.271,0.228,0.408c1.178,2.223,2.299,4.475,3.367,6.751
+		c0.178,0.379,0.336,0.768,0.51,1.149c0.849,1.85,1.668,3.708,2.442,5.59c0.291,0.711,0.56,1.436,0.844,2.151
+		c0.619,1.57,1.223,3.145,1.789,4.735c0.297,0.834,0.574,1.674,0.855,2.516c0.504,1.496,0.989,3.002,1.447,4.516
+		c0.268,0.893,0.528,1.789,0.779,2.684c0.42,1.491,0.817,2.988,1.19,4.491c0.228,0.914,0.453,1.824,0.662,2.743
+		c0.35,1.529,0.668,3.067,0.971,4.607c0.176,0.893,0.362,1.785,0.52,2.682c0.295,1.649,0.543,3.305,0.782,4.969
+		c0.113,0.791,0.248,1.578,0.347,2.375c0.268,2.11,0.484,4.227,0.666,6.352c0.029,0.348,0.076,0.691,0.105,1.041
+		c0.003,0.047,0.012,0.094,0.014,0.14c0.408-0.129,0.817-0.242,1.225-0.373c1.45-0.463,2.897-0.957,4.344-1.444
+		c1.199-0.402,2.393-0.811,3.586-1.229c0.569-1.619,1.106-3.245,1.645-4.87c0.598-1.803,1.213-3.598,1.774-5.409
+		c0.656-2.127,1.252-4.272,1.858-6.411c0.502-1.774,1.03-3.542,1.496-5.325c0.578-2.2,1.086-4.415,1.611-6.629
+		c0.414-1.748,0.858-3.487,1.237-5.241c0.493-2.27,0.914-4.557,1.351-6.842c0.33-1.715,0.688-3.426,0.986-5.147
+		c0.406-2.348,0.732-4.715,1.08-7.075c0.245-1.674,0.528-3.341,0.744-5.022c0.318-2.471,0.551-4.954,0.805-7.437
+		c0.16-1.584,0.365-3.16,0.498-4.75c0.234-2.743,0.379-5.5,0.534-8.255c0.076-1.34,0.195-2.67,0.25-4.012
+		c0.172-4.067,0.26-8.146,0.262-12.236c0-0.032,0.003-0.067,0.003-0.099c0-3.241-0.058-6.477-0.166-9.71
+		c-0.037-1.1-0.111-2.194-0.16-3.294c-0.096-2.129-0.187-4.26-0.33-6.387c-0.088-1.322-0.216-2.641-0.324-3.962
+		c-0.152-1.887-0.301-3.776-0.49-5.661c-0.146-1.436-0.324-2.865-0.49-4.295c-0.205-1.76-0.402-3.522-0.642-5.276
+		c-0.201-1.494-0.435-2.985-0.66-4.475c-0.254-1.68-0.508-3.364-0.791-5.039c-0.26-1.526-0.545-3.046-0.828-4.567
+		c-0.303-1.633-0.61-3.268-0.942-4.895c-0.315-1.537-0.651-3.069-0.989-4.602c-0.356-1.602-0.715-3.201-1.1-4.797
+		c-0.367-1.535-0.756-3.067-1.149-4.596c-0.216-0.844-0.447-1.68-0.672-2.521C500.574,325.963,500.005,325.978,499.436,326.015z"/>
+	<path fill="#9B3C2F" d="M505.712,454.031c-0.438,2.282-0.858,4.569-1.351,6.842C504.854,458.6,505.274,456.312,505.712,454.031z"/>
+	<path fill="#9B3C2F" d="M510.873,399.996c0-3.241-0.058-6.477-0.166-9.707C510.815,393.52,510.873,396.759,510.873,399.996
+		L510.873,399.996z"/>
+	<path fill="#9B3C2F" d="M507.775,441.808c-0.348,2.36-0.674,4.727-1.08,7.075C507.104,446.535,507.431,444.168,507.775,441.808z"/>
+	<path fill="#9B3C2F" d="M503.124,466.113c-0.525,2.211-1.033,4.429-1.611,6.629C502.092,470.541,502.598,468.324,503.124,466.113z"
+		/>
+	<path fill="#9B3C2F" d="M505.049,342.439c0.332,1.628,0.639,3.262,0.942,4.896C505.688,345.701,505.382,344.067,505.049,342.439z"
+		/>
+	<path fill="#9B3C2F" d="M509.324,429.352c-0.254,2.48-0.487,4.966-0.805,7.437C508.837,434.319,509.07,431.832,509.324,429.352z"/>
+	<path fill="#9B3C2F" d="M506.821,351.902c0.283,1.678,0.537,3.358,0.791,5.039C507.358,355.26,507.104,353.576,506.821,351.902z"/>
+	<path fill="#9B3C2F" d="M509.403,370.989c0.19,1.881,0.336,3.772,0.49,5.661C509.738,374.758,509.593,372.871,509.403,370.989z"/>
+	<path fill="#9B3C2F" d="M510.214,380.609c0.143,2.124,0.233,4.257,0.33,6.387C510.45,384.865,510.357,382.736,510.214,380.609z"/>
+	<path fill="#9B3C2F" d="M502.961,333.044c0.383,1.596,0.744,3.195,1.1,4.797C503.705,336.239,503.342,334.637,502.961,333.044z"/>
+	<path fill="#9B3C2F" d="M508.271,361.416c0.236,1.754,0.438,3.516,0.642,5.276C508.708,364.932,508.507,363.169,508.271,361.416z"
+		/>
+	<path fill="#9B3C2F" d="M500.017,478.063c-0.607,2.139-1.199,4.284-1.858,6.411C498.814,482.349,499.41,480.206,500.017,478.063z"
+		/>
+	<path fill="#9B3C2F" d="M501.814,328.449c-0.216-0.84-0.406-1.686-0.631-2.521c-0.014,0-0.026,0-0.041,0.004
+		C501.367,326.768,501.595,327.609,501.814,328.449z"/>
+	<path fill="#9B3C2F" d="M494.794,494.738c0.566-1.608,1.057-3.235,1.59-4.852c-0.539,1.625-1.076,3.253-1.645,4.87
+		C494.759,494.75,494.776,494.744,494.794,494.738z"/>
+	<path fill="#9B3C2F" d="M510.357,416.346c-0.154,2.754-0.301,5.512-0.534,8.255C510.056,421.86,510.202,419.102,510.357,416.346z"
+		/>
+	<path fill="#9B3C2F" d="M510.87,400.099c0,4.09-0.09,8.169-0.262,12.236C510.78,408.269,510.87,404.19,510.87,400.099z"/>
+	<path fill="#9B3C2F" d="M439.503,400.094l0.108-0.094l-0.105-0.094c-0.032,0.032-0.061,0.064-0.094,0.094
+		C439.445,400.029,439.474,400.061,439.503,400.094z"/>
+	<path fill="#9B3C2F" d="M474.606,451.804c0.291,0.711,0.56,1.436,0.844,2.151C475.169,453.24,474.901,452.519,474.606,451.804z"/>
+	<path fill="#9B3C2F" d="M477.237,458.693c0.297,0.834,0.574,1.674,0.855,2.516C477.813,460.368,477.536,459.527,477.237,458.693z"
+		/>
+	<path fill="#9B3C2F" d="M479.54,465.722c0.268,0.893,0.528,1.789,0.779,2.684C480.068,467.511,479.812,466.615,479.54,465.722z"/>
+	<path fill="#9B3C2F" d="M471.654,445.065c0.178,0.379,0.336,0.768,0.51,1.149C471.989,445.834,471.832,445.444,471.654,445.065z"/>
+	<path fill="#9B3C2F" d="M481.513,472.897c0.228,0.914,0.453,1.824,0.662,2.743C481.964,474.723,481.74,473.809,481.513,472.897z"/>
+	<path fill="#9B3C2F" d="M468.058,437.901c0.073,0.137,0.154,0.271,0.228,0.408C468.214,438.173,468.132,438.041,468.058,437.901z"
+		/>
+	<path fill="#9B3C2F" d="M485.463,496.623c0.029,0.348,0.076,0.691,0.105,1.041C485.541,497.314,485.492,496.97,485.463,496.623z"/>
+	<path fill="#9B3C2F" d="M483.146,480.246c0.176,0.893,0.362,1.785,0.52,2.682C483.508,482.032,483.322,481.139,483.146,480.246z"/>
+	<path fill="#9B3C2F" d="M484.451,487.897c0.113,0.791,0.248,1.578,0.348,2.375C484.695,489.475,484.564,488.688,484.451,487.897z"
+		/>
+	<path fill="#9B3C2F" d="M445.215,405.932c0.615,0.66,1.211,1.334,1.812,2.002C446.426,407.265,445.829,406.591,445.215,405.932z"/>
+	<path fill="#9B3C2F" d="M454.865,417.393c0.549,0.721,1.094,1.438,1.628,2.168C455.959,418.834,455.41,418.114,454.865,417.393z"/>
+	<path fill="#9B3C2F" d="M450.171,411.531c0.596,0.706,1.178,1.418,1.76,2.133C451.349,412.949,450.765,412.236,450.171,411.531z"/>
+	<path fill="#9B3C2F" d="M463.575,430.119c0.362,0.592,0.741,1.176,1.097,1.774C464.315,431.295,463.936,430.711,463.575,430.119z"
+		/>
+	<path fill="#9B3C2F" d="M439.996,400.59c0.584,0.566,1.144,1.152,1.719,1.731C441.14,401.742,440.58,401.155,439.996,400.59z"/>
+	<path fill="#9B3C2F" d="M459.311,423.548c0.479,0.697,0.963,1.387,1.426,2.089C460.272,424.935,459.787,424.243,459.311,423.548z"
+		/>
+	<path fill="#9B3C2F" d="M494.738,494.755c-1.193,0.42-2.389,0.826-3.586,1.229c1.19-0.4,2.387-0.773,3.575-1.188
+		C494.73,494.785,494.736,494.771,494.738,494.755z"/>
+	<path fill="#9B3C2F" d="M486.808,497.431c-0.408,0.131-0.817,0.245-1.225,0.373c0,0.012,0.004,0.023,0.004,0.035
+		C485.994,497.709,486.4,497.562,486.808,497.431z"/>
+	<path fill="#9B3C2F" d="M494.727,494.8c0.018-0.006,0.037-0.012,0.055-0.018c0.006-0.014,0.008-0.029,0.014-0.041
+		c-0.018,0.006-0.035,0.012-0.055,0.018C494.736,494.771,494.73,494.785,494.727,494.8z"/>
+	<path fill="#9B3C2F" d="M479.4,335.025c-0.242,0.793-0.487,1.584-0.741,2.372C478.913,336.607,479.157,335.816,479.4,335.025z"/>
+	<path fill="#9B3C2F" d="M477.661,340.361c-0.271,0.787-0.543,1.576-0.828,2.358C477.118,341.937,477.389,341.15,477.661,340.361z"
+		/>
+	<path fill="#9B3C2F" d="M473.538,350.974c-0.301,0.695-0.59,1.397-0.902,2.086C472.949,352.368,473.238,351.668,473.538,350.974z"
+		/>
+	<path fill="#9B3C2F" d="M475.721,345.651c-0.297,0.764-0.586,1.529-0.896,2.287C475.135,347.18,475.423,346.416,475.721,345.651z"
+		/>
+	<path fill="#9B3C2F" d="M470.732,357.095c-0.426,0.873-0.867,1.739-1.307,2.602C469.867,358.834,470.308,357.967,470.732,357.095z"
+		/>
+	<path fill="#9B3C2F" d="M441.814,397.617c1.053-1.053,2.086-2.121,3.102-3.201C443.897,395.495,442.865,396.562,441.814,397.617z"
+		/>
+	<path fill="#9B3C2F" d="M459.086,376.958c-0.531,0.764-1.068,1.523-1.613,2.276C458.019,378.479,458.555,377.72,459.086,376.958z"
+		/>
+	<path fill="#9B3C2F" d="M455.836,381.455c-0.563,0.75-1.127,1.496-1.704,2.238C454.707,382.951,455.273,382.205,455.836,381.455z"
+		/>
+	<path fill="#9B3C2F" d="M452.414,385.838c-0.592,0.732-1.182,1.465-1.789,2.186C451.232,387.303,451.822,386.57,452.414,385.838z"
+		/>
+	<path fill="#9B3C2F" d="M448.796,390.138c-0.61,0.697-1.211,1.401-1.832,2.089C447.585,391.538,448.186,390.835,448.796,390.138z"
+		/>
+	<path fill="#9B3C2F" d="M480.943,329.613c-0.207,0.787-0.426,1.57-0.648,2.352C480.517,331.182,480.736,330.401,480.943,329.613z"
+		/>
+	<path fill="#9B3C2F" d="M465.065,367.646c-0.459,0.776-0.934,1.541-1.403,2.305C464.134,369.186,464.607,368.421,465.065,367.646z"
+		/>
+	<path fill="#9B3C2F" d="M467.793,362.835c-0.406,0.75-0.834,1.488-1.254,2.232C466.956,364.322,467.384,363.587,467.793,362.835z"
+		/>
+	<path fill="#9B3C2F" d="M462.165,372.352c-0.496,0.773-1.006,1.541-1.518,2.307C461.159,373.893,461.666,373.127,462.165,372.352z"
+		/>
+	<path fill="#9B3C2F" d="M290.095,423.474c0.131,0.043,0.262,0.09,0.394,0.135c2.504,0.826,5.03,1.57,7.577,2.252
+		c0.484,0.129,0.969,0.26,1.456,0.385c2.498,0.639,5.01,1.211,7.54,1.713c0.504,0.099,1.012,0.193,1.52,0.285
+		c2.555,0.475,5.126,0.893,7.708,1.229c0.429,0.055,0.858,0.096,1.287,0.149c2.661,0.318,5.331,0.578,8.009,0.744
+		c0.219,0.014,0.441,0.02,0.66,0.032c2.623,0.149,5.255,0.213,7.89,0.216c0.406,0,0.814,0.012,1.219,0.008
+		c2.623-0.02,5.249-0.131,7.874-0.301c0.525-0.035,1.051-0.061,1.576-0.102c2.588-0.195,5.176-0.467,7.761-0.805
+		c0.528-0.07,1.053-0.143,1.582-0.219c2.626-0.377,5.249-0.817,7.866-1.346c0.166-0.035,0.336-0.073,0.502-0.105
+		c4.52-17.606,12.064-34.006,22.487-48.889c-0.029-0.012-0.059-0.026-0.09-0.037c-0.239-0.094-0.484-0.172-0.723-0.262
+		c-1.932-0.738-3.875-1.438-5.829-2.089c-0.758-0.25-1.523-0.473-2.282-0.711c-1.453-0.455-2.909-0.904-4.376-1.31
+		c-0.875-0.242-1.756-0.461-2.635-0.689c-1.371-0.353-2.746-0.691-4.126-1c-0.92-0.205-1.842-0.397-2.764-0.584
+		c-1.371-0.277-2.746-0.534-4.126-0.77c-0.916-0.158-1.836-0.312-2.758-0.449c-1.436-0.216-2.874-0.4-4.319-0.569
+		c-0.864-0.102-1.727-0.213-2.594-0.301c-1.619-0.16-3.25-0.28-4.878-0.385c-0.695-0.043-1.383-0.108-2.08-0.143
+		c-2.342-0.117-4.692-0.184-7.055-0.184c-2.008,0-4.009,0.043-6.005,0.129c-0.394,0.018-0.785,0.049-1.176,0.07
+		c-1.573,0.078-3.145,0.172-4.712,0.303c-0.607,0.053-1.213,0.123-1.821,0.181c-1.346,0.131-2.688,0.268-4.026,0.435
+		c-0.7,0.088-1.395,0.195-2.092,0.295c-1.24,0.176-2.48,0.359-3.714,0.566c-0.741,0.125-1.479,0.266-2.217,0.406
+		c-1.184,0.222-2.366,0.449-3.545,0.7c-0.758,0.164-1.518,0.336-2.273,0.51c-1.152,0.266-2.303,0.545-3.449,0.84
+		c-0.762,0.195-1.52,0.4-2.276,0.607c-1.144,0.315-2.282,0.648-3.42,0.992c-0.741,0.225-1.479,0.453-2.217,0.688
+		c-0.447,0.143-0.89,0.303-1.336,0.453c-0.639,7.884-0.965,15.756-0.965,23.453C289.127,407.706,289.454,415.586,290.095,423.474z"
+		/>
+	<path fill="#9B3C2F" d="M687.378,147.39c0.365,1.357,0.686,2.725,1.033,4.085c0.654,2.576,1.299,5.153,1.881,7.743
+		c0.35,1.553,0.666,3.114,0.992,4.671c0.508,2.428,0.995,4.858,1.442,7.3c0.297,1.628,0.575,3.259,0.844,4.893
+		c0.397,2.41,0.764,4.823,1.103,7.241c0.231,1.637,0.455,3.276,0.656,4.919c0.307,2.483,0.566,4.972,0.808,7.466
+		c0.154,1.573,0.318,3.143,0.447,4.718c0.221,2.734,0.383,5.477,0.531,8.22c0.073,1.336,0.172,2.667,0.228,4.006
+		c0.166,4.082,0.262,8.175,0.262,12.277c0,3.883-0.076,7.753-0.225,11.613c-0.049,1.295-0.154,2.579-0.219,3.872
+		c-0.131,2.559-0.248,5.118-0.443,7.665c-0.119,1.559-0.297,3.102-0.441,4.653c-0.211,2.27-0.4,4.546-0.66,6.807
+		c-0.19,1.645-0.441,3.276-0.656,4.913c-0.286,2.153-0.549,4.313-0.881,6.456c-0.26,1.686-0.58,3.362-0.869,5.042
+		c-0.359,2.077-0.695,4.161-1.098,6.227c-0.332,1.713-0.723,3.408-1.086,5.112c-0.429,2.02-0.84,4.041-1.31,6.048
+		c-0.406,1.727-0.867,3.44-1.305,5.159c-0.498,1.961-0.977,3.927-1.518,5.876c-0.479,1.736-1.012,3.457-1.523,5.184
+		c-0.566,1.911-1.115,3.828-1.719,5.727c-0.551,1.733-1.155,3.452-1.739,5.176c-0.633,1.87-1.252,3.743-1.922,5.599
+		c-0.625,1.727-1.299,3.434-1.952,5.149c-0.7,1.83-1.389,3.665-2.124,5.483c-0.697,1.715-1.441,3.414-2.17,5.118
+		c-0.764,1.789-1.518,3.577-2.319,5.351c-0.77,1.707-1.588,3.397-2.393,5.089c-0.828,1.745-1.645,3.493-2.51,5.22
+		c-0.844,1.69-1.731,3.358-2.606,5.034c-0.893,1.704-1.774,3.411-2.702,5.1c-0.918,1.674-1.879,3.329-2.83,4.989
+		c-0.951,1.657-1.893,3.315-2.877,4.957c-0.995,1.66-2.028,3.3-3.057,4.942c-1.006,1.608-2.01,3.219-3.049,4.811
+		c-1.074,1.643-2.182,3.264-3.288,4.89c-0.727,1.068-1.42,2.153-2.162,3.215l0.012,0.02l-0.029,0.037
+		c4.175,7.986,7.63,16.311,10.285,24.806c0.916,1.502,1.78,3.032,2.667,4.549c0.77,1.313,1.561,2.614,2.311,3.938
+		c0.924,1.633,1.797,3.294,2.69,4.946c0.727,1.346,1.477,2.676,2.182,4.03c0.858,1.651,1.669,3.323,2.495,4.989
+		c0.686,1.381,1.395,2.748,2.06,4.141c0.805,1.686,1.558,3.397,2.331,5.094c0.631,1.387,1.287,2.764,1.893,4.161
+		c0.752,1.727,1.453,3.477,2.174,5.22c0.575,1.391,1.176,2.774,1.731,4.175c0.697,1.762,1.34,3.542,2.002,5.316
+		c0.522,1.401,1.071,2.789,1.573,4.196c0.645,1.809,1.237,3.639,1.846,5.459c0.463,1.391,0.957,2.772,1.403,4.169
+		c0.586,1.842,1.117,3.702,1.669,5.555c0.414,1.395,0.855,2.78,1.248,4.181c0.525,1.873,0.995,3.761,1.485,5.643
+		c0.362,1.397,0.756,2.786,1.097,4.186c0.469,1.926,0.885,3.866,1.316,5.8c0.307,1.374,0.642,2.74,0.931,4.117
+		c0.406,1.94,0.75,3.895,1.117,5.844c0.26,1.389,0.551,2.768,0.791,4.163c0.342,1.981,0.627,3.973,0.928,5.964
+		c0.207,1.369,0.447,2.734,0.637,4.106c0.283,2.055,0.504,4.117,0.746,6.177c0.154,1.322,0.338,2.637,0.475,3.962
+		c0.222,2.156,0.383,4.324,0.557,6.489c0.099,1.234,0.233,2.465,0.318,3.702c0.16,2.354,0.26,4.721,0.365,7.085
+		c0.047,1.053,0.125,2.1,0.164,3.157c0.125,3.417,0.184,6.842,0.184,10.273c0,4.102-0.096,8.193-0.262,12.275
+		c-0.055,1.354-0.158,2.699-0.231,4.047c-0.146,2.725-0.307,5.45-0.528,8.167c-0.131,1.602-0.297,3.195-0.455,4.791
+		c-0.239,2.463-0.496,4.922-0.797,7.373c-0.207,1.678-0.435,3.346-0.672,5.018c-0.332,2.375-0.695,4.747-1.086,7.114
+		c-0.277,1.678-0.56,3.352-0.867,5.022c-0.435,2.383-0.913,4.759-1.406,7.131c-0.336,1.614-0.662,3.227-1.027,4.832
+		c-0.569,2.521-1.196,5.028-1.83,7.534c-0.362,1.426-0.697,2.86-1.082,4.28c-0.887,3.286-1.844,6.556-2.844,9.816
+		c-0.19,0.613-0.35,1.234-0.543,1.844c-0.018,0.055-0.032,0.108-0.047,0.164C790.336,620.626,861,515.877,861,400
+		c0-115.875-70.664-220.626-177.067-264.474c0.02,0.061,0.035,0.123,0.053,0.181c0.17,0.537,0.309,1.082,0.475,1.619
+		C685.49,140.668,686.471,144.02,687.378,147.39z"/>
+	<polygon fill="#9B3C2F" points="643.939,395.472 643.965,395.433 643.957,395.413 643.93,395.454 	"/>
+	<path fill="#9B3C2F" d="M368.013,520.855l-0.012-0.032c-1.33-0.143-2.655-0.315-3.983-0.475c-0.779-0.094-1.559-0.178-2.334-0.28
+		c-2.833-0.365-5.661-0.762-8.479-1.208c-0.362-0.058-0.721-0.125-1.08-0.184c-2.454-0.397-4.899-0.826-7.339-1.284
+		c-0.893-0.166-1.783-0.347-2.672-0.522c-1.969-0.388-3.933-0.797-5.891-1.223c-0.916-0.199-1.83-0.4-2.743-0.607
+		c-2.188-0.498-4.368-1.027-6.542-1.576c-0.596-0.152-1.196-0.289-1.791-0.443c-2.734-0.706-5.454-1.456-8.163-2.241
+		c-0.738-0.213-1.471-0.443-2.206-0.662c-1.395-0.418-2.795-0.823-4.184-1.258c11.822,28.734,28.17,55.168,48.723,78.767
+		c0.19-0.105,0.383-0.207,0.569-0.315c2.647-1.508,5.235-3.102,7.767-4.77c0.502-0.33,0.995-0.674,1.491-1.012
+		c2.504-1.698,4.963-3.455,7.347-5.31c0.099-0.078,0.205-0.149,0.307-0.228c2.442-1.911,4.8-3.927,7.114-6.002
+		c0.475-0.426,0.954-0.852,1.424-1.287c2.232-2.057,4.409-4.178,6.515-6.387c0.119-0.125,0.233-0.256,0.353-0.383
+		c-10.224-12.418-18.326-26.201-24.138-41.076L368.013,520.855z"/>
+	<path fill="#9B3C2F" d="M368.001,520.823l0.012,0.032l0.053,0.006c-0.003-0.012-0.008-0.02-0.012-0.029
+		C368.033,520.825,368.019,520.825,368.001,520.823z"/>
+	<path fill="#9B3C2F" d="M362.645,504.16c-0.418-1.596-0.805-3.198-1.17-4.803c-0.084-0.367-0.181-0.735-0.262-1.103
+		c-0.432-1.973-0.82-3.95-1.172-5.938c-0.102-0.572-0.184-1.144-0.277-1.715c-0.236-1.432-0.461-2.868-0.656-4.307
+		c-0.099-0.729-0.187-1.461-0.274-2.191c-0.16-1.316-0.303-2.631-0.429-3.954c-0.07-0.744-0.14-1.491-0.199-2.238
+		c-0.111-1.389-0.199-2.784-0.271-4.178c-0.035-0.651-0.078-1.301-0.105-1.955c-0.082-2.031-0.131-4.067-0.131-6.11
+		c0-0.006,0-0.008,0-0.014l0,0c0,0,0,0,0-0.004c0-2.573,0.09-5.153,0.225-7.735c0.037-0.738,0.094-1.477,0.143-2.215
+		c0.131-1.967,0.301-3.93,0.508-5.891c0.073-0.695,0.14-1.391,0.222-2.086c0.303-2.535,0.651-5.071,1.082-7.595
+		c-0.787,0.135-1.582,0.213-2.372,0.336c-2.06,0.318-4.117,0.642-6.183,0.875c-0.793,0.09-1.59,0.129-2.383,0.205
+		c-2.094,0.205-4.19,0.408-6.284,0.525c-0.861,0.047-1.719,0.041-2.579,0.076c-1.905,0.073-3.813,0.164-5.716,0.164
+		c-0.108,0-0.213-0.006-0.321-0.006c-0.356,0-0.709-0.02-1.065-0.023c-2.241-0.02-4.473-0.09-6.699-0.207
+		c-0.861-0.047-1.721-0.108-2.582-0.166c-1.836-0.129-3.665-0.289-5.491-0.481c-0.809-0.084-1.619-0.164-2.428-0.262
+		c-2.51-0.307-5.013-0.66-7.499-1.092c-0.055-0.008-0.113-0.018-0.17-0.026c-2.561-0.449-5.108-0.98-7.644-1.561
+		c-0.732-0.166-1.456-0.353-2.186-0.531c-1.844-0.453-3.682-0.936-5.509-1.456c-0.449-0.129-0.904-0.225-1.351-0.356
+		c0.356,2.83,0.762,5.651,1.205,8.468c0.111,0.7,0.234,1.395,0.35,2.094c0.344,2.089,0.703,4.175,1.094,6.255
+		c0.16,0.855,0.33,1.707,0.496,2.561c0.385,1.961,0.791,3.918,1.217,5.87c0.184,0.84,0.367,1.68,0.557,2.521
+		c0.473,2.077,0.975,4.147,1.494,6.212c0.166,0.666,0.326,1.334,0.498,1.998c1.426,5.495,3.014,10.941,4.764,16.336
+		c0.201,0.621,0.418,1.237,0.625,1.858c0.496,1.488,1.012,2.971,1.532,4.452c1.395,0.49,2.792,0.975,4.192,1.444
+		c0.735,0.245,1.465,0.502,2.2,0.741c2.67,0.867,5.354,1.701,8.05,2.489c0.149,0.043,0.301,0.082,0.453,0.125
+		c2.524,0.732,5.059,1.424,7.601,2.086c0.852,0.222,1.709,0.426,2.565,0.639c1.862,0.467,3.723,0.92,5.593,1.348
+		c0.995,0.228,1.99,0.447,2.988,0.662c1.771,0.385,3.548,0.752,5.327,1.106c1.006,0.199,2.01,0.397,3.02,0.586
+		c1.879,0.35,3.766,0.674,5.655,0.989c0.881,0.146,1.76,0.303,2.641,0.441c2.678,0.418,5.362,0.805,8.056,1.147
+		c0.078,0.008,0.158,0.023,0.236,0.032c0.012,0.004,0.026,0.004,0.037,0.004c-0.236-0.803-0.443-1.611-0.666-2.413
+		C363.012,505.505,362.819,504.834,362.645,504.16z"/>
+	<path fill="#9B3C2F" d="M357.824,471.773c0.026,0.654,0.07,1.305,0.105,1.955C357.895,473.077,357.85,472.426,357.824,471.773z"/>
+	<polygon fill="#9B3C2F" points="357.693,465.667 357.693,465.652 357.693,465.652 	"/>
+	<path fill="#9B3C2F" d="M362.645,504.16c0.178,0.674,0.371,1.346,0.555,2.016C363.012,505.505,362.819,504.834,362.645,504.16z"/>
+	<path fill="#9B3C2F" d="M361.212,498.254c0.082,0.367,0.178,0.735,0.262,1.103C361.389,498.986,361.294,498.622,361.212,498.254z"
+		/>
+	<path fill="#9B3C2F" d="M358.057,455.703c-0.049,0.738-0.102,1.477-0.143,2.215C357.955,457.176,358.008,456.441,358.057,455.703z"
+		/>
+	<path fill="#9B3C2F" d="M358.828,484.097c0.088,0.732,0.175,1.461,0.274,2.191C359.003,485.562,358.916,484.83,358.828,484.097z"/>
+	<path fill="#9B3C2F" d="M358.787,447.722c-0.084,0.695-0.149,1.391-0.222,2.086C358.639,449.114,358.705,448.417,358.787,447.722z"
+		/>
+	<path fill="#9B3C2F" d="M358.201,477.909c0.061,0.746,0.129,1.491,0.199,2.238C358.329,479.4,358.26,478.655,358.201,477.909z"/>
+	<path fill="#9B3C2F" d="M359.762,490.598c0.094,0.572,0.178,1.147,0.277,1.715C359.936,491.745,359.856,491.17,359.762,490.598z"/>
+	<path fill="#9B3C2F" d="M305.245,494.753c-0.52-1.479-1.035-2.961-1.532-4.452c0.493,1.482,0.975,2.965,1.491,4.438
+		C305.218,494.744,305.233,494.747,305.245,494.753z"/>
+	<path fill="#9B3C2F" d="M292.613,444.6c-0.441-2.815-0.846-5.637-1.205-8.468h-0.002
+		C291.764,438.963,292.173,441.785,292.613,444.6z"/>
+	<path fill="#9B3C2F" d="M294.554,455.51c0.385,1.961,0.791,3.919,1.217,5.87C295.345,459.426,294.939,457.471,294.554,455.51z"/>
+	<path fill="#9B3C2F" d="M298.324,472.109c1.426,5.495,3.014,10.941,4.764,16.336C301.338,483.05,299.75,477.602,298.324,472.109z"
+		/>
+	<path fill="#9B3C2F" d="M292.964,446.692c0.344,2.089,0.703,4.175,1.094,6.255C293.667,450.868,293.304,448.782,292.964,446.692z"
+		/>
+	<path fill="#9B3C2F" d="M296.33,463.898c0.473,2.078,0.975,4.147,1.494,6.212C297.305,468.044,296.803,465.972,296.33,463.898z"/>
+	<path fill="#9B3C2F" d="M298.271,437.948c-1.848-0.453-3.682-0.936-5.509-1.456C294.589,437.011,296.427,437.495,298.271,437.948z"
+		/>
+	<path fill="#9B3C2F" d="M357.5,440.463c-2.06,0.318-4.12,0.642-6.183,0.875C353.384,441.102,355.441,440.781,357.5,440.463z"/>
+	<path fill="#9B3C2F" d="M323.685,441.904c-1.836-0.129-3.665-0.289-5.491-0.481C320.019,441.615,321.849,441.776,323.685,441.904z"
+		/>
+	<path fill="#9B3C2F" d="M348.931,441.543c-2.094,0.205-4.19,0.408-6.284,0.525C344.741,441.951,346.836,441.746,348.931,441.543z"
+		/>
+	<path fill="#9B3C2F" d="M308.101,440.04c-2.565-0.449-5.108-0.98-7.644-1.561C302.991,439.06,305.538,439.593,308.101,440.04z"/>
+	<path fill="#9B3C2F" d="M315.768,441.158c-2.51-0.307-5.013-0.66-7.499-1.092C310.759,440.498,313.259,440.851,315.768,441.158z"/>
+	<path fill="#9B3C2F" d="M332.965,442.277c-2.238-0.018-4.47-0.09-6.699-0.207C328.492,442.187,330.727,442.258,332.965,442.277z"/>
+	<path fill="#9B3C2F" d="M334.351,442.307c1.902,0,3.807-0.09,5.716-0.164c-2.014,0.078-4.026,0.16-6.034,0.158
+		C334.138,442.301,334.243,442.307,334.351,442.307z"/>
+	<path fill="#9B3C2F" d="M344.219,505.391c-1.78-0.353-3.557-0.721-5.327-1.106C340.662,504.67,342.436,505.038,344.219,505.391z"/>
+	<polygon fill="#9B3C2F" points="363.864,508.591 363.864,508.589 363.826,508.585 	"/>
+	<path fill="#9B3C2F" d="M352.89,506.966c-1.887-0.312-3.772-0.639-5.655-0.989C349.118,506.327,351.003,506.651,352.89,506.966z"/>
+	<path fill="#9B3C2F" d="M305.259,494.79c1.387,0.487,2.786,0.94,4.181,1.406c-1.403-0.467-2.798-0.954-4.192-1.444
+		C305.25,494.765,305.253,494.779,305.259,494.79z"/>
+	<path fill="#9B3C2F" d="M363.587,508.554c-2.693-0.342-5.378-0.729-8.056-1.147C358.209,507.825,360.893,508.21,363.587,508.554z"
+		/>
+	<path fill="#9B3C2F" d="M327.742,501.636c-2.544-0.662-5.079-1.354-7.601-2.086C322.663,500.282,325.199,500.973,327.742,501.636z"
+		/>
+	<path fill="#9B3C2F" d="M319.69,499.424c-2.696-0.787-5.38-1.619-8.05-2.489C314.312,497.805,316.994,498.636,319.69,499.424z"/>
+	<path fill="#9B3C2F" d="M335.901,503.623c-1.87-0.429-3.735-0.881-5.593-1.348C332.169,502.742,334.03,503.197,335.901,503.623z"/>
+	<polygon fill="#9B3C2F" points="305.206,494.738 305.218,494.776 305.259,494.79 305.245,494.753 	"/>
+	<path fill="#9B3C2F" d="M420.739,165.867c1.438,0.995,2.844,2.025,4.245,3.063c0.475,0.353,0.969,0.694,1.441,1.053
+		c3.749,2.854,7.347,5.868,10.793,9.033c0.435,0.4,0.849,0.817,1.278,1.219c1.26,1.188,2.512,2.381,3.731,3.61
+		c0.555,0.56,1.088,1.138,1.633,1.704c1.059,1.103,2.115,2.209,3.139,3.344c0.58,0.642,1.147,1.301,1.715,1.955
+		c0.954,1.092,1.902,2.191,2.824,3.311c0.574,0.697,1.133,1.403,1.695,2.11c0.881,1.112,1.754,2.229,2.602,3.367
+		c0.549,0.732,1.092,1.473,1.625,2.217c0.826,1.144,1.633,2.303,2.428,3.469c0.514,0.756,1.024,1.514,1.523,2.282
+		c0.779,1.196,1.537,2.407,2.285,3.624c0.467,0.762,0.936,1.523,1.391,2.293c0.75,1.272,1.471,2.565,2.182,3.86
+		c0.406,0.741,0.823,1.473,1.217,2.223c0.738,1.401,1.441,2.819,2.135,4.245c0.326,0.672,0.668,1.33,0.986,2.008
+		c0.791,1.68,1.537,3.387,2.268,5.1c0.187,0.438,0.391,0.867,0.572,1.305c1.754,4.225,3.329,8.54,4.709,12.951
+		c0.061,0.099,0.113,0.201,0.176,0.301c4.745,7.796,9.13,15.826,13.138,24.03c0.129,0.262,0.262,0.52,0.388,0.782
+		c1.887,3.893,3.676,7.831,5.392,11.799c0.193,0.449,0.394,0.893,0.584,1.342c1.645,3.86,3.198,7.755,4.674,11.677
+		c0.119,0.318,0.26,0.627,0.379,0.945l0.012,0.002l0.006,0.014c0.359,0.135,0.709,0.291,1.068,0.429
+		c3.848,1.453,7.673,2.977,11.466,4.59c0.534,0.228,1.065,0.467,1.599,0.697c3.881,1.68,7.735,3.428,11.545,5.276
+		c0.365,0.178,0.723,0.365,1.088,0.543c3.965,1.94,7.896,3.956,11.77,6.071c0.102,0.055,0.205,0.117,0.307,0.172
+		c3.837,2.1,7.621,4.295,11.359,6.562c0.225,0.137,0.455,0.256,0.68,0.394c1.949,0.61,3.878,1.27,5.792,1.952
+		c0.166,0.061,0.338,0.111,0.508,0.172c2.221,0.803,4.415,1.657,6.585,2.555c0.631,0.26,1.243,0.551,1.87,0.82
+		c1.518,0.654,3.034,1.31,4.526,2.01c0.808,0.379,1.599,0.787,2.399,1.178c1.287,0.631,2.571,1.264,3.834,1.932
+		c0.858,0.453,1.701,0.928,2.547,1.395c1.184,0.654,2.364,1.31,3.528,1.993c0.863,0.508,1.715,1.033,2.567,1.559
+		c1.121,0.688,2.235,1.387,3.335,2.104c0.852,0.555,1.695,1.121,2.535,1.695c1.076,0.732,2.141,1.477,3.198,2.238
+		c0.826,0.596,1.649,1.196,2.463,1.807c1.045,0.785,2.075,1.584,3.096,2.395c0.791,0.627,1.582,1.252,2.358,1.893
+		c1.024,0.846,2.031,1.713,3.032,2.588c0.741,0.645,1.485,1.284,2.211,1.943c1.027,0.93,2.031,1.891,3.034,2.85
+		c0.666,0.639,1.342,1.264,1.998,1.914c1.092,1.086,2.153,2.203,3.213,3.323c0.531,0.56,1.08,1.106,1.602,1.678
+		c3.139,3.42,6.13,6.991,8.964,10.708c0.42,0.551,0.814,1.121,1.225,1.678c0.983,1.328,1.961,2.658,2.903,4.02
+		c0.479,0.691,0.934,1.403,1.403,2.106c0.642,0.959,1.299,1.905,1.92,2.879c0.228-0.338,0.469-0.672,0.697-1.01
+		c0.838-1.254,1.637-2.53,2.454-3.796c1.155-1.795,2.311-3.586,3.426-5.401c0.82-1.336,1.608-2.69,2.401-4.038
+		c1.047-1.774,2.092-3.548,3.102-5.339c0.785-1.397,1.543-2.809,2.305-4.219c0.957-1.774,1.908-3.548,2.827-5.337
+		c0.741-1.444,1.459-2.901,2.174-4.356c0.875-1.78,1.742-3.565,2.579-5.362c0.692-1.485,1.363-2.979,2.031-4.475
+		c0.799-1.795,1.582-3.594,2.342-5.407c0.639-1.518,1.26-3.04,1.87-4.569c0.723-1.815,1.43-3.633,2.118-5.462
+		c0.58-1.547,1.149-3.096,1.704-4.651c0.654-1.836,1.284-3.68,1.897-5.526c0.522-1.567,1.036-3.133,1.529-4.709
+		c0.584-1.862,1.138-3.735,1.684-5.608c0.459-1.582,0.92-3.16,1.351-4.75c0.516-1.897,0.995-3.801,1.473-5.707
+		c0.397-1.584,0.797-3.168,1.164-4.764c0.447-1.934,0.855-3.878,1.26-5.821c0.332-1.588,0.674-3.172,0.981-4.764
+		c0.379-1.979,0.711-3.968,1.051-5.956c0.266-1.573,0.549-3.143,0.787-4.721c0.312-2.055,0.575-4.117,0.844-6.183
+		c0.199-1.529,0.42-3.051,0.592-4.584c0.248-2.174,0.435-4.356,0.633-6.542c0.131-1.438,0.289-2.871,0.397-4.313
+		c0.184-2.422,0.301-4.852,0.424-7.286c0.061-1.217,0.154-2.428,0.201-3.647c0.137-3.653,0.211-7.318,0.211-10.991
+		c0-4.123-0.09-8.234-0.266-12.334c-0.059-1.363-0.178-2.713-0.256-4.073c-0.154-2.731-0.297-5.468-0.528-8.187
+		c-0.14-1.637-0.347-3.259-0.514-4.89c-0.248-2.43-0.479-4.864-0.787-7.286c-0.225-1.742-0.516-3.469-0.77-5.206
+		c-0.338-2.297-0.656-4.596-1.047-6.883c-0.307-1.785-0.683-3.557-1.024-5.337c-0.426-2.217-0.832-4.44-1.313-6.649
+		c-0.391-1.803-0.846-3.594-1.272-5.392c-0.514-2.165-1.012-4.333-1.576-6.486c-0.475-1.809-1.01-3.6-1.52-5.397
+		c-0.601-2.121-1.19-4.245-1.842-6.355c-0.555-1.797-1.167-3.58-1.76-5.372c-0.543-1.637-1.082-3.274-1.657-4.901
+		c-1.614-0.566-3.235-1.103-4.858-1.639c-1.803-0.598-3.604-1.213-5.415-1.774c-2.115-0.654-4.248-1.243-6.376-1.846
+		c-1.789-0.508-3.569-1.039-5.366-1.508c-2.182-0.572-4.379-1.076-6.573-1.596c-1.766-0.418-3.524-0.867-5.299-1.252
+		c-2.25-0.487-4.514-0.904-6.778-1.336c-1.736-0.332-3.466-0.697-5.211-0.998c-2.331-0.402-4.677-0.727-7.02-1.071
+		c-1.69-0.248-3.376-0.534-5.071-0.75c-2.459-0.315-4.934-0.549-7.405-0.803c-1.594-0.164-3.18-0.367-4.776-0.502
+		c-2.743-0.234-5.5-0.379-8.255-0.534c-1.336-0.076-2.667-0.195-4.009-0.25c-4.102-0.176-8.214-0.266-12.336-0.266
+		c-3.674,0-7.339,0.073-10.991,0.211c-1.217,0.047-2.424,0.14-3.639,0.201c-2.434,0.123-4.87,0.239-7.292,0.424
+		c-1.436,0.108-2.862,0.266-4.292,0.394c-2.191,0.199-4.385,0.388-6.567,0.637c-1.512,0.172-3.014,0.388-4.522,0.584
+		c-2.089,0.271-4.178,0.537-6.259,0.852c-1.543,0.236-3.078,0.51-4.616,0.77c-2.025,0.342-4.053,0.683-6.069,1.068
+		c-1.561,0.297-3.11,0.633-4.665,0.957c-1.979,0.414-3.956,0.828-5.923,1.284c-1.559,0.362-3.108,0.752-4.659,1.138
+		c-1.946,0.484-3.889,0.977-5.823,1.502c-1.549,0.42-3.09,0.869-4.63,1.316c-1.917,0.557-3.831,1.123-5.733,1.721
+		c-1.535,0.481-3.063,0.983-4.59,1.491c-1.891,0.631-3.778,1.272-5.655,1.94c-1.514,0.539-3.026,1.094-4.532,1.66
+		c-1.867,0.7-3.729,1.424-5.581,2.165c-1.491,0.596-2.979,1.202-4.458,1.826c-1.846,0.776-3.686,1.576-5.518,2.393
+		c-1.461,0.651-2.92,1.307-4.374,1.981c-1.83,0.852-3.651,1.733-5.462,2.626c-1.424,0.7-2.85,1.403-4.266,2.127
+		c-1.818,0.934-3.624,1.899-5.424,2.874c-1.387,0.75-2.772,1.491-4.147,2.264c-1.803,1.012-3.586,2.066-5.372,3.119
+		c-1.346,0.797-2.696,1.582-4.03,2.399c-1.797,1.103-3.574,2.247-5.351,3.393c-1.287,0.828-2.582,1.643-3.858,2.495
+		c-0.332,0.222-0.66,0.461-0.992,0.683c0.995,0.633,1.958,1.301,2.936,1.955C419.385,164.968,420.071,165.406,420.739,165.867z"/>
+	<path fill="#9B3C2F" d="M574.068,328.352c0.808,0.379,1.599,0.787,2.399,1.178C575.667,329.141,574.877,328.732,574.068,328.352z"
+		/>
+	<path fill="#9B3C2F" d="M614.213,355.916c0.666,0.639,1.342,1.266,1.998,1.914C615.555,357.182,614.879,356.555,614.213,355.916z"
+		/>
+	<path fill="#9B3C2F" d="M580.3,331.463c0.858,0.453,1.701,0.928,2.547,1.395C582.001,332.391,581.159,331.915,580.3,331.463z"/>
+	<path fill="#9B3C2F" d="M603.575,346.641c0.791,0.627,1.582,1.252,2.358,1.893C605.157,347.895,604.366,347.268,603.575,346.641z"
+		/>
+	<path fill="#9B3C2F" d="M619.424,361.157c0.531,0.56,1.08,1.106,1.602,1.678C620.504,362.262,619.955,361.717,619.424,361.157z"/>
+	<path fill="#9B3C2F" d="M634.118,379.241c0.479,0.691,0.934,1.403,1.403,2.106C635.052,380.644,634.596,379.932,634.118,379.241z"
+		/>
+	<path fill="#9B3C2F" d="M598.017,342.442c0.826,0.596,1.649,1.196,2.463,1.807C599.666,343.635,598.843,343.035,598.017,342.442z"
+		/>
+	<path fill="#9B3C2F" d="M608.968,351.122c0.741,0.645,1.485,1.284,2.211,1.943C610.452,352.406,609.706,351.767,608.968,351.122z"
+		/>
+	<path fill="#9B3C2F" d="M567.673,325.523c0.631,0.26,1.243,0.551,1.87,0.82C568.919,326.07,568.302,325.783,567.673,325.523z"/>
+	<path fill="#9B3C2F" d="M560.58,322.794c0.166,0.061,0.338,0.111,0.508,0.172C560.921,322.905,560.749,322.855,560.58,322.794z"/>
+	<path fill="#9B3C2F" d="M586.379,334.85c0.863,0.508,1.715,1.033,2.567,1.559C588.094,335.884,587.242,335.358,586.379,334.85z"/>
+	<path fill="#9B3C2F" d="M592.28,338.512c0.852,0.555,1.695,1.123,2.535,1.695C593.976,339.632,593.133,339.066,592.28,338.512z"/>
+	<path fill="#9B3C2F" d="M629.986,373.542c0.42,0.551,0.814,1.121,1.225,1.678C630.803,374.663,630.406,374.09,629.986,373.542z"/>
+	<path fill="#9B3C2F" d="M653.156,124.929c2.127,0.604,4.26,1.193,6.376,1.846C657.416,126.123,655.286,125.533,653.156,124.929z"/>
+	<path fill="#9B3C2F" d="M439.521,148.21c1.801-0.975,3.606-1.94,5.424-2.874C443.127,146.269,441.32,147.237,439.521,148.21z"/>
+	<path fill="#9B3C2F" d="M415.744,162.542c0.012,0.006,0.02,0.014,0.032,0.023c0.332-0.225,0.656-0.461,0.992-0.683
+		C416.426,162.104,416.08,162.314,415.744,162.542z"/>
+	<path fill="#9B3C2F" d="M591.405,114.58c2.754,0.154,5.512,0.301,8.255,0.534C596.917,114.88,594.159,114.735,591.405,114.58z"/>
+	<path fill="#9B3C2F" d="M542.279,115.928c2.182-0.248,4.377-0.438,6.567-0.637C546.656,115.49,544.463,115.68,542.279,115.928z"/>
+	<path fill="#9B3C2F" d="M564.073,114.274c3.653-0.137,7.318-0.211,10.991-0.211C571.39,114.063,567.726,114.137,564.073,114.274z"
+		/>
+	<path fill="#9B3C2F" d="M531.502,117.366c2.08-0.318,4.169-0.58,6.259-0.852C535.671,116.782,533.579,117.048,531.502,117.366z"/>
+	<path fill="#9B3C2F" d="M553.14,114.897c2.424-0.184,4.858-0.301,7.292-0.424C557.998,114.598,555.564,114.714,553.14,114.897z"/>
+	<path fill="#9B3C2F" d="M449.21,143.209c1.815-0.893,3.633-1.774,5.462-2.626C452.843,141.434,451.022,142.315,449.21,143.209z"/>
+	<path fill="#9B3C2F" d="M510.228,121.448c1.967-0.455,3.944-0.869,5.923-1.284C514.174,120.579,512.195,120.993,510.228,121.448z"
+		/>
+	<path fill="#9B3C2F" d="M604.436,115.616c2.471,0.25,4.946,0.484,7.405,0.803C609.382,116.1,606.907,115.866,604.436,115.616z"/>
+	<path fill="#9B3C2F" d="M469.021,134.382c1.852-0.741,3.714-1.461,5.581-2.165C472.736,132.921,470.877,133.641,469.021,134.382z"
+		/>
+	<path fill="#9B3C2F" d="M499.746,124.088c1.934-0.525,3.878-1.018,5.823-1.502C503.623,123.07,501.68,123.564,499.746,124.088z"/>
+	<path fill="#9B3C2F" d="M430.006,153.592c1.783-1.053,3.569-2.106,5.372-3.119C433.571,151.489,431.789,152.539,430.006,153.592z"
+		/>
+	<path fill="#9B3C2F" d="M669.808,130.192c-0.006-0.018-0.012-0.035-0.018-0.055c-1.605-0.563-3.227-1.053-4.841-1.584
+		C666.571,129.086,668.191,129.624,669.808,130.192z"/>
+	<path fill="#9B3C2F" d="M459.045,138.601c1.832-0.817,3.67-1.616,5.518-2.393C462.716,136.985,460.878,137.785,459.045,138.601z"/>
+	<path fill="#9B3C2F" d="M479.134,130.557c1.879-0.668,3.764-1.313,5.655-1.94C482.898,129.244,481.013,129.889,479.134,130.557z"/>
+	<path fill="#9B3C2F" d="M420.626,159.384c1.777-1.144,3.553-2.291,5.351-3.393C424.177,157.094,422.402,158.241,420.626,159.384z"
+		/>
+	<path fill="#9B3C2F" d="M641.22,121.824c2.194,0.52,4.391,1.024,6.573,1.596C645.611,122.849,643.414,122.343,641.22,121.824z"/>
+	<path fill="#9B3C2F" d="M575.063,114.063c4.123,0,8.234,0.09,12.333,0.266C583.297,114.154,579.186,114.063,575.063,114.063z"/>
+	<path fill="#9B3C2F" d="M629.143,119.237c2.262,0.435,4.526,0.849,6.778,1.336C633.672,120.085,631.404,119.669,629.143,119.237z"
+		/>
+	<path fill="#9B3C2F" d="M520.817,119.204c2.016-0.385,4.041-0.727,6.069-1.068C524.858,118.481,522.833,118.819,520.817,119.204z"
+		/>
+	<path fill="#9B3C2F" d="M616.912,117.168c2.342,0.344,4.688,0.668,7.02,1.071C621.601,117.836,619.255,117.512,616.912,117.168z"/>
+	<path fill="#9B3C2F" d="M489.379,127.125c1.905-0.598,3.817-1.164,5.733-1.721C493.198,125.961,491.284,126.528,489.379,127.125z"
+		/>
+	<path fill="#9B3C2F" d="M468.488,219.606c-0.394-0.746-0.811-1.482-1.217-2.223C467.677,218.124,468.093,218.859,468.488,219.606z"
+		/>
+	<path fill="#9B3C2F" d="M471.613,225.859c-0.318-0.677-0.66-1.336-0.986-2.008C470.953,224.523,471.295,225.182,471.613,225.859z"
+		/>
+	<path fill="#9B3C2F" d="M461.415,207.603c-0.498-0.768-1.01-1.526-1.523-2.282C460.403,206.079,460.913,206.837,461.415,207.603z"
+		/>
+	<path fill="#9B3C2F" d="M474.452,232.266c-0.181-0.441-0.385-0.867-0.572-1.305C474.067,231.397,474.27,231.825,474.452,232.266z"
+		/>
+	<path fill="#9B3C2F" d="M420.739,165.867c-0.668-0.461-1.351-0.899-2.028-1.351C419.385,164.968,420.071,165.406,420.739,165.867z"
+		/>
+	<path fill="#9B3C2F" d="M442.225,183.85c0.555,0.56,1.088,1.138,1.633,1.704C443.314,184.987,442.779,184.406,442.225,183.85z"/>
+	<path fill="#9B3C2F" d="M426.423,169.987c-0.473-0.359-0.963-0.697-1.441-1.053C425.46,169.287,425.951,169.625,426.423,169.987z"
+		/>
+	<path fill="#9B3C2F" d="M453.234,196.27c-0.56-0.706-1.121-1.412-1.695-2.11C452.113,194.855,452.673,195.564,453.234,196.27z"/>
+	<path fill="#9B3C2F" d="M465.089,213.523c-0.455-0.77-0.924-1.532-1.391-2.293C464.167,211.99,464.636,212.752,465.089,213.523z"/>
+	<path fill="#9B3C2F" d="M457.461,201.852c-0.537-0.744-1.076-1.482-1.625-2.217C456.385,200.369,456.928,201.108,457.461,201.852z"
+		/>
+	<path fill="#9B3C2F" d="M438.493,180.24c-0.429-0.402-0.844-0.82-1.278-1.219C437.65,179.42,438.064,179.837,438.493,180.24z"/>
+	<path fill="#9B3C2F" d="M448.714,190.849c-0.569-0.654-1.135-1.31-1.715-1.955C447.582,189.539,448.145,190.198,448.714,190.849z"
+		/>
+	<path fill="#9B3C2F" d="M673.221,140.463c0.651,2.11,1.24,4.233,1.842,6.355C674.461,144.696,673.871,142.572,673.221,140.463z"/>
+	<path fill="#9B3C2F" d="M679.43,164.093c0.479,2.209,0.887,4.429,1.313,6.649C680.317,168.523,679.909,166.299,679.43,164.093z"/>
+	<path fill="#9B3C2F" d="M681.849,273.199c-0.338,1.99-0.672,3.977-1.051,5.956C681.178,277.175,681.511,275.186,681.849,273.199z"
+		/>
+	<path fill="#9B3C2F" d="M684.705,251.17c-0.199,2.182-0.385,4.368-0.633,6.542C684.32,255.537,684.51,253.353,684.705,251.17z"/>
+	<path fill="#9B3C2F" d="M683.48,262.296c-0.268,2.063-0.528,4.129-0.844,6.183C682.952,266.423,683.212,264.361,683.48,262.296z"/>
+	<path fill="#9B3C2F" d="M679.821,283.918c-0.406,1.943-0.814,3.887-1.26,5.821C679.007,287.805,679.415,285.862,679.821,283.918z"
+		/>
+	<path fill="#9B3C2F" d="M677.397,294.501c-0.475,1.908-0.957,3.813-1.473,5.707C676.44,298.314,676.918,296.41,677.397,294.501z"/>
+	<path fill="#9B3C2F" d="M681.765,176.079c0.394,2.285,0.711,4.587,1.047,6.883C682.476,180.663,682.158,178.364,681.765,176.079z"
+		/>
+	<path fill="#9B3C2F" d="M667.759,325.458c-0.686,1.826-1.391,3.647-2.118,5.462C666.364,329.105,667.071,327.285,667.759,325.458z"
+		/>
+	<path fill="#9B3C2F" d="M659.397,345.369c-0.838,1.797-1.701,3.583-2.579,5.362C657.695,348.952,658.562,347.166,659.397,345.369z"
+		/>
+	<path fill="#9B3C2F" d="M663.77,335.486c-0.762,1.809-1.543,3.612-2.342,5.407C662.227,339.099,663.009,337.298,663.77,335.486z"/>
+	<path fill="#9B3C2F" d="M654.648,355.088c-0.92,1.789-1.87,3.565-2.827,5.337C652.777,358.653,653.728,356.879,654.648,355.088z"/>
+	<path fill="#9B3C2F" d="M685.671,212.604c0.176,4.1,0.266,8.21,0.266,12.334C685.937,220.814,685.846,216.703,685.671,212.604z"/>
+	<path fill="#9B3C2F" d="M685.937,224.937c0,3.674-0.073,7.339-0.211,10.991C685.863,232.274,685.937,228.61,685.937,224.937z"/>
+	<path fill="#9B3C2F" d="M684.886,200.344c0.231,2.719,0.373,5.456,0.528,8.187C685.263,205.8,685.12,203.063,684.886,200.344z"/>
+	<path fill="#9B3C2F" d="M685.525,239.574c-0.123,2.43-0.239,4.864-0.424,7.286C685.286,244.438,685.402,242.006,685.525,239.574z"
+		/>
+	<path fill="#9B3C2F" d="M674.572,304.961c-0.545,1.876-1.1,3.746-1.684,5.608C673.475,308.708,674.029,306.835,674.572,304.961z"/>
+	<path fill="#9B3C2F" d="M671.359,315.278c-0.615,1.846-1.243,3.69-1.897,5.526C670.117,318.969,670.744,317.128,671.359,315.278z"
+		/>
+	<path fill="#9B3C2F" d="M676.582,152.215c0.566,2.153,1.062,4.321,1.576,6.486C677.645,156.537,677.145,154.369,676.582,152.215z"
+		/>
+	<path fill="#9B3C2F" d="M683.585,188.168c0.312,2.422,0.539,4.855,0.787,7.286C684.125,193.023,683.894,190.587,683.585,188.168z"
+		/>
+	<path fill="#9B3C2F" d="M649.514,364.646c-1.006,1.791-2.055,3.565-3.102,5.339C647.463,368.211,648.508,366.437,649.514,364.646z"
+		/>
+	<path fill="#9B3C2F" d="M637.462,384.259c0.231-0.344,0.443-0.7,0.674-1.045c-0.228,0.342-0.469,0.672-0.697,1.01
+		C637.447,384.238,637.452,384.25,637.462,384.259z"/>
+	<path fill="#9B3C2F" d="M671.462,135.095c-0.539-1.628-1.033-3.264-1.602-4.884c-0.018-0.006-0.037-0.012-0.055-0.018
+		C670.379,131.821,670.919,133.458,671.462,135.095z"/>
+	<path fill="#9B3C2F" d="M644.012,374.02c-1.112,1.815-2.27,3.606-3.426,5.401C641.745,377.627,642.9,375.835,644.012,374.02z"/>
+	<path fill="#9B3C2F" d="M669.863,130.21c-0.006-0.018-0.012-0.037-0.018-0.055c-0.018-0.006-0.037-0.012-0.055-0.018
+		c0.006,0.018,0.012,0.035,0.018,0.055C669.825,130.198,669.843,130.204,669.863,130.21z"/>
+	<path fill="#9B3C2F" d="M661.137,465.64c0,0.003,0,0.006,0,0.008l0,0c0,0,0,0,0,0.003c0,83.66-68.062,151.722-151.722,151.722
+		c-0.52,0-1.03-0.035-1.549-0.041c-2.066-0.02-4.129-0.058-6.18-0.16c-1.041-0.053-2.074-0.154-3.114-0.227
+		c-1.541-0.108-3.081-0.207-4.612-0.362c-1.127-0.113-2.244-0.274-3.367-0.414c-1.43-0.178-2.862-0.348-4.286-0.566
+		c-1.155-0.178-2.303-0.394-3.452-0.598c-1.377-0.245-2.758-0.487-4.126-0.77c-1.164-0.239-2.319-0.514-3.475-0.782
+		c-1.342-0.312-2.684-0.627-4.018-0.975c-1.161-0.303-2.317-0.631-3.472-0.963c-1.316-0.377-2.626-0.764-3.93-1.176
+		c-1.155-0.365-2.309-0.75-3.457-1.144c-1.287-0.441-2.571-0.902-3.848-1.377c-1.149-0.429-2.297-0.869-3.438-1.328
+		c-0.545-0.219-1.1-0.412-1.645-0.637c-0.443,0.539-0.91,1.057-1.363,1.59c-0.461,0.545-0.924,1.088-1.391,1.625
+		c-1.223,1.403-2.471,2.78-3.737,4.135c-0.348,0.371-0.686,0.75-1.033,1.115c-1.643,1.719-3.321,3.403-5.036,5.036
+		c-0.236,0.225-0.484,0.441-0.721,0.666c-1.471,1.383-2.971,2.737-4.496,4.059c-0.502,0.435-1.006,0.861-1.514,1.287
+		c-1.351,1.141-2.725,2.258-4.114,3.352c-0.493,0.388-0.983,0.782-1.482,1.161c-1.826,1.397-3.676,2.766-5.567,4.082
+		c-0.029,0.02-0.059,0.043-0.09,0.064c-1.68,1.167-3.387,2.305-5.118,3.408c0.318,0.213,0.631,0.441,0.948,0.654
+		c1.342,0.896,2.702,1.754,4.059,2.623c1.713,1.1,3.422,2.206,5.153,3.268c1.389,0.852,2.795,1.672,4.198,2.5
+		c1.725,1.018,3.452,2.037,5.194,3.016c1.43,0.805,2.874,1.578,4.315,2.358c1.745,0.942,3.489,1.879,5.252,2.78
+		c1.465,0.75,2.938,1.477,4.411,2.2c1.768,0.869,3.539,1.727,5.321,2.559c1.491,0.695,2.991,1.368,4.493,2.037
+		c1.795,0.799,3.594,1.582,5.403,2.342c1.512,0.636,3.032,1.254,4.552,1.864c1.824,0.729,3.653,1.438,5.491,2.13
+		c1.535,0.578,3.073,1.141,4.616,1.692c1.846,0.66,3.706,1.293,5.567,1.911c1.553,0.516,3.108,1.027,4.668,1.518
+		c1.879,0.59,3.77,1.15,5.661,1.698c1.561,0.455,3.125,0.908,4.694,1.334c1.914,0.522,3.84,1.006,5.768,1.488
+		c1.567,0.391,3.133,0.787,4.709,1.15c1.952,0.453,3.915,0.863,5.876,1.272c1.567,0.326,3.133,0.666,4.709,0.969
+		c1.996,0.383,4.003,0.717,6.007,1.059c1.559,0.262,3.114,0.543,4.68,0.782c2.06,0.312,4.129,0.575,6.2,0.844
+		c1.523,0.199,3.043,0.418,4.573,0.592c2.176,0.248,4.368,0.438,6.556,0.636c1.432,0.129,2.86,0.286,4.295,0.394
+		c2.428,0.184,4.87,0.301,7.309,0.424c1.208,0.061,2.413,0.154,3.624,0.199c3.653,0.137,7.318,0.211,10.994,0.211
+		c4.123,0,8.234-0.09,12.334-0.266c1.36-0.058,2.711-0.178,4.067-0.256c2.734-0.154,5.471-0.297,8.193-0.528
+		c1.628-0.137,3.245-0.344,4.866-0.51c2.44-0.25,4.884-0.479,7.315-0.791c1.73-0.221,3.446-0.51,5.17-0.764
+		c2.309-0.338,4.618-0.66,6.915-1.053c1.785-0.307,3.557-0.68,5.337-1.024c2.217-0.426,4.44-0.832,6.649-1.313
+		c1.809-0.394,3.604-0.849,5.407-1.275c2.159-0.514,4.321-1.01,6.466-1.573c1.821-0.479,3.624-1.016,5.436-1.529
+		c2.106-0.598,4.219-1.182,6.311-1.83c1.824-0.563,3.63-1.182,5.442-1.783c1.616-0.534,3.233-1.071,4.841-1.633
+		c0.572-1.631,1.115-3.27,1.657-4.911c0.586-1.777,1.196-3.545,1.748-5.331c0.676-2.194,1.289-4.403,1.914-6.608
+		c0.481-1.704,0.989-3.399,1.438-5.112c0.604-2.297,1.135-4.608,1.68-6.919c0.391-1.651,0.809-3.294,1.17-4.952
+		c0.516-2.381,0.959-4.776,1.415-7.171c0.307-1.608,0.645-3.209,0.924-4.823c0.424-2.459,0.77-4.934,1.129-7.408
+		c0.227-1.567,0.493-3.128,0.697-4.7c0.33-2.567,0.575-5.147,0.838-7.726c0.152-1.491,0.342-2.977,0.47-4.47
+		c0.239-2.803,0.388-5.622,0.545-8.438c0.07-1.281,0.187-2.555,0.242-3.84c0.176-4.102,0.266-8.216,0.266-12.339
+		c0-2.985-0.061-5.967-0.154-8.946c-0.029-0.908-0.07-1.812-0.108-2.719c-0.088-2.145-0.195-4.286-0.332-6.425
+		c-0.061-0.954-0.119-1.908-0.19-2.862c-0.178-2.436-0.388-4.87-0.627-7.298c-0.053-0.537-0.094-1.076-0.149-1.614
+		c-0.307-2.932-0.662-5.858-1.059-8.776c-0.111-0.814-0.239-1.628-0.356-2.442c-0.312-2.156-0.645-4.307-1.004-6.452
+		c-0.164-0.971-0.33-1.94-0.502-2.909c-0.385-2.162-0.799-4.319-1.237-6.472c-0.158-0.776-0.303-1.555-0.467-2.331
+		c-0.604-2.862-1.248-5.716-1.94-8.554c-0.154-0.639-0.326-1.27-0.487-1.908c-0.56-2.241-1.147-4.473-1.762-6.699
+		c-0.262-0.948-0.534-1.893-0.805-2.842c-0.58-2.016-1.184-4.024-1.809-6.025c-0.271-0.873-0.537-1.745-0.817-2.612
+		c-0.896-2.78-1.824-5.552-2.807-8.304c-0.099-0.274-0.205-0.545-0.303-0.817c-0.902-2.5-1.842-4.987-2.813-7.464
+		c-0.35-0.89-0.711-1.774-1.068-2.658c-0.776-1.92-1.573-3.834-2.389-5.739c-0.385-0.899-0.77-1.801-1.167-2.696
+		c-0.205-0.461-0.424-0.916-0.631-1.377c0.012,0.23,0.006,0.467,0.018,0.697C661.069,461.094,661.137,463.364,661.137,465.64z"/>
+	<path fill="#9B3C2F" d="M661.137,465.64c0-2.276-0.067-4.546-0.17-6.816C661.069,461.091,661.137,463.362,661.137,465.64z"/>
+	<path fill="#9B3C2F" d="M467.759,611.517c1.155,0.33,2.311,0.66,3.472,0.963C470.072,612.177,468.914,611.849,467.759,611.517z"/>
+	<path fill="#9B3C2F" d="M482.855,615.004c1.149,0.205,2.297,0.42,3.452,0.598C485.15,615.424,484.004,615.209,482.855,615.004z"/>
+	<path fill="#9B3C2F" d="M453.085,606.491c1.141,0.457,2.287,0.899,3.438,1.328C455.373,607.389,454.226,606.948,453.085,606.491z"
+		/>
+	<path fill="#9B3C2F" d="M460.371,609.195c1.149,0.394,2.303,0.779,3.457,1.144C462.673,609.974,461.52,609.589,460.371,609.195z"/>
+	<path fill="#9B3C2F" d="M475.251,613.455c1.158,0.268,2.313,0.539,3.475,0.782C477.565,613.994,476.409,613.723,475.251,613.455z"
+		/>
+	<path fill="#9B3C2F" d="M490.592,616.168c1.123,0.14,2.241,0.297,3.367,0.414C492.833,616.469,491.716,616.308,490.592,616.168z"/>
+	<path fill="#9B3C2F" d="M661.137,465.652L661.137,465.652c0,83.658-68.062,151.718-151.722,151.718
+		c-0.52,0-1.033-0.032-1.549-0.037c0.516,0.006,1.03,0.041,1.549,0.041C593.075,617.373,661.137,549.311,661.137,465.652z"/>
+	<path fill="#9B3C2F" d="M498.572,616.944c1.039,0.073,2.072,0.176,3.113,0.227C500.644,617.119,499.611,617.018,498.572,616.944z"
+		/>
+	<path fill="#9B3C2F" d="M664.967,671.441c1.605-0.531,3.224-1.018,4.821-1.578c0.006-0.018,0.012-0.035,0.018-0.055
+		C668.2,670.371,666.583,670.908,664.967,671.441z"/>
+	<path fill="#9B3C2F" d="M526.836,681.855c-2.008-0.338-4.012-0.677-6.007-1.059C522.825,681.178,524.832,681.517,526.836,681.855z"
+		/>
+	<path fill="#9B3C2F" d="M537.716,683.483c-2.069-0.268-4.141-0.531-6.2-0.844C533.577,682.952,535.645,683.212,537.716,683.483z"/>
+	<path fill="#9B3C2F" d="M505.534,677.405c-1.926-0.481-3.852-0.965-5.768-1.488C501.682,676.44,503.608,676.924,505.534,677.405z"
+		/>
+	<path fill="#9B3C2F" d="M635.907,679.43c-2.209,0.479-4.429,0.887-6.649,1.313C631.477,680.317,633.698,679.909,635.907,679.43z"/>
+	<path fill="#9B3C2F" d="M647.779,676.582c-2.147,0.563-4.309,1.059-6.466,1.573C643.469,677.641,645.631,677.145,647.779,676.582z"
+		/>
+	<path fill="#9B3C2F" d="M587.396,685.671c-4.1,0.176-8.214,0.266-12.333,0.266C579.186,685.937,583.297,685.846,587.396,685.671z"
+		/>
+	<path fill="#9B3C2F" d="M575.063,685.937c-3.674,0-7.339-0.073-10.994-0.211C567.726,685.863,571.39,685.937,575.063,685.937z"/>
+	<path fill="#9B3C2F" d="M560.446,685.525c-2.44-0.123-4.878-0.239-7.309-0.424C555.568,685.286,558.006,685.402,560.446,685.525z"
+		/>
+	<path fill="#9B3C2F" d="M548.842,684.708c-2.188-0.199-4.377-0.388-6.556-0.637C544.465,684.32,546.653,684.51,548.842,684.708z"/>
+	<path fill="#9B3C2F" d="M516.123,679.831c-1.963-0.412-3.924-0.823-5.876-1.272C512.195,679.007,514.158,679.419,516.123,679.831z"
+		/>
+	<path fill="#9B3C2F" d="M435.319,649.495c-1.742-0.981-3.469-1.998-5.194-3.016C431.852,647.499,433.577,648.514,435.319,649.495z"
+		/>
+	<path fill="#9B3C2F" d="M454.617,659.394c-1.783-0.832-3.553-1.69-5.321-2.559C451.066,657.705,452.834,658.562,454.617,659.394z"
+		/>
+	<path fill="#9B3C2F" d="M444.887,654.632c-1.76-0.904-3.507-1.842-5.252-2.78C441.379,652.794,443.123,653.731,444.887,654.632z"/>
+	<path fill="#9B3C2F" d="M425.927,643.98c-1.73-1.062-3.44-2.165-5.153-3.268C422.487,641.814,424.197,642.918,425.927,643.98z"/>
+	<path fill="#9B3C2F" d="M415.741,637.458c0.324,0.216,0.654,0.418,0.977,0.633c-0.318-0.213-0.631-0.441-0.948-0.654
+		C415.762,637.444,415.75,637.45,415.741,637.458z"/>
+	<path fill="#9B3C2F" d="M659.525,673.224c-2.094,0.648-4.204,1.231-6.311,1.83C655.321,674.455,657.431,673.871,659.525,673.224z"
+		/>
+	<path fill="#9B3C2F" d="M495.071,674.584c-1.891-0.549-3.782-1.109-5.661-1.698C491.292,673.472,493.181,674.033,495.071,674.584z"
+		/>
+	<path fill="#9B3C2F" d="M464.517,663.774c-1.809-0.762-3.61-1.543-5.403-2.342C460.907,662.227,462.704,663.012,464.517,663.774z"
+		/>
+	<path fill="#9B3C2F" d="M484.742,671.369c-1.862-0.619-3.717-1.252-5.567-1.911C481.025,670.114,482.881,670.747,484.742,671.369z"
+		/>
+	<path fill="#9B3C2F" d="M474.559,667.765c-1.838-0.692-3.668-1.401-5.491-2.13C470.892,666.364,472.721,667.073,474.559,667.765z"
+		/>
+	<path fill="#9B3C2F" d="M599.656,684.886c-2.723,0.231-5.459,0.373-8.193,0.528C594.198,685.263,596.935,685.12,599.656,684.886z"
+		/>
+	<path fill="#9B3C2F" d="M611.838,683.585c-2.43,0.312-4.876,0.543-7.315,0.791C606.966,684.125,609.408,683.898,611.838,683.585z"
+		/>
+	<path fill="#9B3C2F" d="M623.923,681.765c-2.297,0.397-4.608,0.715-6.915,1.053C619.317,682.479,621.628,682.161,623.923,681.765z"
+		/>
+	<path fill="#9B3C2F" d="M420.981,633.963c-0.029,0.02-0.058,0.043-0.09,0.064C420.921,634.007,420.95,633.987,420.981,633.963z"/>
+	<path fill="#9B3C2F" d="M428.031,628.72c-0.493,0.388-0.983,0.782-1.482,1.161C427.047,629.5,427.535,629.109,428.031,628.72z"/>
+	<path fill="#9B3C2F" d="M433.659,624.078c-0.502,0.435-1.01,0.861-1.514,1.287C432.653,624.939,433.16,624.513,433.659,624.078z"/>
+	<path fill="#9B3C2F" d="M444.948,613.204c-0.348,0.371-0.686,0.75-1.033,1.115C444.262,613.953,444.6,613.574,444.948,613.204z"/>
+	<path fill="#9B3C2F" d="M438.876,619.354c-0.236,0.225-0.484,0.441-0.721,0.666C438.392,619.795,438.64,619.582,438.876,619.354z"
+		/>
+	<path fill="#9B3C2F" d="M450.077,607.442c-0.461,0.545-0.924,1.088-1.391,1.625C449.155,608.53,449.616,607.987,450.077,607.442z"
+		/>
+	<path fill="#9B3C2F" d="M675.561,498.66c0.615,2.227,1.202,4.458,1.762,6.699C676.76,503.118,676.176,500.886,675.561,498.66z"/>
+	<path fill="#9B3C2F" d="M666.208,470.597c0.971,2.475,1.911,4.963,2.813,7.464C668.118,475.561,667.175,473.072,666.208,470.597z"
+		/>
+	<path fill="#9B3C2F" d="M677.811,507.267c0.692,2.842,1.336,5.692,1.94,8.554C679.147,512.959,678.503,510.106,677.811,507.267z"/>
+	<path fill="#9B3C2F" d="M685.345,556.976c0.135,2.139,0.246,4.28,0.332,6.425C685.59,561.256,685.478,559.115,685.345,556.976z"/>
+	<path fill="#9B3C2F" d="M685.783,566.118c0.094,2.979,0.154,5.958,0.154,8.946C685.937,572.076,685.875,569.097,685.783,566.118z"
+		/>
+	<path fill="#9B3C2F" d="M678.249,640.931c-0.545,2.311-1.076,4.622-1.68,6.919C677.169,645.553,677.703,643.238,678.249,640.931z"
+		/>
+	<path fill="#9B3C2F" d="M684.527,546.817c0.239,2.428,0.449,4.86,0.627,7.298C684.976,551.677,684.767,549.245,684.527,546.817z"/>
+	<path fill="#9B3C2F" d="M685.937,575.063c0,4.126-0.09,8.237-0.266,12.339C685.846,583.3,685.937,579.189,685.937,575.063z"/>
+	<path fill="#9B3C2F" d="M680.218,518.153c0.435,2.151,0.849,4.309,1.237,6.472C681.067,522.46,680.653,520.303,680.218,518.153z"/>
+	<path fill="#9B3C2F" d="M669.32,478.878c0.983,2.752,1.911,5.524,2.807,8.304C671.232,484.4,670.304,481.629,669.32,478.878z"/>
+	<path fill="#9B3C2F" d="M675.127,652.958c-0.625,2.206-1.237,4.415-1.914,6.608C673.893,657.375,674.502,655.166,675.127,652.958z"
+		/>
+	<path fill="#9B3C2F" d="M681.957,527.531c0.359,2.145,0.695,4.295,1.004,6.452C682.652,531.828,682.319,529.678,681.957,527.531z"
+		/>
+	<path fill="#9B3C2F" d="M683.316,536.424c0.397,2.918,0.752,5.844,1.059,8.777C684.072,542.268,683.714,539.345,683.316,536.424z"
+		/>
+	<path fill="#9B3C2F" d="M669.808,669.808c0.018-0.006,0.035-0.012,0.055-0.018c0.569-1.619,1.065-3.262,1.605-4.89
+		C670.922,666.536,670.379,668.177,669.808,669.808z"/>
+	<path fill="#9B3C2F" d="M672.944,489.796c0.625,2.002,1.229,4.009,1.809,6.025C674.176,493.805,673.568,491.797,672.944,489.796z"
+		/>
+	<path fill="#9B3C2F" d="M682.884,616.58c-0.359,2.471-0.703,4.948-1.129,7.408C682.179,621.525,682.523,619.051,682.884,616.58z"/>
+	<path fill="#9B3C2F" d="M660.949,458.045c0,0.029,0,0.055,0.003,0.084c0.207,0.461,0.426,0.916,0.631,1.377
+		C661.367,459.02,661.165,458.529,660.949,458.045z"/>
+	<path fill="#9B3C2F" d="M662.747,462.2c0.817,1.905,1.617,3.817,2.389,5.739C664.36,466.017,663.563,464.105,662.747,462.2z"/>
+	<path fill="#9B3C2F" d="M684.417,604.153c-0.26,2.579-0.504,5.159-0.838,7.726C683.909,609.312,684.157,606.733,684.417,604.153z"
+		/>
+	<path fill="#9B3C2F" d="M680.831,628.808c-0.455,2.393-0.899,4.791-1.415,7.171C679.932,633.598,680.376,631.203,680.831,628.808z"
+		/>
+	<path fill="#9B3C2F" d="M685.432,591.245c-0.158,2.815-0.307,5.634-0.545,8.438C685.125,596.879,685.275,594.061,685.432,591.245z"
+		/>
+	<path fill="#9B3C2F" d="M669.79,669.863c0.018-0.006,0.037-0.012,0.055-0.018c0.006-0.018,0.012-0.037,0.018-0.055
+		c-0.018,0.006-0.035,0.012-0.055,0.018C669.802,669.825,669.796,669.843,669.79,669.863z"/>
+	<path fill="#9B3C2F" d="M295.913,362.627c1.461-0.383,2.93-0.732,4.399-1.071c0.496-0.113,0.986-0.242,1.482-0.353
+		c1.932-0.424,3.875-0.805,5.823-1.152c0.672-0.119,1.346-0.216,2.016-0.326c1.328-0.219,2.655-0.426,3.989-0.61
+		c0.803-0.111,1.605-0.205,2.41-0.303c1.229-0.149,2.459-0.283,3.694-0.4c0.82-0.078,1.643-0.154,2.463-0.219
+		c1.281-0.102,2.561-0.181,3.848-0.248c0.756-0.041,1.512-0.09,2.27-0.119c1.756-0.07,3.518-0.105,5.284-0.113
+		c0.25,0,0.502-0.018,0.756-0.018c0.473,0,0.942,0.032,1.415,0.037c2.104,0.02,4.204,0.059,6.294,0.164
+		c1.006,0.049,2.002,0.149,3.005,0.219c1.573,0.111,3.149,0.213,4.712,0.371c1.08,0.108,2.147,0.26,3.221,0.391
+		c1.479,0.181,2.956,0.359,4.426,0.584c1.1,0.17,2.194,0.373,3.288,0.566c1.432,0.25,2.862,0.508,4.286,0.799
+		c1.103,0.228,2.203,0.484,3.3,0.735c1.401,0.321,2.798,0.654,4.19,1.016c1.1,0.285,2.197,0.592,3.291,0.904
+		c1.374,0.391,2.743,0.799,4.106,1.229c1.098,0.348,2.191,0.706,3.286,1.08c1.34,0.457,2.672,0.936,4.003,1.432
+		c1.097,0.408,2.191,0.823,3.282,1.26c0.467,0.187,0.942,0.35,1.409,0.539c-0.201-0.213-0.397-0.435-0.598-0.645
+		c-0.683-0.706-1.387-1.389-2.083-2.08c-0.948-0.94-1.897-1.873-2.868-2.78c-0.741-0.695-1.496-1.369-2.25-2.045
+		c-0.965-0.863-1.94-1.721-2.926-2.555c-0.785-0.662-1.576-1.316-2.375-1.961c-0.995-0.805-1.998-1.596-3.014-2.372
+		c-0.82-0.627-1.645-1.252-2.48-1.862c-1.027-0.75-2.069-1.479-3.113-2.2c-0.849-0.584-1.695-1.17-2.555-1.736
+		c-1.074-0.706-2.165-1.387-3.256-2.06c-0.858-0.531-1.709-1.071-2.579-1.582c-1.144-0.674-2.307-1.316-3.472-1.958
+		c-0.844-0.463-1.674-0.945-2.527-1.391c-1.293-0.68-2.608-1.316-3.921-1.955c-0.744-0.362-1.477-0.746-2.227-1.094
+		c-2.043-0.951-4.108-1.856-6.194-2.707c-0.598-0.245-1.211-0.455-1.815-0.692c-1.526-0.598-3.055-1.193-4.602-1.739
+		c-0.875-0.309-1.762-0.58-2.647-0.869c-1.289-0.426-2.579-0.855-3.883-1.246c-0.963-0.289-1.938-0.543-2.909-0.809
+		c-1.24-0.342-2.483-0.683-3.735-0.989c-1.006-0.248-2.022-0.467-3.034-0.692c-1.231-0.274-2.463-0.539-3.7-0.779
+		c-1.036-0.201-2.075-0.383-3.116-0.56c-1.231-0.211-2.465-0.406-3.706-0.584c-1.051-0.152-2.106-0.289-3.163-0.414
+		c-1.243-0.149-2.486-0.277-3.735-0.391c-1.059-0.096-2.118-0.19-3.18-0.262c-0.435-0.029-0.875-0.043-1.31-0.067
+		c-0.586,2.2-1.184,4.399-1.721,6.62c-0.154,0.648-0.33,1.287-0.481,1.938c-0.896,3.825-1.704,7.679-2.442,11.551
+		c-0.172,0.899-0.318,1.801-0.481,2.699c-0.551,3.052-1.053,6.112-1.506,9.185c-0.164,1.103-0.324,2.206-0.475,3.311
+		c-0.117,0.869-0.199,1.742-0.307,2.612c0.721-0.213,1.45-0.397,2.176-0.601C294.405,363.042,295.158,362.825,295.913,362.627z"/>
+	<path fill="#9B3C2F" d="M291.405,363.87c0.023-0.006,0.047-0.012,0.07-0.02c0.111-0.869,0.19-1.742,0.307-2.612
+		C291.665,362.116,291.516,362.989,291.405,363.87z"/>
+	<path fill="#9B3C2F" d="M292.257,357.926c0.453-3.073,0.954-6.133,1.506-9.185C293.212,351.794,292.71,354.854,292.257,357.926z"/>
+	<path fill="#9B3C2F" d="M294.244,346.043c0.738-3.872,1.547-7.726,2.442-11.551C295.791,338.316,294.982,342.17,294.244,346.043z"
+		/>
+	<path fill="#9B3C2F" d="M298.816,325.931c-0.586,2.194-1.115,4.409-1.649,6.624c0.537-2.221,1.133-4.417,1.721-6.62
+		C298.863,325.933,298.84,325.931,298.816,325.931z"/>
+	<path fill="#9B3C2F" d="M309.638,359.723c-0.672,0.111-1.346,0.207-2.016,0.326C308.293,359.934,308.967,359.835,309.638,359.723z"
+		/>
+	<path fill="#9B3C2F" d="M301.799,361.203c-0.496,0.108-0.989,0.239-1.482,0.353C300.812,361.442,301.303,361.311,301.799,361.203z"
+		/>
+	<path fill="#9B3C2F" d="M352.998,358.875c-1.074-0.131-2.145-0.283-3.221-0.391C350.854,358.592,351.925,358.743,352.998,358.875z"
+		/>
+	<path fill="#9B3C2F" d="M360.713,360.024c-1.094-0.193-2.188-0.397-3.288-0.566C358.524,359.627,359.619,359.832,360.713,360.024z"
+		/>
+	<path fill="#9B3C2F" d="M345.065,358.11c-1-0.07-1.998-0.166-3.005-0.219C343.066,357.944,344.061,358.041,345.065,358.11z"/>
+	<path fill="#9B3C2F" d="M295.913,362.627c-0.756,0.199-1.508,0.414-2.264,0.625C294.405,363.042,295.158,362.825,295.913,362.627z"
+		/>
+	<path fill="#9B3C2F" d="M333.596,357.711c0.25,0,0.502-0.014,0.756-0.014c0.473,0,0.942,0.029,1.415,0.035
+		c-0.473-0.003-0.942-0.037-1.415-0.037C334.1,357.693,333.85,357.707,333.596,357.711z"/>
+	<path fill="#9B3C2F" d="M375.78,363.479c-1.094-0.312-2.191-0.619-3.291-0.904C373.588,362.86,374.682,363.169,375.78,363.479z"/>
+	<path fill="#9B3C2F" d="M322.193,358.192c-0.823,0.064-1.643,0.14-2.463,0.219C320.55,358.335,321.37,358.26,322.193,358.192z"/>
+	<path fill="#9B3C2F" d="M316.037,358.813c-0.805,0.096-1.608,0.193-2.41,0.303C314.43,359.006,315.231,358.91,316.037,358.813z"/>
+	<path fill="#9B3C2F" d="M368.299,361.559c-1.1-0.254-2.197-0.508-3.3-0.735C366.102,361.051,367.199,361.308,368.299,361.559z"/>
+	<path fill="#9B3C2F" d="M390.454,368.48c-1.092-0.435-2.186-0.849-3.282-1.26C388.268,367.631,389.365,368.045,390.454,368.48z"/>
+	<path fill="#9B3C2F" d="M328.311,357.822c-0.758,0.029-1.514,0.078-2.27,0.119C326.797,357.903,327.553,357.854,328.311,357.822z"
+		/>
+	<path fill="#9B3C2F" d="M383.168,365.79c-1.092-0.373-2.186-0.732-3.286-1.08C380.982,365.058,382.076,365.417,383.168,365.79z"/>
+	<path fill="#9B3C2F" d="M509.934,313.91l0.006,0.02c0.307,0,0.613,0.02,0.92,0.023c1.797,0.018,3.592,0.061,5.38,0.143
+		c0.262,0.012,0.528,0.008,0.791,0.02c-0.236-0.105-0.475-0.205-0.711-0.309c-2.215-0.989-4.444-1.949-6.685-2.88
+		c-0.25-0.105-0.504-0.205-0.756-0.307c0.348,1.098,0.682,2.191,1.016,3.291L509.934,313.91z"/>
+	<path fill="#9B3C2F" d="M510.859,313.953c1.797,0.018,3.592,0.061,5.38,0.143C514.447,314.015,512.656,313.971,510.859,313.953z"/>
+	<rect x="509.896" y="313.91" fill="#9B3C2F" width="0.041" height="0.02"/>
+	<path fill="#9B3C2F" d="M517.039,314.117c-0.239-0.108-0.481-0.205-0.721-0.309c0.236,0.105,0.475,0.205,0.711,0.309
+		C517.033,314.117,517.036,314.117,517.039,314.117z"/>
+	<path fill="#9B3C2F" d="M508.869,310.598c0.004,0.006,0.004,0.014,0.006,0.02c0.25,0.105,0.504,0.201,0.756,0.307
+		C509.376,310.82,509.126,310.703,508.869,310.598z"/>
+	<path fill="#9B3C2F" d="M397.435,175.966c-1.149,0.914-2.303,1.824-3.438,2.754c-1.479,1.211-2.936,2.445-4.388,3.682
+		c-1.071,0.91-2.147,1.815-3.201,2.74c-1.535,1.346-3.037,2.723-4.54,4.1c-0.934,0.855-1.879,1.695-2.801,2.559
+		c-1.899,1.786-3.758,3.606-5.605,5.442c-0.487,0.484-0.992,0.954-1.477,1.441c-2.299,2.313-4.552,4.671-6.766,7.058
+		c-0.756,0.814-1.482,1.654-2.229,2.477c-1.459,1.611-2.918,3.225-4.339,4.866c-0.873,1.006-1.715,2.034-2.573,3.051
+		c-1.258,1.497-2.516,2.994-3.741,4.514c-0.881,1.094-1.742,2.2-2.608,3.305c-1.161,1.482-2.313,2.973-3.446,4.479
+		c-0.861,1.144-1.704,2.299-2.547,3.455c-1.098,1.506-2.18,3.022-3.245,4.549c-0.82,1.176-1.637,2.358-2.44,3.545
+		c-1.047,1.553-2.078,3.116-3.096,4.688c-0.77,1.188-1.541,2.375-2.291,3.574c-1.021,1.628-2.014,3.276-2.999,4.925
+		c-0.7,1.17-1.409,2.331-2.092,3.51c-1.036,1.789-2.037,3.6-3.034,5.415c-0.586,1.062-1.188,2.115-1.76,3.186
+		c-1.275,2.387-2.504,4.797-3.708,7.222c-0.26,0.52-0.534,1.027-0.791,1.549c-1.438,2.932-2.821,5.894-4.161,8.878
+		c-0.459,1.018-0.881,2.055-1.328,3.078c-0.738,1.698-1.467,3.399-2.174,5.114c0.035-0.012,0.073-0.02,0.111-0.032
+		c0.691-0.216,1.389-0.4,2.083-0.613c3.192-0.977,6.393-1.917,9.614-2.786c1.401-0.377,2.813-0.709,4.216-1.065
+		c2.53-0.642,5.063-1.275,7.61-1.85c1.59-0.359,3.186-0.683,4.782-1.016c2.387-0.496,4.774-0.977,7.171-1.415
+		c1.668-0.307,3.344-0.59,5.018-0.867c2.358-0.388,4.721-0.746,7.087-1.08c1.69-0.236,3.376-0.469,5.071-0.677
+		c2.41-0.295,4.829-0.549,7.251-0.785c1.645-0.16,3.288-0.336,4.94-0.469c2.6-0.211,5.206-0.362,7.814-0.504
+		c1.473-0.082,2.944-0.19,4.42-0.25c3.69-0.149,7.394-0.225,11.101-0.239c0.365,0,0.729-0.023,1.094-0.023
+		c0.596,0,1.188,0.026,1.783,0.029c2.69,0.014,5.38,0.053,8.067,0.14c1.319,0.043,2.635,0.125,3.95,0.187
+		c1.987,0.09,3.973,0.178,5.958,0.309c1.444,0.096,2.885,0.225,4.327,0.338c1.852,0.149,3.706,0.297,5.552,0.481
+		c1.479,0.146,2.956,0.318,4.432,0.487c1.809,0.207,3.618,0.42,5.424,0.66c1.479,0.195,2.956,0.412,4.432,0.631
+		c1.803,0.266,3.6,0.549,5.395,0.846c1.459,0.242,2.918,0.496,4.374,0.762c1.812,0.33,3.618,0.683,5.424,1.045
+		c1.424,0.285,2.848,0.574,4.268,0.885c1.852,0.402,3.696,0.832,5.54,1.27c1.354,0.321,2.707,0.637,4.059,0.975
+		c0.449,0.113,0.902,0.211,1.351,0.324c-0.004-0.123-0.004-0.245-0.006-0.371c-0.082-2.798-0.254-5.587-0.498-8.368
+		c-0.035-0.4-0.073-0.799-0.111-1.196c-0.271-2.772-0.615-5.535-1.051-8.28c-0.053-0.33-0.113-0.66-0.166-0.989
+		c-0.469-2.848-1.012-5.684-1.66-8.499c-0.012-0.053-0.026-0.102-0.037-0.154c-0.666-2.883-1.43-5.745-2.279-8.583
+		c-0.029-0.096-0.053-0.19-0.082-0.285c-1.943-3.149-3.956-6.241-6.011-9.302c-0.342-0.508-0.656-1.039-1-1.543
+		c-2.477-3.645-5.039-7.222-7.673-10.734c-0.826-1.1-1.704-2.159-2.544-3.247c-1.844-2.389-3.686-4.78-5.602-7.105
+		c-1.088-1.322-2.232-2.594-3.344-3.893c-1.739-2.034-3.466-4.076-5.261-6.06c-1.237-1.369-2.527-2.69-3.793-4.032
+		c-1.739-1.85-3.472-3.708-5.261-5.512c-1.354-1.365-2.758-2.684-4.141-4.024c-1.771-1.715-3.536-3.434-5.354-5.106
+		c-1.456-1.336-2.953-2.631-4.438-3.942c-1.818-1.602-3.633-3.204-5.495-4.764c-1.547-1.295-3.131-2.553-4.706-3.819
+		c-1.272-1.021-2.553-2.028-3.842-3.028C399.131,174.641,398.275,175.298,397.435,175.966z"/>
+	<path fill="#9B3C2F" d="M343.738,231.887c-1.098,1.506-2.18,3.022-3.245,4.549C341.561,234.909,342.643,233.392,343.738,231.887z"
+		/>
+	<path fill="#9B3C2F" d="M327.576,256.682c-1.035,1.789-2.037,3.6-3.034,5.415C325.54,260.285,326.541,258.469,327.576,256.682z"/>
+	<path fill="#9B3C2F" d="M332.671,248.243c-1.021,1.628-2.014,3.276-2.999,4.925C330.657,251.521,331.649,249.874,332.671,248.243z"
+		/>
+	<path fill="#9B3C2F" d="M322.783,265.283c-1.275,2.387-2.504,4.797-3.708,7.222C320.279,270.08,321.507,267.67,322.783,265.283z"/>
+	<path fill="#9B3C2F" d="M338.054,239.98c-1.047,1.553-2.078,3.116-3.096,4.688C335.979,243.1,337.007,241.533,338.054,239.98z"/>
+	<path fill="#9B3C2F" d="M318.28,274.053c-1.438,2.932-2.821,5.894-4.161,8.878C315.459,279.947,316.844,276.986,318.28,274.053z"/>
+	<path fill="#9B3C2F" d="M365.218,205.741c2.215-2.387,4.467-4.745,6.766-7.058C369.687,200.997,367.433,203.352,365.218,205.741z"
+		/>
+	<path fill="#9B3C2F" d="M362.989,208.218c-1.459,1.611-2.918,3.225-4.339,4.866C360.074,211.439,361.53,209.829,362.989,208.218z"
+		/>
+	<path fill="#9B3C2F" d="M393.998,178.72c-1.479,1.211-2.936,2.445-4.388,3.682C391.063,181.165,392.519,179.931,393.998,178.72z"/>
+	<path fill="#9B3C2F" d="M356.08,216.134c-1.258,1.497-2.516,2.994-3.741,4.514C353.564,219.128,354.822,217.631,356.08,216.134z"/>
+	<path fill="#9B3C2F" d="M386.409,185.142c-1.535,1.346-3.037,2.723-4.54,4.1C383.372,187.864,384.875,186.49,386.409,185.142z"/>
+	<path fill="#9B3C2F" d="M399.98,173.981c-0.012-0.008-0.023-0.018-0.035-0.026c-0.849,0.656-1.668,1.346-2.51,2.01
+		C398.275,175.298,399.131,174.641,399.98,173.981z"/>
+	<path fill="#9B3C2F" d="M379.068,191.8c-1.899,1.786-3.758,3.606-5.605,5.442C375.311,195.406,377.169,193.586,379.068,191.8z"/>
+	<path fill="#9B3C2F" d="M310.621,291.126c0.706-1.713,1.436-3.417,2.174-5.114c-0.741,1.704-1.5,3.402-2.206,5.124
+		C310.598,291.131,310.609,291.128,310.621,291.126z"/>
+	<path fill="#9B3C2F" d="M349.731,223.953c-1.161,1.482-2.313,2.973-3.446,4.479C347.417,226.926,348.569,225.439,349.731,223.953z"
+		/>
+	<path fill="#9B3C2F" d="M453.756,228.514c2.635,3.516,5.196,7.093,7.673,10.734C458.953,235.604,456.391,232.026,453.756,228.514z"
+		/>
+	<path fill="#9B3C2F" d="M445.61,218.161c1.917,2.325,3.758,4.718,5.602,7.105C449.368,222.877,447.526,220.487,445.61,218.161z"/>
+	<path fill="#9B3C2F" d="M403.823,177.013c-1.269-1.018-2.5-2.074-3.787-3.073c-0.018,0.014-0.037,0.029-0.055,0.043
+		C401.27,174.983,402.55,175.991,403.823,177.013z"/>
+	<path fill="#9B3C2F" d="M437.005,208.206c1.795,1.984,3.522,4.026,5.261,6.06C440.527,212.233,438.8,210.191,437.005,208.206z"/>
+	<path fill="#9B3C2F" d="M468.427,250.044c-1.934-3.133-3.95-6.204-5.995-9.249c2.055,3.061,4.067,6.153,6.011,9.302
+		C468.435,250.079,468.433,250.062,468.427,250.044z"/>
+	<path fill="#9B3C2F" d="M408.529,180.83c1.862,1.559,3.676,3.163,5.495,4.764C412.205,183.992,410.39,182.388,408.529,180.83z"/>
+	<path fill="#9B3C2F" d="M427.951,198.662c1.789,1.803,3.522,3.662,5.261,5.512C431.473,202.325,429.743,200.465,427.951,198.662z"
+		/>
+	<path fill="#9B3C2F" d="M418.458,189.534c1.818,1.668,3.583,3.391,5.354,5.106C422.04,192.923,420.276,191.204,418.458,189.534z"/>
+	<path fill="#9B3C2F" d="M399.945,173.956c0.012,0.008,0.023,0.018,0.035,0.026c0.018-0.014,0.037-0.029,0.055-0.043
+		c-0.012-0.008-0.023-0.02-0.035-0.029C399.982,173.926,399.963,173.94,399.945,173.956z"/>
+	<path fill="#9B3C2F" d="M405.591,621.577c0.773-0.631,1.561-1.24,2.325-1.879c3.235-2.699,6.417-5.474,9.532-8.316
+		c0.793-0.723,1.559-1.477,2.346-2.209c2.328-2.17,4.628-4.371,6.883-6.618c1.057-1.051,2.092-2.118,3.131-3.186
+		c0.934-0.959,1.838-1.949,2.758-2.92c-0.17-0.099-0.324-0.213-0.493-0.312c-2.465-1.461-4.876-3.002-7.245-4.596
+		c-0.592-0.397-1.182-0.793-1.768-1.199c-2.547-1.766-5.053-3.589-7.487-5.509c-0.199-0.154-0.388-0.324-0.584-0.481
+		c-2.258-1.801-4.456-3.676-6.612-5.602c-0.522-0.467-1.045-0.934-1.561-1.409c-2.293-2.11-4.54-4.274-6.708-6.53
+		c-0.035-0.037-0.073-0.07-0.108-0.105c-0.043,0.047-0.094,0.088-0.137,0.135c-2.147,2.232-4.371,4.374-6.641,6.462
+		c-0.545,0.504-1.1,0.998-1.654,1.494c-2.104,1.879-4.245,3.708-6.446,5.465c-0.245,0.195-0.481,0.406-0.729,0.598
+		c-2.407,1.897-4.881,3.696-7.399,5.444c-0.627,0.435-1.26,0.858-1.893,1.284c-2.301,1.543-4.639,3.037-7.026,4.458
+		c-0.219,0.129-0.42,0.277-0.639,0.406c0.91,0.963,1.803,1.94,2.729,2.889c1.062,1.092,2.121,2.18,3.201,3.253
+		c2.206,2.197,4.458,4.35,6.734,6.474c0.834,0.779,1.649,1.578,2.492,2.346c3.102,2.827,6.261,5.585,9.48,8.269
+		c0.791,0.66,1.605,1.287,2.401,1.938c1.824,1.488,3.68,2.932,5.534,4.374C401.876,624.539,403.749,623.081,405.591,621.577z"/>
+	<path fill="#9B3C2F" d="M432.075,596.138c-2.465-1.461-4.876-3.002-7.245-4.596C427.201,593.136,429.609,594.677,432.075,596.138z"
+		/>
+	<path fill="#9B3C2F" d="M414.988,584.353c-2.258-1.801-4.456-3.676-6.612-5.602C410.533,580.68,412.73,582.556,414.988,584.353z"/>
+	<path fill="#9B3C2F" d="M423.062,590.344c-2.547-1.766-5.053-3.589-7.487-5.509C418.008,586.754,420.514,588.578,423.062,590.344z"
+		/>
+	<path fill="#9B3C2F" d="M406.819,577.342c-2.293-2.11-4.54-4.274-6.708-6.53C402.279,573.068,404.526,575.233,406.819,577.342z"/>
+	<path fill="#9B3C2F" d="M392.064,619.681c-3.219-2.684-6.378-5.442-9.48-8.269C385.686,614.24,388.846,616.996,392.064,619.681z"/>
+	<path fill="#9B3C2F" d="M380.093,609.067c-2.276-2.124-4.526-4.278-6.734-6.474C375.567,604.792,377.817,606.942,380.093,609.067z"
+		/>
+	<path fill="#9B3C2F" d="M394.466,621.622c1.818,1.485,3.624,2.982,5.477,4.42c0.02-0.014,0.041-0.032,0.061-0.047
+		C398.142,624.554,396.289,623.11,394.466,621.622z"/>
+	<path fill="#9B3C2F" d="M367.363,596.497c0.914,0.965,1.87,1.891,2.798,2.844c-0.925-0.948-1.818-1.928-2.729-2.889
+		C367.409,596.464,367.386,596.482,367.363,596.497z"/>
+	<path fill="#9B3C2F" d="M400,625.992c0.02,0.014,0.041,0.032,0.061,0.047c1.87-1.45,3.696-2.965,5.532-4.464
+		C403.749,623.081,401.876,624.539,400,625.992z"/>
+	<path fill="#9B3C2F" d="M417.451,611.383c-3.119,2.842-6.296,5.616-9.532,8.316C411.154,617,414.332,614.228,417.451,611.383z"/>
+	<path fill="#9B3C2F" d="M432.641,596.497c-0.023-0.014-0.047-0.029-0.07-0.043c-0.922,0.971-1.824,1.961-2.758,2.92
+		C430.747,598.408,431.715,597.472,432.641,596.497z"/>
+	<path fill="#9B3C2F" d="M426.68,602.557c-2.256,2.246-4.555,4.446-6.883,6.618C422.124,607.003,424.425,604.803,426.68,602.557z"/>
+	<path fill="#9B3C2F" d="M399.939,626.042c0.02,0.014,0.041,0.032,0.061,0.049c0.02-0.014,0.041-0.032,0.061-0.049
+		c-0.02-0.014-0.041-0.032-0.061-0.047C399.98,626.009,399.959,626.025,399.939,626.042z"/>
+	<path fill="#9B3C2F" d="M375.1,591.586c-2.299,1.543-4.639,3.037-7.026,4.458C370.461,594.626,372.799,593.133,375.1,591.586z"/>
+	<path fill="#9B3C2F" d="M384.393,584.858c-2.404,1.897-4.881,3.696-7.399,5.444C379.511,588.557,381.986,586.754,384.393,584.858z"
+		/>
+	<path fill="#9B3C2F" d="M399.863,570.841c-2.147,2.232-4.371,4.374-6.641,6.462C395.492,575.215,397.715,573.074,399.863,570.841z"
+		/>
+	<path fill="#9B3C2F" d="M391.567,578.795c-2.104,1.879-4.245,3.708-6.446,5.465C387.323,582.503,389.464,580.675,391.567,578.795z"
+		/>
+	<path fill="#9B3C2F" d="M486.037,288.643c0.006,0.475,0.035,0.945,0.037,1.42l0.014,0.002v0.035
+		c1.094,0.33,2.194,0.672,3.291,1.016c-0.123-0.297-0.239-0.601-0.365-0.899c-0.875-2.098-1.777-4.186-2.702-6.267
+		c-0.146-0.326-0.283-0.66-0.429-0.986c0.014,0.291,0.012,0.584,0.023,0.873C485.98,285.439,486.017,287.041,486.037,288.643z"/>
+	<path fill="#9B3C2F" d="M489.408,291.126c-0.125-0.303-0.266-0.604-0.391-0.908c0.125,0.297,0.242,0.598,0.365,0.899
+		C489.391,291.12,489.399,291.122,489.408,291.126z"/>
+	<path fill="#9B3C2F" d="M485.886,282.955c0,0.002,0,0.008,0,0.012c0.146,0.326,0.283,0.66,0.429,0.986
+		C486.166,283.621,486.032,283.285,485.886,282.955z"/>
+	<path fill="#9B3C2F" d="M486.037,288.643c-0.02-1.602-0.058-3.204-0.129-4.803C485.98,285.439,486.017,287.041,486.037,288.643z"/>
+	<path fill="#9B3C2F" d="M304.034,308.78c-0.493,1.465-0.995,2.926-1.461,4.394c-0.131,0.414-0.248,0.828-0.379,1.243
+		c0.053,0.003,0.108,0.012,0.16,0.014c0.289,0.023,0.572,0.061,0.861,0.084c2.182,0.184,4.36,0.406,6.527,0.683
+		c0.782,0.099,1.559,0.23,2.337,0.344c1.668,0.239,3.335,0.49,4.993,0.787c0.904,0.16,1.801,0.348,2.702,0.525
+		c1.526,0.301,3.049,0.615,4.567,0.963c0.936,0.216,1.87,0.447,2.803,0.677c1.477,0.367,2.944,0.756,4.405,1.167
+		c0.928,0.26,1.852,0.528,2.774,0.805c1.473,0.447,2.936,0.92,4.391,1.409c0.881,0.295,1.762,0.586,2.637,0.899
+		c1.529,0.543,3.04,1.127,4.549,1.719c0.782,0.307,1.567,0.598,2.342,0.916c1.756,0.723,3.495,1.494,5.225,2.282
+		c0.502,0.23,1.016,0.438,1.514,0.674c2.247,1.053,4.467,2.159,6.661,3.323c0.297,0.158,0.586,0.332,0.881,0.493
+		c1.862,1,3.706,2.037,5.524,3.114c0.691,0.412,1.365,0.846,2.051,1.27c1.409,0.867,2.813,1.742,4.192,2.652
+		c0.776,0.51,1.535,1.045,2.303,1.57c1.266,0.869,2.524,1.754,3.766,2.661c0.791,0.578,1.57,1.17,2.348,1.766
+		c1.19,0.91,2.369,1.836,3.534,2.78c0.773,0.627,1.541,1.258,2.302,1.899c1.15,0.969,2.276,1.963,3.397,2.967
+		c0.732,0.656,1.471,1.31,2.191,1.984c1.144,1.065,2.262,2.165,3.373,3.268c0.654,0.648,1.316,1.284,1.958,1.946
+		c0.143,0.149,0.295,0.289,0.441,0.438l0.099-0.113l0.094,0.108c1.207-1.258,2.436-2.495,3.682-3.708
+		c0.225-0.219,0.455-0.424,0.68-0.639c1.129-1.086,2.27-2.159,3.432-3.207c0.475-0.429,0.959-0.844,1.441-1.264
+		c0.924-0.814,1.85-1.625,2.792-2.416c0.557-0.467,1.123-0.92,1.686-1.381c0.887-0.723,1.777-1.441,2.682-2.141
+		c0.592-0.461,1.19-0.91,1.789-1.363c0.899-0.677,1.801-1.346,2.713-2.002c0.61-0.438,1.223-0.873,1.838-1.305
+		c0.924-0.645,1.858-1.278,2.798-1.899c0.613-0.406,1.225-0.814,1.84-1.211c0.986-0.633,1.981-1.248,2.982-1.862
+		c0.584-0.356,1.161-0.717,1.75-1.065c1.117-0.662,2.252-1.301,3.387-1.934c0.481-0.268,0.957-0.545,1.441-0.811
+		c3.28-1.78,6.626-3.44,10.037-4.975c0.414-0.187,0.834-0.359,1.252-0.539c1.289-0.566,2.585-1.123,3.889-1.654
+		c0.569-0.23,1.147-0.449,1.721-0.672c1.167-0.459,2.337-0.908,3.518-1.336c0.633-0.23,1.27-0.449,1.908-0.672
+		c1.144-0.397,2.291-0.785,3.446-1.155c0.651-0.211,1.305-0.412,1.961-0.613c1.17-0.359,2.342-0.703,3.524-1.033
+		c0.639-0.178,1.278-0.359,1.92-0.528c0.426-0.113,0.846-0.239,1.272-0.35c0.158-0.776,0.332-1.553,0.475-2.331
+		c0.105-0.563,0.216-1.127,0.315-1.692c0.353-2.034,0.672-4.079,0.934-6.133c0.043-0.344,0.076-0.695,0.117-1.039
+		c0.211-1.75,0.388-3.507,0.534-5.266c0.053-0.627,0.099-1.258,0.143-1.885c0.035-0.516,0.049-1.033,0.078-1.547
+		c-0.904-0.242-1.807-0.487-2.711-0.721c-1.409-0.362-2.821-0.717-4.239-1.059c-1.748-0.42-3.501-0.817-5.258-1.205
+		c-1.371-0.303-2.746-0.604-4.123-0.887c-1.815-0.371-3.635-0.715-5.456-1.051c-1.34-0.248-2.676-0.498-4.018-0.727
+		c-1.887-0.321-3.782-0.607-5.675-0.89c-1.287-0.193-2.571-0.394-3.86-0.569c-1.99-0.268-3.989-0.498-5.985-0.727
+		c-1.202-0.137-2.404-0.291-3.61-0.412c-2.159-0.219-4.321-0.391-6.486-0.56c-1.053-0.082-2.104-0.187-3.157-0.256
+		c-2.504-0.17-5.013-0.285-7.522-0.388c-0.723-0.029-1.447-0.082-2.17-0.105c-3.262-0.111-6.53-0.17-9.804-0.17
+		c-4.143,0-8.278,0.09-12.4,0.266c-0.846,0.035-1.69,0.117-2.535,0.16c-3.247,0.166-6.491,0.353-9.722,0.627
+		c-1.351,0.117-2.696,0.291-4.044,0.426c-2.713,0.271-5.427,0.531-8.128,0.879c-1.564,0.201-3.113,0.463-4.671,0.692
+		c-2.471,0.359-4.948,0.703-7.408,1.129c-1.668,0.289-3.323,0.639-4.983,0.954c-2.334,0.447-4.671,0.875-6.993,1.381
+		c-1.725,0.373-3.434,0.809-5.149,1.217c-2.244,0.531-4.491,1.047-6.72,1.633c-1.745,0.459-3.475,0.975-5.211,1.465
+		c-2.186,0.619-4.374,1.225-6.544,1.897c-1.742,0.537-3.466,1.133-5.2,1.704c-1.686,0.557-3.373,1.117-5.053,1.707
+		C304.827,306.431,304.43,307.605,304.034,308.78z"/>
+	<path fill="#9B3C2F" d="M400.096,360.491L400,360.383l-0.099,0.113c0.032,0.032,0.064,0.061,0.096,0.094
+		C400.029,360.559,400.064,360.526,400.096,360.491z"/>
+	<path fill="#9B3C2F" d="M302.157,314.414c0.012,0,0.023,0.003,0.035,0.003c0.131-0.414,0.245-0.828,0.379-1.243
+		C302.438,313.588,302.288,314,302.157,314.414z"/>
+	<path fill="#9B3C2F" d="M305.2,305.276c-0.408,1.161-0.773,2.337-1.167,3.504c0.397-1.176,0.797-2.348,1.205-3.518
+		C305.227,305.267,305.212,305.273,305.2,305.276z"/>
+	<path fill="#9B3C2F" d="M407.89,352.935c0.475-0.429,0.959-0.844,1.441-1.264C408.849,352.093,408.365,352.505,407.89,352.935z"/>
+	<path fill="#9B3C2F" d="M452.21,325.117c0.569-0.23,1.147-0.449,1.721-0.672C453.357,324.67,452.779,324.886,452.21,325.117z"/>
+	<path fill="#9B3C2F" d="M447.065,327.311c0.414-0.187,0.834-0.359,1.252-0.539C447.901,326.951,447.479,327.125,447.065,327.311z"
+		/>
+	<path fill="#9B3C2F" d="M425.626,339.166c0.613-0.406,1.225-0.814,1.842-1.211C426.849,338.351,426.24,338.76,425.626,339.166z"/>
+	<path fill="#9B3C2F" d="M420.987,342.369c0.61-0.438,1.223-0.873,1.838-1.305C422.212,341.496,421.6,341.932,420.987,342.369z"/>
+	<path fill="#9B3C2F" d="M430.449,336.093c0.584-0.356,1.161-0.717,1.75-1.065C431.614,335.378,431.033,335.737,430.449,336.093z"/>
+	<path fill="#9B3C2F" d="M435.587,333.094c0.481-0.268,0.957-0.545,1.441-0.811C436.544,332.548,436.069,332.829,435.587,333.094z"
+		/>
+	<path fill="#9B3C2F" d="M403.778,356.783c0.225-0.219,0.455-0.424,0.68-0.639C404.233,356.359,404.003,356.567,403.778,356.783z"/>
+	<path fill="#9B3C2F" d="M416.488,345.733c0.592-0.461,1.19-0.91,1.789-1.363C417.678,344.823,417.08,345.272,416.488,345.733z"/>
+	<path fill="#9B3C2F" d="M412.123,349.255c0.557-0.467,1.123-0.92,1.686-1.381C413.244,348.336,412.677,348.788,412.123,349.255z"/>
+	<path fill="#9B3C2F" d="M457.447,323.109c0.633-0.23,1.27-0.449,1.908-0.672C458.719,322.66,458.08,322.878,457.447,323.109z"/>
+	<path fill="#9B3C2F" d="M468.283,319.637c0.639-0.178,1.278-0.356,1.92-0.528C469.562,319.278,468.922,319.456,468.283,319.637z"/>
+	<path fill="#9B3C2F" d="M462.801,321.282c0.651-0.211,1.305-0.412,1.961-0.613C464.105,320.868,463.452,321.073,462.801,321.282z"
+		/>
+	<path fill="#9B3C2F" d="M374.292,339.218c0.773,0.51,1.535,1.045,2.302,1.57C375.827,340.263,375.065,339.732,374.292,339.218z"/>
+	<path fill="#9B3C2F" d="M317.069,316.334c0.904,0.16,1.801,0.347,2.702,0.525C318.87,316.682,317.971,316.495,317.069,316.334z"/>
+	<path fill="#9B3C2F" d="M380.358,343.451c0.791,0.578,1.57,1.17,2.348,1.766C381.927,344.622,381.148,344.029,380.358,343.451z"/>
+	<path fill="#9B3C2F" d="M324.335,317.819c0.936,0.216,1.87,0.447,2.803,0.677C326.205,318.266,325.275,318.036,324.335,317.819z"/>
+	<path fill="#9B3C2F" d="M397.502,358.116c0.654,0.648,1.316,1.284,1.958,1.946C398.822,359.4,398.156,358.764,397.502,358.116z"/>
+	<path fill="#9B3C2F" d="M386.243,347.997c0.773,0.627,1.541,1.258,2.301,1.899C387.783,349.255,387.016,348.624,386.243,347.997z"
+		/>
+	<path fill="#9B3C2F" d="M391.942,352.865c0.732,0.656,1.471,1.31,2.191,1.984C393.411,354.174,392.673,353.521,391.942,352.865z"/>
+	<path fill="#9B3C2F" d="M368.048,335.296c0.691,0.412,1.365,0.846,2.051,1.27C369.414,336.146,368.74,335.708,368.048,335.296z"/>
+	<path fill="#9B3C2F" d="M361.641,331.69c0.297,0.158,0.586,0.332,0.881,0.493C362.227,332.022,361.938,331.848,361.641,331.69z"/>
+	<path fill="#9B3C2F" d="M331.544,319.667c0.928,0.26,1.852,0.528,2.774,0.805C333.397,320.194,332.472,319.929,331.544,319.667z"/>
+	<path fill="#9B3C2F" d="M338.71,321.88c0.881,0.295,1.762,0.586,2.637,0.899C340.476,322.468,339.591,322.175,338.71,321.88z"/>
+	<path fill="#9B3C2F" d="M353.465,327.696c0.502,0.23,1.016,0.438,1.514,0.674C354.48,328.133,353.967,327.926,353.465,327.696z"/>
+	<path fill="#9B3C2F" d="M302.352,314.435c0.289,0.023,0.572,0.061,0.861,0.084C302.924,314.496,302.641,314.455,302.352,314.435z"
+		/>
+	<path fill="#9B3C2F" d="M345.899,324.495c0.782,0.307,1.567,0.598,2.342,0.916C347.466,325.093,346.678,324.802,345.899,324.495z"
+		/>
+	<path fill="#9B3C2F" d="M309.74,315.205c0.782,0.099,1.559,0.23,2.337,0.344C311.298,315.436,310.523,315.305,309.74,315.205z"/>
+	<path fill="#9B3C2F" d="M432.751,291.023c1.998,0.228,3.995,0.459,5.985,0.727C436.745,291.481,434.747,291.251,432.751,291.023z"
+		/>
+	<path fill="#9B3C2F" d="M442.596,292.321c1.893,0.283,3.787,0.569,5.675,0.89C446.383,292.888,444.489,292.605,442.596,292.321z"/>
+	<path fill="#9B3C2F" d="M315.488,301.854c2.17-0.672,4.36-1.278,6.544-1.897C319.85,300.576,317.662,301.182,315.488,301.854z"/>
+	<path fill="#9B3C2F" d="M375.345,290.183c3.229-0.274,6.474-0.461,9.722-0.627C381.82,289.722,378.575,289.905,375.345,290.183z"/>
+	<path fill="#9B3C2F" d="M351.093,293.308c2.459-0.424,4.936-0.77,7.408-1.129C356.03,292.538,353.552,292.882,351.093,293.308z"/>
+	<path fill="#9B3C2F" d="M452.286,293.938c1.821,0.336,3.641,0.68,5.456,1.051C455.93,294.618,454.109,294.273,452.286,293.938z"/>
+	<path fill="#9B3C2F" d="M422.653,290.052c2.165,0.17,4.33,0.342,6.486,0.56C426.983,290.393,424.818,290.221,422.653,290.052z"/>
+	<path fill="#9B3C2F" d="M339.113,295.642c2.323-0.504,4.659-0.934,6.993-1.381C343.772,294.708,341.435,295.14,339.113,295.642z"/>
+	<path fill="#9B3C2F" d="M327.246,298.492c2.229-0.586,4.475-1.103,6.72-1.633C331.723,297.39,329.475,297.906,327.246,298.492z"/>
+	<path fill="#9B3C2F" d="M411.974,289.403c2.51,0.105,5.018,0.222,7.522,0.388C416.993,289.626,414.484,289.509,411.974,289.403z"/>
+	<path fill="#9B3C2F" d="M363.173,291.487c2.699-0.348,5.415-0.61,8.128-0.879C368.588,290.878,365.874,291.14,363.173,291.487z"/>
+	<path fill="#9B3C2F" d="M409.804,289.299c-3.262-0.111-6.53-0.172-9.804-0.172c-4.143,0-8.278,0.094-12.4,0.268
+		c4.123-0.176,8.255-0.266,12.4-0.266C403.27,289.13,406.538,289.188,409.804,289.299z"/>
+	<path fill="#9B3C2F" d="M461.864,295.875c1.756,0.388,3.51,0.785,5.258,1.205C465.374,296.66,463.62,296.263,461.864,295.875z"/>
+	<path fill="#9B3C2F" d="M310.292,303.557c-1.678,0.555-3.364,1.065-5.034,1.649c-0.006,0.02-0.012,0.037-0.02,0.059
+		C306.919,304.675,308.605,304.114,310.292,303.557z"/>
+	<path fill="#9B3C2F" d="M474.075,298.819c-0.902-0.242-1.809-0.447-2.713-0.677c0.904,0.234,1.807,0.479,2.711,0.721
+		C474.072,298.848,474.075,298.834,474.075,298.819z"/>
+	<path fill="#9B3C2F" d="M305.2,305.276c0.014-0.006,0.026-0.008,0.041-0.014c0.006-0.02,0.012-0.037,0.02-0.059
+		c-0.014,0.006-0.026,0.008-0.041,0.014C305.212,305.239,305.206,305.259,305.2,305.276z"/>
+	<path fill="#9B3C2F" d="M484.494,311.929c-0.184,1.305-0.353,2.612-0.569,3.907l0.315-0.073l-0.073,0.309
+		c1.19-0.199,2.387-0.35,3.583-0.522c0.922-0.131,1.838-0.285,2.766-0.402c1.862-0.23,3.731-0.406,5.602-0.569
+		c0.563-0.049,1.121-0.125,1.684-0.17c-0.129-0.412-0.245-0.823-0.373-1.234c-0.467-1.459-0.963-2.912-1.453-4.368
+		c-0.402-1.193-0.805-2.383-1.223-3.569c-1.065-0.373-2.133-0.735-3.201-1.097c-1.628-0.551-3.253-1.106-4.887-1.625
+		c-0.359-0.113-0.717-0.216-1.076-0.326c-0.187,2.463-0.441,4.919-0.746,7.368C484.74,310.353,484.605,311.138,484.494,311.929z"/>
+	<path fill="#9B3C2F" d="M484.168,316.075l0.073-0.309l-0.315,0.073c-0.014,0.094-0.026,0.187-0.041,0.28
+		C483.978,316.1,484.074,316.09,484.168,316.075z"/>
+	<path fill="#9B3C2F" d="M497.802,314.414c-0.563,0.043-1.121,0.119-1.684,0.17C496.681,314.534,497.242,314.459,497.802,314.414
+		L497.802,314.414z"/>
+	<path fill="#9B3C2F" d="M487.754,315.553c0.922-0.131,1.838-0.289,2.766-0.402C489.592,315.266,488.676,315.421,487.754,315.553z"
+		/>
+	<path fill="#9B3C2F" d="M495.976,308.812c-0.4-1.184-0.768-2.378-1.182-3.557c-0.014-0.006-0.026-0.008-0.041-0.014
+		C495.171,306.431,495.573,307.622,495.976,308.812z"/>
+	<path fill="#9B3C2F" d="M497.837,314.412c-0.129-0.412-0.277-0.82-0.408-1.231c0.131,0.412,0.245,0.823,0.373,1.234
+		C497.814,314.414,497.826,314.414,497.837,314.412z"/>
+	<polygon fill="#9B3C2F" points="497.802,314.414 497.837,314.414 497.837,314.414 	"/>
+	<path fill="#9B3C2F" d="M485.588,302.163c0,0.008-0.003,0.02-0.003,0.029c0.359,0.113,0.717,0.213,1.076,0.326
+		C486.303,302.408,485.947,302.276,485.588,302.163z"/>
+	<path fill="#9B3C2F" d="M494.738,305.206c-1.057-0.371-2.127-0.7-3.19-1.059c1.068,0.362,2.135,0.723,3.201,1.098
+		C494.747,305.233,494.744,305.221,494.738,305.206z"/>
+	<polygon fill="#9B3C2F" points="494.794,305.259 494.779,305.221 494.738,305.206 494.753,305.245 	"/>
+	<path fill="#9B3C2F" d="M484.494,311.929c0.111-0.791,0.245-1.576,0.344-2.369C484.74,310.353,484.605,311.138,484.494,311.929z"/>
+</g>
+</svg>
diff --git a/app/assets/stylesheets/darkswarm/groups.css.sass b/app/assets/stylesheets/darkswarm/groups.css.sass
index 90f4af2a74..42ce75ac46 100644
--- a/app/assets/stylesheets/darkswarm/groups.css.sass
+++ b/app/assets/stylesheets/darkswarm/groups.css.sass
@@ -3,6 +3,9 @@
 
 #groups
   background-color: $clr-brick-light
+  background-image: url("/assets/groups.svg")
+  background-position: center 10px
+  background-repeat: no-repeat
 
 .group
   .group_footer

From 3c3409bc1f908ca6160423dfe5961bbb1a9aa7d1 Mon Sep 17 00:00:00 2001
From: summerscope <summerscope@gmail.com>
Date: Tue, 27 May 2014 18:03:12 +1000
Subject: [PATCH 107/139] Tweaks to styling on groups page

---
 app/assets/stylesheets/darkswarm/groups.css.sass | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/darkswarm/groups.css.sass b/app/assets/stylesheets/darkswarm/groups.css.sass
index 42ce75ac46..b859273ab7 100644
--- a/app/assets/stylesheets/darkswarm/groups.css.sass
+++ b/app/assets/stylesheets/darkswarm/groups.css.sass
@@ -4,17 +4,17 @@
 #groups
   background-color: $clr-brick-light
   background-image: url("/assets/groups.svg")
-  background-position: center 10px
+  background-position: center 15px
   background-repeat: no-repeat
+  padding-bottom: 20px
 
 .group
-  .group_footer
-    margin-bottom: 1em
-    hr
-      border-bottom: 10px solid white
-      outline: none
-      border-top: none
-      margin-top: none
+  padding-bottom: 40px
+  hr
+    border-bottom: 10px solid white
+    outline: 0
+    border-top: 0
+    margin: 0
 
 .group-hero
   position: relative

From 1a79b966e96bac39c7795139895d4e8e86485f81 Mon Sep 17 00:00:00 2001
From: summerscope <summerscope@gmail.com>
Date: Wed, 28 May 2014 12:21:25 +1000
Subject: [PATCH 108/139] Adding in links to homepage buttons for Groups &
 Producers

---
 app/assets/stylesheets/darkswarm/mixins.sass | 4 ++--
 app/views/home/_groups.html.haml             | 2 +-
 app/views/home/_producers.html.haml          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/darkswarm/mixins.sass b/app/assets/stylesheets/darkswarm/mixins.sass
index fde601f2d9..fd26cfcae9 100644
--- a/app/assets/stylesheets/darkswarm/mixins.sass
+++ b/app/assets/stylesheets/darkswarm/mixins.sass
@@ -85,10 +85,10 @@
   &, & *
     color: $clr-turquoise
   a
-    color: white
+    color: $clr-turquoise
     &:hover
       text-decoration: none
-      color: $clr-turquoise-light
+      color: $clr-turquoise-bright
 
 @mixin fullbg
   background-position: center center 
diff --git a/app/views/home/_groups.html.haml b/app/views/home/_groups.html.haml
index 0e16977f20..dd55a9bcd1 100644
--- a/app/views/home/_groups.html.haml
+++ b/app/views/home/_groups.html.haml
@@ -5,6 +5,6 @@
       %h2 Groups / Regions
       %h5 See all the groups &amp; regions on the Open Food Network
       %p
-      %button.neutral-btn.light 
+      %a.neutral-btn.light{href: "/groups"}
         %i.fi-torsos-all 
         View groups &amp; regions
\ No newline at end of file
diff --git a/app/views/home/_producers.html.haml b/app/views/home/_producers.html.haml
index c24f170e72..31a573d610 100644
--- a/app/views/home/_producers.html.haml
+++ b/app/views/home/_producers.html.haml
@@ -5,6 +5,6 @@
       %h2 Producers
       %h5 Looking for a specific producer or farmer?
       %p
-      %button.neutral-btn.turquoise
+      %a.neutral-btn.turquoise{href: "/producers"}
         %i.fi-trees
         View all producers
\ No newline at end of file

From 1af82bd4fb492d5d7b377f26149a11b4f79c1559 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 28 May 2014 12:58:06 +1000
Subject: [PATCH 109/139] Forcing scope to parent scope so we don't child our
 child

Conflicts:
	app/assets/javascripts/darkswarm/directives/modal.js.coffee
---
 app/assets/javascripts/darkswarm/directives/modal.js.coffee | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/directives/modal.js.coffee b/app/assets/javascripts/darkswarm/directives/modal.js.coffee
index f641c29cb5..c1af42b2fc 100644
--- a/app/assets/javascripts/darkswarm/directives/modal.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/modal.js.coffee
@@ -8,14 +8,13 @@ Darkswarm.directive "ofnModal", ($modal)->
   link: (scope, elem, attrs, ctrl, transclude)->
     scope.title = attrs.title
     contents = null
-    
     # We're using an isolate scope, which is a child of the original scope
     # We have to compile the transclude against the original scope, not the isolate
     transclude scope.$parent, (clone)->
       contents = clone
 
     elem.on "click", =>
-      scope.modalInstance = $modal.open(controller: ctrl, template: contents)
+      scope.modalInstance = $modal.open(controller: ctrl, template: contents, scope: scope.$parent)
 
 # TODO THIS IS TERRIBLE PLEASE FIX NG-BIND-HTML
 Darkswarm.directive "injectHtml", ->

From 576f10dbc39dfee489ab745f7a096e4737da3b9f Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 28 May 2014 12:58:23 +1000
Subject: [PATCH 110/139] Adding ng-if checks

Conflicts:
	app/views/modals/_producer.html.haml
---
 app/views/modals/_producer.html.haml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/views/modals/_producer.html.haml b/app/views/modals/_producer.html.haml
index 6798598f49..51ad2e4852 100644
--- a/app/views/modals/_producer.html.haml
+++ b/app/views/modals/_producer.html.haml
@@ -13,24 +13,24 @@
       %img.producer-logo{"ng-src" => "{{producer.logo}}"} 
       %h4 Stay in touch with {{ producer.name }}
       %ul.small-block-grid-1{bindonce: true}
-        %li{"bo-if" => "producer.website"}
-          %a{"bo-href" => "{{producer.website}}", target: "_blank" }
+        %li{"ng-if" => "producer.website"}
+          %a{"ng-href" => "{{producer.website}}", target: "_blank" }
             %i.fi-web
             {{ producer.website }}
-        %li  
+        %li{"ng-if" => "producer.twitter"} 
           %a{"ng-href" => "http://twitter.com/{{producer.twitter}}", target: "_blank"}
             %i.fi-social-twitter
             {{ producer.twitter }}
-        %li 
-          %a{"bo-href" => "{{producer.facebook}}", target: "_blank"}
+        %li{"ng-if" => "producer.facebook"}
+          %a{"ng-href" => "{{producer.facebook}}", target: "_blank"}
             %i.fi-social-facebook
             {{ producer.facebook }}
-        %li 
-          %a{"bo-href" => "{{producer.linkedin}}", target: "_blank"}
+        %li{"ng-if" => "producer.linkedin"}
+          %a{"ng-href" => "{{producer.linkedin}}", target: "_blank"}
             %i.fi-social-linkedin
             {{ producer.linkedin }}
-        %li
-          %a{"bo-href" => "http://instagram.com/{{producer.instagram}}", target: "_blank"}  
+        %li{"ng-if" => "producer.instagram"}
+          %a{"ng-href" => "http://instagram.com/{{producer.instagram}}", target: "_blank"}  
             / Will needs logic to allow user to input @instagramhandle to drive a logical URL
             %i.fi-social-instagram
             {{ producer.instagram }}

From c26462db5794a5e63485dada840b9172a81a7c9b Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 28 May 2014 13:25:45 +1000
Subject: [PATCH 111/139] Addin some URL stripping

---
 .../darkswarm/filters/strip_url.js.coffee        |  6 ++++++
 app/views/modals/_producer.html.haml             |  7 +++++--
 .../darkswarm/filters/strip_url_spec.js.coffee   | 16 ++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)
 create mode 100644 app/assets/javascripts/darkswarm/filters/strip_url.js.coffee
 create mode 100644 spec/javascripts/unit/darkswarm/filters/strip_url_spec.js.coffee

diff --git a/app/assets/javascripts/darkswarm/filters/strip_url.js.coffee b/app/assets/javascripts/darkswarm/filters/strip_url.js.coffee
new file mode 100644
index 0000000000..dcc86b600a
--- /dev/null
+++ b/app/assets/javascripts/darkswarm/filters/strip_url.js.coffee
@@ -0,0 +1,6 @@
+Darkswarm.filter "stripUrl", ->
+  stripper = /(https?:\/\/)?(www\.)?(.*)/
+  (url) ->
+    url.match(stripper).pop()
+
+
diff --git a/app/views/modals/_producer.html.haml b/app/views/modals/_producer.html.haml
index 51ad2e4852..1b976aeece 100644
--- a/app/views/modals/_producer.html.haml
+++ b/app/views/modals/_producer.html.haml
@@ -16,22 +16,25 @@
         %li{"ng-if" => "producer.website"}
           %a{"ng-href" => "{{producer.website}}", target: "_blank" }
             %i.fi-web
-            {{ producer.website }}
+            {{ producer.website | stripUrl }}
+
         %li{"ng-if" => "producer.twitter"} 
           %a{"ng-href" => "http://twitter.com/{{producer.twitter}}", target: "_blank"}
             %i.fi-social-twitter
             {{ producer.twitter }}
+
         %li{"ng-if" => "producer.facebook"}
           %a{"ng-href" => "{{producer.facebook}}", target: "_blank"}
             %i.fi-social-facebook
             {{ producer.facebook }}
+
         %li{"ng-if" => "producer.linkedin"}
           %a{"ng-href" => "{{producer.linkedin}}", target: "_blank"}
             %i.fi-social-linkedin
             {{ producer.linkedin }}
+
         %li{"ng-if" => "producer.instagram"}
           %a{"ng-href" => "http://instagram.com/{{producer.instagram}}", target: "_blank"}  
-            / Will needs logic to allow user to input @instagramhandle to drive a logical URL
             %i.fi-social-instagram
             {{ producer.instagram }}
 
diff --git a/spec/javascripts/unit/darkswarm/filters/strip_url_spec.js.coffee b/spec/javascripts/unit/darkswarm/filters/strip_url_spec.js.coffee
new file mode 100644
index 0000000000..f34df5cc71
--- /dev/null
+++ b/spec/javascripts/unit/darkswarm/filters/strip_url_spec.js.coffee
@@ -0,0 +1,16 @@
+describe 'filtering urls', ->
+  filter = null
+
+  beforeEach ->
+    module 'Darkswarm'
+    inject ($filter) ->
+      filter = $filter('stripUrl')
+
+  it "removes http and www", ->
+    expect(filter("http://www.footle.com")).toEqual "footle.com"
+
+  it "removes https and www", ->
+    expect(filter("https://www.footle.com")).toEqual "footle.com"
+
+  it "removes just www", ->
+    expect(filter("www.footle.com")).toEqual "footle.com"

From 0c8ee2488b4cbad84d9765b1d99e40aa8e2e4634 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 28 May 2014 14:58:53 +1000
Subject: [PATCH 112/139] Moving back to ng-bind-html

---
 .../javascripts/darkswarm/directives/modal.js.coffee      | 8 --------
 app/views/modals/_producer.html.haml                      | 6 +++---
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/directives/modal.js.coffee b/app/assets/javascripts/darkswarm/directives/modal.js.coffee
index c1af42b2fc..c8ed5df4af 100644
--- a/app/assets/javascripts/darkswarm/directives/modal.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/modal.js.coffee
@@ -15,11 +15,3 @@ Darkswarm.directive "ofnModal", ($modal)->
 
     elem.on "click", =>
       scope.modalInstance = $modal.open(controller: ctrl, template: contents, scope: scope.$parent)
-
-# TODO THIS IS TERRIBLE PLEASE FIX NG-BIND-HTML
-Darkswarm.directive "injectHtml", ->
-  restrict: 'A'
-  scope:
-    injectHtml: "="
-  link: (scope, elem, attrs, ctrl)->
-    elem.html(scope.injectHtml)
diff --git a/app/views/modals/_producer.html.haml b/app/views/modals/_producer.html.haml
index 1b976aeece..35d95bef5e 100644
--- a/app/views/modals/_producer.html.haml
+++ b/app/views/modals/_producer.html.haml
@@ -5,7 +5,7 @@
       / Will - scale large images down to 1200px wide, crop in to img aspect ratio 60W:13H
       %h3.producer-name {{ producer.name }}
   .row  
-    .columns.small-12.large-6{"inject-html" => "producer.long_description"}
+    .columns.small-12.large-6{"ng-bind-html" => "producer.long_description"}
     .columns.small-12.large-6
       / Will needs logic to add in following only if data is available for each type:
       / Will needs better formatting of URLs printed on-screen (minus http://www.)
@@ -26,12 +26,12 @@
         %li{"ng-if" => "producer.facebook"}
           %a{"ng-href" => "{{producer.facebook}}", target: "_blank"}
             %i.fi-social-facebook
-            {{ producer.facebook }}
+            {{ producer.facebook | stripUrl }}
 
         %li{"ng-if" => "producer.linkedin"}
           %a{"ng-href" => "{{producer.linkedin}}", target: "_blank"}
             %i.fi-social-linkedin
-            {{ producer.linkedin }}
+            {{ producer.linkedin | stripUrl }}
 
         %li{"ng-if" => "producer.instagram"}
           %a{"ng-href" => "http://instagram.com/{{producer.instagram}}", target: "_blank"}  

From 50c7bd55be9523587992b9b4ae29ee4a7274d3e3 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 28 May 2014 15:06:01 +1000
Subject: [PATCH 113/139] Adding url strip and re-construction of http

---
 app/views/modals/_producer.html.haml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/views/modals/_producer.html.haml b/app/views/modals/_producer.html.haml
index 35d95bef5e..37250176f6 100644
--- a/app/views/modals/_producer.html.haml
+++ b/app/views/modals/_producer.html.haml
@@ -7,14 +7,11 @@
   .row  
     .columns.small-12.large-6{"ng-bind-html" => "producer.long_description"}
     .columns.small-12.large-6
-      / Will needs logic to add in following only if data is available for each type:
-      / Will needs better formatting of URLs printed on-screen (minus http://www.)
-      / Will needs formatting of URLs driving %a regardless of user input (plus http://www.)
       %img.producer-logo{"ng-src" => "{{producer.logo}}"} 
       %h4 Stay in touch with {{ producer.name }}
       %ul.small-block-grid-1{bindonce: true}
         %li{"ng-if" => "producer.website"}
-          %a{"ng-href" => "{{producer.website}}", target: "_blank" }
+          %a{"ng-href" => "http://{{producer.website | stripUrl}}", target: "_blank" }
             %i.fi-web
             {{ producer.website | stripUrl }}
 
@@ -24,12 +21,12 @@
             {{ producer.twitter }}
 
         %li{"ng-if" => "producer.facebook"}
-          %a{"ng-href" => "{{producer.facebook}}", target: "_blank"}
+          %a{"ng-href" => "http://{{producer.facebook | stripUrl}}", target: "_blank"}
             %i.fi-social-facebook
             {{ producer.facebook | stripUrl }}
 
         %li{"ng-if" => "producer.linkedin"}
-          %a{"ng-href" => "{{producer.linkedin}}", target: "_blank"}
+          %a{"ng-href" => "http://{{producer.linkedin | stripUrl}}", target: "_blank"}
             %i.fi-social-linkedin
             {{ producer.linkedin | stripUrl }}
 

From a7105fc3a850efdb68bf8c06815954359540f6bd Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 28 May 2014 16:01:19 +1000
Subject: [PATCH 114/139] Tweaking image sizing on enterprise

---
 app/models/enterprise.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb
index a72c6fdbd6..cdb94d74ba 100644
--- a/app/models/enterprise.rb
+++ b/app/models/enterprise.rb
@@ -18,8 +18,8 @@ class Enterprise < ActiveRecord::Base
   delegate :latitude, :longitude, :city, :state_name, :to => :address
 
   accepts_nested_attributes_for :address
-  has_attached_file :logo, :styles => { :medium => "300x300>", :thumb => "100x100>" }, :default_url => "/images/:style/missing.png"
-  has_attached_file :promo_image, :styles => { :large => "570x380>", :thumb => "100x100>" }, :default_url => "/images/:style/missing.png"
+  has_attached_file :logo, :styles => { :medium => "300x300>", :thumb => "100x100>" }
+  has_attached_file :promo_image, :styles => { :large => "260x1200#", :thumb => "100x100>" }
 
   validates_presence_of :name
   validates_presence_of :address

From f65ff5af18d70b2e8bde22cff384c2eebbcb7cb6 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 28 May 2014 16:01:36 +1000
Subject: [PATCH 115/139] Automatically sorting out image rotation

---
 config/initializers/paperclip.rb | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 config/initializers/paperclip.rb

diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb
new file mode 100644
index 0000000000..c40b9a4130
--- /dev/null
+++ b/config/initializers/paperclip.rb
@@ -0,0 +1,3 @@
+Paperclip::Attachment.default_options[:convert_options] = {
+  all: "-auto-orient"
+}

From b8cc9d33436a89172d3598ebec713641248b628c Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 28 May 2014 16:02:54 +1000
Subject: [PATCH 116/139] Modding image sizing on groups

---
 app/models/enterprise_group.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/enterprise_group.rb b/app/models/enterprise_group.rb
index 6c163b087a..1cea76db72 100644
--- a/app/models/enterprise_group.rb
+++ b/app/models/enterprise_group.rb
@@ -9,7 +9,7 @@ class EnterpriseGroup < ActiveRecord::Base
   attr_accessible :name, :description, :long_description, :on_front_page, :enterprise_ids
 
   attr_accessible :promo_image
-  has_attached_file :promo_image, styles: {medium: "800>400"}
+  has_attached_file :promo_image, styles: {large: "260x1200#"}
   validates_attachment_content_type :promo_image, :content_type => /\Aimage\/.*\Z/
 
   attr_accessible :logo

From 9bb059493e6ae162af7c85ce8bd20957053849ac Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 28 May 2014 16:03:05 +1000
Subject: [PATCH 117/139] Fixing the image render

---
 app/views/groups/index.html.haml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/views/groups/index.html.haml b/app/views/groups/index.html.haml
index fdbf8c5ee6..afa28624f0 100644
--- a/app/views/groups/index.html.haml
+++ b/app/views/groups/index.html.haml
@@ -22,11 +22,10 @@
     .row.pad-top{bindonce: true}
       .small-12.columns
         .group-hero
-          %img.group-hero-img{"bo-src" => "{{group.promo_image}}"} 
+          %img.group-hero-img{"bo-src" => "group.promo_image"} 
           %img.group-logo{"bo-src" => "group.logo"}
           %h3.group-name {{ group.name }}
           %h5.group-description {{ group.description }}
-          / Will - scale large images down to 1200px wide, crop in to img aspect ratio 60W:13H
           
     .row.pad-top{bindonce: true}
       .small-6.columns

From 33829d90446e141bba33c69bd946208fb3df018d Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 28 May 2014 16:03:21 +1000
Subject: [PATCH 118/139] Only rendering images if they exist

---
 app/views/json/_groups.rabl  | 6 +++++-
 app/views/shop/products.rabl | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/views/json/_groups.rabl b/app/views/json/_groups.rabl
index 9475b425c4..27325bb850 100644
--- a/app/views/json/_groups.rabl
+++ b/app/views/json/_groups.rabl
@@ -6,5 +6,9 @@ child enterprises: :enterprises do
 end
 
 node :logo do |group|
-  group.logo(:original)
+  group.logo(:medium) if group.logo.exists?
+end
+
+node :promo_image do |group|
+  group.promo_image(:large) if group.promo_image.exists?
 end
diff --git a/app/views/shop/products.rabl b/app/views/shop/products.rabl
index ee5e567285..b1567a311a 100644
--- a/app/views/shop/products.rabl
+++ b/app/views/shop/products.rabl
@@ -13,10 +13,10 @@ child :supplier => :supplier do
   attributes :id, :name, :description, :long_description, :website, :instagram, :facebook, :linkedin, :twitter
 
   node :logo do |supplier|
-    supplier.logo.url
+    supplier.logo(:medium) if supplier.logo.exists?
   end
   node :promo_image do |supplier|
-    supplier.promo_image.url
+    supplier.promo_image(:large) if supplier.promo_image.exists?
   end
 end
 

From fcfda13a73787fb73b7717e9a2de8fd973936d47 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 28 May 2014 16:10:28 +1000
Subject: [PATCH 119/139] Patching a couple of minor regressions

---
 app/assets/javascripts/darkswarm/all.js.coffee                  | 2 +-
 .../controllers/products/product_node_controller.js.coffee      | 1 -
 app/views/modals/_producer.html.haml                            | 2 +-
 spec/javascripts/application_spec.js                            | 1 +
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/all.js.coffee b/app/assets/javascripts/darkswarm/all.js.coffee
index 3a039394ca..2c07d069c4 100644
--- a/app/assets/javascripts/darkswarm/all.js.coffee
+++ b/app/assets/javascripts/darkswarm/all.js.coffee
@@ -5,8 +5,8 @@
 #
 #= require angular
 #= require angular-cookies
-#= require angular-resource
 #= require angular-sanitize
+#= require angular-resource
 #= require ../shared/mm-foundation-tpls-0.2.0-SNAPSHOT
 #= require ../shared/bindonce.min.js
 #= require ../shared/ng-infinite-scroll.min.js
diff --git a/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
index fa0daababc..ca29b01449 100644
--- a/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
@@ -8,7 +8,6 @@ Darkswarm.controller "ProductNodeCtrl", ($scope, $sce) ->
       $scope.product.price
 
   $scope.producer = $scope.product.supplier
-  $scope.producer.twitterific = true
   $scope.hasVariants = $scope.product.variants.length > 0
 
 Darkswarm.filter "unsafe", ($sce) ->
diff --git a/app/views/modals/_producer.html.haml b/app/views/modals/_producer.html.haml
index 37250176f6..13f8026195 100644
--- a/app/views/modals/_producer.html.haml
+++ b/app/views/modals/_producer.html.haml
@@ -7,7 +7,7 @@
   .row  
     .columns.small-12.large-6{"ng-bind-html" => "producer.long_description"}
     .columns.small-12.large-6
-      %img.producer-logo{"ng-src" => "{{producer.logo}}"} 
+      %img.producer-logo{"ng-src" => "{{producer.logo}}", "ng-if" => "producer.logo"} 
       %h4 Stay in touch with {{ producer.name }}
       %ul.small-block-grid-1{bindonce: true}
         %li{"ng-if" => "producer.website"}
diff --git a/spec/javascripts/application_spec.js b/spec/javascripts/application_spec.js
index 9e821754de..df629c1c81 100644
--- a/spec/javascripts/application_spec.js
+++ b/spec/javascripts/application_spec.js
@@ -1,6 +1,7 @@
 //= require angular
 //= require angular-resource
 //= require angular-animate
+//= require angular-sanitize
 //= require angular-mocks
 //= require angular-cookies
 //= require angular-backstretch.js

From 98b4fe27f6c11ac0c45b0464fc37fa550f05564e Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 28 May 2014 16:12:13 +1000
Subject: [PATCH 120/139] Hiding group logo if not present

---
 app/views/groups/index.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/groups/index.html.haml b/app/views/groups/index.html.haml
index afa28624f0..40b56e2551 100644
--- a/app/views/groups/index.html.haml
+++ b/app/views/groups/index.html.haml
@@ -23,7 +23,7 @@
       .small-12.columns
         .group-hero
           %img.group-hero-img{"bo-src" => "group.promo_image"} 
-          %img.group-logo{"bo-src" => "group.logo"}
+          %img.group-logo{"bo-src" => "group.logo", "bo-if" => "group.logo"}
           %h3.group-name {{ group.name }}
           %h5.group-description {{ group.description }}
           

From 4b1f409774226ee0d7c57fbd274008833d1dcfd4 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Wed, 28 May 2014 16:19:10 +1000
Subject: [PATCH 121/139] Only rendering images that exist{

---
 app/views/modals/_product.html.haml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/views/modals/_product.html.haml b/app/views/modals/_product.html.haml
index 70137ba987..52a7bc7f1f 100644
--- a/app/views/modals/_product.html.haml
+++ b/app/views/modals/_product.html.haml
@@ -2,13 +2,11 @@
 
   .row
     .columns.small-12.large-6
-      %img.product-img{"ng-src" => "{{product.master.images[0].large_url}}"} 
+      %img.product-img{"ng-src" => "{{product.master.images[0].large_url}}", "ng-if" => "product.master.images[0]"} 
     .columns.small-12.large-6
       %h2 
         %img{"ng-src" => "{{product.primary_taxon.icon}}"} 
         {{product.name}}
       %p {{product.description}}
-  / %pre
-  /   {{ product | json }}
   %a.close-reveal-modal{"ng-click" => "$close()"} &#215;
- 
\ No newline at end of file
+ 

From 09ce8697afda30a890323c62a66b8285842c20c0 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Wed, 28 May 2014 16:55:04 +1000
Subject: [PATCH 122/139] Only trigger taxon search AJAX when column visible -
 fixes deadlocks in specs

---
 app/views/spree/admin/products/bulk_edit.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/spree/admin/products/bulk_edit.html.haml b/app/views/spree/admin/products/bulk_edit.html.haml
index ee74fd9662..fa295adb47 100644
--- a/app/views/spree/admin/products/bulk_edit.html.haml
+++ b/app/views/spree/admin/products/bulk_edit.html.haml
@@ -132,7 +132,7 @@
           %td{ 'ng-show' => 'columns.on_hand.visible' }
             %span{ 'ng-bind' => 'product.on_hand', :name => 'on_hand', 'ng-show' => '!hasOnDemandVariants(product) && (hasVariants(product) || product.on_demand)' }
             %input.field{ 'ng-model' => 'product.on_hand', :name => 'on_hand', 'ofn-track-product' => 'on_hand', 'ng-hide' => 'hasVariants(product) || product.on_demand', :type => 'number' }
-          %td{ 'ng-show' => 'columns.taxons.visible' }
+          %td{ 'ng-if' => 'columns.taxons.visible' }
             %input.fullwidth{ :type => 'text', 'ng-model' => 'product.taxon_ids', 'ofn-taxon-autocomplete' => '', 'ofn-track-product' => 'taxon_ids' }
           %td{ 'ng-show' => 'columns.available_on.visible' }
             %input{ 'ng-model' => 'product.available_on', :name => 'available_on', 'ofn-track-product' => 'available_on', 'datetimepicker' => 'product.available_on', type: "text" }

From 2a630a855acda49a0abd17b1ed29c5ee9006d007 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 29 May 2014 09:28:08 +1000
Subject: [PATCH 123/139] Move primary taxon field into Rob's new product form

---
 .../add_primary_taxon_field.html.haml.deface  |  3 +++
 .../new/replace_form.html.haml.deface         | 25 ++++++++++++-------
 .../products/_primary_taxon_form.html.haml    |  5 ++++
 3 files changed, 24 insertions(+), 9 deletions(-)
 create mode 100644 app/overrides/spree/admin/products/_form/add_primary_taxon_field.html.haml.deface
 create mode 100644 app/views/spree/admin/products/_primary_taxon_form.html.haml

diff --git a/app/overrides/spree/admin/products/_form/add_primary_taxon_field.html.haml.deface b/app/overrides/spree/admin/products/_form/add_primary_taxon_field.html.haml.deface
new file mode 100644
index 0000000000..efd7ccbfaf
--- /dev/null
+++ b/app/overrides/spree/admin/products/_form/add_primary_taxon_field.html.haml.deface
@@ -0,0 +1,3 @@
+/ insert_top "[data-hook='admin_product_form_right']"
+
+= render 'spree/admin/products/primary_taxon_form', f: f
\ No newline at end of file
diff --git a/app/overrides/spree/admin/products/new/replace_form.html.haml.deface b/app/overrides/spree/admin/products/new/replace_form.html.haml.deface
index c752744ee6..e964e9a704 100644
--- a/app/overrides/spree/admin/products/new/replace_form.html.haml.deface
+++ b/app/overrides/spree/admin/products/new/replace_form.html.haml.deface
@@ -2,20 +2,25 @@
 
 %fieldset{ id: "new_product" }
   %legend{align: "center"}= t(:new_product)
+
   .row
-    = f.field_container :name do
-      = f.label :name, t(:name)
-      %span.required *
-      %br/
-      = f.text_field :name, :class => 'fullwidth title'
-      = f.error_message_on :name
-  .row
-    .alpha.six.columns
+    .alpha.eleven.columns
+      = f.field_container :name do
+        = f.label :name, t(:name)
+        %span.required *
+        %br/
+        = f.text_field :name, :class => 'fullwidth title'
+        = f.error_message_on :name
+    .five.columns.omega
       = f.field_container :supplier do
         = f.label :supplier
         %span.required *
         = f.collection_select(:supplier_id, Enterprise.is_primary_producer.managed_by(spree_current_user).by_name, :id, :name, {:include_blank => true}, {:class => "select2 fullwidth"})
         = f.error_message_on :supplier
+
+  .row
+    .alpha.six.columns
+      = render 'spree/admin/products/primary_taxon_form', f: f
     .five.columns
       = f.field_container :price do
         = f.label :price, t(:price)
@@ -30,6 +35,7 @@
         %br/
         = f.text_field :on_hand, :class => 'fullwidth'
         = f.error_message_on :on_hand
+
   .row{ 'ng-controller' => 'unitsCtrl' }
     .six.columns.alpha
       = f.label :variant_unit_with_scale, :units
@@ -45,6 +51,7 @@
     .five.columns.omega{ 'ng-show' => "product.variant_unit_with_scale == 'items'" }
       = f.label :product_variant_unit_name, :unit_name
       %input.fullwidth{ id: 'product_variant_unit_name','ng-model' => 'product.variant_unit_name', :name => 'product[variant_unit_name]', :placeholder => 'eg. bunches', :type => 'text' }
+
   #product-from-prototype.clearfix{"data-hook" => "product-from-prototype"}
     = render :file => 'spree/admin/prototypes/show' if @prototype
   = render :partial => 'spree/admin/shared/new_resource_links'
@@ -53,4 +60,4 @@
 :javascript
   angular.element(document.getElementById("new_product")).ready(function() {
     angular.bootstrap(document.getElementById("new_product"), ['admin.products']);
-  });
\ No newline at end of file
+  });
diff --git a/app/views/spree/admin/products/_primary_taxon_form.html.haml b/app/views/spree/admin/products/_primary_taxon_form.html.haml
new file mode 100644
index 0000000000..a844f4f447
--- /dev/null
+++ b/app/views/spree/admin/products/_primary_taxon_form.html.haml
@@ -0,0 +1,5 @@
+= f.field_container :primary_taxon_id do
+  = f.label :primary_taxon_id
+  %br
+  = f.collection_select(:primary_taxon_id, Spree::Taxon.all, :id, :name, {:include_blank => true}, {:class => "select2 fullwidth"})
+  = f.error_message_on :primary_taxon_id

From fdff442ec66e814a2fdae0973a212a099f5d28f5 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 29 May 2014 10:54:08 +1000
Subject: [PATCH 124/139] Do not fetch products JSON on every shopping page

---
 .../order_cycle_controller.js.coffee          | 14 ++++++++------
 .../darkswarm/services/order.js.coffee        |  2 +-
 .../darkswarm/services/order_cycle.js.coffee  |  6 +++---
 .../darkswarm/services/product.js.coffee      |  2 +-
 app/views/shop/show.html.haml                 | 19 ++++++++++---------
 .../shopping_shared/_order_cycles.html.haml   |  2 --
 6 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee
index 29e81ae861..555e49c539 100644
--- a/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/order_cycle_controller.js.coffee
@@ -1,15 +1,17 @@
-Darkswarm.controller "OrderCycleCtrl", ($scope, $rootScope, OrderCycle, $timeout) ->
+Darkswarm.controller "OrderCycleCtrl", ($scope, OrderCycle, $timeout) ->
   $scope.order_cycle = OrderCycle.order_cycle
   $scope.OrderCycle = OrderCycle
 
-  $scope.changeOrderCycle = ->
-    OrderCycle.push_order_cycle()
-    $timeout ->
-      $("#order_cycle_id").trigger("closeTrigger") 
-
   # Timeout forces this to be evaluated after everything is loaded
   # This is a hack. We should probably write our own "popover" directive
   # That takes an expression instead of a trigger, and binds to that
   $timeout =>
     if !$scope.OrderCycle.selected()
       $("#order_cycle_id").trigger("openTrigger") 
+
+
+Darkswarm.controller "OrderCycleChangeCtrl", ($scope, OrderCycle, Product, $timeout) ->
+  $scope.changeOrderCycle = ->
+    OrderCycle.push_order_cycle Product.update
+    $timeout ->
+      $("#order_cycle_id").trigger("closeTrigger") 
diff --git a/app/assets/javascripts/darkswarm/services/order.js.coffee b/app/assets/javascripts/darkswarm/services/order.js.coffee
index 2357fd42da..8078cf8fc3 100644
--- a/app/assets/javascripts/darkswarm/services/order.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/order.js.coffee
@@ -1,4 +1,4 @@
-Darkswarm.factory 'Order', ($resource, Product, order, $http, CheckoutFormState, flash, Navigation)->
+Darkswarm.factory 'Order', ($resource, order, $http, CheckoutFormState, flash, Navigation)->
   new class Order
     errors: {}
 
diff --git a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
index 1bb23446a2..0c5176328b 100644
--- a/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/order_cycle.js.coffee
@@ -1,10 +1,10 @@
-Darkswarm.factory 'OrderCycle', ($resource, Product, orderCycleData) ->
+Darkswarm.factory 'OrderCycle', ($resource, orderCycleData) ->
   class OrderCycle
     @order_cycle = orderCycleData # Object or {} due to RABL 
-    @push_order_cycle: ->
+    @push_order_cycle: (callback) ->
       new $resource("/shop/order_cycle").save {order_cycle_id: @order_cycle.order_cycle_id}, (order_data)->
         OrderCycle.order_cycle.orders_close_at = order_data.orders_close_at
-        Product.update()
+        callback()
 
     @orders_close_at: ->
       @order_cycle.orders_close_at if @selected()
diff --git a/app/assets/javascripts/darkswarm/services/product.js.coffee b/app/assets/javascripts/darkswarm/services/product.js.coffee
index e58b83bacc..406e122de1 100644
--- a/app/assets/javascripts/darkswarm/services/product.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/product.js.coffee
@@ -9,7 +9,7 @@ Darkswarm.factory 'Product', ($resource) ->
       products: null
       loading: true
 
-    update: ->
+    update: =>
       @data.products = $resource("/shop/products").query =>
         @data.loading = false 
       @data
diff --git a/app/views/shop/show.html.haml b/app/views/shop/show.html.haml
index b94bd59bf9..d4b36a5e29 100644
--- a/app/views/shop/show.html.haml
+++ b/app/views/shop/show.html.haml
@@ -1,19 +1,20 @@
 %shop.darkswarm
   - content_for :order_cycle_form do
 
-    %strong.avenir Ready for
-    %select.avenir#order_cycle_id{"ng-model" => "order_cycle.order_cycle_id", 
-            "ng-change" => "changeOrderCycle()",
-            "ng-options" => "oc.id as oc.time for oc in #{@order_cycles.map {|oc| {time: pickup_time(oc), id: oc.id}}.to_json}",
-            "popover-placement" => "bottom", "popover" => "When do you want to get your order?", "popover-trigger" => "openTrigger"}
+    %div{"ng-controller" => "OrderCycleChangeCtrl"}
+      %strong.avenir Ready for
+      %select.avenir#order_cycle_id{"ng-model" => "order_cycle.order_cycle_id", 
+              "ng-change" => "changeOrderCycle()",
+              "ng-options" => "oc.id as oc.time for oc in #{@order_cycles.map {|oc| {time: pickup_time(oc), id: oc.id}}.to_json}",
+              "popover-placement" => "bottom", "popover" => "When do you want to get your order?", "popover-trigger" => "openTrigger"}
 
-    %closing{"ng-if" => "OrderCycle.selected()"}
-      Orders close
-      %strong {{ OrderCycle.orders_close_at() | date_in_words }} 
+      %closing{"ng-if" => "OrderCycle.selected()"}
+        Orders close
+        %strong {{ OrderCycle.orders_close_at() | date_in_words }} 
 
   = render partial: "shopping_shared/details"
 
   .row
     = render partial: "shop/products/form"
 
-= render partial: "shared/footer"
\ No newline at end of file
+= render partial: "shared/footer"
diff --git a/app/views/shopping_shared/_order_cycles.html.haml b/app/views/shopping_shared/_order_cycles.html.haml
index 91517e0c1c..195389df91 100644
--- a/app/views/shopping_shared/_order_cycles.html.haml
+++ b/app/views/shopping_shared/_order_cycles.html.haml
@@ -14,5 +14,3 @@
   - else
     %form.custom
       = yield :order_cycle_form
-
-

From b757629bfa80ce3ad7fa38aa2ae92e9b9e5154e7 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 29 May 2014 11:52:46 +1000
Subject: [PATCH 125/139] Minor test tweaks

---
 spec/features/admin/bulk_order_management_spec.rb             | 2 +-
 spec/javascripts/unit/darkswarm/services/order_spec.js.coffee | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/spec/features/admin/bulk_order_management_spec.rb b/spec/features/admin/bulk_order_management_spec.rb
index 79981bbd16..963cd04f8d 100644
--- a/spec/features/admin/bulk_order_management_spec.rb
+++ b/spec/features/admin/bulk_order_management_spec.rb
@@ -206,7 +206,7 @@ feature %q{
         page.should have_selector "tr#li_#{li2.id}", visible: true
         select2_select s1.name, from: "supplier_filter"
         page.should have_selector "tr#li_#{li1.id}", visible: true
-        page.should_not have_selector "tr#li_#{li2.id}", visible: true
+        page.should_not have_selector "tr#li_#{li2.id}"
       end
 
       it "displays all line items when 'All' is selected from supplier filter" do
diff --git a/spec/javascripts/unit/darkswarm/services/order_spec.js.coffee b/spec/javascripts/unit/darkswarm/services/order_spec.js.coffee
index fedcf23629..c5df602b3a 100644
--- a/spec/javascripts/unit/darkswarm/services/order_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/services/order_spec.js.coffee
@@ -77,7 +77,6 @@ describe 'Order service', ->
     $httpBackend.flush()
     expect(Order.errors).toEqual {error: "frogs"}
 
-
   it "Munges the order attributes to add _attributes as Rails needs", ->
     expect(Order.preprocess().bill_address_attributes).not.toBe(undefined)
     expect(Order.preprocess().bill_address).toBe(undefined)

From 65d11ce552b5312a51649fa0a913c91891a40d01 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 29 May 2014 15:41:27 +1000
Subject: [PATCH 126/139] Removing some unnecessary

---
 app/views/spree/shared/_order_details.html.haml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/views/spree/shared/_order_details.html.haml b/app/views/spree/shared/_order_details.html.haml
index 559a0227f1..b6ff00925d 100644
--- a/app/views/spree/shared/_order_details.html.haml
+++ b/app/views/spree/shared/_order_details.html.haml
@@ -16,8 +16,6 @@
       .columns.large-2
         %h6
           = t(:shipping_method)
-          \:
-          = link_to "(#{t(:edit)})", checkout_state_path(:delivery) unless @order.completed?
         .delivery
           = order.shipping_method.name
   .columns.large-4

From 06bac3de850b279c22fd40b2f4138d9b1cc0878c Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 29 May 2014 15:45:56 +1000
Subject: [PATCH 127/139] Fixing an incorrect sentence case

---
 app/views/producers/_fat.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/producers/_fat.html.haml b/app/views/producers/_fat.html.haml
index 45b3bf8dd0..3313db6552 100644
--- a/app/views/producers/_fat.html.haml
+++ b/app/views/producers/_fat.html.haml
@@ -5,7 +5,7 @@
       {{ producer.taxons | printArrayOfObjects }}
   .columns.small-8
     %strong About us
-    %p.trans-sentence
+    %p
       {{ producer.description }}
 
 .row.active_table_row.link{"ng-show" => "open()", "ng-repeat" => "hub in producer.distributors"}

From e44853346ec7bc997746358766048a2a6f493977 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 29 May 2014 16:12:58 +1000
Subject: [PATCH 128/139] Dropping current producers, switching to suppliers
 and using Angular

---
 .../tabs/producers_controller.js.coffee       |  2 ++
 app/helpers/shared_helper.rb                  | 10 ------
 app/views/json/_current_hub.rabl              |  4 +++
 app/views/json/_hubs.rabl                     |  6 +---
 app/views/json/_producer.rabl                 |  5 +++
 app/views/shopping_shared/_modals.html.haml   | 19 -----------
 .../shopping_shared/_producers.html.haml      |  8 ++---
 spec/helpers/shared_helper_spec.rb            | 33 -------------------
 8 files changed, 15 insertions(+), 72 deletions(-)
 create mode 100644 app/assets/javascripts/darkswarm/controllers/tabs/producers_controller.js.coffee
 create mode 100644 app/views/json/_producer.rabl

diff --git a/app/assets/javascripts/darkswarm/controllers/tabs/producers_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/tabs/producers_controller.js.coffee
new file mode 100644
index 0000000000..92cf8dedfc
--- /dev/null
+++ b/app/assets/javascripts/darkswarm/controllers/tabs/producers_controller.js.coffee
@@ -0,0 +1,2 @@
+Darkswarm.controller "ProducersTabCtrl", ($scope, CurrentHub) ->
+  $scope.CurrentHub = CurrentHub
diff --git a/app/helpers/shared_helper.rb b/app/helpers/shared_helper.rb
index 828277cb57..f856a088d1 100644
--- a/app/helpers/shared_helper.rb
+++ b/app/helpers/shared_helper.rb
@@ -14,16 +14,6 @@ module SharedHelper
     klass
   end
 
-  # all suppliers of current distributor's products
-  def current_producers
-    if current_distributor && current_order_cycle
-      variants = current_order_cycle.variants_distributed_by(current_distributor)
-      Enterprise.supplying_variant_in(variants)
-    else
-      []
-    end
-  end
-  
   def enterprise_user?
     spree_current_user.andand.enterprises.andand.count.to_i > 0
   end
diff --git a/app/views/json/_current_hub.rabl b/app/views/json/_current_hub.rabl
index ab67cce3cc..57731d9599 100644
--- a/app/views/json/_current_hub.rabl
+++ b/app/views/json/_current_hub.rabl
@@ -1,2 +1,6 @@
 object current_distributor
 attributes :name, :id
+
+child suppliers: :producers do
+  extends "json/producer"
+end
diff --git a/app/views/json/_hubs.rabl b/app/views/json/_hubs.rabl
index dc589b878b..c118b4504f 100644
--- a/app/views/json/_hubs.rabl
+++ b/app/views/json/_hubs.rabl
@@ -6,11 +6,7 @@ child distributed_taxons: :taxons do
 end
 
 child suppliers: :producers do
-  attributes :name, :id, :description, :long_description
-  
-  node :promo_image do |producer| 
-    producer.promo_image.url 
-  end
+  extends "json/producer"
 end
 
 node :pickup do |hub|
diff --git a/app/views/json/_producer.rabl b/app/views/json/_producer.rabl
new file mode 100644
index 0000000000..4c0efae8e1
--- /dev/null
+++ b/app/views/json/_producer.rabl
@@ -0,0 +1,5 @@
+attributes :name, :id, :description, :long_description
+
+node :promo_image do |producer| 
+  producer.promo_image.url 
+end
diff --git a/app/views/shopping_shared/_modals.html.haml b/app/views/shopping_shared/_modals.html.haml
index ad92f1957f..83a162a470 100644
--- a/app/views/shopping_shared/_modals.html.haml
+++ b/app/views/shopping_shared/_modals.html.haml
@@ -1,22 +1,3 @@
-- for producer in current_producers
-  .reveal-modal{id: "producer_details_#{producer.id}", "data-reveal" => ""}
-    .row
-      - if producer.logo.exists?
-        .large-1.columns
-          %img.left{src: producer.logo.url(:thumb)}
-      .large-11.columns
-        %h2
-          = producer.name
-    .row
-      .large-8.columns
-        = producer.long_description.andand.html_safe
-
-      - if producer.promo_image.exists?
-        .large-4.columns
-          %img.about.right{src: producer.promo_image.url(:large)}
-    %a.close-reveal-modal &#215;
-
-
 - for group in current_distributor.groups
   - for sibling in group.enterprises.except(current_distributor)
     .reveal-modal{id: "sibling_details_#{sibling.id}", "data-reveal" => ""}
diff --git a/app/views/shopping_shared/_producers.html.haml b/app/views/shopping_shared/_producers.html.haml
index 32f09869e8..584d75ff35 100644
--- a/app/views/shopping_shared/_producers.html.haml
+++ b/app/views/shopping_shared/_producers.html.haml
@@ -1,6 +1,4 @@
-.content#producers
+.content#producers{"ng-controller" => "ProducersTabCtrl"}
   %ul
-    - for producer in current_producers
-      %li
-        %a{"data-reveal-id" => "producer_details_#{producer.id}", "data-reveal" => ""}
-          = producer.name
+    %li{"ng-repeat" => "producer in CurrentHub.producers"}
+      = render partial: "modals/producer"
diff --git a/spec/helpers/shared_helper_spec.rb b/spec/helpers/shared_helper_spec.rb
index d28a6eb7b3..92c688d1ae 100644
--- a/spec/helpers/shared_helper_spec.rb
+++ b/spec/helpers/shared_helper_spec.rb
@@ -23,37 +23,4 @@ describe SharedHelper do
     helper.stub(:current_order) { order }
     helper.distributor_link_class(d1).should =~ /empties-cart/
   end
-
-  describe "finding current producers" do
-    it "finds producers for the current distribution" do
-      s = create(:supplier_enterprise)
-      d = create(:distributor_enterprise)
-      p = create(:simple_product)
-      oc = create(:simple_order_cycle, suppliers: [s], distributors: [d], variants: [p.master])
-
-      helper.stub(:current_order_cycle) { oc }
-      helper.stub(:current_distributor) { d }
-
-      helper.current_producers.should == [s]
-    end
-
-    it "returns [] when no order cycle set" do
-      d = double(:distributor)
-
-      helper.stub(:current_order_cycle) { nil }
-      helper.stub(:current_distributor) { d }
-
-      helper.current_producers.should == []
-    end
-
-    it "returns [] when no distributor set" do
-      oc = double(:order_cycle)
-
-      helper.stub(:current_order_cycle) { oc }
-      helper.stub(:current_distributor) { nil }
-
-      helper.current_producers.should == []
-
-    end
-  end
 end

From f28fe34958314dc8f25e386ea5c19f648fc2c5d7 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 29 May 2014 16:15:39 +1000
Subject: [PATCH 129/139] Removing groups modals

---
 app/views/shopping_shared/_groups.html.haml |  8 ++------
 app/views/shopping_shared/_modals.html.haml | 17 -----------------
 2 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100644 app/views/shopping_shared/_modals.html.haml

diff --git a/app/views/shopping_shared/_groups.html.haml b/app/views/shopping_shared/_groups.html.haml
index a218d6aeb5..815cf4ec67 100644
--- a/app/views/shopping_shared/_groups.html.haml
+++ b/app/views/shopping_shared/_groups.html.haml
@@ -2,9 +2,5 @@
   %ul
     - for group in current_distributor.groups
       %li
-        %h4= group.name 
-        %ul
-          - for sibling in group.enterprises.except(current_distributor)
-            %li
-              %a{"data-reveal-id" => "sibling_details_#{sibling.id}", "data-reveal" => ""}
-                = sibling.name 
+        %h4
+          %a= group.name 
diff --git a/app/views/shopping_shared/_modals.html.haml b/app/views/shopping_shared/_modals.html.haml
deleted file mode 100644
index 83a162a470..0000000000
--- a/app/views/shopping_shared/_modals.html.haml
+++ /dev/null
@@ -1,17 +0,0 @@
-- for group in current_distributor.groups
-  - for sibling in group.enterprises.except(current_distributor)
-    .reveal-modal{id: "sibling_details_#{sibling.id}", "data-reveal" => ""}
-      .row
-        - if sibling.logo.exists?
-          .large-1.columns
-            %img.left{src: sibling.logo.url(:thumb)}
-        .large-11.columns
-          %h2
-            = sibling.name
-      .row
-        .large-8.columns
-          = sibling.long_description.andand.html_safe
-        - if sibling.promo_image.exists?
-          .large-4.columns
-            %img.about.right{src: sibling.promo_image.url(:large)}
-      %a.close-reveal-modal &#215;

From c49d9d838cfad679b7ce06a942246b02c71e0665 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 29 May 2014 16:19:20 +1000
Subject: [PATCH 130/139] Removing reference to modals and unnecessary ID

---
 app/views/shopping_shared/_details.html.haml | 2 --
 app/views/shopping_shared/_groups.html.haml  | 5 ++---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/views/shopping_shared/_details.html.haml b/app/views/shopping_shared/_details.html.haml
index 37edfa3c16..e152be43c0 100644
--- a/app/views/shopping_shared/_details.html.haml
+++ b/app/views/shopping_shared/_details.html.haml
@@ -1,5 +1,3 @@
-= render partial: "shopping_shared/modals"
-
 %navigation
   %distributor.details.row
     #distributor_title
diff --git a/app/views/shopping_shared/_groups.html.haml b/app/views/shopping_shared/_groups.html.haml
index 815cf4ec67..cc7e4ff369 100644
--- a/app/views/shopping_shared/_groups.html.haml
+++ b/app/views/shopping_shared/_groups.html.haml
@@ -1,6 +1,5 @@
-.content#groups
+.content
   %ul
     - for group in current_distributor.groups
       %li
-        %h4
-          %a= group.name 
+        %a{href: main_app.groups_path}= group.name 

From d5a652182e72bf6b3abd196a7e3ed69f21a86028 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 29 May 2014 16:31:12 +1000
Subject: [PATCH 131/139] Scrolling to groups when hotlinked

---
 .../darkswarm/controllers/groups_controller.js.coffee        | 5 ++++-
 app/views/groups/index.html.haml                             | 5 +++--
 app/views/shopping_shared/_groups.html.haml                  | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/controllers/groups_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/groups_controller.js.coffee
index 8fd47c49f8..850f58b33e 100644
--- a/app/assets/javascripts/darkswarm/controllers/groups_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/groups_controller.js.coffee
@@ -1,3 +1,6 @@
-Darkswarm.controller "GroupsCtrl", ($scope, Groups) ->
+Darkswarm.controller "GroupsCtrl", ($scope, Groups, $anchorScroll, $rootScope) ->
   $scope.Groups = Groups
   $scope.order = 'position'
+
+  $rootScope.$on "$locationChangeSuccess", (newRoute, oldRoute) ->
+    $anchorScroll()
diff --git a/app/views/groups/index.html.haml b/app/views/groups/index.html.haml
index 40b56e2551..c1fd5ccf8e 100644
--- a/app/views/groups/index.html.haml
+++ b/app/views/groups/index.html.haml
@@ -17,8 +17,9 @@
       "ng-debounce" => "150",
       "ofn-disable-enter" => true}
 
-  .group{"ng-repeat" => "group in Groups.groups | filter:query | orderBy:order"}
-    
+  .group{"ng-repeat" => "group in Groups.groups | filter:query | orderBy:order",
+        name: "group{{group.id}}",
+        id: "group{{group.id}}"}
     .row.pad-top{bindonce: true}
       .small-12.columns
         .group-hero
diff --git a/app/views/shopping_shared/_groups.html.haml b/app/views/shopping_shared/_groups.html.haml
index cc7e4ff369..e9ebb219b3 100644
--- a/app/views/shopping_shared/_groups.html.haml
+++ b/app/views/shopping_shared/_groups.html.haml
@@ -2,4 +2,4 @@
   %ul
     - for group in current_distributor.groups
       %li
-        %a{href: main_app.groups_path}= group.name 
+        %a{href: main_app.groups_path(anchor: "#/#group#{group.id}")}= group.name 

From aaf9b765077b7ef20e27eaafe081cdc8d2ae85bd Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 29 May 2014 16:38:01 +1000
Subject: [PATCH 132/139] Making toggling of fat nodes work

---
 .../darkswarm/controllers/producer_node_controller.js.coffee    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/darkswarm/controllers/producer_node_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/producer_node_controller.js.coffee
index 2f3bf1ce00..d46106a830 100644
--- a/app/assets/javascripts/darkswarm/controllers/producer_node_controller.js.coffee
+++ b/app/assets/javascripts/darkswarm/controllers/producer_node_controller.js.coffee
@@ -1,6 +1,6 @@
 Darkswarm.controller "ProducerNodeCtrl", ($scope, HashNavigation, $anchorScroll) ->
   $scope.toggle = ->
-    HashNavigation.navigate $scope.producer.hash
+    HashNavigation.toggle $scope.producer.hash
 
   $scope.open = ->
     HashNavigation.active($scope.producer.hash)

From e26a61c31fb3ec1966f7835cf47674bb4b9fa8d0 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 29 May 2014 16:49:20 +1000
Subject: [PATCH 133/139] Adding back sanitize

---
 app/assets/javascripts/darkswarm/darkswarm.js.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/darkswarm/darkswarm.js.coffee b/app/assets/javascripts/darkswarm/darkswarm.js.coffee
index fe128b963a..8d26384c14 100644
--- a/app/assets/javascripts/darkswarm/darkswarm.js.coffee
+++ b/app/assets/javascripts/darkswarm/darkswarm.js.coffee
@@ -5,6 +5,7 @@ window.Darkswarm = angular.module("Darkswarm", ["ngResource",
   'infinite-scroll', 
   'angular-flash.service', 
   'templates',
+  'ngSanitize',
   'backstretch']).config ($httpProvider, $tooltipProvider, $locationProvider, $anchorScrollProvider) ->
   $httpProvider.defaults.headers.post['X-CSRF-Token'] = $('meta[name="csrf-token"]').attr('content') 
   $httpProvider.defaults.headers.put['X-CSRF-Token'] = $('meta[name="csrf-token"]').attr('content') 

From 3ae2dc34e88f86ed0628cf52bb8a2b6c8d1affa2 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Thu, 29 May 2014 16:50:41 +1000
Subject: [PATCH 134/139] Preventing rabl from dying if no current hub

---
 app/views/json/_current_hub.rabl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/json/_current_hub.rabl b/app/views/json/_current_hub.rabl
index 57731d9599..7f615bb07a 100644
--- a/app/views/json/_current_hub.rabl
+++ b/app/views/json/_current_hub.rabl
@@ -1,6 +1,8 @@
 object current_distributor
 attributes :name, :id
 
-child suppliers: :producers do
-  extends "json/producer"
+if current_distributor
+  child suppliers: :producers do
+    extends "json/producer"
+  end
 end

From 7d73f7d7f2371d1623d1215c95cd0108f0a1b221 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 29 May 2014 16:00:39 +1000
Subject: [PATCH 135/139] Fix reversed checkbox value for select all variants
 on order cycle admin page

---
 .../order_cycles/_exchange_distributed_products_form.html.haml  | 2 +-
 .../order_cycles/_exchange_supplied_products_form.html.haml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/order_cycles/_exchange_distributed_products_form.html.haml b/app/views/admin/order_cycles/_exchange_distributed_products_form.html.haml
index 3f7d7ba578..ae0b9b7349 100644
--- a/app/views/admin/order_cycles/_exchange_distributed_products_form.html.haml
+++ b/app/views/admin/order_cycles/_exchange_distributed_products_form.html.haml
@@ -1,7 +1,7 @@
 %td{:colspan => 3}
   .exchange-select-all-variants
     %label
-      = check_box_tag 'order_cycle_outgoing_exchange_{{ $parent.$index }}_select_all_variants', 1, 1, 'ng-model' => 'exchange.select_all_variants', 'ng-click' => 'setExchangeVariants(exchange, incomingExchangesVariants(), exchange.select_all_variants)', 'id' => 'order_cycle_outgoing_exchange_{{ $parent.$index }}_select_all_variants'
+      = check_box_tag 'order_cycle_outgoing_exchange_{{ $parent.$index }}_select_all_variants', 1, 1, 'ng-model' => 'exchange.select_all_variants', 'ng-change' => 'setExchangeVariants(exchange, incomingExchangesVariants(), exchange.select_all_variants)', 'id' => 'order_cycle_outgoing_exchange_{{ $parent.$index }}_select_all_variants'
       Select all
 
   .exchange-product{'ng-repeat' => 'product in supplied_products | filter:productSuppliedToOrderCycle'}
diff --git a/app/views/admin/order_cycles/_exchange_supplied_products_form.html.haml b/app/views/admin/order_cycles/_exchange_supplied_products_form.html.haml
index 6ad13a88a6..ac791d7fd2 100644
--- a/app/views/admin/order_cycles/_exchange_supplied_products_form.html.haml
+++ b/app/views/admin/order_cycles/_exchange_supplied_products_form.html.haml
@@ -2,7 +2,7 @@
 %td{:colspan => 3}
   .exchange-select-all-variants
     %label
-      = check_box_tag 'order_cycle_incoming_exchange_{{ $parent.$index }}_select_all_variants', 1, 1, 'ng-model' => 'exchange.select_all_variants', 'ng-click' => 'setExchangeVariants(exchange, suppliedVariants(exchange.enterprise_id), exchange.select_all_variants)', 'id' => 'order_cycle_incoming_exchange_{{ $parent.$index }}_select_all_variants'
+      = check_box_tag 'order_cycle_incoming_exchange_{{ $parent.$index }}_select_all_variants', 1, 1, 'ng-model' => 'exchange.select_all_variants', 'ng-change' => 'setExchangeVariants(exchange, suppliedVariants(exchange.enterprise_id), exchange.select_all_variants)', 'id' => 'order_cycle_incoming_exchange_{{ $parent.$index }}_select_all_variants'
       Select all
 
   .exchange-product{'ng-repeat' => 'product in enterprises[exchange.enterprise_id].supplied_products'}

From 4c6a7622eb6d35458198de27ff5fd76e2227bb35 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Thu, 29 May 2014 17:18:27 +1000
Subject: [PATCH 136/139] Convert rep template to rabl

---
 app/views/admin/enterprises/index.rabl | 14 ++++++++++++++
 app/views/admin/enterprises/index.rep  | 15 ---------------
 2 files changed, 14 insertions(+), 15 deletions(-)
 create mode 100644 app/views/admin/enterprises/index.rabl
 delete mode 100644 app/views/admin/enterprises/index.rep

diff --git a/app/views/admin/enterprises/index.rabl b/app/views/admin/enterprises/index.rabl
new file mode 100644
index 0000000000..9e1ee893d1
--- /dev/null
+++ b/app/views/admin/enterprises/index.rabl
@@ -0,0 +1,14 @@
+collection @collection
+
+attributes :id, :name
+
+child supplied_products: :supplied_products do |product|
+  attributes :name
+  node(:supplier_name) { |p| p.supplier.andand.name }
+  node(:image_url) { |p| p.images.present? ? p.images.first.attachment.url(:mini) : nil }
+  node(:master_id) { |p| p.master.id }
+  child variants: :variants do |variant|
+    attributes :id
+    node(:label) { |v| v.options_text }
+  end
+end
diff --git a/app/views/admin/enterprises/index.rep b/app/views/admin/enterprises/index.rep
deleted file mode 100644
index beaceef8a4..0000000000
--- a/app/views/admin/enterprises/index.rep
+++ /dev/null
@@ -1,15 +0,0 @@
-r.list_of :enterprises, @collection do
-  r.element :id
-  r.element :name
-
-  r.list_of :supplied_products do |product|
-    r.element :name
-    r.element :supplier_name, product.supplier.andand.name
-    r.element :image_url, product.images.present? ? product.images.first.attachment.url(:mini) : nil
-    r.element :master_id, product.master.id
-    r.list_of :variants do |variant|
-      r.element :id
-      r.element :label, variant.options_text
-    end
-  end
-end

From 5b58bf2c71ee39c18aedf215c24d761f058e002e Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Fri, 30 May 2014 10:43:16 +1000
Subject: [PATCH 137/139] Adding our own custom unauthorized page

---
 .../spree/store_controller_decorator.rb            |  7 +++++++
 app/views/shared/unauthorized.html.haml            |  1 +
 spec/controllers/spree/store_controller_spec.rb    | 14 ++++++++++++++
 .../darkswarm/services/order_cycle_spec.js.coffee  |  4 ++--
 .../unit/darkswarm/services/order_spec.js.coffee   |  1 -
 5 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 app/controllers/spree/store_controller_decorator.rb
 create mode 100644 app/views/shared/unauthorized.html.haml
 create mode 100644 spec/controllers/spree/store_controller_spec.rb

diff --git a/app/controllers/spree/store_controller_decorator.rb b/app/controllers/spree/store_controller_decorator.rb
new file mode 100644
index 0000000000..09c2efc7b4
--- /dev/null
+++ b/app/controllers/spree/store_controller_decorator.rb
@@ -0,0 +1,7 @@
+class Spree::StoreController
+  layout 'darkswarm'
+
+  def unauthorized
+    render 'shared/unauthorized', :status => 401
+  end
+end
diff --git a/app/views/shared/unauthorized.html.haml b/app/views/shared/unauthorized.html.haml
new file mode 100644
index 0000000000..fcf3f3bf27
--- /dev/null
+++ b/app/views/shared/unauthorized.html.haml
@@ -0,0 +1 @@
+Unauthorized
diff --git a/spec/controllers/spree/store_controller_spec.rb b/spec/controllers/spree/store_controller_spec.rb
new file mode 100644
index 0000000000..e1b94de185
--- /dev/null
+++ b/spec/controllers/spree/store_controller_spec.rb
@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe Spree::StoreController do
+  controller(Spree::StoreController) do
+    before_filter :unauthorized
+    def index
+      render text: ""
+    end
+  end 
+  it "redirects to home when unauthorized" do
+    get :index
+    response.should render_template("shared/unauthorized", layout: 'darkswarm')
+  end
+end
diff --git a/spec/javascripts/unit/darkswarm/services/order_cycle_spec.js.coffee b/spec/javascripts/unit/darkswarm/services/order_cycle_spec.js.coffee
index f7a65867e8..93dd7de79c 100644
--- a/spec/javascripts/unit/darkswarm/services/order_cycle_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/services/order_cycle_spec.js.coffee
@@ -21,14 +21,14 @@ describe 'OrderCycle service', ->
     $httpBackend.expectPOST("/shop/order_cycle", {"order_cycle_id" : 10}).respond(200)
     spyOn(mockProduct, "update")
     OrderCycle.order_cycle.order_cycle_id = 10
-    OrderCycle.push_order_cycle()
+    OrderCycle.push_order_cycle mockProduct.update
     $httpBackend.flush()
     expect(mockProduct.update).toHaveBeenCalled()
 
   it "updates the orders_close_at attr after update", ->
     datestring = "2013-12-20T00:00:00+11:00" 
     $httpBackend.expectPOST("/shop/order_cycle").respond({orders_close_at: datestring})
-    OrderCycle.push_order_cycle()
+    OrderCycle.push_order_cycle mockProduct.update
     $httpBackend.flush()
     expect(OrderCycle.order_cycle.orders_close_at).toEqual(datestring)
 
diff --git a/spec/javascripts/unit/darkswarm/services/order_spec.js.coffee b/spec/javascripts/unit/darkswarm/services/order_spec.js.coffee
index c5df602b3a..4f6c711f99 100644
--- a/spec/javascripts/unit/darkswarm/services/order_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/services/order_spec.js.coffee
@@ -29,7 +29,6 @@ describe 'Order service', ->
 
     inject ($injector, _$httpBackend_)->
       $httpBackend = _$httpBackend_
-      $httpBackend.expectGET("/shop/products").respond 200, []
       Order = $injector.get("Order")
       Navigation = $injector.get("Navigation")
       flash = $injector.get("flash")

From dd0907addda37ad94f1a62dd06b68a8fd4d8f30b Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Fri, 30 May 2014 11:24:16 +1000
Subject: [PATCH 138/139] Adding back the primary taxon migration

---
 db/migrate/20140522044009_add_primary_taxon_to_products.rb | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 db/migrate/20140522044009_add_primary_taxon_to_products.rb

diff --git a/db/migrate/20140522044009_add_primary_taxon_to_products.rb b/db/migrate/20140522044009_add_primary_taxon_to_products.rb
new file mode 100644
index 0000000000..f6ff3cfe96
--- /dev/null
+++ b/db/migrate/20140522044009_add_primary_taxon_to_products.rb
@@ -0,0 +1,7 @@
+class AddPrimaryTaxonToProducts < ActiveRecord::Migration
+  def change
+    add_column :spree_products, :primary_taxon_id, :integer
+    add_index :spree_products, :primary_taxon_id
+    add_foreign_key :spree_products, :spree_taxons, column: :primary_taxon_id
+  end
+end

From c9acb14809cec966c86db98c1a1f2c3bc2eb6507 Mon Sep 17 00:00:00 2001
From: Rob H <oeoeaio@gmail.com>
Date: Fri, 30 May 2014 11:30:00 +1000
Subject: [PATCH 139/139] Adding primary taxon migration to schema

---
 db/schema.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/db/schema.rb b/db/schema.rb
index 77df8baf75..6005fd7cb5 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140522015012) do
+ActiveRecord::Schema.define(:version => 20140522044009) do
 
   create_table "adjustment_metadata", :force => true do |t|
     t.integer "adjustment_id"
@@ -681,6 +681,7 @@ ActiveRecord::Schema.define(:version => 20140522015012) do
     t.float    "variant_unit_scale"
     t.string   "variant_unit_name"
     t.text     "notes"
+    t.integer  "primary_taxon_id"
   end
 
   add_index "spree_products", ["available_on"], :name => "index_products_on_available_on"
@@ -688,6 +689,7 @@ ActiveRecord::Schema.define(:version => 20140522015012) do
   add_index "spree_products", ["name"], :name => "index_products_on_name"
   add_index "spree_products", ["permalink"], :name => "index_products_on_permalink"
   add_index "spree_products", ["permalink"], :name => "permalink_idx_unique", :unique => true
+  add_index "spree_products", ["primary_taxon_id"], :name => "index_spree_products_on_primary_taxon_id"
 
   create_table "spree_products_promotion_rules", :id => false, :force => true do |t|
     t.integer "product_id"
@@ -1092,6 +1094,7 @@ ActiveRecord::Schema.define(:version => 20140522015012) do
   add_foreign_key "spree_products", "enterprises", name: "spree_products_supplier_id_fk", column: "supplier_id"
   add_foreign_key "spree_products", "spree_shipping_categories", name: "spree_products_shipping_category_id_fk", column: "shipping_category_id"
   add_foreign_key "spree_products", "spree_tax_categories", name: "spree_products_tax_category_id_fk", column: "tax_category_id"
+  add_foreign_key "spree_products", "spree_taxons", name: "spree_products_primary_taxon_id_fk", column: "primary_taxon_id"
 
   add_foreign_key "spree_products_promotion_rules", "spree_products", name: "spree_products_promotion_rules_product_id_fk", column: "product_id"
   add_foreign_key "spree_products_promotion_rules", "spree_promotion_rules", name: "spree_products_promotion_rules_promotion_rule_id_fk", column: "promotion_rule_id"