Aktualizacja projektu Bocian

SE/projects/bocian

@@ -1 +1 @@
-Subproject commit 60c4b8652b439ef1054837287275de19485f65b3
+Subproject commit acd64603f64e8c81ca56338de5bbb640bfa2ac5d

SE/se-lib/Route/UrlAction/RaportyKasowe.php

@@ -50,7 +50,7 @@ class Route_UrlAction_RaportyKasowe extends RouteBase {
 		SE_Layout::menu();
 		try {
 			$lastDate = DB::getPDO()->fetchValue("select max(RK_DATE_TO) from BILLS_RK where A_STATUS='OFF_HARD' and ID_BILLING_OWNER='{$this->RK['ID_BILLING_OWNER']}' and L_APPOITMENT_USER='".User::getLogin()."'");
-			if (!$lastRK=($lastDate)) $lastDate = '2004-06-30';
+			if (!$lastRK=($lastDate)) $lastDate = '2015-12-31';
 			$minTS = strtotime($lastDate . " + 1 day");
 			$minDate = date("Y-m-d", $minTS);
 			$firstTS = strtotime(date("Y-m", strtotime($minDate)));
@@ -157,7 +157,7 @@ class Route_UrlAction_RaportyKasowe extends RouteBase {
 <?php
 			}
 		} catch (Exception $e) {
-			SE_Layout::alert('danger', "Inicjalizacja nowego raportu kasowe" . $e->getMessage());
+			SE_Layout::alert('danger', "Wystąpił błąd podczas inicjalizacji nowego raportu kasowego - " . $e->getMessage());
 ?>
 <div class="container" style="text-align:center">
   <a href="<?php echo $this->REFERER?>" class="btn btn-primary">Powrót</a>
@@ -175,15 +175,22 @@ class Route_UrlAction_RaportyKasowe extends RouteBase {
 <div class="container" style="margin-top:20px">
   <form class="form-horizontal" method="post">
     <legend>
-      Edycja raportu kasowego nr <?=$this->RK['RK_NUMBER']?> :: <?=$this->RK['RK_MONTH']?>
+      Edycja raportu kasowego nr <?=$this->RK['RK_NUMBER']?>/<?=User::getID()?> :: <?=$this->RK['RK_MONTH']?>
       <span class="pull-right">
-        <?php echo "Nr kasy: " . User::getID() . " :: " . $this->BO['name1']?>
+        Kasjer: <?=User::getFullname()?> :: <?=$this->BO['name1']?>
       </span>
     </legend>
     <div class="form-group">
       <div class="col-sm-12">
         <input type="submit" class="btn btn-default btn-sm" name="action" value="Dodaj KP"/>
         <input type="submit" class="btn btn-default btn-sm" name="action" value="Dodaj KW"/>
+<?php
+		if ($ID_BILLING_USERS = DB::getPDO()->fetchValue("select ID_BILLING_USERS from ADMIN_USERS where ID='".User::getID()."'")) {
+			$query = "select `TABLE`, `ID`, `BILL_DATE`, `WINIEN`, `MA` from (select 'BILLS_KP' as `TABLE`, `bkp`.`ID`, `bkp`.`BILL_DATE`, `bkp`.`WINIEN`, `bkp`.`MA` from `BILLING_NUMBERS` `bn` join `BILLS_KP` `bkp` on `bn`.`ID` = `bkp`.`ID_BILLING_NUMBERS` join `BILLING_USERS` `bu` on `bn`.`ID_BILLING_USERS` = `bu`.`ID` where `bkp`.`ID_BILLS_RK_POS` is null and `bu`.`BILLING_OWNER` = '{$this->RK['ID_BILLING_OWNER']}' and `bn`.`U_ID` = '{$ID_BILLING_USERS}' and `bkp`.`BILL_DATE` like '{$this->RK['RK_MONTH']}%' union select 'BILLS_KW' as `TABLE`, `bkw`.`ID`, `bkw`.`BILL_DATE`, `bkw`.`WINIEN`, `bkw`.`MA` from `BILLING_NUMBERS` `bn` join `BILLS_KW` `bkw` on `bn`.`ID` = `bkw`.`ID_BILLING_NUMBERS` join `BILLING_USERS` `bu` on `bn`.`ID_BILLING_USERS` = `bu`.`ID` where `bkw`.`ID_BILLS_RK_POS` is null and `bu`.`BILLING_OWNER` = '{$this->RK['ID_BILLING_OWNER']}' and `bn`.`U_ID` = '{$ID_BILLING_USERS}' and `bkw`.`BILL_DATE` like '{$this->RK['RK_MONTH']}%') as r1";
+			$docs = DB::getPDO(931)->fetchAll($query);
+			print_r($docs);
+		}
+?>
         <input type="hidden" name="_task" value="edit">
         <input type="hidden" name="REFERER" value="<?php echo $this->REFERER?>"/>
       </div>