diff --git a/app/assets/javascripts/admin/all.js b/app/assets/javascripts/admin/all.js index 688494f870..5cb8af0ebe 100644 --- a/app/assets/javascripts/admin/all.js +++ b/app/assets/javascripts/admin/all.js @@ -36,6 +36,7 @@ //= require ./orders/orders //= require ./order_cycles/order_cycles //= require ./payment_methods/payment_methods +//= require ./product_import/product_import //= require ./products/products //= require ./resources/resources //= require ./shipping_methods/shipping_methods diff --git a/app/assets/javascripts/admin/product_import/controllers/dropdown_panels.js.coffee b/app/assets/javascripts/admin/product_import/controllers/dropdown_panels.js.coffee index 1403611168..91b0c23a53 100644 --- a/app/assets/javascripts/admin/product_import/controllers/dropdown_panels.js.coffee +++ b/app/assets/javascripts/admin/product_import/controllers/dropdown_panels.js.coffee @@ -1,4 +1,4 @@ -angular.module("ofn.admin").controller "DropdownPanelsCtrl", ($scope) -> +angular.module("admin.productImport").controller "DropdownPanelsCtrl", ($scope) -> $scope.active = false $scope.togglePanel = -> diff --git a/app/assets/javascripts/admin/product_import/controllers/import_feedback.js.coffee b/app/assets/javascripts/admin/product_import/controllers/import_feedback.js.coffee index ea23c59d9f..f914b0bb57 100644 --- a/app/assets/javascripts/admin/product_import/controllers/import_feedback.js.coffee +++ b/app/assets/javascripts/admin/product_import/controllers/import_feedback.js.coffee @@ -1,4 +1,4 @@ -angular.module("ofn.admin").controller "ImportFeedbackCtrl", ($scope) -> +angular.module("admin.productImport").controller "ImportFeedbackCtrl", ($scope) -> $scope.count = (items) -> total = 0 diff --git a/app/assets/javascripts/admin/product_import/controllers/import_form_controller.js.coffee b/app/assets/javascripts/admin/product_import/controllers/import_form_controller.js.coffee index 280183376b..b3d3e2d824 100644 --- a/app/assets/javascripts/admin/product_import/controllers/import_form_controller.js.coffee +++ b/app/assets/javascripts/admin/product_import/controllers/import_form_controller.js.coffee @@ -1,4 +1,4 @@ -angular.module("ofn.admin").controller "ImportFormCtrl", ($scope, $http, $filter, ProductImportService, $timeout) -> +angular.module("admin.productImport").controller "ImportFormCtrl", ($scope, $http, $filter, ProductImportService, $timeout) -> $scope.entries = {} $scope.update_counts = {} diff --git a/app/assets/javascripts/admin/product_import/controllers/import_options_form.js.coffee b/app/assets/javascripts/admin/product_import/controllers/import_options_form.js.coffee index 66178b0183..25a8cc7470 100644 --- a/app/assets/javascripts/admin/product_import/controllers/import_options_form.js.coffee +++ b/app/assets/javascripts/admin/product_import/controllers/import_options_form.js.coffee @@ -1,4 +1,4 @@ -angular.module("ofn.admin").controller "ImportOptionsFormCtrl", ($scope, $rootScope, ProductImportService) -> +angular.module("admin.productImport").controller "ImportOptionsFormCtrl", ($scope, $rootScope, ProductImportService) -> $scope.initForm = () -> $scope.settings = {} if $scope.settings == undefined diff --git a/app/assets/javascripts/admin/product_import/filters/filter_entries.js.coffee b/app/assets/javascripts/admin/product_import/filters/filter_entries.js.coffee index 7513384f9e..4a1007b3a9 100644 --- a/app/assets/javascripts/admin/product_import/filters/filter_entries.js.coffee +++ b/app/assets/javascripts/admin/product_import/filters/filter_entries.js.coffee @@ -1,4 +1,4 @@ -angular.module("ofn.admin").filter 'entriesFilterValid', -> +angular.module("admin.productImport").filter 'entriesFilterValid', -> (entries, type) -> if type == 'all' return entries @@ -18,7 +18,7 @@ angular.module("ofn.admin").filter 'entriesFilterValid', -> filtered -angular.module("ofn.admin").filter 'entriesFilterSupplier', -> +angular.module("admin.productImport").filter 'entriesFilterSupplier', -> (entries, supplier) -> if supplier == 'all' return entries diff --git a/app/assets/javascripts/admin/product_import/product_import.js.coffee b/app/assets/javascripts/admin/product_import/product_import.js.coffee new file mode 100644 index 0000000000..5eb83204e1 --- /dev/null +++ b/app/assets/javascripts/admin/product_import/product_import.js.coffee @@ -0,0 +1,3 @@ +angular.module("admin.productImport", ["ngResource"]).config ($httpProvider) -> + $httpProvider.defaults.headers.common["X-CSRF-Token"] = $("meta[name=csrf-token]").attr("content") + $httpProvider.defaults.headers.common["Accept"] = "application/json, text/javascript, */*" diff --git a/app/assets/javascripts/admin/product_import/services/product_import_service.js.coffee b/app/assets/javascripts/admin/product_import/services/product_import_service.js.coffee index 51b57c8735..af0f464df1 100644 --- a/app/assets/javascripts/admin/product_import/services/product_import_service.js.coffee +++ b/app/assets/javascripts/admin/product_import/services/product_import_service.js.coffee @@ -1,4 +1,4 @@ -angular.module("ofn.admin").factory "ProductImportService", ($rootScope) -> +angular.module("admin.productImport").factory "ProductImportService", ($rootScope) -> new class ProductImportService suppliers: {} resetTotal: 0 diff --git a/app/views/admin/product_import/_upload_form.html.haml b/app/views/admin/product_import/_upload_form.html.haml index 9c18cf47c6..008f027139 100644 --- a/app/views/admin/product_import/_upload_form.html.haml +++ b/app/views/admin/product_import/_upload_form.html.haml @@ -1,4 +1,4 @@ -%div{ng: {app: 'ofn.admin'}} +%div{ng: {app: 'admin.productImport'}} %h5= t('admin.product_import.index.select_file') %br diff --git a/app/views/admin/product_import/import.html.haml b/app/views/admin/product_import/import.html.haml index dddcd69c4f..bb8c85b8e4 100644 --- a/app/views/admin/product_import/import.html.haml +++ b/app/views/admin/product_import/import.html.haml @@ -3,7 +3,7 @@ = render partial: 'spree/admin/shared/product_sub_menu' -.import-wrapper{ng: {app: 'ofn.admin', controller: 'ImportFormCtrl', init: "supplier_product_counts = #{@importer.supplier_products.to_json}"}} +.import-wrapper{ng: {app: 'admin.productImport', controller: 'ImportFormCtrl', init: "supplier_product_counts = #{@importer.supplier_products.to_json}"}} - if @importer.item_count == 0 #and @importer.invalid_count %h5 diff --git a/app/views/admin/product_import/save.html.haml b/app/views/admin/product_import/save.html.haml index ce5f6f57b9..23a1d13d99 100644 --- a/app/views/admin/product_import/save.html.haml +++ b/app/views/admin/product_import/save.html.haml @@ -6,7 +6,7 @@ %h5= t('admin.product_import.save.final_results') %br -%div.post-save-results{ng: {app: 'ofn.admin'}} +%div.post-save-results{ng: {app: 'admin.productImport'}} - if @importer.products_created_count > 0 %p