Check for double files and some code clean up.

app/Helpers/Attachments/AttachmentHelper.php

@@ -54,6 +54,7 @@ class AttachmentHelper implements AttachmentHelperInterface
     public function saveAttachmentsForModel(Model $model)
     {
         $files = Input::file('attachments');
+
         foreach ($files as $entry) {
             if (!is_null($entry)) {
                 $this->processFile($entry, $model);
@@ -71,11 +72,19 @@ class AttachmentHelper implements AttachmentHelperInterface
      */
     protected function hasFile(UploadedFile $file, Model $model)
     {
-        $md5   = md5_file($file->getPath());
+        $md5   = md5_file($file->getRealPath());
+        $name  = $file->getClientOriginalName();
         $class = get_class($model);
         $count = Auth::user()->attachments()->where('md5', $md5)->where('attachable_id', $model->id)->where('attachable_type', $class)->count();
 
-        return ($count > 0);
+        if ($count > 0) {
+            $err = 'File ' . e($name) . ' already attached to this object.';
+            $this->errors->add('attachments', $err);
+
+            return true;
+        }
+
+        return false;
     }
 
     /**
@@ -97,7 +106,7 @@ class AttachmentHelper implements AttachmentHelperInterface
         $attachment = new Attachment;
         $attachment->user()->associate(Auth::user());
         $attachment->attachable()->associate($model);
-        $attachment->md5      = md5_file($file->getPath());
+        $attachment->md5      = md5_file($file->getRealPath());
         $attachment->filename = $file->getClientOriginalName();
         $attachment->mime     = $file->getMimeType();
         $attachment->size     = $file->getSize();
@@ -128,6 +137,11 @@ class AttachmentHelper implements AttachmentHelperInterface
 
     }
 
+    /**
+     * @param UploadedFile $file
+     *
+     * @return bool
+     */
     protected function validMime(UploadedFile $file)
     {
         $mime = $file->getMimeType();
@@ -143,6 +157,11 @@ class AttachmentHelper implements AttachmentHelperInterface
         return true;
     }
 
+    /**
+     * @param UploadedFile $file
+     *
+     * @return bool
+     */
     protected function validSize(UploadedFile $file)
     {
         $size = $file->getSize();

app/Http/Controllers/TransactionController.php

@@ -311,16 +311,29 @@ class TransactionController extends Controller
     /**
      * @param JournalFormRequest         $request
      * @param JournalRepositoryInterface $repository
+     * @param AttachmentHelperInterface  $att
      * @param TransactionJournal         $journal
      *
-     * @return \Illuminate\Http\RedirectResponse
+     * @return $this|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
-    public function update(JournalFormRequest $request, JournalRepositoryInterface $repository, TransactionJournal $journal)
+    public function update(JournalFormRequest $request, JournalRepositoryInterface $repository, AttachmentHelperInterface $att, TransactionJournal $journal)
     {
 
         $journalData = $request->getJournalData();
         $repository->update($journal, $journalData);
 
+        // save attachments:
+        $att->saveAttachmentsForModel($journal);
+
+        if ($att->getErrors()->count() > 0) {
+            // todo moet beter
+            Session::flash('error', '<ul>' . join('', $att->getErrors()->get('attachments', '<li>:message</li>')) . '</ul>');
+        }
+        if ($att->getMessages()->count() > 0) {
+            // todo moet beter
+            Session::flash('info', '<ul>' . join('', $att->getMessages()->get('attachments', '<li>:message</li>')) . '</ul>');
+        }
+
         event(new JournalSaved($journal));
         // update, get events by date and sort DESC
 

resources/twig/transactions/edit.twig

@@ -5,94 +5,99 @@
 {% endblock %}
 
 {% block content %}
-    {{ Form.open({'class' : 'form-horizontal','id' : 'update','url' : route('transactions.update',journal.id)}) }}
+    <form method="POST" action="{{ route('transactions.update',journal.id) }}" accept-charset="UTF-8" class="form-horizontal" id="update"
+          enctype="multipart/form-data">
 
-    <input type="hidden" name="id" value="{{ journal.id }}"/>
-    <input type="hidden" name="what" value="{{ what }}"/>
+        <input name="_token" type="hidden" value="{{ csrf_token() }}">
+        <input type="hidden" name="id" value="{{ journal.id }}"/>
+        <input type="hidden" name="what" value="{{ what }}"/>
 
-    <div class="row">
-        <div class="col-lg-6 col-md-12 col-sm-12">
-            <div class="box box-primary">
-                <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+        <div class="row">
+            <div class="col-lg-6 col-md-12 col-sm-12">
+                <div class="box box-primary">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+                    </div>
+                    <div class="box-body">
+                        <!-- ALWAYS AVAILABLE -->
+                        {{ ExpandedForm.text('description',journal.description) }}
+
+                        <!-- SHOW ACCOUNT (FROM) ONLY FOR WITHDRAWALS AND DEPOSITS -->
+                        {% if what == 'deposit' or what == 'withdrawal' %}
+                            {{ ExpandedForm.select('account_id',accounts,data['account_id']) }}
+                        {% endif %}
+
+                        <!-- SHOW EXPENSE ACCOUNT ONLY FOR WITHDRAWALS -->
+                        {% if what == 'withdrawal' %}
+                            {{ ExpandedForm.text('expense_account',data['expense_account']) }}
+                        {% endif %}
+
+                        <!-- SHOW REVENUE ACCOUNT ONLY FOR DEPOSITS -->
+                        {% if what == 'deposit' %}
+                            {{ ExpandedForm.text('revenue_account',data['revenue_account']) }}
+                        {% endif %}
+
+                        <!-- ONLY SHOW FROM/TO ACCOUNT WHEN CREATING TRANSFER -->
+                        {% if what == 'transfer' %}
+                            {{ ExpandedForm.select('account_from_id',accounts,data['account_from_id']) }}
+                            {{ ExpandedForm.select('account_to_id',accounts,data['account_to_id']) }}
+                        {% endif %}
+
+                        <!-- ALWAYS SHOW AMOUNT -->
+                        {{ ExpandedForm.amount('amount',data.amount,{'currency' : journal.transactionCurrency}) }}
+
+                        <!-- ALWAYS SHOW DATE -->
+                        {{ ExpandedForm.date('date',data['date']) }}
+                    </div>
                 </div>
-                <div class="box-body">
-                    <!-- ALWAYS AVAILABLE -->
-                    {{ ExpandedForm.text('description',journal.description) }}
+                <!-- close panel -->
 
-                    <!-- SHOW ACCOUNT (FROM) ONLY FOR WITHDRAWALS AND DEPOSITS -->
-                    {% if what == 'deposit' or what == 'withdrawal' %}
-                        {{ ExpandedForm.select('account_id',accounts,data['account_id']) }}
-                    {% endif %}
-
-                    <!-- SHOW EXPENSE ACCOUNT ONLY FOR WITHDRAWALS -->
-                    {% if what == 'withdrawal' %}
-                        {{ ExpandedForm.text('expense_account',data['expense_account']) }}
-                    {% endif %}
-
-                    <!-- SHOW REVENUE ACCOUNT ONLY FOR DEPOSITS -->
-                    {% if what == 'deposit' %}
-                        {{ ExpandedForm.text('revenue_account',data['revenue_account']) }}
-                    {% endif %}
-
-                    <!-- ONLY SHOW FROM/TO ACCOUNT WHEN CREATING TRANSFER -->
-                    {% if what == 'transfer' %}
-                        {{ ExpandedForm.select('account_from_id',accounts,data['account_from_id']) }}
-                        {{ ExpandedForm.select('account_to_id',accounts,data['account_to_id']) }}
-                    {% endif %}
-
-                    <!-- ALWAYS SHOW AMOUNT -->
-                    {{ ExpandedForm.amount('amount',data.amount,{'currency' : journal.transactionCurrency}) }}
-
-                    <!-- ALWAYS SHOW DATE -->
-                    {{ ExpandedForm.date('date',data['date']) }}
-                </div>
             </div>
-            <!-- close panel -->
+            <div class="col-lg-6 col-md-12 col-sm-12">
+                <div class="box">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+                    </div>
+                    <div class="box-body">
+                        <!-- BUDGET ONLY WHEN CREATING A WITHDRAWAL -->
+                        {% if what == 'withdrawal' %}
+                            {{ ExpandedForm.select('budget_id',budgets,data['budget_id']) }}
+                        {% endif %}
 
-        </div>
-        <div class="col-lg-6 col-md-12 col-sm-12">
-            <div class="box">
-                <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+                        <!-- CATEGORY ALWAYS -->
+                        {{ ExpandedForm.text('category',data['category']) }}
+
+                        <!-- TAGS -->
+                        {{ ExpandedForm.text('tags') }}
+
+                        <!-- RELATE THIS TRANSFER TO A PIGGY BANK -->
+                        {% if what == 'withdrawal' and piggies|length > 0 %}
+                            {{ ExpandedForm.select('piggy_bank_id',piggies,data['piggy_bank_id']) }}
+                        {% endif %}
+
+                        <!-- ATTACHMENTS -->
+                        {{ ExpandedForm.file('attachments[]', {'multiple': 'multiple'}) }}
+
+                    </div>
                 </div>
-                <div class="box-body">
-                    <!-- BUDGET ONLY WHEN CREATING A WITHDRAWAL -->
-                    {% if what == 'withdrawal' %}
-                        {{ ExpandedForm.select('budget_id',budgets,data['budget_id']) }}
-                    {% endif %}
+                <!-- end of panel for options-->
 
-                    <!-- CATEGORY ALWAYS -->
-                    {{ ExpandedForm.text('category',data['category']) }}
-
-                    <!-- TAGS -->
-                    {{ ExpandedForm.text('tags') }}
-
-                    <!-- RELATE THIS TRANSFER TO A PIGGY BANK -->
-                    {% if what == 'withdrawal' and piggies|length > 0 %}
-                        {{ ExpandedForm.select('piggy_bank_id',piggies,data['piggy_bank_id']) }}
-                    {% endif %}
-
-                </div>
-            </div>
-            <!-- end of panel for options-->
-
-            <!-- panel for options -->
-            <div class="box">
-                <div class="box-header with-border">
-                    <h3 class="box-title">{{ 'options'|_ }}</h3>
-                </div>
-                <div class="box-body">
-                    {{ ExpandedForm.optionsList('update','transaction') }}
-                </div>
-                <div class="box-footer">
-                    <button type="submit" class="pull-right btn btn-success">{{ ('update_' ~ what)|_ }}</button>
+                <!-- panel for options -->
+                <div class="box">
+                    <div class="box-header with-border">
+                        <h3 class="box-title">{{ 'options'|_ }}</h3>
+                    </div>
+                    <div class="box-body">
+                        {{ ExpandedForm.optionsList('update','transaction') }}
+                    </div>
+                    <div class="box-footer">
+                        <button type="submit" class="pull-right btn btn-success">{{ ('update_' ~ what)|_ }}</button>
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
 
-    {{ Form.close|raw }}
+    </form>
 
 
 {% endblock %}

resources/twig/transactions/show.twig

@@ -76,6 +76,7 @@
             </div>
 
             <!-- attachments -->
+            {% if journal.attachments|length > 0 %}
             <div class="box">
                 <div class="box-header with-border">
                     <h3 class="box-title">{{ 'attachments'|_ }}</h3>
@@ -97,6 +98,7 @@
                     </table>
                 </div>
             </div>
+            {% endif %}
 
             <!-- events, if present -->
             {% if journal.piggyBankEvents|length > 0 %}