Sfoglia il codice sorgente

fixed order type in functions on Order record for pro-netmedia

Piotr Labudda 9 anni fa
parent
commit
38d11c87fc

+ 3 - 1
SE/se-lib/Route/UrlAction/ProjektyProNetMediaApproveZam.php

@@ -96,6 +96,7 @@ class Route_UrlAction_ProjektyProNetMediaApproveZam extends RouteBase {// TODO:
 		$data['orderRaw'] = DB::getPDO()->fetchAll("
 			select r.ID
 					, r.ORDER_LABEL
+					, r.ORDER_TYPE
 					, r.ID_PROJECT
 					, sum(o.OFFER_PRICE_PER_UNIT * o.OFFER_QUANTITY) as SUM_NETTO
 					, p.M_DIST_DESC
@@ -114,6 +115,7 @@ class Route_UrlAction_ProjektyProNetMediaApproveZam extends RouteBase {// TODO:
 		$data['zamowienie_suma'] = number_format($data['orderRaw']['SUM_NETTO'], 2, ',', ' ');
 		$data['id_project'] = $data['orderRaw']['ID_PROJECT'];
 		$data['project_label'] = $data['orderRaw']['M_DIST_DESC'];
+		$data['ORDER_TYPE'] = $data['orderRaw']['ORDER_TYPE'];
 
 		return $data;
 	}
@@ -121,7 +123,7 @@ class Route_UrlAction_ProjektyProNetMediaApproveZam extends RouteBase {// TODO:
 	public function approveFormView($data) {
 		?>
 <div class="container">
-	<h1>Zamówienie: <?php echo $data['zamowienie_label']; ?>
+	<h1><?= ('zlecenie' == $data['ORDER_TYPE']) ? "Zlecenie" : "Zamówienie"; ?>: <?php echo $data['zamowienie_label']; ?>
 		<br><small>Dotyczy projektu: <?php echo $data['project_label']; ?></small>
 	</h1>
 

+ 3 - 1
SE/se-lib/Route/UrlAction/ProjektyProNetMediaFinalApproveZam.php

@@ -95,6 +95,7 @@ class Route_UrlAction_ProjektyProNetMediaFinalApproveZam extends RouteBase {// T
 		$data['orderRaw'] = DB::getPDO()->fetchAll("
 			select r.ID
 					, r.ORDER_LABEL
+					, r.ORDER_TYPE
 					, r.ID_PROJECT
 					, sum(o.OFFER_PRICE_PER_UNIT * o.OFFER_QUANTITY) as SUM_NETTO
 					, p.M_DIST_DESC
@@ -113,6 +114,7 @@ class Route_UrlAction_ProjektyProNetMediaFinalApproveZam extends RouteBase {// T
 		$data['zamowienie_suma'] = number_format($data['orderRaw']['SUM_NETTO'], 2, ',', ' ');
 		$data['id_project'] = $data['orderRaw']['ID_PROJECT'];
 		$data['project_label'] = $data['orderRaw']['M_DIST_DESC'];
+		$data['ORDER_TYPE'] = $data['orderRaw']['ORDER_TYPE'];
 
 		return $data;
 	}
@@ -120,7 +122,7 @@ class Route_UrlAction_ProjektyProNetMediaFinalApproveZam extends RouteBase {// T
 	public function finalApproveFormView($data) {
 		?>
 <div class="container">
-	<h1>Zamówienie: <?php echo $data['zamowienie_label']; ?>
+	<h1><?= ('zlecenie' == $data['ORDER_TYPE']) ? "Zlecenie" : "Zamówienie"; ?>: <?php echo $data['zamowienie_label']; ?>
 		<br><small>Dotyczy projektu: <?php echo $data['project_label']; ?></small>
 	</h1>
 

+ 3 - 1
SE/se-lib/Route/UrlAction/ProjektyProNetMediaRequestApproveZam.php

@@ -41,6 +41,7 @@ class Route_UrlAction_ProjektyProNetMediaRequestApproveZam extends RouteBase {//
 		$data['orderRaw'] = DB::getPDO()->fetchAll("
 			select r.ID
 					, r.ORDER_LABEL
+					, r.ORDER_TYPE
 					, r.ID_PROJECT
 					, sum(o.OFFER_PRICE_PER_UNIT * o.OFFER_QUANTITY) as SUM_NETTO
 					, p.M_DIST_DESC
@@ -59,6 +60,7 @@ class Route_UrlAction_ProjektyProNetMediaRequestApproveZam extends RouteBase {//
 		$data['zamowienie_suma'] = number_format($data['orderRaw']['SUM_NETTO'], 2, ',', ' ');
 		$data['id_project'] = $data['orderRaw']['ID_PROJECT'];
 		$data['project_label'] = $data['orderRaw']['M_DIST_DESC'];
+		$data['ORDER_TYPE'] = $data['orderRaw']['ORDER_TYPE'];
 
 		return $data;
 	}
@@ -66,7 +68,7 @@ class Route_UrlAction_ProjektyProNetMediaRequestApproveZam extends RouteBase {//
 	public function previewOrder($data) {
 ?>
 <div class="container">
-	<h1>Zamówienie: <?php echo $data['zamowienie_label']; ?>
+	<h1><?= ('zlecenie' == $data['ORDER_TYPE']) ? "Zlecenie" : "Zamówienie"; ?>: <?php echo $data['zamowienie_label']; ?>
 		<br><small>Dotyczy projektu: <?php echo $data['project_label']; ?></small>
 	</h1>