CANCELADO + show CONFIRMADO

back/db.py

@@ -58,7 +58,7 @@ class db():
 	def pedidos(self, clientid):
 		ret=[]
 		cur = self.get_cursor()
-		cur.execute( "SELECT id, cant_productos, subtotal, fecha, estado, observaciones FROM pedidos where cliente = %s", (int(clientid),) )
+		cur.execute( "SELECT id, cant_productos, subtotal, fecha, estado, observaciones FROM pedidos where cliente = %s and estado != 'CANCELADO'", (int(clientid),) )
 		for row in cur.fetchall():
 			row["fecha"] = row["fecha"].isoformat() #strftime("%Y-%m-%d %H:%M")
 			ret.append(row)

controllers/editPedidoCtrl.js

@@ -4,6 +4,7 @@ app.controller('editPedidoCtrl', function ($scope, $http, $routeParams, notify,
 	$scope.cero=true;
 	$scope.total=0;
 	$scope.observaciones="";
+	$scope.hash = $routeParams.hash;
 	$scope.fecha = new Date();
 
 	$scope.modificar = function() {
@@ -28,6 +29,9 @@ app.controller('editPedidoCtrl', function ($scope, $http, $routeParams, notify,
 			function(data) {
 	   			$scope.listaproductos = data.data.productos; 
 				$scope.observaciones = data.data.observaciones || "";
+				$scope.estado = data.data.estado;
+				if ($scope.estado == 'CONFIRMADO')
+					$scope.cero = false;
 				$scope.updateTotal();
 			},
 			function(data) {

views/createOrEditPedido.html

@@ -17,7 +17,7 @@
 		<h4>Tabla de productos</h4>
 		<div class="input-group">
 			<div class="input-group-addon">Filtrar</div>
-			<input type="text" class="form-control form-control-small" ng-model="filtro" style="display:block">
+			<input ng-disabled="estado == 'CONFIRMADO'" type="text" class="form-control form-control-small" ng-model="filtro" style="display:block">
 		</div>
 		<table class="table table-striped">
 			<tr>
@@ -56,17 +56,18 @@
 		<div class="row">
 			<div class="col-md-12">
 				<label>Observaciones:</label>
-				<textarea class="form-control" ng-model="observaciones" multiline="true" maxlength="160" style="resize:vertical; min-height: 40px;"> </textarea>
+				<textarea class="form-control" ng-disabled="estado == 'CONFIRMADO'" ng-model="observaciones" multiline="true" maxlength="160" style="resize:vertical; min-height: 40px;"> </textarea>
 			</div>
 		</div>
 		<div class="row" style="margin-top:10px;">
 			<div class="col-md-12">
-				<button ng-show="cero==true" class="css-button" ng-click="confirmar()">Confirmar</button>
-				<button ng-show="cero==false" class="css-button" ng-click="modificar()">Modificar</button>
+				<button ng-if="estado!='CONFIRMADO'" ng-show="cero==true" class="css-button" ng-click="confirmar()">Confirmar</button>
+				<button ng-if="estado!='CONFIRMADO'" ng-show="cero==false" class="css-button" ng-click="modificar()">Modificar</button>
 				<!--
 				<button class="css-button" ng-click="">Ver pedido</button>
 				-->
-				<button ng-show="cero==false" class="css-button" ng-click="ok()">Guardar Pedido</button>
+				<button ng-if="estado!='CONFIRMADO'" ng-show="cero==false" class="css-button" ng-click="ok()">Guardar Pedido</button>
+				<a ng-show="estado=='CONFIRMADO'" class="css-button" ng-href="/{{hash}}">Volver</a>
 			</div>
 		</div>
 	</div>

views/main.html

@@ -42,11 +42,14 @@
 				<td><span class="status-label" ng-class="[p.estado]">{{p.estado}}<span></td>
 				<td style="min-width:135px">
 					<a ng-if="p.estado==='CREADO'" href="#" ng-href="edit/{{userdata.hash}}/{{p.id}}" title="Editar" class="status-label action-label">
-					Editar
+						Editar
 					</a>
 					<a ng-if="p.estado==='CREADO'" href="#" ng-click="openModal(p.id)" title="Confirmar" class="status-label action-label"> 
 						Confirmar
 					</a>
+					<a ng-if="p.estado==='CONFIRMADO'" href="#" ng-href="edit/{{userdata.hash}}/{{p.id}}" title="Editar" class="status-label action-label">
+						Ver
+					</a>
 				</td>
 			</tr>
 		</table>