Yarik / ecreators

Commit 423c02d303720d979da85b4c7e7659996cb4f680

Authored by Yarik
2 parents aa22879e 0eff1ddc

Merge remote-tracking branch 'origin/master'

Showing 2 changed files with 14 additions and 0 deletions   Show diff stats
Inline Side-by-side
frontend/views/cabinet/arrivals.php
  Show/Hide comments   View file @423c02d
@@ -41,6 +41,7 @@ @@ -41,6 +41,7 @@
41 </tr> 41 </tr>
42 <?php 42 <?php
43 } 43 }
  44 +
44 ?> 45 ?>
45 </table> 46 </table>
46 </div> 47 </div>
frontend/views/cabinet/users.php
  Show/Hide comments   View file @423c02d
@@ -53,12 +53,14 @@ @@ -53,12 +53,14 @@
53 <td>Сума до виплати</td> 53 <td>Сума до виплати</td>
54 </tr> 54 </tr>
55 <?php 55 <?php
  56 + $total = 0;
56 foreach ($reports as $index => $report) { 57 foreach ($reports as $index => $report) {
57 if ($user->isAdmin()) { 58 if ($user->isAdmin()) {
58 $sum = $report->sum; 59 $sum = $report->sum;
59 } else { 60 } else {
60 $sum = $report->sum * $report->intellectualProperty->creativeRoles[0]->part / 100; 61 $sum = $report->sum * $report->intellectualProperty->creativeRoles[0]->part / 100;
61 } 62 }
  63 + $total += $sum;
62 ?> 64 ?>
63 <tr> 65 <tr>
64 <?php 66 <?php
@@ -76,6 +78,17 @@ @@ -76,6 +78,17 @@
76 <?php 78 <?php
77 } 79 }
78 ?> 80 ?>
  81 + <tr>
  82 + <td></td>
  83 + <td></td>
  84 + <td></td>
  85 + <td></td>
  86 + <td></td>
  87 + <td></td>
  88 + <td></td>
  89 + <td></td>
  90 + <td><?=$total?></td>
  91 + </tr>
79 </table> 92 </table>
80 <?php 93 <?php
81 Pjax::end(); 94 Pjax::end();