Преглед изворни кода

added order actions, turn off dbg

Piotr Labudda пре 10 година
родитељ
комит
ab155cc1ce

+ 55 - 2
SE/se-lib/Route/UrlAction/ProjektyProNetMediaApproveZam.php

@@ -29,9 +29,61 @@ class Route_UrlAction_ProjektyProNetMediaApproveZam extends RouteBase {// TODO:
 	}
 
 	public function approveOrderAction() {
+		SE_Layout::gora();
+		try {
+			$data = array();
+			$data['id_order'] = V::get('id_order', 0, $_REQUEST, 'int');
+			$data = $this->setProps($data);
+			$sqlObj = array();
+			$sqlObj['ID'] = $data['id_order'];
+			$sqlObj['APPROVE_STATUS'] = 'ZATWIERDZONE';
+			$sqlObj['APPROVED_BY'] = User::getFullName();
+			$affected = DB::getDB()->UPDATE_OBJ('CRM_LISTA_ZASOBOW_ORDERS', (object)$sqlObj);
+			echo '<div class="container">';
+			if ($affected >= 0) {
+				SE_Layout::alert('success', "Zmieniono status zamówienia na ZATWIERDZONE");
+			} else {
+				SE_Layout::alert('danger', "Wystąpiły błędy podczas zmieniania statusu zamówienia");
+			}
+			?>
+			<div style="text-align:center">
+				<a href="index.php?_route=UrlAction_ProjektyProNetMediaZamZlec&ID_PROJECT=<?php echo $data['id_project']; ?>" class="btn btn-primary">Wróć</a>
+			</div>
+			<?php
+			echo '</div>';
+		} catch (Exception $e) {
+			SE_Layout::alert('danger', "Error #" . $e->getCode() .  "|" . $e->getLine() .  ": " . $e->getMessage());
+		}
+		SE_Layout::dol();
 	}
 
 	public function rejectOrderAction() {
+		SE_Layout::gora();
+		try {
+			$data = array();
+			$data['id_order'] = V::get('id_order', 0, $_REQUEST, 'int');
+			$data = $this->setProps($data);
+			$sqlObj = array();
+			$sqlObj['ID'] = $data['id_order'];
+			$sqlObj['APPROVE_STATUS'] = 'ODRZUCONE';
+			$sqlObj['APPROVED_BY'] = User::getFullName();
+			$affected = DB::getDB()->UPDATE_OBJ('CRM_LISTA_ZASOBOW_ORDERS', (object)$sqlObj);
+			echo '<div class="container">';
+			if ($affected >= 0) {
+				SE_Layout::alert('success', "Zmieniono status zamówienia na ODRZUCONE");
+			} else {
+				SE_Layout::alert('danger', "Wystąpiły błędy podczas zmieniania statusu zamówienia");
+			}
+			?>
+			<div style="text-align:center">
+				<a href="index.php?_route=UrlAction_ProjektyProNetMediaZamZlec&ID_PROJECT=<?php echo $data['id_project']; ?>" class="btn btn-primary">Wróć</a>
+			</div>
+			<?php
+			echo '</div>';
+		} catch (Exception $e) {
+			SE_Layout::alert('danger', "Error #" . $e->getCode() .  "|" . $e->getLine() .  ": " . $e->getMessage());
+		}
+		SE_Layout::dol();
 	}
 
 	public function setProps($data) {
@@ -76,12 +128,14 @@ class Route_UrlAction_ProjektyProNetMediaApproveZam extends RouteBase {// TODO:
 
 	<form style="text-align:center">
 		<input type="hidden" name="_route" value="UrlAction_ProjektyProNetMediaApproveZam">
+		<input type="hidden" name="_task" value="">
+		<input type="hidden" name="id_order" value="<?php echo $data['id_order']; ?>">
 		<button onClick="return approveOrder(this);" class="btn btn-lg btn-primary">Zatwierdzam</button>
 		<button onClick="return rejectOrder(this);" class="btn btn-lg btn-danger" style="margin-left:30px">Nie zatwierdzam</button>
 	</form>
 
 	<hr>
-	<?php Router::getRoute('UrlAction_ProjektyProNetMediaZamZlec')->previewOrder($data['id_order']); ?>
+	<?php Router::getRoute('UrlAction_ProjektyProNetMediaZamZlec')->previewOrder($data['id_order']);?>
 </div>
 <script>
 function approveOrder(fld) {
@@ -94,7 +148,6 @@ function rejectOrder(fld) {
 }
 </script>
 		<?php
-		DBG::_(true, true, 'data', $data, __CLASS__, __FUNCTION__, __LINE__);
 	}
 
 }

+ 33 - 17
SE/se-lib/Route/UrlAction/ProjektyProNetMediaRequestApproveZam.php

@@ -21,7 +21,11 @@ class Route_UrlAction_ProjektyProNetMediaRequestApproveZam extends RouteBase {//
 			$data['id_order'] = V::get('ID_ORDER', 0, $_REQUEST, 'int');
 			if (!$data['id_order']) throw new Exception("Error: Brak nr zamówienia!");
 			$data = $this->setProps($data);
-			$this->approveFormView($data);
+			if (V::get('_change', '', $_POST)) {
+				$this->changeStatusToWaitingApproval($data);
+			} else {
+				$this->previewOrder($data);
+			}
 		} catch (Exception $e) {
 			SE_Layout::alert('danger', "Error #" . $e->getCode() .  "|" . $e->getLine() .  ": " . $e->getMessage());
 		}
@@ -59,8 +63,8 @@ class Route_UrlAction_ProjektyProNetMediaRequestApproveZam extends RouteBase {//
 		return $data;
 	}
 
-	public function approveFormView($data) {
-		?>
+	public function previewOrder($data) {
+?>
 <div class="container">
 	<h1>Zamówienie: <?php echo $data['zamowienie_label']; ?>
 		<br><small>Dotyczy projektu: <?php echo $data['project_label']; ?></small>
@@ -68,27 +72,39 @@ class Route_UrlAction_ProjektyProNetMediaRequestApproveZam extends RouteBase {//
 
 	<?php echo SE_Layout::alert('info', "Suma netto zamówienia: <b>{$data['zamowienie_suma']}</b>"); ?>
 
-	<form style="text-align:center">
+	<form style="text-align:center" method="post">
 		<input type="hidden" name="_route" value="UrlAction_ProjektyProNetMediaRequestApproveZam">
-		<button onClick="return approveOrder(this);" class="btn btn-lg btn-primary">Zatwierdzam</button>
-		<button onClick="return rejectOrder(this);" class="btn btn-lg btn-danger" style="margin-left:30px">Nie zatwierdzam</button>
+		<input type="hidden" name="ID_ORDER" value="<?php echo $data['id_order']; ?>">
+		<input type="hidden" name="_change" value="1">
+		<input type="submit" class="btn btn-lg btn-primary" value="Zmień status"/>
+		<span style="font-size:1.6em">na <code>OCZEKUJE_ZATWIERDZENIA</code></span>
 	</form>
 
 	<hr>
 	<?php Router::getRoute('UrlAction_ProjektyProNetMediaZamZlec')->previewOrder($data['id_order']); ?>
 </div>
-<script>
-function approveOrder(fld) {
-	var frm = fld.form;
-	frm['_task'].value='approveOrder';
-}
-function rejectOrder(fld) {
-	var frm = fld.form;
-	frm['_task'].value='rejectOrder';
-}
-</script>
+<?php
+	}
+
+	public function changeStatusToWaitingApproval($data) {
+		$idOrder = V::get('id_order', 0, $data, 'int');
+		if (!$idOrder) throw new Exception("Error: Brak nr zamówienia!");
+		$sqlObj = array();
+		$sqlObj['ID'] = $idOrder;
+		$sqlObj['APPROVE_STATUS'] = 'OCZEKUJE_ZATWIERDZENIA';
+		$affected = DB::getDB()->UPDATE_OBJ('CRM_LISTA_ZASOBOW_ORDERS', (object)$sqlObj);
+		echo '<div class="container">';
+		if ($affected >= 0) {
+			SE_Layout::alert('success', "Zmieniono status zamówienia na OCZEKUJE_ZATWIERDZENIA");
+		} else {
+			SE_Layout::alert('danger', "Wystąpiły błędy podczas zmieniania statusu zamówienia");
+		}
+		?>
+		<div style="text-align:center">
+			<a href="index.php?_route=UrlAction_ProjektyProNetMediaZamZlec&ID_PROJECT=<?php echo $data['id_project']; ?>" class="btn btn-primary">Wróć</a>
+		</div>
 		<?php
-		DBG::_(true, true, 'data', $data, __CLASS__, __FUNCTION__, __LINE__);
+		echo '</div>';
 	}
 
 }

+ 4 - 6
SE/se-lib/Route/UrlAction/ProjektyProNetMediaZamZlec.php

@@ -59,7 +59,7 @@ class Route_UrlAction_ProjektyProNetMediaZamZlec extends RouteBase {// TODO: Url
 		} catch (Exception $e) {
 			SE_Layout::alert('danger', "Error #" . $e->getCode() .  "|" . $e->getLine() .  ": " . $e->getMessage());
 		}
-		SE_Layout::dol();
+		if (1 != V::get('_print', '', $_GET)) SE_Layout::dol();
 	}
 
 	public function addZlecenieAction() {
@@ -101,7 +101,7 @@ class Route_UrlAction_ProjektyProNetMediaZamZlec extends RouteBase {// TODO: Url
 		} catch (Exception $e) {
 			SE_Layout::alert('danger', "Error #" . $e->getCode() .  "|" . $e->getLine() .  ": " . $e->getMessage());
 		}
-		SE_Layout::dol();
+		if (1 != V::get('_print', '', $_GET)) SE_Layout::dol();
 	}
 
 	public function addZamowienieAction() {
@@ -194,7 +194,7 @@ class Route_UrlAction_ProjektyProNetMediaZamZlec extends RouteBase {// TODO: Url
 		} catch (Exception $e) {
 			SE_Layout::alert('danger', "Error #" . $e->getCode() .  "|" . $e->getLine() .  ": " . $e->getMessage());
 		}
-		SE_Layout::dol();
+		if (1 != V::get('_print', '', $_GET)) SE_Layout::dol();
 	}
 
 	public function previewOrder($idOrder) {
@@ -1009,7 +1009,7 @@ jQuery("#widget-orders").p5_Orders({
 	    }
     },
   },
-	dbg: true
+	dbg: false
 });
 </script>
 <script>
@@ -1021,9 +1021,7 @@ jQuery(document).ready(function() {
 	}
 })
 </script>
-
 <?php
-		exit;
 	}
 
 }