From a4a2f98b6eb4a1c72c19c67047d651605d2d8b1f Mon Sep 17 00:00:00 2001 From: luisramos0 Date: Fri, 22 Nov 2019 14:54:12 +0000 Subject: [PATCH] Rename Product service to more appropriate ExchangeProduct --- .../order_cycle_exchanges_controller.js.coffee | 4 ++-- .../controllers/simple_create.js.coffee | 4 ++-- .../controllers/simple_edit.js.coffee | 4 ++-- .../services/exchange_product.js.coffee | 15 +++++++++++++++ .../admin/order_cycles/services/product.js.coffee | 15 --------------- .../controllers/simple_create_spec.js.coffee | 8 ++++---- 6 files changed, 25 insertions(+), 25 deletions(-) create mode 100644 app/assets/javascripts/admin/order_cycles/services/exchange_product.js.coffee delete mode 100644 app/assets/javascripts/admin/order_cycles/services/product.js.coffee diff --git a/app/assets/javascripts/admin/order_cycles/controllers/order_cycle_exchanges_controller.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/order_cycle_exchanges_controller.js.coffee index b52a7ae188..d4046f381a 100644 --- a/app/assets/javascripts/admin/order_cycles/controllers/order_cycle_exchanges_controller.js.coffee +++ b/app/assets/javascripts/admin/order_cycles/controllers/order_cycle_exchanges_controller.js.coffee @@ -1,5 +1,5 @@ angular.module('admin.orderCycles') - .controller 'AdminOrderCycleExchangesCtrl', ($scope, $controller, $filter, $window, $location, OrderCycle, Product, Enterprise, EnterpriseFee, Schedules, RequestMonitor, ocInstance, StatusMessage) -> + .controller 'AdminOrderCycleExchangesCtrl', ($scope, $controller, $filter, $window, $location, OrderCycle, ExchangeProduct, Enterprise, EnterpriseFee, Schedules, RequestMonitor, ocInstance, StatusMessage) -> $controller('AdminEditOrderCycleCtrl', {$scope: $scope, ocInstance: ocInstance, $location: $location}) $scope.supplier_enterprises = Enterprise.producer_enterprises @@ -42,7 +42,7 @@ angular.module('admin.orderCycles') incoming = true if $scope.view == 'incoming' params = { exchange_id: exchange.id, enterprise_id: exchange.enterprise_id, order_cycle_id: $scope.order_cycle.id, incoming: incoming} - Product.index params, (products) -> + ExchangeProduct.index params, (products) -> $scope.enterprises[exchange.enterprise_id].supplied_products = products # Register listeners to capture first toggle open of the products panel of the exchange diff --git a/app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee index dbb47aac11..a05c1f01a9 100644 --- a/app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee +++ b/app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee @@ -1,4 +1,4 @@ -angular.module('admin.orderCycles').controller "AdminSimpleCreateOrderCycleCtrl", ($scope, $controller, $window, OrderCycle, Enterprise, EnterpriseFee, Product, StatusMessage, Schedules, RequestMonitor, ocInstance) -> +angular.module('admin.orderCycles').controller "AdminSimpleCreateOrderCycleCtrl", ($scope, $controller, $window, OrderCycle, Enterprise, EnterpriseFee, ExchangeProduct, StatusMessage, Schedules, RequestMonitor, ocInstance) -> $controller('AdminOrderCycleBasicCtrl', {$scope: $scope, ocInstance: ocInstance}) $scope.order_cycle = OrderCycle.new {coordinator_id: ocInstance.coordinator_id}, => @@ -20,7 +20,7 @@ angular.module('admin.orderCycles').controller "AdminSimpleCreateOrderCycleCtrl" $scope.incoming_exchange = OrderCycle.order_cycle.incoming_exchanges[0] params = { enterprise_id: $scope.incoming_exchange.enterprise_id, incoming: true } - Product.index params, $scope.storeProductsAndSelectAllVariants + ExchangeProduct.index params, $scope.storeProductsAndSelectAllVariants $scope.storeProductsAndSelectAllVariants = (products) -> $scope.enterprises[$scope.incoming_exchange.enterprise_id].supplied_products = products diff --git a/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee index 2507524591..fc043afaaa 100644 --- a/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee +++ b/app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee @@ -1,4 +1,4 @@ -angular.module('admin.orderCycles').controller "AdminSimpleEditOrderCycleCtrl", ($scope, $controller, $location, $window, OrderCycle, Enterprise, EnterpriseFee, Product, Schedules, RequestMonitor, StatusMessage, ocInstance) -> +angular.module('admin.orderCycles').controller "AdminSimpleEditOrderCycleCtrl", ($scope, $controller, $location, $window, OrderCycle, Enterprise, EnterpriseFee, ExchangeProduct, Schedules, RequestMonitor, StatusMessage, ocInstance) -> $controller('AdminOrderCycleBasicCtrl', {$scope: $scope, ocInstance: ocInstance}) $scope.orderCycleId = -> @@ -15,7 +15,7 @@ angular.module('admin.orderCycles').controller "AdminSimpleEditOrderCycleCtrl", $scope.loadExchangeProducts = -> exchange = OrderCycle.order_cycle.incoming_exchanges[0] - Product.index { exchange_id: exchange.id }, (products) -> + ExchangeProduct.index { exchange_id: exchange.id }, (products) -> $scope.enterprises[exchange.enterprise_id].supplied_products = products $scope.removeDistributionOfVariant = angular.noop diff --git a/app/assets/javascripts/admin/order_cycles/services/exchange_product.js.coffee b/app/assets/javascripts/admin/order_cycles/services/exchange_product.js.coffee new file mode 100644 index 0000000000..dfc8adeca5 --- /dev/null +++ b/app/assets/javascripts/admin/order_cycles/services/exchange_product.js.coffee @@ -0,0 +1,15 @@ +angular.module('admin.orderCycles').factory('ExchangeProduct', ($resource) -> + ExchangeProductResource = $resource('/api/exchanges/:exchange_id/products.json', {}, { + 'index': + method: 'GET' + isArray: true + }) + { + ExchangeProductResource: ExchangeProductResource + loaded: false + + index: (params={}, callback=null) -> + ExchangeProductResource.index params, (data) => + @loaded = true + (callback || angular.noop)(data) + }) diff --git a/app/assets/javascripts/admin/order_cycles/services/product.js.coffee b/app/assets/javascripts/admin/order_cycles/services/product.js.coffee deleted file mode 100644 index d11b9b3e41..0000000000 --- a/app/assets/javascripts/admin/order_cycles/services/product.js.coffee +++ /dev/null @@ -1,15 +0,0 @@ -angular.module('admin.orderCycles').factory('Product', ($resource) -> - ProductResource = $resource('/api/exchanges/:exchange_id/products.json', {}, { - 'index': - method: 'GET' - isArray: true - }) - { - ProductResource: ProductResource - loaded: false - - index: (params={}, callback=null) -> - ProductResource.index params, (data) => - @loaded = true - (callback || angular.noop)(data) - }) diff --git a/spec/javascripts/unit/admin/order_cycles/controllers/simple_create_spec.js.coffee b/spec/javascripts/unit/admin/order_cycles/controllers/simple_create_spec.js.coffee index e28c8d5f58..0461f921d8 100644 --- a/spec/javascripts/unit/admin/order_cycles/controllers/simple_create_spec.js.coffee +++ b/spec/javascripts/unit/admin/order_cycles/controllers/simple_create_spec.js.coffee @@ -3,7 +3,7 @@ describe "AdminSimpleCreateOrderCycleCtrl", -> scope = null OrderCycle = {} Enterprise = {} - Product = {} + ExchangeProduct = {} EnterpriseFee = {} incoming_exchange = {} outgoing_exchange = {} @@ -28,7 +28,7 @@ describe "AdminSimpleCreateOrderCycleCtrl", -> get: jasmine.createSpy().and.returnValue {id: 123} index: jasmine.createSpy() suppliedVariants: jasmine.createSpy().and.returnValue('supplied variants') - Product = + ExchangeProduct = index: jasmine.createSpy() EnterpriseFee = index: jasmine.createSpy() @@ -36,7 +36,7 @@ describe "AdminSimpleCreateOrderCycleCtrl", -> module('admin.orderCycles') inject ($controller) -> - ctrl = $controller 'AdminSimpleCreateOrderCycleCtrl', {$scope: scope, OrderCycle: OrderCycle, Enterprise: Enterprise, EnterpriseFee: EnterpriseFee, Product: Product, ocInstance: ocInstance} + ctrl = $controller 'AdminSimpleCreateOrderCycleCtrl', {$scope: scope, OrderCycle: OrderCycle, Enterprise: Enterprise, EnterpriseFee: EnterpriseFee, ExchangeProduct: ExchangeProduct, ocInstance: ocInstance} describe "initialisation", -> enterprise = {id: 123} @@ -54,7 +54,7 @@ describe "AdminSimpleCreateOrderCycleCtrl", -> scope.loadExchangeProducts() - expect(Product.index).toHaveBeenCalledWith({ enterprise_id: enterprise.id, incoming: true }, scope.storeProductsAndSelectAllVariants) + expect(ExchangeProduct.index).toHaveBeenCalledWith({ enterprise_id: enterprise.id, incoming: true }, scope.storeProductsAndSelectAllVariants) it "stores products and selects all variants", -> scope.incoming_exchange = incoming_exchange