Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

304 csv import improvements #305

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

304 csv import improvements #305

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3f27a96
Allow to have leading - in substitution
cholletk May 17, 2021
1bbc94c
Multiply amount by 100 if there is a dot
cholletk May 17, 2021
579c8e4
Adding ability to import earnings
cholletk May 17, 2021
679f8b8
Typo error
cholletk May 17, 2021
c0f02c9
Remove tag for earnings
cholletk May 17, 2021
0d255ba
Using amount instead of row_amount
cholletk May 17, 2021
53428c1
If no amount present, don't process the row
cholletk May 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 27 additions & 7 deletions app/Http/Controllers/ImportController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,19 @@
use App\Models\Import;
use App\Models\Tag;
use App\Repositories\SpendingRepository;
use App\Repositories\EarningRepository;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Validator;

class ImportController extends Controller
{
private $spendingRepository;
private $earningRepository;

public function __construct(SpendingRepository $spendingRepository)
public function __construct(SpendingRepository $spendingRepository, EarningRepository $earningRepository)
{
$this->spendingRepository = $spendingRepository;
$this->earningRepository = $earningRepository;
}

public function index()
Expand Down Expand Up @@ -136,7 +139,7 @@ public function postComplete(Request $request, Import $import)
'tag_id' => 'nullable|exists:tags,id', // TODO CHECK IF TAG BELONGS TO USER
'happened_on' => 'date|date_format:' . $date_format,
'description' => 'max:255',
'amount' => 'regex:/^\d*([\,\.]\d{2})?$/'
'amount' => 'regex:/^(\-)?\d*([\,\.]\d{2})?$/'
]);

if ($validator->fails()) {
Expand All @@ -154,19 +157,36 @@ public function postComplete(Request $request, Import $import)
}

foreach ($request->input('rows') as $row) {
if (isset($row['import'])) {
if (isset($row['import']) && isset($row['amount'])) {
// TODO CHECK HOW THIS WORKS WITH 1k+ AMOUNTS
$amount = str_replace(',', '.', $row['amount']);

$this->spendingRepository->create(
//correct amount to be in cents
if(strpos($amount, '.')!==false){
$amount *= 100;
}

if($amount<0){
$amount*=-1;
$this->spendingRepository->create(
session('space_id'),
$import->id,
null,
$row['tag_id'],
$row['happened_on'],
$row['description'],
$amount
);
} else {
$this->earningRepository->create(
session('space_id'),
$import->id,
null,
$row['tag_id'],
$row['happened_on'],
$row['description'],
$amount
);
);
}

}
}

Expand Down