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
Download Patch File Download Diff File Expand all files Collapse all files

47
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);
if (!$success) {
return false;
}
$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'] = '';
}
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();

18
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,20 +134,9 @@ class Payments extends Controller
*/
public function import(ImportFile $import)
{
// Loop through all sheets
$import->each(function ($sheet) {
if ($sheet->getTitle() != 'payments') {
return;
}
// Loop through all rows
$sheet->each(function ($row) {
$data = $row->toArray();
$data['company_id'] = session('company_id');
Payment::create($data);
});
});
if (!Import::createFromFile($import, 'Expense\Payment')) {
return redirect('common/import/expenses/payments');
}
$message = trans('messages.success.imported', ['type' => trans_choice('general.payments', 2)]);

35
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,25 +168,9 @@ class Vendors extends Controller
*/
public function import(ImportFile $import)
{
// Loop through all sheets
$import->each(function ($sheet) {
if ($sheet->getTitle() != 'vendors') {
return;
}
// 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);
});
});
if (!Import::createFromFile($import, 'Expense\Vendor')) {
return redirect('common/import/expenses/vendors');
}
$message = trans('messages.success.imported', ['type' => trans_choice('general.vendors', 2)]);
@@ -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);