Overigen/dbois
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conflicts

Browse Source
This commit is contained in:
theo
2019-10-25 16:52:12 +02:00
parent d0069061ba
commit 7345f3ca1f
3 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/reports/ReservationsController.php
+1 -1
View File
@@ -60,4 +60,4 @@ class ReservationsController extends MY_Controller {
$this->json( $projects );
}
}
}
application/models/eloquent/Project.php
+13 -2
View File
@@ -82,8 +82,8 @@ class Project extends BaseModel {
{
$project = Project::getBaseProject();
$project = $project->whereArchive( 'F' )
->whereId( $projectID )
$project = $project->whereId( $projectID )
// ->whereArchive( 'F' )
->first();
return $project;
@@ -183,4 +183,15 @@ class Project extends BaseModel {
self::whereId( $offer->project_id )
->update( ['projectname' => $offer->offername] );
}
public static function getProjectsWithExternalCosts( $projects )
{
$projectCosts = self::selectRAW( 'projects.id, OFF.costs' )
->join( 'offers AS OFF', 'OFF.project_id', '=', 'projects.id' )
->whereNotIn( 'projects.id', $projects )
->where( 'OFF.costs', '>', 0 )
->get();
return $projectCosts;
}
}
application/models/eloquent/queries/ReservationTotals.php
+12 -9
View File
@@ -11,10 +11,11 @@ class ReservationTotals {
public static function fire()
{
// UNION ALL wordt gebruikt voor een full outer join
$sql = "SELECT Q5.project_id AS projectID, external_id AS externalID,
fromreservation,
Q5.costs, reservation, payed, (reservation - fromreservation) AS saldo,
(Q5.costs - payed) AS saldoToPay, PRJ.projectnumber, EXT.contactperson,
$sql = " SELECT PRJ.id AS projectID, external_id AS externalID,
COALESCE(fromreservation, 0) AS fromreservation,
COALESCE(Q5.costs, 0) AS costs, COALESCE(reservation, 0) AS reservation,
COALESCE(payed, 0) AS payed, (COALESCE(reservation, 0) - COALESCE(fromreservation, 0)) AS saldo,
(COALESCE(Q5.costs, 0) - COALESCE(payed, 0)) AS saldoToPay, PRJ.projectnumber, EXT.contactperson,
ROUND(( (OFF.costs * (100 + (SELECT vatrate
FROM vats VTS
JOIN projects P
@@ -52,12 +53,14 @@ class ReservationTotals {
ON Q3.external_id = Q4.external_id AND Q3.project_id = Q4.project_id
WHERE Q4.id IS NULL
) Q5
JOIN projects PRJ
RIGHT JOIN projects PRJ
ON PRJ.id = Q5.project_id
JOIN externals EXT
ON EXT.id = Q5.external_id
JOIN offers OFF
ON PRJ.id = OFF.project_id ";
LEFT JOIN offers OFF
ON PRJ.id = OFF.project_id
LEFT JOIN externals EXT
ON EXT.id = Q5.external_id
WHERE OFF.costs > 0
AND PRJ.archive = 'F'";
return $sql;
}