raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-01 02:03:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

BOM: Add a method to check that all selected variants have a unit_value

Browse Source
This commit is contained in:
Rob H
2014-03-27 14:11:19 +11:00
parent a260a3fa56
commit 0c2e215fef
3 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/admin/bulk_order_management.js.coffee
View File

@@ -227,11 +227,16 @@ orderManagementModule.controller "AdminOrderMgmtCtrl", [
$scope.selectedUnitsProduct = unitsProduct
$scope.selectedUnitsVariant = unitsVariant
$scope.sumUnitValues = (lineItems) ->
sum = lineItems.reduce (sum,lineItem) ->
$scope.sumUnitValues = ->
sum = $scope.filteredLineItems.reduce (sum,lineItem) ->
sum = sum + lineItem.quantity * lineItem.units_variant.unit_value
, 0
$scope.allUnitValuesPresent = ->
for i,lineItem of $scope.filteredLineItems
return false if !lineItem.units_variant.hasOwnProperty('unit_value') || !(lineItem.units_variant.unit_value > 0)
true
$scope.getScale = (value, unitType) ->
scaledValue = null
validScales = []
@@ -264,7 +269,7 @@ orderManagementModule.controller "AdminOrderMgmtCtrl", [
if $scope.selectedUnitsProduct.hasOwnProperty("group_buy_unit_size") && $scope.selectedUnitsProduct.group_buy_unit_size > 0 &&
$scope.selectedUnitsProduct.hasOwnProperty("variant_unit") &&
( $scope.selectedUnitsProduct.variant_unit == "weight" || $scope.selectedUnitsProduct.variant_unit == "volume" )
Math.round( $scope.sumUnitValues( $scope.filteredLineItems ) / $scope.selectedUnitsProduct.group_buy_unit_size * 1000)/1000
Math.round( $scope.sumUnitValues() / $scope.selectedUnitsProduct.group_buy_unit_size * 1000)/1000
else
''

2
app/views/spree/admin/orders/bulk_management.html.haml
View File

@@ -57,7 +57,7 @@
%span{ :class => "five columns alpha" }
Total Units Ordered
%span{ :class => "two columns omega" }
{{ formattedValueWithUnitName( sumUnitValues( filteredLineItems ), selectedUnitsProduct, selectedUnitsVariant ) }}
{{ formattedValueWithUnitName( sumUnitValues(), selectedUnitsProduct, selectedUnitsVariant ) }}
%div.shared_resource{ :class => "seven columns alpha" }
%span{ :class => "five columns alpha" } Shared Resource?
%span{ :class => 'two columns omega' }

41
spec/javascripts/unit/bulk_order_management_spec.js.coffee
View File

@@ -261,17 +261,48 @@ describe "AdminOrderMgmtCtrl", ->
expect(scope.fulfilled()).toEqual 1.5
expect(scope.sumUnitValues).toHaveBeenCalled()
describe "allUnitValuesPresent()", ->
it "returns false if the unit_value of any item in filteredLineItems does not exist", ->
scope.filteredLineItems = [
{ units_variant: { unit_value: 1000 } }
{ units_variant: { unit_value: 2000 } }
{ units_variant: { unit_yayay: 1000 } }
]
expect(scope.allUnitValuesPresent()).toEqual false
it "returns false if the unit_value of any item in filteredLineItems is not a number greater than 0", ->
scope.filteredLineItems = [
{ units_variant: { unit_value: 0 } }
{ units_variant: { unit_value: 2000 } }
{ units_variant: { unit_value: 1000 } }
]
expect(scope.allUnitValuesPresent()).toEqual false
scope.filteredLineItems = [
{ units_variant: { unit_value: 'lala' } }
{ units_variant: { unit_value: 2000 } }
{ units_variant: { unit_value: 1000 } }
]
expect(scope.allUnitValuesPresent()).toEqual false
it "returns true if the unit_value of all items in filteredLineItems are numbers greater than 0", ->
scope.filteredLineItems = [
{ units_variant: { unit_value: 100 } }
{ units_variant: { unit_value: 2000 } }
{ units_variant: { unit_value: 1000 } }
]
expect(scope.allUnitValuesPresent()).toEqual true
describe "sumUnitValues()", ->
it "returns the sum of the product of unit_value and quantity for specified line_items", ->
line_items = [
scope.filteredLineItems = [
{ units_variant: { unit_value: 1 }, quantity: 2 }
{ units_variant: { unit_value: 2 }, quantity: 3 }
{ units_variant: { unit_value: 3 }, quantity: 7 }
]
sp0 = line_items[0].units_variant.unit_value * line_items[0].quantity
sp1 = line_items[1].units_variant.unit_value * line_items[1].quantity
sp2 = line_items[2].units_variant.unit_value * line_items[2].quantity
expect(scope.sumUnitValues(line_items)).toEqual (sp0 + sp1 + sp2)
sp0 = scope.filteredLineItems[0].units_variant.unit_value * scope.filteredLineItems[0].quantity
sp1 = scope.filteredLineItems[1].units_variant.unit_value * scope.filteredLineItems[1].quantity
sp2 = scope.filteredLineItems[2].units_variant.unit_value * scope.filteredLineItems[2].quantity
expect(scope.sumUnitValues()).toEqual (sp0 + sp1 + sp2)
describe "formatting a value based upon the properties of a specified Units Variant", ->
# A Units Variant is an API object which holds unit properies of a variant