@@ -131,7 +131,7 @@ |
||
| 131 | 131 | throw new ImportException('Could not load the users currency preference.'); |
| 132 | 132 | } |
| 133 | 133 | $code = $response->getPreference()->data ?? 'EUR'; |
| 134 | - $currencyRequest = new GetCurrencyRequest($uri,$token); |
|
| 134 | + $currencyRequest = new GetCurrencyRequest($uri, $token); |
|
| 135 | 135 | $currencyRequest->setCode($code); |
| 136 | 136 | try { |
| 137 | 137 | /** @var GetCurrencyResponse $result */ |
@@ -35,8 +35,8 @@ |
||
| 35 | 35 | */ |
| 36 | 36 | private function haveAccess(): bool |
| 37 | 37 | { |
| 38 | - $uri = (string)config('csv_importer.uri'); |
|
| 39 | - $token = (string)config('csv_importer.access_token'); |
|
| 38 | + $uri = (string)config('csv_importer.uri'); |
|
| 39 | + $token = (string)config('csv_importer.access_token'); |
|
| 40 | 40 | $request = new SystemInformationRequest($uri, $token); |
| 41 | 41 | try { |
| 42 | 42 | $request->get(); |
@@ -40,8 +40,8 @@ |
||
| 40 | 40 | public function doValidate(): JsonResponse |
| 41 | 41 | { |
| 42 | 42 | $response = ['result' => 'OK', 'message' => null]; |
| 43 | - $uri = (string)config('csv_importer.uri'); |
|
| 44 | - $token = (string)config('csv_importer.access_token'); |
|
| 43 | + $uri = (string)config('csv_importer.uri'); |
|
| 44 | + $token = (string)config('csv_importer.access_token'); |
|
| 45 | 45 | $request = new SystemInformationRequest($uri, $token); |
| 46 | 46 | try { |
| 47 | 47 | $result = $request->get(); |
@@ -40,7 +40,7 @@ |
||
| 40 | 40 | */ |
| 41 | 41 | protected function redirectTo($request) |
| 42 | 42 | { |
| 43 | - if (! $request->expectsJson()) { |
|
| 43 | + if (!$request->expectsJson()) { |
|
| 44 | 44 | return route('login'); |
| 45 | 45 | } |
| 46 | 46 | } |
@@ -60,7 +60,7 @@ |
||
| 60 | 60 | */ |
| 61 | 61 | protected function commands() |
| 62 | 62 | { |
| 63 | - $this->load(__DIR__.'/Commands'); |
|
| 63 | + $this->load(__DIR__ . '/Commands'); |
|
| 64 | 64 | |
| 65 | 65 | require base_path('routes/console.php'); |
| 66 | 66 | } |
@@ -80,11 +80,11 @@ discard block |
||
| 80 | 80 | case 'VZ': // Verzamelbetaling |
| 81 | 81 | case 'IC': // Incasso |
| 82 | 82 | case 'DV': // Divers |
| 83 | - $this->removeIBANIngDescription(); // Remove "IBAN:", because it is already at "Tegenrekening" |
|
| 84 | - $this->removeNameIngDescription(); // Remove "Naam:", because it is already at "Naam/ Omschrijving" |
|
| 85 | - $this->removeIngDescription(); // Remove "Omschrijving", but not the value from description |
|
| 83 | + $this->removeIBANIngDescription(); // Remove "IBAN:", because it is already at "Tegenrekening" |
|
| 84 | + $this->removeNameIngDescription(); // Remove "Naam:", because it is already at "Naam/ Omschrijving" |
|
| 85 | + $this->removeIngDescription(); // Remove "Omschrijving", but not the value from description |
|
| 86 | 86 | $this->moveValutadatumDescription(); // Move "Valutadatum" from description to new column |
| 87 | - $this->MoveSavingsAccount(); // Move savings account number and name |
|
| 87 | + $this->MoveSavingsAccount(); // Move savings account number and name |
|
| 88 | 88 | break; |
| 89 | 89 | case 'BA': // Betaalautomaat |
| 90 | 90 | $this->moveValutadatumDescription(); // Move "Valutadatum" from description to new column |
@@ -152,19 +152,19 @@ discard block |
||
| 152 | 152 | |
| 153 | 153 | if (preg_match('/(Naar|Van) (.*rekening) ([A-Za-z0-9]+)/', $this->row[8], $matches)) { // Search for saving acount at 'Mededelingen' column |
| 154 | 154 | $this->row[1] .= ' ' . $matches[2] . ' ' . $matches[3]; // Current name + Saving acount name + Acount number |
| 155 | - if ('' === (string) $this->row[3]) { // if Saving account number does not yet exists |
|
| 155 | + if ('' === (string)$this->row[3]) { // if Saving account number does not yet exists |
|
| 156 | 156 | $this->row[3] = $matches[3]; // Copy savings account number |
| 157 | 157 | } |
| 158 | 158 | $this->row[8] = preg_replace('/(Naar|Van) (.*rekening) ([A-Za-z0-9]+)/', '', $this->row[8]); // Remove the savings account content from description |
| 159 | 159 | } elseif (preg_match('/(Naar|Van) (.*rekening) ([A-Za-z0-9]+)/', $this->row[1], $matches)) { // Search for saving acount at 'Naam / Omschrijving' column |
| 160 | - $this->row[1] = $matches[2] . ' ' . $matches[3]; // Saving acount name + Acount number |
|
| 161 | - if ('' === (string) $this->row[3]) { // if Saving account number does not yet exists |
|
| 160 | + $this->row[1] = $matches[2] . ' ' . $matches[3]; // Saving acount name + Acount number |
|
| 161 | + if ('' === (string)$this->row[3]) { // if Saving account number does not yet exists |
|
| 162 | 162 | $this->row[3] = $matches[3]; // Copy savings account number |
| 163 | 163 | } |
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | // if Saving account number exists |
| 167 | - if (('' !== (string) $this->row[3]) && !preg_match('/[A-Za-z]/', $this->row[3])) { // if Saving account number has no characters |
|
| 167 | + if (('' !== (string)$this->row[3]) && !preg_match('/[A-Za-z]/', $this->row[3])) { // if Saving account number has no characters |
|
| 168 | 168 | $this->row[3] = sprintf('%010d', $this->row[3]); // Make the number 10 digits |
| 169 | 169 | } |
| 170 | 170 | } |
@@ -71,17 +71,17 @@ |
||
| 71 | 71 | $row = SpecificService::runSpecifics($row, $specifics); |
| 72 | 72 | // loop each column, put in $data |
| 73 | 73 | foreach ($row as $columnIndex => $column) { |
| 74 | - if(!isset($data[$columnIndex])) { |
|
| 74 | + if (!isset($data[$columnIndex])) { |
|
| 75 | 75 | // don't need to handle this. Continue. |
| 76 | 76 | continue; |
| 77 | 77 | } |
| 78 | - if('' !== $column) { |
|
| 78 | + if ('' !== $column) { |
|
| 79 | 79 | $data[$columnIndex]['values'][] = trim($column); |
| 80 | 80 | } |
| 81 | 81 | } |
| 82 | 82 | } |
| 83 | 83 | // loop data, clean up data: |
| 84 | - foreach($data as $index => $columnInfo) { |
|
| 84 | + foreach ($data as $index => $columnInfo) { |
|
| 85 | 85 | $data[$index]['values'] = array_unique($data[$index]['values']); |
| 86 | 86 | asort($data[$index]['values']); |
| 87 | 87 | } |
@@ -44,8 +44,8 @@ |
||
| 44 | 44 | { |
| 45 | 45 | Log::debug('Now in OpposingAccounts::getMap()'); |
| 46 | 46 | $result = []; |
| 47 | - $uri = (string) config('csv_importer.uri'); |
|
| 48 | - $token = (string) config('csv_importer.access_token'); |
|
| 47 | + $uri = (string)config('csv_importer.uri'); |
|
| 48 | + $token = (string)config('csv_importer.access_token'); |
|
| 49 | 49 | // get list of asset accounts: |
| 50 | 50 | $request = new GetAccountsRequest($uri, $token); |
| 51 | 51 | $request->setType(GetAccountsRequest::ALL); |
@@ -55,7 +55,7 @@ |
||
| 55 | 55 | */ |
| 56 | 56 | public function __construct(Repository $config) |
| 57 | 57 | { |
| 58 | - $trustedProxies = (string) config('csv_importer.trusted_proxies'); |
|
| 58 | + $trustedProxies = (string)config('csv_importer.trusted_proxies'); |
|
| 59 | 59 | $this->proxies = explode(',', $trustedProxies); |
| 60 | 60 | if ('**' === $trustedProxies) { |
| 61 | 61 | $this->proxies = '**'; |