From f9f76f90829da236c24b376e07d658aa89e8129c Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Mon, 18 May 2020 16:16:22 +0200 Subject: [PATCH] Move reused available stock logic to service --- .../javascripts/darkswarm/directives/on_hand.js.coffee | 6 ++---- .../darkswarm/directives/validate_stock_quantity.js.coffee | 6 ++---- .../darkswarm/services/stock_quantity.js.coffee | 7 +++++++ 3 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 app/assets/javascripts/darkswarm/services/stock_quantity.js.coffee diff --git a/app/assets/javascripts/darkswarm/directives/on_hand.js.coffee b/app/assets/javascripts/darkswarm/directives/on_hand.js.coffee index 1086363676..e5cba8a5cb 100644 --- a/app/assets/javascripts/darkswarm/directives/on_hand.js.coffee +++ b/app/assets/javascripts/darkswarm/directives/on_hand.js.coffee @@ -1,4 +1,4 @@ -Darkswarm.directive "ofnOnHand", -> +Darkswarm.directive "ofnOnHand", (StockQuantity) -> restrict: 'A' require: "ngModel" @@ -23,6 +23,4 @@ Darkswarm.directive "ofnOnHand", -> viewValue scope.available_quantity = -> - on_hand = parseInt(attr.ofnOnHand) - finalized_quantity = parseInt(attr.finalizedquantity) || 0 # finalizedquantity is optional - on_hand + finalized_quantity + StockQuantity.available_quantity(attr.ofnOnHand, attr.finalizedquantity) diff --git a/app/assets/javascripts/darkswarm/directives/validate_stock_quantity.js.coffee b/app/assets/javascripts/darkswarm/directives/validate_stock_quantity.js.coffee index 132f03c22a..5d5395c5f5 100644 --- a/app/assets/javascripts/darkswarm/directives/validate_stock_quantity.js.coffee +++ b/app/assets/javascripts/darkswarm/directives/validate_stock_quantity.js.coffee @@ -1,4 +1,4 @@ -Darkswarm.directive "validateStockQuantity", -> +Darkswarm.directive "validateStockQuantity", (StockQuantity) -> restrict: 'A' require: "ngModel" @@ -12,6 +12,4 @@ Darkswarm.directive "validateStockQuantity", -> selectedQuantity scope.available_quantity = -> - on_hand = parseInt(attr.ofnOnHand) - finalized_quantity = parseInt(attr.finalizedquantity) || 0 # finalizedquantity is optional - on_hand + finalized_quantity + StockQuantity.available_quantity(attr.ofnOnHand, attr.finalizedquantity) diff --git a/app/assets/javascripts/darkswarm/services/stock_quantity.js.coffee b/app/assets/javascripts/darkswarm/services/stock_quantity.js.coffee new file mode 100644 index 0000000000..efc6b67eb4 --- /dev/null +++ b/app/assets/javascripts/darkswarm/services/stock_quantity.js.coffee @@ -0,0 +1,7 @@ +Darkswarm.factory "StockQuantity", -> + new class StockQuantity + available_quantity: (on_hand, finalized_quantity) -> + on_hand = parseInt(on_hand) + finalized_quantity = parseInt(finalized_quantity) || 0 # finalized_quantity is optional + + on_hand + finalized_quantity