Merge branch 'master' into email/manager_invite

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

@@ -1,3 +1,14 @@
-angular.module("ofn.admin", ["ngResource", "ngAnimate", "admin.utils", "admin.indexUtils", "admin.dropdown", "admin.products", "admin.taxons", "infinite-scroll"]).config ($httpProvider) ->
+angular.module("ofn.admin", [
+  "ngResource",
+  "mm.foundation",
+  "angularFileUpload",
+  "ngAnimate",
+  "admin.utils",
+  "admin.indexUtils",
+  "admin.dropdown",
+  "admin.products",
+  "admin.taxons",
+  "infinite-scroll"
+]).config ($httpProvider) ->
   $httpProvider.defaults.headers.common["X-CSRF-Token"] = $("meta[name=csrf-token]").attr("content")
   $httpProvider.defaults.headers.common["Accept"] = "application/json, text/javascript, */*"

app/assets/javascripts/admin/all.js

@@ -51,7 +51,6 @@
 //= require textAngular.min.js
 //= require i18n/translations
 //= require darkswarm/i18n.translate.js
-//
 //= require moment
 //= require moment/en-gb.js
 //= require moment/es.js
@@ -60,5 +59,7 @@
 //= require moment/nb.js
 //= require moment/pt-br.js
 //= require moment/sv.js
+//= require ../shared/mm-foundation-tpls-0.8.0.min.js
+//= require angularjs-file-upload
 
 //= require_tree .

app/assets/javascripts/admin/customers/controllers/customers_controller.js.coffee

@@ -12,7 +12,7 @@ angular.module("admin.customers").controller "customersCtrl", ($scope, $q, $filt
 
   $scope.$watch "shop_id", ->
     if $scope.shop_id?
-      CurrentShop.shop = $filter('filter')($scope.shops, {id: $scope.shop_id})[0]
+      CurrentShop.shop = $filter('filter')($scope.shops, {id: parseInt($scope.shop_id)}, true)[0]
       Customers.index({enterprise_id: $scope.shop_id}).then (data) ->
         pendingChanges.removeAll()
         $scope.customers_form.$setPristine()

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

@@ -5,7 +5,7 @@ angular.module("admin.enterprises")
     $scope.ShippingMethods = EnterpriseShippingMethods.shippingMethods
     $scope.navClear = NavigationCheck.clear
     $scope.menu = SideMenu
-    $scope.newManager = { id: '', email: (t('add_manager')) }
+    $scope.newManager = { id: null, email: (t('add_manager')) }
     $scope.StatusMessage = StatusMessage
 
     $scope.$watch 'enterprise_form.$dirty', (newValue) ->
@@ -38,17 +38,17 @@ angular.module("admin.enterprises")
           return
         for i, user of $scope.Enterprise.users when user.id == manager.id
           $scope.Enterprise.users.splice i, 1
-        if $scope.enterprise_form?
-          $scope.enterprise_form.$setDirty()
+          $scope.enterprise_form?.$setDirty()
 
     $scope.addManager = (manager) ->
-      if manager.id? and manager.email?
+      if manager.id? and angular.isNumber(manager.id) and manager.email?
         manager =
           id: manager.id
           email: manager.email
           confirmed: manager.confirmed
         if (user for user in $scope.Enterprise.users when user.id == manager.id).length == 0
           $scope.Enterprise.users.push manager
+          $scope.enterprise_form?.$setDirty()
         else
           alert ("#{manager.email}" + " " + t("is_already_manager"))
 

app/assets/javascripts/admin/products/controllers/product_image_controller.js.coffee

@@ -0,0 +1,6 @@
+angular.module("ofn.admin").controller "ProductImageCtrl", ($scope, ProductImageService) ->
+  $scope.imageUploader = ProductImageService.imageUploader
+  $scope.imagePreview = ProductImageService.imagePreview
+
+  $scope.$watch 'product.image_url', (newValue) ->
+    $scope.imagePreview = newValue if newValue

app/assets/javascripts/admin/products/directives/image_modal.js.coffee

@@ -0,0 +1,6 @@
+angular.module("ofn.admin").directive "imageModal", ($modal, ProductImageService) ->
+  restrict: 'C'
+  link: (scope, elem, attrs, ctrl) ->
+    elem.on "click", (ev) =>
+      scope.uploadModal = $modal.open(templateUrl: 'admin/modals/image_upload.html', controller: ctrl, scope: scope, windowClass: 'product-image-upload')
+      ProductImageService.configure(scope.product)

app/assets/javascripts/admin/products/services/product_image_service.js.coffee

@@ -0,0 +1,15 @@
+angular.module("ofn.admin").factory "ProductImageService", (FileUploader, SpreeApiKey) ->
+  new class ProductImageService
+    imagePreview: null
+
+    imageUploader: new FileUploader
+      headers:
+        'X-Spree-Token': SpreeApiKey
+      autoUpload: true
+
+    configure: (product) =>
+      @imageUploader.url = "/api/product_images/#{product.id}"
+      @imagePreview = product.image_url
+      @imageUploader.onSuccessItem = (image, response) =>
+        product.thumb_url = response.thumb_url
+        product.image_url = response.image_url

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

@@ -1,4 +1,5 @@
-window.Darkswarm = angular.module("Darkswarm", ["ngResource",
+window.Darkswarm = angular.module("Darkswarm", [
+  'ngResource',
   'mm.foundation',
   'LocalStorageModule',
   'infinite-scroll',
@@ -10,7 +11,7 @@ window.Darkswarm = angular.module("Darkswarm", ["ngResource",
   'duScroll',
   'angularFileUpload',
   'angularSlideables'
-  ]).config ($httpProvider, $tooltipProvider, $locationProvider, $anchorScrollProvider) ->
+]).config ($httpProvider, $tooltipProvider, $locationProvider, $anchorScrollProvider) ->
   $httpProvider.defaults.headers['common']['X-CSRF-Token'] = $('meta[name="csrf-token"]').attr('content')
   $httpProvider.defaults.headers['common']['X-Requested-With'] = 'XMLHttpRequest'
   $httpProvider.defaults.headers.common.Accept = "application/json, text/javascript, */*"

app/assets/javascripts/templates/admin/modals/image_upload.html.haml

@@ -0,0 +1,10 @@
+%a.close-reveal-modal{"ng-click" => "$close()"}
+  %i.fa.fa-times-circle{'aria-hidden' => "true"}
+
+%form#image_upload{ name: 'form', novalidate: true, enctype: 'multipart/form-data', multipart: true, ng: { controller: "ProductImageCtrl" } }
+  %div.image-preview
+    %img.spinner{ src: "/assets/spinning-circles.svg", ng: { hide: "!imageUploader.isUploading" }}
+    %img.preview{ng: {src: "{{imagePreview}}", class: "{'faded': imageUploader.isUploading}"}}
+
+  %label{for: 'image-upload', class: 'button'} #{t('admin.products.bulk_edit.upload_an_image')}
+  %input#image-upload{hidden: true, type: 'file', 'nv-file-select' => true, uploader: "imageUploader"}