From a0481310a3df24a396d6b9fe0d239408af337ac5 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 4 Dec 2016 23:51:18 +0200
Subject: [PATCH] Hide draft invoices from the client portal

---
 app/Console/Commands/CheckData.php            | 17 +++++++-----
 app/Ninja/Transformers/InvoiceTransformer.php |  1 +
 app/Ninja/Transformers/QuoteTransformer.php   | 26 -------------------
 resources/views/invoices/edit.blade.php       |  2 +-
 4 files changed, 13 insertions(+), 33 deletions(-)
 delete mode 100644 app/Ninja/Transformers/QuoteTransformer.php

diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php
index 17484c8f6aef..9b5bbad58eef 100644
--- a/app/Console/Commands/CheckData.php
+++ b/app/Console/Commands/CheckData.php
@@ -73,12 +73,16 @@ class CheckData extends Command {
         $this->logMessage('Done');
         $errorEmail = env('ERROR_EMAIL');
 
-        if ( ! $this->isValid && $errorEmail) {
-            Mail::raw($this->log, function ($message) use ($errorEmail) {
-                $message->to($errorEmail)
-                        ->from(CONTACT_EMAIL)
-                        ->subject('Check-Data');
-            });
+        if ( ! $this->isValid) {
+            if ($errorEmail) {
+                Mail::raw($this->log, function ($message) use ($errorEmail) {
+                    $message->to($errorEmail)
+                            ->from(CONTACT_EMAIL)
+                            ->subject('Check-Data');
+                });
+            } else {
+                $this->info($this->log);
+            }
         }
     }
 
@@ -209,6 +213,7 @@ class CheckData extends Command {
                     ->where('accounts.id', '!=', 20432)
                     ->where('clients.is_deleted', '=', 0)
                     ->where('invoices.is_deleted', '=', 0)
+                    ->where('invoices.is_public', '=', 1)
                     ->where('invoices.invoice_type_id', '=', INVOICE_TYPE_STANDARD)
                     ->where('invoices.is_recurring', '=', 0)
                     ->havingRaw('abs(clients.balance - sum(invoices.balance)) > .01 and clients.balance != 999999999.9999');
diff --git a/app/Ninja/Transformers/InvoiceTransformer.php b/app/Ninja/Transformers/InvoiceTransformer.php
index 62b997c15eba..7887f74ef74d 100644
--- a/app/Ninja/Transformers/InvoiceTransformer.php
+++ b/app/Ninja/Transformers/InvoiceTransformer.php
@@ -119,6 +119,7 @@ class InvoiceTransformer extends EntityTransformer
             'custom_text_value1' => $invoice->custom_text_value1,
             'custom_text_value2' => $invoice->custom_text_value2,
             'is_quote' => (bool) $invoice->isType(INVOICE_TYPE_QUOTE), // Temp to support mobile app
+            'is_public' => (bool) $invoice->is_public,
         ]);
     }
 }
diff --git a/app/Ninja/Transformers/QuoteTransformer.php b/app/Ninja/Transformers/QuoteTransformer.php
deleted file mode 100644
index 7443230449eb..000000000000
--- a/app/Ninja/Transformers/QuoteTransformer.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php namespace App\Ninja\Transformers;
-
-use App\Models\Invoice;
-
-class QuoteTransformer extends EntityTransformer
-{
-    protected $defaultIncludes = [
-        'invoice_items',
-    ];
-
-    public function includeInvoiceItems($invoice)
-    {
-        $transformer = new InvoiceItemTransformer($this->account, $this->serializer);
-        return $this->includeCollection($invoice->invoice_items, $transformer, 'invoice_items');
-    }
-
-    public function transform(Invoice $invoice)
-    {
-        return [
-            'id' => (int) $invoice->public_id,
-            'quote_number' => $invoice->invoice_number,
-            'amount' => (float) $invoice->amount,
-            'quote_terms' => $invoice->terms,
-        ];
-    }
-}
\ No newline at end of file
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index d38c9c79fb36..53271337b050 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -554,7 +554,7 @@
                 <!-- do nothing -->
             @else
                 @if (!$invoice->is_deleted)
-					@if ($invoice->is_public)
+					@if ($invoice->isSent())
 						{!! Button::success(trans("texts.save_{$entityType}"))->withAttributes(array('id' => 'saveButton', 'onclick' => 'onSaveClick()'))->appendIcon(Icon::create('floppy-disk')) !!}
 					@else
 						{!! Button::normal(trans("texts.save_draft"))->withAttributes(array('id' => 'saveButton', 'onclick' => 'onSaveClick()'))->appendIcon(Icon::create('floppy-disk')) !!}