bug fixes

This commit is contained in:
Hillel Coren 2014-02-03 13:15:28 +02:00
parent 3f3a14966f
commit 3f2a7fcc4d

View File

@ -974,11 +974,9 @@
if (data) { if (data) {
ko.mapping.fromJS(data, self.mapping, self); ko.mapping.fromJS(data, self.mapping, self);
self.is_recurring(parseInt(data.is_recurring)); self.is_recurring(parseInt(data.is_recurring));
//console.log('is rec %s', parseInt(data.is_recurring));
} else { } else {
self.addItem(); self.addItem();
} }
//console.log('test')
self._tax = ko.observable(); self._tax = ko.observable();
this.tax = ko.computed({ this.tax = ko.computed({
@ -1420,6 +1418,9 @@
@if ($invoice) @if ($invoice)
var invoice = {{ $invoice }}; var invoice = {{ $invoice }};
ko.mapping.fromJS(invoice, model.invoice().mapping, model.invoice); ko.mapping.fromJS(invoice, model.invoice().mapping, model.invoice);
if (model.invoice().is_recurring() === '0') {
model.invoice().is_recurring(false);
}
var invitationContactIds = {{ json_encode($invitationContactIds) }}; var invitationContactIds = {{ json_encode($invitationContactIds) }};
var client = clientMap[invoice.client.public_id]; var client = clientMap[invoice.client.public_id];
for (var i=0; i<client.contacts.length; i++) { for (var i=0; i<client.contacts.length; i++) {
@ -1443,6 +1444,7 @@
ko.applyBindings(model); ko.applyBindings(model);
</script> </script>
@stop @stop