@@ -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); |
@@ -53,7 +53,7 @@ |
||
| 53 | 53 | private function processAmount(array $transaction): array |
| 54 | 54 | { |
| 55 | 55 | Log::debug(sprintf('Now at the start of processAmount("%s")', $transaction['amount'])); |
| 56 | - if('' === (string)$transaction['amount']) { |
|
| 56 | + if ('' === (string)$transaction['amount']) { |
|
| 57 | 57 | $transaction['amount'] = '0'; |
| 58 | 58 | |
| 59 | 59 | Log::error('Amount is EMPTY. This will give problems further ahead.', $transaction); |
@@ -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 = '**'; |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | // TODO here we collect all the values from the CSV file. |
| 105 | 105 | // get columns from file |
| 106 | 106 | $content = StorageService::getContent(session()->get(Constants::UPLOAD_CSV_FILE)); |
| 107 | - $delimiter = (string) config(sprintf('csv_importer.delimiters.%s', $configuration->getDelimiter())); |
|
| 107 | + $delimiter = (string)config(sprintf('csv_importer.delimiters.%s', $configuration->getDelimiter())); |
|
| 108 | 108 | $data = MapperService::getMapData($content, $delimiter, $configuration->isHeaders(), $configuration->getSpecifics(), $data); |
| 109 | 109 | |
| 110 | 110 | return view('import.map.index', compact('mainTitle', 'subTitle', 'roles', 'data')); |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | $values = !is_array($values) ? [] : $values; |
| 123 | 123 | $mapping = !is_array($mapping) ? [] : $mapping; |
| 124 | 124 | $data = []; |
| 125 | - $configuration = Configuration::fromArray(session()->get(Constants::CONFIGURATION)); |
|
| 125 | + $configuration = Configuration::fromArray(session()->get(Constants::CONFIGURATION)); |
|
| 126 | 126 | |
| 127 | 127 | |
| 128 | 128 | |