diff --git a/app/assets/javascripts/admin/order_cycles/controllers/order_cycle_basic_controller.js.coffee b/app/assets/javascripts/admin/order_cycles/controllers/order_cycle_basic_controller.js.coffee index 7a01e1c5e2..ff25bc7d4b 100644 --- a/app/assets/javascripts/admin/order_cycles/controllers/order_cycle_basic_controller.js.coffee +++ b/app/assets/javascripts/admin/order_cycles/controllers/order_cycle_basic_controller.js.coffee @@ -18,11 +18,11 @@ angular.module('admin.orderCycles') $scope.cancel = (destination) -> $window.location = destination - # Used in panels/exchange_supplied_products.html + # Used in panels/exchange_products_supplied.html $scope.suppliedVariants = (enterprise_id) -> Enterprise.suppliedVariants(enterprise_id) - # Used in panels/exchange_supplied_products.html and panels/exchange_distributed_products.html + # Used in panels/exchange_products_supplied.html and panels/exchange_products_distributed.html $scope.setExchangeVariants = (exchange, variants, selected) -> OrderCycle.setExchangeVariants(exchange, variants, selected) diff --git a/app/assets/javascripts/templates/admin/panels/exchange_distributed_products.html.haml b/app/assets/javascripts/templates/admin/panels/exchange_products_distributed.html.haml similarity index 100% rename from app/assets/javascripts/templates/admin/panels/exchange_distributed_products.html.haml rename to app/assets/javascripts/templates/admin/panels/exchange_products_distributed.html.haml diff --git a/app/assets/javascripts/templates/admin/panels/exchange_supplied_products.html.haml b/app/assets/javascripts/templates/admin/panels/exchange_products_supplied.html.haml similarity index 100% rename from app/assets/javascripts/templates/admin/panels/exchange_supplied_products.html.haml rename to app/assets/javascripts/templates/admin/panels/exchange_products_supplied.html.haml diff --git a/app/views/admin/order_cycles/_exchange_form.html.haml b/app/views/admin/order_cycles/_exchange_form.html.haml index aecadde20d..1713555840 100644 --- a/app/views/admin/order_cycles/_exchange_form.html.haml +++ b/app/views/admin/order_cycles/_exchange_form.html.haml @@ -30,11 +30,11 @@ - if type == 'supplier' %tr.panel-row{ object: "exchange", - panels: "{products: 'exchange_supplied_products'}", + panels: "{products: 'exchange_products_supplied'}", locals: "$index,order_cycle,exchange,enterprises,setExchangeVariants,selectAllVariants,suppliedVariants,removeDistributionOfVariant,initializeExchangeProductsPanel,loadMoreExchangeProducts,loadAllExchangeProducts,productsLoading", colspan: 4 } - if type == 'distributor' %tr.panel-row{ object: "exchange", - panels: "{products: 'exchange_distributed_products', tags: 'exchange_tags'}", + panels: "{products: 'exchange_products_distributed', tags: 'exchange_tags'}", locals: "$index,order_cycle,exchange,enterprises,setExchangeVariants,incomingExchangeVariantsFor,variantSuppliedToOrderCycle,initializeExchangeProductsPanel,loadMoreExchangeProducts,loadAllExchangeProducts,productsLoading", colspan: 5 }