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

import validation

Browse Source
This commit is contained in:
denisdulici 2018-06-23 15:59:13 +03:00
parent e44934337a
commit 978e8631aa
22 changed files with 417 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Http/Controllers/Common/Items.php
View File

@ -9,6 +9,7 @@ use App\Models\Setting\Category;
use App\Models\Setting\Currency;
use App\Models\Setting\Tax;
use App\Traits\Uploads;
use App\Utilities\Import;
use App\Utilities\ImportFile;
class Items extends Controller
@ -106,21 +107,10 @@ class Items extends Controller
*/
public function import(ImportFile $import)
{
// Loop through all sheets
$import->each(function ($sheet) {
if ($sheet->getTitle() != 'items') {
return;
if (!Import::createFromFile($import, 'Common\Item')) {
return redirect('common/import/common/items');
}
// Loop through all rows
$sheet->each(function ($row) {
$data = $row->toArray();
$data['company_id'] = session('company_id');
Item::create($data);
});
});
$message = trans('messages.success.imported', ['type' => trans_choice('general.items', 2)]);
flash($message)->success();

45
app/Http/Controllers/Expenses/Bills.php
View File

@ -24,6 +24,7 @@ use App\Models\Common\Media;
use App\Traits\Currencies;
use App\Traits\DateTime;
use App\Traits\Uploads;
use App\Utilities\Import;
use App\Utilities\ImportFile;
use App\Utilities\Modules;
use Date;
@ -291,45 +292,23 @@ class Bills extends Controller
*/
public function import(ImportFile $import)
{
$success = true;
// Loop through all sheets
$import->each(function ($sheet) {
$class = '\App\Models\Expense\\' . str_singular(studly_case($sheet->getTitle()));
$import->each(function ($sheet) use (&$success) {
$slug = 'Expense\\' . str_singular(studly_case($sheet->getTitle()));
if (!class_exists($class)) {
return;
}
$success = Import::createFromSheet($sheet, $slug);
$sheet->each(function ($row) use ($sheet, $class) {
$data = $row->toArray();
$data['company_id'] = session('company_id');
switch ($sheet->getTitle()) {
case 'bills':
if (empty($data['vendor_email'])) {
$data['vendor_email'] = '';
if (!$success) {
return false;
}
break;
case 'bill_items':
if (empty($data['tax_id'])) {
$data['tax_id'] = '0';
}
break;
case 'bill_histories':
if (empty($data['notify'])) {
$data['notify'] = '0';
}
break;
case 'bill_totals':
if (empty($data['amount'])) {
$data['amount'] = '0';
}
break;
}
$class::create($data);
});
});
if (!$success) {
return redirect('common/import/expenses/bills');
}
$message = trans('messages.success.imported', ['type' => trans_choice('general.bills', 2)]);
flash($message)->success();

16
app/Http/Controllers/Expenses/Payments.php
View File

@ -10,6 +10,7 @@ use App\Models\Expense\Vendor;
use App\Models\Setting\Category;
use App\Models\Setting\Currency;
use App\Traits\Uploads;
use App\Utilities\Import;
use App\Utilities\ImportFile;
use App\Utilities\Modules;
@ -133,21 +134,10 @@ class Payments extends Controller
*/
public function import(ImportFile $import)
{
// Loop through all sheets
$import->each(function ($sheet) {
if ($sheet->getTitle() != 'payments') {
return;
if (!Import::createFromFile($import, 'Expense\Payment')) {
return redirect('common/import/expenses/payments');
}
// Loop through all rows
$sheet->each(function ($row) {
$data = $row->toArray();
$data['company_id'] = session('company_id');
Payment::create($data);
});
});
$message = trans('messages.success.imported', ['type' => trans_choice('general.payments', 2)]);
flash($message)->success();

33
app/Http/Controllers/Expenses/Vendors.php
View File

@ -9,6 +9,7 @@ use App\Models\Expense\Payment;
use App\Models\Expense\Vendor;
use App\Models\Setting\Currency;
use App\Traits\Uploads;
use App\Utilities\Import;
use App\Utilities\ImportFile;
use Date;
use Illuminate\Pagination\Paginator;
@ -124,10 +125,6 @@ class Vendors extends Controller
*/
public function store(Request $request)
{
if (empty($request['email'])) {
$request['email'] = '';
}
$vendor = Vendor::create($request->all());
// Upload logo
@ -171,26 +168,10 @@ class Vendors extends Controller
*/
public function import(ImportFile $import)
{
// Loop through all sheets
$import->each(function ($sheet) {
if ($sheet->getTitle() != 'vendors') {
return;
if (!Import::createFromFile($import, 'Expense\Vendor')) {
return redirect('common/import/expenses/vendors');
}
// Loop through all rows
$sheet->each(function ($row) {
$data = $row->toArray();
if (empty($data['email'])) {
$data['email'] = '';
}
$data['company_id'] = session('company_id');
Vendor::create($data);
});
});
$message = trans('messages.success.imported', ['type' => trans_choice('general.vendors', 2)]);
flash($message)->success();
@ -222,10 +203,6 @@ class Vendors extends Controller
*/
public function update(Vendor $vendor, Request $request)
{
if (empty($request['email'])) {
$request['email'] = '';
}
$vendor->update($request->all());
// Upload logo
@ -336,10 +313,6 @@ class Vendors extends Controller
public function vendor(Request $request)
{
if (empty($request['email'])) {
$request['email'] = '';
}
$vendor = Vendor::create($request->all());
return response()->json($vendor);

33
app/Http/Controllers/Incomes/Customers.php
View File

@ -9,6 +9,7 @@ use App\Models\Income\Customer;
use App\Models\Income\Invoice;
use App\Models\Income\Revenue;
use App\Models\Setting\Currency;
use App\Utilities\Import;
use App\Utilities\ImportFile;
use Date;
use Illuminate\Http\Request as FRequest;
@ -125,10 +126,6 @@ class Customers extends Controller
public function store(Request $request)
{
if (empty($request->input('create_user'))) {
if (empty($request['email'])) {
$request['email'] = '';
}
Customer::create($request->all());
} else {
// Check if user exist
@ -191,26 +188,10 @@ class Customers extends Controller
*/
public function import(ImportFile $import)
{
// Loop through all sheets
$import->each(function ($sheet) {
if ($sheet->getTitle() != 'customers') {
return;
if (!Import::createFromFile($import, 'Income\Customer')) {
return redirect('common/import/incomes/customers');
}
// Loop through all rows
$sheet->each(function ($row) {
$data = $row->toArray();
if (empty($data['email'])) {
$data['email'] = '';
}
$data['company_id'] = session('company_id');
Customer::create($data);
});
});
$message = trans('messages.success.imported', ['type' => trans_choice('general.customers', 2)]);
flash($message)->success();
@ -243,10 +224,6 @@ class Customers extends Controller
public function update(Customer $customer, Request $request)
{
if (empty($request->input('create_user'))) {
if (empty($request['email'])) {
$request['email'] = '';
}
$customer->update($request->all());
} else {
// Check if user exist
@ -372,10 +349,6 @@ class Customers extends Controller
public function customer(Request $request)
{
if (empty($request['email'])) {
$request['email'] = '';
}
$customer = Customer::create($request->all());
return response()->json($customer);

45
app/Http/Controllers/Incomes/Invoices.php
View File

@ -27,6 +27,7 @@ use App\Traits\Currencies;
use App\Traits\DateTime;
use App\Traits\Incomes;
use App\Traits\Uploads;
use App\Utilities\Import;
use App\Utilities\ImportFile;
use App\Utilities\Modules;
use Date;
@ -312,45 +313,23 @@ class Invoices extends Controller
*/
public function import(ImportFile $import)
{
$success = true;
// Loop through all sheets
$import->each(function ($sheet) {
$class = '\App\Models\Income\\' . str_singular(studly_case($sheet->getTitle()));
$import->each(function ($sheet) use (&$success) {
$slug = 'Income\\' . str_singular(studly_case($sheet->getTitle()));
if (!class_exists($class)) {
return;
}
$success = Import::createFromSheet($sheet, $slug);
$sheet->each(function ($row) use ($sheet, $class) {
$data = $row->toArray();
$data['company_id'] = session('company_id');
switch ($sheet->getTitle()) {
case 'invoices':
if (empty($data['customer_email'])) {
$data['customer_email'] = '';
if (!$success) {
return false;
}
break;
case 'invoice_items':
if (empty($data['tax_id'])) {
$data['tax_id'] = '0';
}
break;
case 'invoice_histories':
if (empty($data['notify'])) {
$data['notify'] = '0';
}
break;
case 'invoice_totals':
if (empty($data['amount'])) {
$data['amount'] = '0';
}
break;
}
$class::create($data);
});
});
if (!$success) {
return redirect('common/import/incomes/invoices');
}
$message = trans('messages.success.imported', ['type' => trans_choice('general.invoices', 2)]);
flash($message)->success();

16
app/Http/Controllers/Incomes/Revenues.php
View File

@ -12,6 +12,7 @@ use App\Models\Setting\Currency;
use App\Traits\Currencies;
use App\Traits\DateTime;
use App\Traits\Uploads;
use App\Utilities\Import;
use App\Utilities\ImportFile;
use App\Utilities\Modules;
@ -135,21 +136,10 @@ class Revenues extends Controller
*/
public function import(ImportFile $import)
{
// Loop through all sheets
$import->each(function ($sheet) {
if ($sheet->getTitle() != 'revenues') {
return;
if (!Import::createFromFile($import, 'Income\Revenue')) {
return redirect('common/import/incomes/revenues');
}
// Loop through all rows
$sheet->each(function ($row) {
$data = $row->toArray();
$data['company_id'] = session('company_id');
Revenue::create($data);
});
});
$message = trans('messages.success.imported', ['type' => trans_choice('general.revenues', 2)]);
flash($message)->success();

6
app/Http/Requests/Expense/Bill.php
View File

@ -34,11 +34,15 @@ class Bill extends Request
$company_id = $this->request->get('company_id');
return [
'vendor_id' => 'required|integer',
'bill_number' => 'required|string|unique:bills,NULL,' . $id . ',id,company_id,' . $company_id . ',deleted_at,NULL',
'bill_status_code' => 'required|string',
'billed_at' => 'required|date',
'due_at' => 'required|date',
'amount' => 'required',
'currency_code' => 'required|string',
'currency_rate' => 'required',
'vendor_id' => 'required|integer',
'vendor_name' => 'required|string',
'category_id' => 'required|integer',
'attachment' => 'mimes:' . setting('general.file_types') . '|between:0,' . setting('general.file_size') * 1024,
];

32
app/Http/Requests/Expense/BillHistory.php Normal file
View File

@ -0,0 +1,32 @@
<?php
namespace App\Http\Requests\Expense;
use App\Http\Requests\Request;
class BillHistory extends Request
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'bill_id' => 'required|integer',
'status_code' => 'required|string',
'notify' => 'required|integer',
];
}
}

37
app/Http/Requests/Expense/BillItem.php Normal file
View File

@ -0,0 +1,37 @@
<?php
namespace App\Http\Requests\Expense;
use App\Http\Requests\Request;
class BillItem extends Request
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'bill_id' => 'required|integer',
'name' => 'required|string',
'quantity' => 'required|integer',
'price' => 'required',
'price' => 'required',
'total' => 'required',
'tax' => 'required',
'tax_id' => 'required',
];
}
}

33
app/Http/Requests/Expense/BillTotal.php Normal file
View File

@ -0,0 +1,33 @@
<?php
namespace App\Http\Requests\Expense;
use App\Http\Requests\Request;
class BillTotal extends Request
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'bill_id' => 'required|integer',
'name' => 'required|string',
'amount' => 'required',
'sort_order' => 'required|integer',
];
}
}

6
app/Http/Requests/Income/Invoice.php
View File

@ -34,11 +34,15 @@ class Invoice extends Request
$company_id = $this->request->get('company_id');
return [
'customer_id' => 'required|integer',
'invoice_number' => 'required|string|unique:invoices,NULL,' . $id . ',id,company_id,' . $company_id . ',deleted_at,NULL',
'invoice_status_code' => 'required|string',
'invoiced_at' => 'required|date',
'due_at' => 'required|date',
'amount' => 'required',
'currency_code' => 'required|string',
'currency_rate' => 'required',
'customer_id' => 'required|integer',
'customer_name' => 'required|string',
'category_id' => 'required|integer',
'attachment' => 'mimes:' . setting('general.file_types') . '|between:0,' . setting('general.file_size') * 1024,
];

32
app/Http/Requests/Income/InvoiceHistory.php Normal file
View File

@ -0,0 +1,32 @@
<?php
namespace App\Http\Requests\Income;
use App\Http\Requests\Request;
class InvoiceHistory extends Request
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'invoice_id' => 'required|integer',
'status_code' => 'required|string',
'notify' => 'required|integer',
];
}
}

37
app/Http/Requests/Income/InvoiceItem.php Normal file
View File

@ -0,0 +1,37 @@
<?php
namespace App\Http\Requests\Income;
use App\Http\Requests\Request;
class InvoiceItem extends Request
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'invoice_id' => 'required|integer',
'name' => 'required|string',
'quantity' => 'required|integer',
'price' => 'required',
'price' => 'required',
'total' => 'required',
'tax' => 'required',
'tax_id' => 'required',
];
}
}

33
app/Http/Requests/Income/InvoiceTotal.php Normal file
View File

@ -0,0 +1,33 @@
<?php
namespace App\Http\Requests\Income;
use App\Http\Requests\Request;
class InvoiceTotal extends Request
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'invoice_id' => 'required|integer',
'name' => 'required|string',
'amount' => 'required',
'sort_order' => 'required|integer',
];
}
}

30
app/Listeners/Updates/Version128.php Normal file
View File

@ -0,0 +1,30 @@
<?php
namespace App\Listeners\Updates;
use App\Events\UpdateFinished;
use Artisan;
class Version128 extends Listener
{
const ALIAS = 'core';
const VERSION = '1.2.0';
/**
* Handle the event.
*
* @param $event
* @return void
*/
public function handle(UpdateFinished $event)
{
// Check if should listen
if (!$this->check($event)) {
return;
}
// Update database
Artisan::call('migrate', ['--force' => true]);
}
}

1
app/Providers/EventServiceProvider.php
View File

@ -25,6 +25,7 @@ class EventServiceProvider extends ServiceProvider
'App\Listeners\Updates\Version120',
'App\Listeners\Updates\Version126',
'App\Listeners\Updates\Version127',
'App\Listeners\Updates\Version128',
],
'Illuminate\Auth\Events\Login' => [
'App\Listeners\Auth\Login',

84
app/Utilities/Import.php Normal file
View File

@ -0,0 +1,84 @@
<?php
namespace App\Utilities;
use Illuminate\Validation\ValidationException;
class Import
{
public static function createFromFile($import, $slug)
{
$success = true;
// Loop through all sheets
$import->each(function ($sheet) use (&$success, $slug) {
$model = '\App\Models\\' . $slug;
$request = '\App\Http\Requests\\' . $slug;
if (!class_exists($model) || !class_exists($request)) {
return false;
}
$tmp = explode('\\', $slug);
$file_name = str_plural(strtolower($tmp[1]));
if ($sheet->getTitle() != $file_name) {
return false;
}
$success = static::createFromSheet($sheet, $slug);
});
return $success;
}
public static function createFromSheet($sheet, $slug)
{
$success = true;
$model = '\App\Models\\' . $slug;
$request = '\App\Http\Requests\\' . $slug;
if (!class_exists($model) || !class_exists($request)) {
return false;
}
// Loop through all rows
$sheet->each(function ($row, $index) use ($sheet, &$success, $model, $request) {
$data = $row->toArray();
// Set the line values so that request class could validate
request()->merge($data);
try {
app($request);
$data['company_id'] = session('company_id');
$model::create($data);
} catch (ValidationException $e) {
$message = trans('messages.error.import_failed', [
'message' => $e->validator->errors()->first(),
'sheet' => $sheet->getTitle(),
'line' => $index + 2,
]);
flash($message)->error()->important();
$success = false;
// Break the import process
return false;
}
// Unset added line values
foreach ($data as $key => $value) {
request()->offsetUnset($key);
}
});
return $success;
}
}

41
database/migrations/2018_06_23_000000_modify_email_column.php Normal file
View File

@ -0,0 +1,41 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class ModifyEmailColumn extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('customers', function (Blueprint $table) {
$table->string('email')->nullable()->change();
});
Schema::table('invoices', function (Blueprint $table) {
$table->string('customer_email')->nullable()->change();
});
Schema::table('vendors', function (Blueprint $table) {
$table->string('email')->nullable()->change();
});
Schema::table('bills', function (Blueprint $table) {
$table->string('vendor_email')->nullable()->change();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
}
}

BIN
public/files/import/bills.xlsx
View File

Binary file not shown.

BIN
public/files/import/invoices.xlsx
View File

Binary file not shown.

1
resources/lang/en-GB/messages.php
View File

@ -18,6 +18,7 @@ return [
'no_file' => 'Error: No file selected!',
'last_category' => 'Error: Can not delete the last :type category!',
'invalid_token' => 'Error: The token entered is invalid!',
'import_failed' => 'Error: :message Sheet name: :sheet. Line number: :line.',
],
'warning' => [
'deleted' => 'Warning: You are not allowed to delete <b>:name</b> because it has :text related.',