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

Make 'Items' option appear in variant_unit field on BPE

Browse Source
This commit is contained in:
Rohan Mitchell
2013-12-05 15:50:08 +11:00
parent 8af7c57a88
commit 84fe6706a2
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/bulk_product_update.js.coffee
View File

@@ -182,6 +182,8 @@ productsApp.controller "AdminBulkProductsCtrl", [
$scope.loadVariantUnit = (product) ->
product.variant_unit_with_scale = if product.variant_unit && product.variant_unit_scale
"#{product.variant_unit}_#{product.variant_unit_scale}"
else if product.variant_unit
product.variant_unit
else
null

6
spec/javascripts/unit/bulk_product_update_spec.js.coffee
View File

@@ -386,10 +386,10 @@ describe "AdminBulkProductsCtrl", ->
scope.loadVariantUnit product
expect(product.variant_unit_with_scale).toBeNull()
it 'sets variant_unit_with_scale to null when variant_unit_scale is null', ->
product = {variant_unit: 'weight', variant_unit_scale: null}
it 'sets variant_unit_with_scale to variant_unit when variant_unit_scale is null', ->
product = {variant_unit: 'items', variant_unit_scale: null, variant_unit_name: 'foo'}
scope.loadVariantUnit product
expect(product.variant_unit_with_scale).toBeNull()
expect(product.variant_unit_with_scale).toEqual "items"
describe "getting on_hand counts when products have variants", ->