mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-02-25 18:45:27 -06:00
Various code cleanup
This commit is contained in:
parent
eed8fe22c6
commit
2116486fe0
@ -44,7 +44,7 @@ interface AttachmentHelperInterface
|
|||||||
/**
|
/**
|
||||||
* @param Model $model
|
* @param Model $model
|
||||||
*
|
*
|
||||||
* @param array $files
|
* @param null|array $files
|
||||||
*
|
*
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
|
@ -29,7 +29,7 @@ class JavascriptController extends Controller
|
|||||||
/**
|
/**
|
||||||
* @param Request $request
|
* @param Request $request
|
||||||
*
|
*
|
||||||
* @return $this
|
* @return \Illuminate\Http\Response
|
||||||
*/
|
*/
|
||||||
public function variables(Request $request)
|
public function variables(Request $request)
|
||||||
{
|
{
|
||||||
|
@ -44,59 +44,58 @@ class Modifier
|
|||||||
switch ($modifier['type']) {
|
switch ($modifier['type']) {
|
||||||
default:
|
default:
|
||||||
throw new FireflyException(sprintf('Search modifier "%s" is not (yet) supported. Sorry!', $modifier['type']));
|
throw new FireflyException(sprintf('Search modifier "%s" is not (yet) supported. Sorry!', $modifier['type']));
|
||||||
break;
|
|
||||||
case 'amount':
|
case 'amount':
|
||||||
case 'amount_is':
|
case 'amount_is':
|
||||||
$res = Modifier::amountCompare($transaction, $modifier['value'], 0);
|
$res = self::amountCompare($transaction, $modifier['value'], 0);
|
||||||
Log::debug(sprintf('Amount is %s? %s', $modifier['value'], var_export($res, true)));
|
Log::debug(sprintf('Amount is %s? %s', $modifier['value'], var_export($res, true)));
|
||||||
break;
|
break;
|
||||||
case 'amount_min':
|
case 'amount_min':
|
||||||
case 'amount_less':
|
case 'amount_less':
|
||||||
$res = Modifier::amountCompare($transaction, $modifier['value'], 1);
|
$res = self::amountCompare($transaction, $modifier['value'], 1);
|
||||||
Log::debug(sprintf('Amount less than %s? %s', $modifier['value'], var_export($res, true)));
|
Log::debug(sprintf('Amount less than %s? %s', $modifier['value'], var_export($res, true)));
|
||||||
break;
|
break;
|
||||||
case 'amount_max':
|
case 'amount_max':
|
||||||
case 'amount_more':
|
case 'amount_more':
|
||||||
$res = Modifier::amountCompare($transaction, $modifier['value'], -1);
|
$res = self::amountCompare($transaction, $modifier['value'], -1);
|
||||||
Log::debug(sprintf('Amount more than %s? %s', $modifier['value'], var_export($res, true)));
|
Log::debug(sprintf('Amount more than %s? %s', $modifier['value'], var_export($res, true)));
|
||||||
break;
|
break;
|
||||||
case 'source':
|
case 'source':
|
||||||
$res = Modifier::stringCompare($transaction->account_name, $modifier['value']);
|
$res = self::stringCompare($transaction->account_name, $modifier['value']);
|
||||||
Log::debug(sprintf('Source is %s? %s', $modifier['value'], var_export($res, true)));
|
Log::debug(sprintf('Source is %s? %s', $modifier['value'], var_export($res, true)));
|
||||||
break;
|
break;
|
||||||
case 'destination':
|
case 'destination':
|
||||||
$res = Modifier::stringCompare($transaction->opposing_account_name, $modifier['value']);
|
$res = self::stringCompare($transaction->opposing_account_name, $modifier['value']);
|
||||||
Log::debug(sprintf('Destination is %s? %s', $modifier['value'], var_export($res, true)));
|
Log::debug(sprintf('Destination is %s? %s', $modifier['value'], var_export($res, true)));
|
||||||
break;
|
break;
|
||||||
case 'category':
|
case 'category':
|
||||||
$res = Modifier::category($transaction, $modifier['value']);
|
$res = self::category($transaction, $modifier['value']);
|
||||||
Log::debug(sprintf('Category is %s? %s', $modifier['value'], var_export($res, true)));
|
Log::debug(sprintf('Category is %s? %s', $modifier['value'], var_export($res, true)));
|
||||||
break;
|
break;
|
||||||
case 'budget':
|
case 'budget':
|
||||||
$res = Modifier::budget($transaction, $modifier['value']);
|
$res = self::budget($transaction, $modifier['value']);
|
||||||
Log::debug(sprintf('Budget is %s? %s', $modifier['value'], var_export($res, true)));
|
Log::debug(sprintf('Budget is %s? %s', $modifier['value'], var_export($res, true)));
|
||||||
break;
|
break;
|
||||||
case 'bill':
|
case 'bill':
|
||||||
$res = Modifier::stringCompare(strval($transaction->bill_name), $modifier['value']);
|
$res = self::stringCompare(strval($transaction->bill_name), $modifier['value']);
|
||||||
Log::debug(sprintf('Bill is %s? %s', $modifier['value'], var_export($res, true)));
|
Log::debug(sprintf('Bill is %s? %s', $modifier['value'], var_export($res, true)));
|
||||||
break;
|
break;
|
||||||
case 'type':
|
case 'type':
|
||||||
$res = Modifier::stringCompare($transaction->transaction_type_type, $modifier['value']);
|
$res = self::stringCompare($transaction->transaction_type_type, $modifier['value']);
|
||||||
Log::debug(sprintf('Transaction type is %s? %s', $modifier['value'], var_export($res, true)));
|
Log::debug(sprintf('Transaction type is %s? %s', $modifier['value'], var_export($res, true)));
|
||||||
break;
|
break;
|
||||||
case 'date':
|
case 'date':
|
||||||
case 'on':
|
case 'on':
|
||||||
$res = Modifier::sameDate($transaction->date, $modifier['value']);
|
$res = self::sameDate($transaction->date, $modifier['value']);
|
||||||
Log::debug(sprintf('Date is %s? %s', $modifier['value'], var_export($res, true)));
|
Log::debug(sprintf('Date is %s? %s', $modifier['value'], var_export($res, true)));
|
||||||
break;
|
break;
|
||||||
case 'date_before':
|
case 'date_before':
|
||||||
case 'before':
|
case 'before':
|
||||||
$res = Modifier::dateBefore($transaction->date, $modifier['value']);
|
$res = self::dateBefore($transaction->date, $modifier['value']);
|
||||||
Log::debug(sprintf('Date is %s? %s', $modifier['value'], var_export($res, true)));
|
Log::debug(sprintf('Date is %s? %s', $modifier['value'], var_export($res, true)));
|
||||||
break;
|
break;
|
||||||
case 'date_after':
|
case 'date_after':
|
||||||
case 'after':
|
case 'after':
|
||||||
$res = Modifier::dateAfter($transaction->date, $modifier['value']);
|
$res = self::dateAfter($transaction->date, $modifier['value']);
|
||||||
Log::debug(sprintf('Date is %s? %s', $modifier['value'], var_export($res, true)));
|
Log::debug(sprintf('Date is %s? %s', $modifier['value'], var_export($res, true)));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user