From cd2c8147c11f633adea1b8fecc3b3f2f1cec2983 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 3 Feb 2014 12:34:58 +0200 Subject: [PATCH] bug fixes --- app/models/Activity.php | 16 ++++++++-------- app/routes.php | 3 ++- app/views/invoices/edit.blade.php | 15 +++++++++------ app/views/splash.blade.php | 2 +- public/css/style.css | 2 +- public/images/invoiceninja-logo.png | Bin 2889 -> 4240 bytes public/js/script.js | 7 ++----- 7 files changed, 23 insertions(+), 22 deletions(-) diff --git a/app/models/Activity.php b/app/models/Activity.php index 66b26c32d9e3..9a58ab882fde 100755 --- a/app/models/Activity.php +++ b/app/models/Activity.php @@ -47,7 +47,7 @@ class Activity extends Eloquent $activity->user_id = $entity->user_id; $activity->account_id = $entity->account_id; } - else if (Auth::check()) + else if (Auth::check()) { $activity->user_id = Auth::user()->id; $activity->account_id = Auth::user()->account_id; @@ -257,18 +257,18 @@ class Activity extends Eloquent $client->paid_to_date = $client->paid_to_date + $payment->amount; $client->save(); - if (Auth::check()) - { - $activity = Activity::getBlank(); - $message = $payment->payment_type_id == PAYMENT_TYPE_CREDIT ? 'applied credit' : 'entered payment'; - $activity->message = Utils::encodeActivity(Auth::user(), $message); - } - else + if ($payment->contact_id) { $activity = new Activity; $activity->contact_id = $payment->contact_id; $activity->message = Utils::encodeActivity($payment->invitation->contact, 'entered payment'); } + else + { + $activity = Activity::getBlank(); + $message = $payment->payment_type_id == PAYMENT_TYPE_CREDIT ? 'applied credit' : 'entered payment'; + $activity->message = Utils::encodeActivity(Auth::user(), $message); + } $activity->payment_id = $payment->id; diff --git a/app/routes.php b/app/routes.php index 0b2064af0da8..7f5aeb0bf86d 100755 --- a/app/routes.php +++ b/app/routes.php @@ -217,7 +217,8 @@ define('DEFAULT_DATETIME_FORMAT', 'F j, Y, g:i a'); define('DEFAULT_QUERY_CACHE', 120); -if (Auth::check() && !Session::has(SESSION_TIMEZONE)) { +if (Auth::check() && !Session::has(SESSION_TIMEZONE)) +{ Event::fire('user.refresh'); } diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php index d805ee3d8a04..93a8d9d8d405 100755 --- a/app/views/invoices/edit.blade.php +++ b/app/views/invoices/edit.blade.php @@ -113,7 +113,7 @@ - + {{ Former::text('product_key')->useDatalist(Product::getProductKeys($products), 'key')->onkeyup('onItemChange()') @@ -128,13 +128,13 @@ - + - +   @@ -157,17 +157,17 @@ Subtotal - + Discount - + Tax - + @@ -973,9 +973,12 @@ if (data) { ko.mapping.fromJS(data, self.mapping, self); + self.is_recurring(parseInt(data.is_recurring)); + console.log('is rec %s', parseInt(data.is_recurring)); } else { self.addItem(); } + console.log('test') self._tax = ko.observable(); this.tax = ko.computed({ diff --git a/app/views/splash.blade.php b/app/views/splash.blade.php index 861454970e24..9eb2d1fef1bf 100755 --- a/app/views/splash.blade.php +++ b/app/views/splash.blade.php @@ -147,7 +147,7 @@
-

SIMPLE, INTUITIVE INVOICING

+

SIMPLE, INTUITIVE INVOICING.

diff --git a/public/css/style.css b/public/css/style.css index 0a6373548c96..92a198e72121 100755 --- a/public/css/style.css +++ b/public/css/style.css @@ -7,7 +7,7 @@ div.required > label { } label.checkbox, -div > label.control-label { +label.control-label { font-weight: normal !important; } diff --git a/public/images/invoiceninja-logo.png b/public/images/invoiceninja-logo.png index ffa6cfdee246adf426bdc50533eb6ee060b33f04..ad5766df872fec3830b4a64b6e4d64eac5cab58b 100644 GIT binary patch delta 3597 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 diff --git a/public/js/script.js b/public/js/script.js index ee8e52f33485..ad7a68ffbee6 100755 --- a/public/js/script.js +++ b/public/js/script.js @@ -294,7 +294,7 @@ function generatePDF(invoice, checkMath) { doc.setLineWidth(1); doc.line(tableLeft - tablePadding, x, lineTotalRight+tablePadding, x); - console.log('%s %s %s', lineTotalRight, tableLeft, (lineTotalRight-tableLeft)); + //console.log('%s %s %s', lineTotalRight, tableLeft, (lineTotalRight-tableLeft)); doc.text(tableLeft, x+16, invoice.public_notes); if (invoice.terms) { @@ -369,9 +369,6 @@ function generatePDF(invoice, checkMath) { doc.setFontType("bold"); doc.text(footerLeft, x, 'Balance Due'); - console.log('total %s', total); - console.log('inovice.amount %s', invoice.amount); - console.log('invoice.blance %s', invoice.balance); total = formatMoney(total - (invoice.amount - invoice.balance), currencyId); var totalX = headerRight - (doc.getStringUnitWidth(total) * doc.internal.getFontSize()); doc.text(totalX, x, total); @@ -872,7 +869,7 @@ function populateInvoiceComboboxes(clientId, invoiceId) { if (invoiceId) { var invoice = invoiceMap[invoiceId]; var client = clientMap[invoice.client.public_id]; - console.log(invoice); + //console.log(invoice); setComboboxValue($('.invoice-select'), invoice.public_id, (invoice.invoice_number + ' - ' + invoice.invoice_status.name + ' - ' + getClientDisplayName(client) + ' - ' + formatMoney(invoice.amount, invoice.currency_id) + ' | ' + formatMoney(invoice.balance, invoice.currency_id))); $invoiceSelect.trigger('change'); } else if (clientId) {