Remplacement des po gagné par le prix auquel ça a été acheté sur les …

…pages des items vendu.
bulton-fr · Dec 30, 2013 · 142f0fd · 142f0fd
1 parent abd940e
commit 142f0fd
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 16 deletions.
diff --git a/controlers/perso/vendu.php b/controlers/perso/vendu.php
@@ -74,7 +74,8 @@
 
 foreach($items as $item)
 {
-	$item['poGagne'] = get_po($item['poGagne']);
+	if($item['typeVente'] == 'rachat') {$item['po'] = get_po($item['rachat']);}
+	else {$item['po'] = get_po($item['enchere']);}
 
 	$dateVendu = new \BFW\CKernel\Date($item['dateVendu']);
 	$item['date'] = $dateVendu->aff_simple();

diff --git a/controlers/vendu/allHisto.php b/controlers/vendu/allHisto.php
@@ -64,7 +64,9 @@
 
 foreach($items as $item)
 {
-	$item['poGagne'] = get_po($item['poGagne']);
+	if($item['typeVente'] == 'rachat') {$item['po'] = get_po($item['rachat']);}
+	else {$item['po'] = get_po($item['enchere']);}
+
 	$dateVendu = new \BFW\CKernel\Date($item['dateVendu']);
 	$item['dateVendu'] = $dateVendu->aff_simple();
 	$item['color'] = get_color_item($item['color']);

diff --git a/controlers/vendu/histo.php b/controlers/vendu/histo.php
@@ -64,7 +64,9 @@
 
 foreach($items as $item)
 {
-	$item['poGagne'] = get_po($item['poGagne']);
+	if($item['typeVente'] == 'rachat') {$item['po'] = get_po($item['rachat']);}
+	else {$item['po'] = get_po($item['enchere']);}
+
 	$dateVendu = new \BFW\CKernel\Date($item['dateVendu']);
 	$item['dateVendu'] = $dateVendu->aff_simple();
 	$item['color'] = get_color_item($item['color']);

diff --git a/controlers/vendu/semaine.php b/controlers/vendu/semaine.php
@@ -75,7 +75,9 @@
 
 foreach($items as $item)
 {
-	$item['poGagne'] = get_po($item['poGagne']);
+	if($item['typeVente'] == 'rachat') {$item['po'] = get_po($item['rachat']);}
+	else {$item['po'] = get_po($item['enchere']);}
+
 	$dateVendu = new \BFW\CKernel\Date($item['dateVendu']);
 	$item['dateVendu'] = $dateVendu->aff_simple();
 	$item['color'] = get_color_item($item['color']);

diff --git a/modeles/PersoItem.php b/modeles/PersoItem.php
@@ -194,7 +194,7 @@ public function getVenduSemaineAllPerso($idUser, $dateDeb, $dateFin, $limit, $or
 		);
 
 		$req = $this->select()
-					->from(array('pi' => $this->_name), array('ref', 'typeVente', 'dateVendu', 'poGagne', 'notes'))
+					->from(array('pi' => $this->_name), array('ref', 'typeVente', 'dateVendu', 'enchere', 'rachat', 'notes'))
 					->joinLeft(array('i' => 'item'), 'i.id=pi.idItem', array('nomItem' => 'text', 'color' => 'color'))
 					->joinLeft(array('s' => 'stat'), 's.idStat=pi.idItem', array('nomStat' => 'nom'))
 					->joinLeft(array('p' => 'perso'), 'p.idPerso=pi.idPerso', array('nomPerso' => 'nom'))
@@ -272,7 +272,7 @@ public function getVenduAllPerso($idUser, $limit, $order)
 		);
 
 		$req = $this->select()
-					->from(array('pi' => $this->_name), array('ref', 'typeVente', 'dateVendu', 'poGagne', 'notes'))
+					->from(array('pi' => $this->_name), array('ref', 'typeVente', 'dateVendu', 'enchere', 'rachat', 'notes'))
 					->joinLeft(array('i' => 'item'), 'i.id=pi.idItem', array('nomItem' => 'text', 'color' => 'color'))
 					->joinLeft(array('s' => 'stat'), 's.idStat=pi.idItem', array('nomStat' => 'nom'))
 					->joinLeft(array('p' => 'perso'), 'p.idPerso=pi.idPerso', array('nomPerso' => 'nom'))
@@ -340,7 +340,7 @@ public function getVenduAll($limit, $order)
 		);
 
 		$req = $this->select()
-					->from(array('pi' => $this->_name), array('ref', 'typeVente', 'dateVendu', 'poGagne', 'notes'))
+					->from(array('pi' => $this->_name), array('ref', 'typeVente', 'dateVendu', 'enchere', 'rachat', 'notes'))
 					->joinLeft(array('i' => 'item'), 'i.id=pi.idItem', array('nomItem' => 'text', 'color' => 'color'))
 					->joinLeft(array('s' => 'stat'), 's.idStat=pi.idItem', array('nomStat' => 'nom'))
 					->joinLeft(array('p' => 'perso'), 'p.idPerso=pi.idPerso', array('nomPerso' => 'nom'))
@@ -741,7 +741,7 @@ public function getVenduPerso($idPerso, $limit, $order)
 		);
 
 		$req = $this->select()
-					->from(array('pi' => $this->_name), array('ref', 'typeVente', 'dateVendu', 'poGagne', 'notes'))
+					->from(array('pi' => $this->_name), array('ref', 'typeVente', 'dateVendu', 'enchere', 'rachat', 'notes'))
 					->joinLeft(array('i' => 'item'), 'i.id=pi.idItem', array('nomItem' => 'text', 'color' => 'color'))
 					->joinLeft(array('s' => 'stat'), 's.idStat=pi.idItem', array('nomStat' => 'nom'))
 					->joinLeft(array('p' => 'perso'), 'p.idPerso=pi.idPerso', array('nomPerso' => 'nom'))

diff --git a/view/perso/vendu.html b/view/perso/vendu.html
@@ -5,7 +5,7 @@
 			<td class="persoVenduItem">Item<div class="triPosition<var name='triItem' />"></div></td>
 			<td class="persoDate">Date<div class="triPosition<var name='triDate' />"></div></td>
 			<td class="persoVenduAchat">Type d'achat<div class="triPosition<var name='triAchat' />"></div></td>
-			<td class="persoPo">Po obtenu<div class="triPosition<var name='triPo' />"></div></td>
+			<td class="persoPo">Vendu à<div class="triPosition<var name='triPo' />"></div></td>
 		</tr>
 	</thead>
 	<tbody id="ViewPersoTbody">
@@ -21,7 +21,7 @@
 				</td>
 				<td class="center"><var name="date" /></td>
 				<td class="center"><var name="typeVente" /></td>
-				<td class="po"><var name="poGagne" /></td>
+				<td class="po"><var name="po" /></td>
 			</tr>
 		</block>
 <block name="start">

diff --git a/view/vendu/allHisto.html b/view/vendu/allHisto.html
@@ -6,7 +6,7 @@
 			<td class="venduPerso">Personnage<div class="triPosition<var name='triPerso' />"></div></td>
 			<td class="venduDate">Date<div class="triPosition<var name='triDate' />"></div></td>
 			<td class="venduAchat">Type d'achat<div class="triPosition<var name='triAchat' />"></div></td>
-			<td class="venduPo">Po obtenu<div class="triPosition<var name='triPo' />"></div></td>
+			<td class="venduPo">Vendu à<div class="triPosition<var name='triPo' />"></div></td>
 		</tr>
 	</thead>
 	<tbody id="VenduTbody">
@@ -23,7 +23,7 @@
 				<td class="center" title="<var name="nomUser" />"><var name="nomPerso" /></td>
 				<td class="center"><var name="dateVendu" /></td>
 				<td class="center"><var name="typeVente" /></td>
-				<td class="po"><var name="poGagne" /></td>
+				<td class="po"><var name="po" /></td>
 			</tr>
 		</block>
 <block name="start">

diff --git a/view/vendu/histo.html b/view/vendu/histo.html
@@ -6,7 +6,7 @@
 			<td class="venduPerso">Personnage<div class="triPosition<var name='triPerso' />"></div></td>
 			<td class="venduDate">Date<div class="triPosition<var name='triDate' />"></div></td>
 			<td class="venduAchat">Type d'achat<div class="triPosition<var name='triAchat' />"></div></td>
-			<td class="venduPo">Po obtenu<div class="triPosition<var name='triPo' />"></div></td>
+			<td class="venduPo">Vendu à<div class="triPosition<var name='triPo' />"></div></td>
 		</tr>
 	</thead>
 	<tbody id="VenduTbody">
@@ -23,7 +23,7 @@
 				<td class="center"><var name="nomPerso" /></td>
 				<td class="center"><var name="dateVendu" /></td>
 				<td class="center"><var name="typeVente" /></td>
-				<td class="po"><var name="poGagne" /></td>
+				<td class="po"><var name="po" /></td>
 			</tr>
 		</block>
 <block name="start">

diff --git a/view/vendu/semaine.html b/view/vendu/semaine.html
@@ -6,7 +6,7 @@
 			<td class="venduPerso">Personnage<div class="triPosition<var name='triPerso' />"></div></td>
 			<td class="venduDate">Date<div class="triPosition<var name='triDate' />"></div></td>
 			<td class="venduAchat">Type d'achat<div class="triPosition<var name='triAchat' />"></div></td>
-			<td class="venduPo">Po obtenu<div class="triPosition<var name='triPo' />"></div></td>
+			<td class="venduPo">Vendu à<div class="triPosition<var name='triPo' />"></div></td>
 		</tr>
 	</thead>
 	<tbody id="VenduTbody">
@@ -23,7 +23,7 @@
 				<td class="center"><var name="nomPerso" /></td>
 				<td class="center"><var name="dateVendu" /></td>
 				<td class="center"><var name="typeVente" /></td>
-				<td class="po"><var name="poGagne" /></td>
+				<td class="po"><var name="po" /></td>
 			</tr>
 		</block>
 <block name="start">