diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index bf67c12498cc..84a93e177b40 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -53,7 +53,14 @@ class AppServiceProvider extends ServiceProvider { $str .= '
  • '.trans("texts.credits").'
  • '.trans("texts.new_credit").'
  • '; - } + } else if($type == 'expense'){ + $str .= '
  • +
  • '.trans("texts.expenses").'
  • +
  • '.trans("texts.new_expense").'
  • +
  • +
  • '.trans("texts.vendors").'
  • +
  • '.trans("texts.new_vendor").'
  • '; + } $str .= ' '; diff --git a/database/migrations/2016_01_04_175228_create_vendors_table.php b/database/migrations/2016_01_04_175228_create_vendors_table.php new file mode 100644 index 000000000000..67d4f6c088fa --- /dev/null +++ b/database/migrations/2016_01_04_175228_create_vendors_table.php @@ -0,0 +1,64 @@ +increments('id'); + $table->timestamps(); + $table->softDeletes(); + $table->integer('user_id', false, true); + $table->integer('account_id', false, true); + $table->integer('currency_id',false, true)->nullable(); + $table->string('name')->nullable(); + $table->string('address1'); + $table->string('address2'); + $table->string('city'); + $table->string('state'); + $table->string('postal_code'); + $table->integer('country_id',false, true); + $table->string('work_phone'); + $table->text('private_notes'); + $table->decimal('balance',13,2); + $table->decimal('paid_to_date',13,2); + + //$table->dateTime('last_login'); + + $table->string('website'); + $table->integer('industry_id',false, true); + $table->integer('size_id'); + $table->tinyInteger('is_deleted')->default(0); + $table->integer('payment_terms')->nullable(); + $table->integer('public_id',false, true); + $table->string('custom_value1')->nullable(); + $table->string('custom_value2')->nullable(); + $table->string('vat_number')->nullable(); + $table->string('id_number')->nullable(); + $table->integer('language_id', false, true)->nullable(); + }); + + // add relations + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::drop('vendors'); + } + +} diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php index cc20ef0de34d..60cad066a5ec 100644 --- a/resources/views/header.blade.php +++ b/resources/views/header.blade.php @@ -374,6 +374,7 @@ {!! HTML::menu_link('task') !!} {!! HTML::menu_link('invoice') !!} {!! HTML::menu_link('payment') !!} + {!! HTML::menu_link('expense') !!}