shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop columns and company logo change variable name.

Browse Source
This commit is contained in:
cuneytsenturk 2018-01-03 17:54:02 +03:00
parent 3ffdb98a4b
commit 3c15d3e96f
14 changed files with 304 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Http/Controllers/Companies/Companies.php
View File

@ -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);
}
}

28
app/Listeners/Updates/Version116.php Normal file
View File

@ -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;
}
}
}

6
app/Models/Company/Company.php
View File

@ -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();
}
}

1
app/Providers/EventServiceProvider.php
View File

@ -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',

3
database/migrations/2017_12_30_000000_create_mediable_tables.php
View File

@ -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');
});
}

32
database/migrations/2018_01_03_000000_drop_attachment_column_bill_payments_table.php Normal file
View File

@ -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();
});
}
}

32
database/migrations/2018_01_03_000000_drop_attachment_column_bills_table.php Normal file
View File

@ -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();
});
}
}

32
database/migrations/2018_01_03_000000_drop_attachment_column_invoice_payments_table.php Normal file
View File

@ -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();
});
}
}

32
database/migrations/2018_01_03_000000_drop_attachment_column_invoices_table.php Normal file
View File

@ -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();
});
}
}

32
database/migrations/2018_01_03_000000_drop_attachment_column_payments_table.php Normal file
View File

@ -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();
});
}
}

32
database/migrations/2018_01_03_000000_drop_attachment_column_revenues_table.php Normal file
View File

@ -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();
});
}
}

32
database/migrations/2018_01_03_000000_drop_picture_column_items_table.php Normal file
View File

@ -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();
});
}
}

32
database/migrations/2018_01_03_000000_drop_picture_column_users_table.php Normal file
View File

@ -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();
});
}
}

14
resources/views/companies/companies/edit.blade.php
View File

@ -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
});