annulation d'une facture non paye

darcs-hash:20061025182958-f46e9-c88fbf735adede3d119ff412ccd27aafe7131dae.gz

intranet/conf/dev.cfg

@@ -21,4 +21,4 @@ paypal.businessAdress = "gdetrez-buisness@crans.org"
 paypal.useSandbox = True
 
 [/static]
-staticFilter.dir = "/home/gdetrez/scripts/intranet/static/"
+staticFilter.dir = "/usr/scripts/intranet/static/"

intranet/pages/factures.py

@@ -63,7 +63,6 @@ class root:
         lst = [ x for x in adh.historique() if x.split(u' : ',1)[1].startswith(u'credit') or x.split(u' : ',1)[1].startswith(u'debit') ]
         histLst = []
         for anItem in lst:
-        	#11/06/2006 01:40, gdetrez : credit 10.0 Euros [Facture n°1 : Impression]
             aLine = {}
             aLine["date"] = anItem.split(u",")[0]
             aLine["type"] = anItem.split(u' : ',2)[1].split(u' ')[0]
@@ -81,3 +80,17 @@ class root:
                 'scripts'		:[],
             }
     historique.exposed = True
+
+    def delFacture(self, no):
+        try:
+            # trrouver la factures
+            fact = self.__ldap.search('fid=' + no, 'w')['facture'][0]
+            #verifier qu'elle appartient bien a l'adherent
+            if not fact.proprietaire().mail() == cherrypy.session['uid']:
+                raise Exception, "Impossible de supprimer cette facture"
+            # la supprimer
+            fact.delete()
+        except Exception, e:
+            cherrypy.log(str(e), "FACTURES", 1)
+        return self.index()
+    delFacture.exposed = True

intranet/static/css/cransFactures.css

@@ -70,6 +70,16 @@ td, tr {
 }
 
 
+.actions {
+    display:block;
+    float:right;
+    font-size:0.9em;
+    font-weight:normal;
+}
+.actions a {
+    margin:2px 10px;
+}
+
 /********************************************
  *  <!-- factures - details -->
 ********************************************/
@@ -110,7 +120,7 @@ table.factureDetails td {
     margin:3px;
     font-weight:normal;
 }
-span.note {
+.note {
     color:#666
 }
 

intranet/templates/factures.tmpl

@@ -47,16 +47,21 @@ function hideDetail(id){
 				#if not $f.payee
 				(non payée)
 				#end if
-				<span class="note">Cr&eacute;e le -</span>
+			
 			</span>
 			<span class="montant">
 				$f.montant&nbsp;&euro;
-				#if not $f.payee
-				<a class="note" href="$f.paypal">Payer avec PayPal</a>
-				#else
-				<span class="note">Pay&eacute;e</span>
-				#end if
 			</span>
+			<span class="note" style="float:left;clear: left;">Cr&eacute;e le -</span>
+		       	#if not $f.payee
+	       		    <span class="actions">
+			        <a href="delFacture?no=$f.no">Annuler</a>
+       			        <a href="$f.paypal">Payer avec PayPal</a>
+			    </span>
+			#else
+		       	    <span class="note" style="float:right;clear:right;">Pay&eacute;e</span>
+		       	#end if
+
 		</div>
 		#if $f.details.__len__() > 1
 		<div id="facture$f.no" style="display:none;">