mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
fix rebase errors
This commit is contained in:
parent
af4ae0feab
commit
cfddb27b48
@ -587,15 +587,7 @@ class StateBalancesController extends AppController
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function ajaxListTransactions($page = 0, $count = 20)
|
|
||||||
{
|
|
||||||
|
|
||||||
return $this->returnJson([
|
|
||||||
'state' => 'error',
|
|
||||||
'msg' => 'moved',
|
|
||||||
'details' => 'moved to state-user-transactions/ajaxListTransactions/'
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function ajaxGdtOverview()
|
public function ajaxGdtOverview()
|
||||||
{
|
{
|
||||||
@ -630,10 +622,6 @@ class StateBalancesController extends AppController
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function ajaxGdtOverview()
|
|
||||||
{
|
|
||||||
return $this->returnJson(['state' => 'success', 'gdt' => ['sum' => 0, 'count' => 0]]);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function overviewGdt()
|
public function overviewGdt()
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user