From 5e015f061114526d3228a52cd0748d15130d54a5 Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Thu, 26 Mar 2015 22:24:37 +1100 Subject: [PATCH] Rename visibleVariants filter to visibleProductVariants --- .../order_cycles/filters/visible_product_variants.js.coffee | 4 ++++ .../admin/order_cycles/filters/visible_products.js.coffee | 2 +- .../admin/order_cycles/filters/visible_variants.js.coffee | 4 ---- 3 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 app/assets/javascripts/admin/order_cycles/filters/visible_product_variants.js.coffee delete mode 100644 app/assets/javascripts/admin/order_cycles/filters/visible_variants.js.coffee diff --git a/app/assets/javascripts/admin/order_cycles/filters/visible_product_variants.js.coffee b/app/assets/javascripts/admin/order_cycles/filters/visible_product_variants.js.coffee new file mode 100644 index 0000000000..8989af5b9d --- /dev/null +++ b/app/assets/javascripts/admin/order_cycles/filters/visible_product_variants.js.coffee @@ -0,0 +1,4 @@ +angular.module("admin.order_cycles").filter "visibleProductVariants", -> + return (product, exchange, rules) -> + variants = product.variants.concat( [{ "id": product.master_id}] ) + return (variant for variant in variants when variant.id in rules[exchange.enterprise_id]) diff --git a/app/assets/javascripts/admin/order_cycles/filters/visible_products.js.coffee b/app/assets/javascripts/admin/order_cycles/filters/visible_products.js.coffee index 2684fe1287..3afff183a1 100644 --- a/app/assets/javascripts/admin/order_cycles/filters/visible_products.js.coffee +++ b/app/assets/javascripts/admin/order_cycles/filters/visible_products.js.coffee @@ -1,3 +1,3 @@ angular.module("admin.order_cycles").filter "visibleProducts", ($filter) -> return (products, exchange, rules) -> - return (product for product in products when $filter('visibleVariants')(product, exchange, rules).length > 0) + return (product for product in products when $filter('visibleProductVariants')(product, exchange, rules).length > 0) diff --git a/app/assets/javascripts/admin/order_cycles/filters/visible_variants.js.coffee b/app/assets/javascripts/admin/order_cycles/filters/visible_variants.js.coffee deleted file mode 100644 index feb1635cce..0000000000 --- a/app/assets/javascripts/admin/order_cycles/filters/visible_variants.js.coffee +++ /dev/null @@ -1,4 +0,0 @@ -angular.module("admin.order_cycles").filter "visibleVariants", -> - return (product, exchange, rules) -> - enterprise_id = if exchange.incoming then exchange.sender_id else exchange.receiver_id - return (variant for variant in product.variants when variant.id in rules[exchange.enterprise_id])