Merge branch 'master' into combined/bulk-product-edit-and-ng-cloak

This commit is contained in:
Rohan Mitchell
2015-06-03 15:05:51 +10:00
39 changed files with 471 additions and 127 deletions

View File

@@ -32,8 +32,9 @@ Darkswarm.factory 'Products', ($resource, Enterprises, Dereferencer, Taxons, Pro
if product.variants
product.variants = (Variants.register variant for variant in product.variants)
variant.product = product for variant in product.variants
product.master.product = product
product.master = Variants.register product.master if product.master
if product.master
product.master.product = product
product.master = Variants.register product.master
registerVariantsWithCart: ->
for product in @products