From 3c15d3e96ffbf3f6a64bf9209f429b8ffb6b8d7c Mon Sep 17 00:00:00 2001
From: cuneytsenturk <cneytsenturk@gmail.com>
Date: Wed, 3 Jan 2018 17:54:02 +0300
Subject: [PATCH] Drop columns and company logo change variable name.

---
 app/Http/Controllers/Companies/Companies.php  | 16 +++++-----
 app/Listeners/Updates/Version116.php          | 28 ++++++++++++++++
 app/Models/Company/Company.php                |  6 ++--
 app/Providers/EventServiceProvider.php        |  1 +
 ...17_12_30_000000_create_mediable_tables.php |  3 +-
 ..._attachment_column_bill_payments_table.php | 32 +++++++++++++++++++
 ...000_drop_attachment_column_bills_table.php | 32 +++++++++++++++++++
 ...tachment_column_invoice_payments_table.php | 32 +++++++++++++++++++
 ..._drop_attachment_column_invoices_table.php | 32 +++++++++++++++++++
 ..._drop_attachment_column_payments_table.php | 32 +++++++++++++++++++
 ..._drop_attachment_column_revenues_table.php | 32 +++++++++++++++++++
 ...000000_drop_picture_column_items_table.php | 32 +++++++++++++++++++
 ...000000_drop_picture_column_users_table.php | 32 +++++++++++++++++++
 .../views/companies/companies/edit.blade.php  | 14 ++++----
 14 files changed, 304 insertions(+), 20 deletions(-)
 create mode 100644 app/Listeners/Updates/Version116.php
 create mode 100644 database/migrations/2018_01_03_000000_drop_attachment_column_bill_payments_table.php
 create mode 100644 database/migrations/2018_01_03_000000_drop_attachment_column_bills_table.php
 create mode 100644 database/migrations/2018_01_03_000000_drop_attachment_column_invoice_payments_table.php
 create mode 100644 database/migrations/2018_01_03_000000_drop_attachment_column_invoices_table.php
 create mode 100644 database/migrations/2018_01_03_000000_drop_attachment_column_payments_table.php
 create mode 100644 database/migrations/2018_01_03_000000_drop_attachment_column_revenues_table.php
 create mode 100644 database/migrations/2018_01_03_000000_drop_picture_column_items_table.php
 create mode 100644 database/migrations/2018_01_03_000000_drop_picture_column_users_table.php

diff --git a/app/Http/Controllers/Companies/Companies.php b/app/Http/Controllers/Companies/Companies.php
index 4ca09d084..908937fa0 100644
--- a/app/Http/Controllers/Companies/Companies.php
+++ b/app/Http/Controllers/Companies/Companies.php
@@ -60,12 +60,12 @@ class Companies extends Controller
         setting()->set('general.company_address', $request->get('company_address'));
 
         if ($request->file('company_logo')) {
-            $logo = $this->getMedia($request->file('company_logo'), 'settings', $company->id);
+            $company_logo = $this->getMedia($request->file('company_logo'), 'settings', $company->id);
 
-            if ($logo) {
-                $company->attachMedia($logo, 'logo');
+            if ($company_logo) {
+                $company->attachMedia($company_logo, 'company_logo');
 
-                setting()->set('general.company_logo', $logo->id);
+                setting()->set('general.company_logo', $company_logo->id);
             }
         }
 
@@ -141,12 +141,12 @@ class Companies extends Controller
         setting()->set('general.company_address', $request->get('company_address'));
 
         if ($request->file('company_logo')) {
-            $logo = $this->getMedia($request->file('company_logo'), 'settings', $company->id);
+            $company_logo = $this->getMedia($request->file('company_logo'), 'settings', $company->id);
 
-            if ($logo) {
-                $company->attachMedia($logo, 'logo');
+            if ($company_logo) {
+                $company->attachMedia($company_logo, 'company_logo');
 
-                setting()->set('general.company_logo', $logo->id);
+                setting()->set('general.company_logo', $company_logo->id);
             }
         }
 
diff --git a/app/Listeners/Updates/Version116.php b/app/Listeners/Updates/Version116.php
new file mode 100644
index 000000000..9dc267726
--- /dev/null
+++ b/app/Listeners/Updates/Version116.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Listeners\Updates;
+
+use App\Events\UpdateFinished;
+use App\Models\Setting\Currency;
+
+class Version116 extends Listener
+{
+    const ALIAS = 'core';
+
+    const VERSION = '1.1.6';
+
+    /**
+     * Handle the event.
+     *
+     * @param  $event
+     * @return void
+     */
+    public function handle(UpdateFinished $event)
+    {
+        // Check if should listen
+        if (!$this->check($event)) {
+            return;
+        }
+
+    }
+}
diff --git a/app/Models/Company/Company.php b/app/Models/Company/Company.php
index 3c0953e73..e04dfe1bc 100644
--- a/app/Models/Company/Company.php
+++ b/app/Models/Company/Company.php
@@ -236,12 +236,12 @@ class Company extends Eloquent
      *
      * @return string
      */
-    public function getLogoAttribute()
+    public function getCompanyLogoAttribute()
     {
-        if (!$this->hasMedia('logo')) {
+        if (!$this->hasMedia('company_logo')) {
             return false;
         }
 
-        return $this->getMedia('logo')->last();
+        return $this->getMedia('company_logo')->last();
     }
 }
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index d76187cda..8ecb8073e 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -21,6 +21,7 @@ class EventServiceProvider extends ServiceProvider
             'App\Listeners\Updates\Version110',
             'App\Listeners\Updates\Version112',
             'App\Listeners\Updates\Version113',
+            'App\Listeners\Updates\Version116',
         ],
         'Illuminate\Auth\Events\Login' => [
             'App\Listeners\Auth\Login',
diff --git a/database/migrations/2017_12_30_000000_create_mediable_tables.php b/database/migrations/2017_12_30_000000_create_mediable_tables.php
index f9dd1f1a4..c85857724 100644
--- a/database/migrations/2017_12_30_000000_create_mediable_tables.php
+++ b/database/migrations/2017_12_30_000000_create_mediable_tables.php
@@ -41,8 +41,7 @@ class CreateMediableTables extends Migration
             $table->index(['mediable_id', 'mediable_type']);
             $table->index('tag');
             $table->index('order');
-            $table->foreign('media_id')->references('id')->on('media')
-                ->onDelete('cascade');
+            $table->foreign('media_id')->references('id')->on('media')->onDelete('cascade');
         });
     }
 
diff --git a/database/migrations/2018_01_03_000000_drop_attachment_column_bill_payments_table.php b/database/migrations/2018_01_03_000000_drop_attachment_column_bill_payments_table.php
new file mode 100644
index 000000000..b7565245d
--- /dev/null
+++ b/database/migrations/2018_01_03_000000_drop_attachment_column_bill_payments_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class DropAttachmentColumnBillPaymentsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('bill_payments', function (Blueprint $table) {
+            $table->dropColumn('attachment');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('bill_payments', function (Blueprint $table) {
+            $table->string('attachment')->nullable();
+        });
+    }
+}
diff --git a/database/migrations/2018_01_03_000000_drop_attachment_column_bills_table.php b/database/migrations/2018_01_03_000000_drop_attachment_column_bills_table.php
new file mode 100644
index 000000000..d62157b79
--- /dev/null
+++ b/database/migrations/2018_01_03_000000_drop_attachment_column_bills_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class DropAttachmentColumnBillsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('bills', function (Blueprint $table) {
+            $table->dropColumn('attachment');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('bills', function (Blueprint $table) {
+            $table->string('attachment')->nullable();
+        });
+    }
+}
diff --git a/database/migrations/2018_01_03_000000_drop_attachment_column_invoice_payments_table.php b/database/migrations/2018_01_03_000000_drop_attachment_column_invoice_payments_table.php
new file mode 100644
index 000000000..87ac83f49
--- /dev/null
+++ b/database/migrations/2018_01_03_000000_drop_attachment_column_invoice_payments_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class DropAttachmentColumnInvoicePaymentsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('invoice_payments', function (Blueprint $table) {
+            $table->dropColumn('attachment');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('invoice_payments', function (Blueprint $table) {
+            $table->string('attachment')->nullable();
+        });
+    }
+}
diff --git a/database/migrations/2018_01_03_000000_drop_attachment_column_invoices_table.php b/database/migrations/2018_01_03_000000_drop_attachment_column_invoices_table.php
new file mode 100644
index 000000000..be24b7b6e
--- /dev/null
+++ b/database/migrations/2018_01_03_000000_drop_attachment_column_invoices_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class DropAttachmentColumnInvoicesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('invoices', function (Blueprint $table) {
+            $table->dropColumn('attachment');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('invoices', function (Blueprint $table) {
+            $table->string('attachment')->nullable();
+        });
+    }
+}
diff --git a/database/migrations/2018_01_03_000000_drop_attachment_column_payments_table.php b/database/migrations/2018_01_03_000000_drop_attachment_column_payments_table.php
new file mode 100644
index 000000000..1cc7fb1ad
--- /dev/null
+++ b/database/migrations/2018_01_03_000000_drop_attachment_column_payments_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class DropAttachmentColumnPaymentsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('payments', function (Blueprint $table) {
+            $table->dropColumn('attachment');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('payments', function (Blueprint $table) {
+            $table->string('attachment')->nullable();
+        });
+    }
+}
diff --git a/database/migrations/2018_01_03_000000_drop_attachment_column_revenues_table.php b/database/migrations/2018_01_03_000000_drop_attachment_column_revenues_table.php
new file mode 100644
index 000000000..fc890fb6f
--- /dev/null
+++ b/database/migrations/2018_01_03_000000_drop_attachment_column_revenues_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class DropAttachmentColumnRevenuesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('revenues', function (Blueprint $table) {
+            $table->dropColumn('attachment');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('revenues', function (Blueprint $table) {
+            $table->string('attachment')->nullable();
+        });
+    }
+}
diff --git a/database/migrations/2018_01_03_000000_drop_picture_column_items_table.php b/database/migrations/2018_01_03_000000_drop_picture_column_items_table.php
new file mode 100644
index 000000000..5afe8311b
--- /dev/null
+++ b/database/migrations/2018_01_03_000000_drop_picture_column_items_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class DropPictureColumnItemsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('items', function (Blueprint $table) {
+            $table->dropColumn('picture');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('items', function (Blueprint $table) {
+            $table->string('picture')->nullable();
+        });
+    }
+}
diff --git a/database/migrations/2018_01_03_000000_drop_picture_column_users_table.php b/database/migrations/2018_01_03_000000_drop_picture_column_users_table.php
new file mode 100644
index 000000000..ed91f6820
--- /dev/null
+++ b/database/migrations/2018_01_03_000000_drop_picture_column_users_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class DropPictureColumnUsersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('picture');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('picture')->nullable();
+        });
+    }
+}
diff --git a/resources/views/companies/companies/edit.blade.php b/resources/views/companies/companies/edit.blade.php
index 3cb4cdc69..a1ccf03d5 100644
--- a/resources/views/companies/companies/edit.blade.php
+++ b/resources/views/companies/companies/edit.blade.php
@@ -61,21 +61,21 @@
             $('#company_logo').fancyfile({
                 text  : '{{ trans('general.form.select.file') }}',
                 style : 'btn-default',
-                @if($company->logo)
-                placeholder : '<?php echo $company->logo->basename; ?>'
+                @if($company->company_logo)
+                placeholder : '<?php echo $company->company_logo->basename; ?>'
                 @else
                 placeholder : '{{ trans('general.form.no_file_selected') }}'
                 @endif
             });
 
-            @if($company->logo)
+            @if($company->company_logo)
                 attachment_html  = '<span class="attachment">';
-                attachment_html += '    <a href="{{ url('uploads/' . $company->logo->id . '/download') }}">';
+                attachment_html += '    <a href="{{ url('uploads/' . $company->company_logo->id . '/download') }}">';
                 attachment_html += '        <span id="download-attachment" class="text-primary">';
-                attachment_html += '            <i class="fa fa-file-{{ $company->logo->aggregate_type }}-o"></i> {{ $company->logo->basename }}';
+                attachment_html += '            <i class="fa fa-file-{{ $company->company_logo->aggregate_type }}-o"></i> {{ $company->company_logo->basename }}';
                 attachment_html += '        </span>';
                 attachment_html += '    </a>';
-                attachment_html += '    {!! Form::open(['id' => 'attachment-' . $company->logo->id, 'method' => 'DELETE', 'url' => [url('uploads/' . $company->logo->id)], 'style' => 'display:inline']) !!}';
+                attachment_html += '    {!! Form::open(['id' => 'attachment-' . $company->company_logo->id, 'method' => 'DELETE', 'url' => [url('uploads/' . $company->company_logo->id)], 'style' => 'display:inline']) !!}';
                 attachment_html += '    <a id="remove-attachment" href="javascript:void();">';
                 attachment_html += '        <span class="text-danger"><i class="fa fa fa-times"></i></span>';
                 attachment_html += '    </a>';
@@ -85,7 +85,7 @@
                 $('.fancy-file .fake-file').append(attachment_html);
 
                 $(document).on('click', '#remove-attachment', function (e) {
-                    confirmDelete("#attachment-{!! $company->logo->id !!}", "{!! trans('general.attachment') !!}", "{!! trans('general.delete_confirm', ['name' => '<strong>' . $company->logo->basename . '</strong>', 'type' => strtolower(trans('general.attachment'))]) !!}", "{!! trans('general.cancel') !!}", "{!! trans('general.delete')  !!}");
+                    confirmDelete("#attachment-{!! $company->company_logo->id !!}", "{!! trans('general.attachment') !!}", "{!! trans('general.delete_confirm', ['name' => '<strong>' . $company->company_logo->basename . '</strong>', 'type' => strtolower(trans('general.attachment'))]) !!}", "{!! trans('general.cancel') !!}", "{!! trans('general.delete')  !!}");
                 });
             @endif
         });