Merge branch 'master' of github.com:invoiceninja/invoiceninja

This commit is contained in:
Hillel Coren 2017-09-13 19:18:32 +03:00
commit b4b8934d61

View File

@ -32,6 +32,8 @@ class ProductTransformer extends EntityTransformer
'tax_rate2' => (float) $product->tax_rate2, 'tax_rate2' => (float) $product->tax_rate2,
'updated_at' => $this->getTimestamp($product->updated_at), 'updated_at' => $this->getTimestamp($product->updated_at),
'archived_at' => $this->getTimestamp($product->deleted_at), 'archived_at' => $this->getTimestamp($product->deleted_at),
'custom_value1' => $product->custom_value1,
'custom_value2' => $product->custom_value2,
]); ]);
} }
} }