Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9937 from turbo124/v5-develop

Browse Source 
v5.10.26
This commit is contained in:
David Bomba 2024-08-23 08:10:57 +10:00 committed by GitHub
commit 2eff70c85a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 64 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.10.25 5.10.26

62
app/Services/Bank/ProcessBankRules.php
View File

@ -140,7 +140,7 @@ class ProcessBankRules extends AbstractService
} }
} }
if (($bank_transaction_rule['matches_on_all'] && (count($match_set) == $rule_count)) || (!$bank_transaction_rule['matches_on_all'] && count($match_set) > 0)) { if (($bank_transaction_rule['matches_on_all'] && $this->checkMatchSetForKey($match_set, $rule_count)) || (!$bank_transaction_rule['matches_on_all'] && count($match_set) > 0)) {
$this->bank_transaction->vendor_id = $bank_transaction_rule->vendor_id; $this->bank_transaction->vendor_id = $bank_transaction_rule->vendor_id;
$this->bank_transaction->ninja_category_id = $bank_transaction_rule->category_id; $this->bank_transaction->ninja_category_id = $bank_transaction_rule->category_id;
@ -150,11 +150,71 @@ class ProcessBankRules extends AbstractService
//auto-convert //auto-convert
if ($bank_transaction_rule['auto_convert']) {
//all types must match.
$entity = $match_set[0][0];
foreach($match_set as $set)
{
if($set[0] != $entity)
return false;
}
// $result_set = [];
// foreach($match_set as $key => $set) {
// $parseable_set = $match_set;
// unset($parseable_set[$key]);
// $entity_ids = $set[1];
// foreach($parseable_set as $kkey => $vvalue) {
// $i = array_intersect($vvalue[1], $entity_ids);
// if(count($i) == 0) {
// return false;
// }
// $result_set[] = $i;
// }
// $commonValues = $result_set[0]; // Start with the first sub-array
// foreach ($result_set as $subArray) {
// $commonValues = array_intersect($commonValues, $subArray);
// }
// echo print_r($commonValues, true);
//just need to ensure the result count = rule count
// }
//there must be a key in each set
//no misses allowed
$this->bank_transaction->status_id = BankTransaction::STATUS_CONVERTED;
$this->bank_transaction->save();
}
} }
} }
}
private function checkMatchSetForKey(array $match_set, $rule_count)
{
} }

4
config/ninja.php
View File

@ -17,8 +17,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => env('APP_VERSION', '5.10.25'), 'app_version' => env('APP_VERSION', '5.10.26'),
'app_tag' => env('APP_TAG', '5.10.25'), 'app_tag' => env('APP_TAG', '5.10.26'),
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', false), 'api_secret' => env('API_SECRET', false),