diff --git a/examples/fieldset/order.php b/examples/fieldset/order.php
index ef9d9d0..7554c84 100644
--- a/examples/fieldset/order.php
+++ b/examples/fieldset/order.php
@@ -1,33 +1,68 @@
+<script type="text/javascript">
+	function clearSampleOrder(){
+		document.getElementById('orderRef').value= '';
+		document.getElementById('orderOrigin').value= '';
+		document.getElementById('orderCountry').value= '';
+		document.getElementById('orderTaxes').value= '';
+		document.getElementById('orderCurrency').value= '';
+		document.getElementById('orderAmount').value= '';
+		document.getElementById('deliveryTime').value= '';
+		document.getElementById('deliveryMode').value= '';
+		document.getElementById('deliveryExpectedDelay').value= '';
+		document.getElementById('deliveryExpectedDate').value= '';
+		document.getElementById('orderDetailRef1').value= '';
+		document.getElementById('orderDetailPrice1').value= '';
+		document.getElementById('orderDetailQuantity1').value= '';
+		document.getElementById('orderDetailComment1').value= '';
+		document.getElementById('orderDetailCategory1').value= '';
+		document.getElementById('orderDetailSubcategory1_1').value= '';
+		document.getElementById('orderDetailSubcategory2_1').value= '';
+		document.getElementById('orderDetailBrand1').value= '';
+		document.getElementById('orderDetailAdditionalData1').value= '';
+		document.getElementById('orderDetailTaxRate1').value= '';
+		document.getElementById('orderDetailRef2').value= '';
+		document.getElementById('orderDetailPrice2').value= '';
+		document.getElementById('orderDetailQuantity2').value= '';
+		document.getElementById('orderDetailComment2').value= '';
+		document.getElementById('orderDetailCategory2').value= '';
+		document.getElementById('orderDetailSubcategory1_2').value= '';
+		document.getElementById('orderDetailSubcategory2_2').value= '';
+		document.getElementById('orderDetailBrand2').value= '';
+		document.getElementById('orderDetailAdditionalData2').value= '';
+		document.getElementById('orderDetailTaxRate2').value= '';
+	}
+</script>
 <fieldset>
 	<h4>Informations about order</h4>
-	<div class="row" <?php if($displayedPage == 'widgetPayment') echo "style='display:none'";?>>
+	<div class="row">
+		<label for="orderAmount">Order amount</label>
+		<input type="text" name="orderAmount" id="orderAmount" value="<?php echo $_SESSION['orderAmount'] ?>" />
+		<span class="help">(required)</span>		
+		<input type="button" class="submit" value="clear order data" onclick="clearSampleOrder()" />
+	</div>
+	<div class="row" <?php if(in_array($displayedPage,array('widgetPayment','configuration'))) echo "style='display:none'";?>>
 		<label for="orderRef">Order reference</label>
 		<input type="text" name="orderRef" id="orderRef" value="<?php echo 'PHP-'.time()?>" />
 		<span class="help">(required)</span>
 	</div>
 	<div class="row" <?php if($displayedPage == 'widgetPayment') echo "style='display:none'";?>>
 		<label for="orderOrigin">Order origin</label>
-		<input type="text" name="orderOrigin" id="orderOrigin" value="1" maxlength="3" />
+		<input type="text" name="orderOrigin" id="orderOrigin" value="<?php echo $_SESSION['orderOrigin'] ?>" maxlength="3" />
 	</div>
 	<div class="row" <?php if($displayedPage == 'widgetPayment') echo "style='display:none'";?>>
 		<label for="orderCountry">Order country</label>
-		<input type="text" name="orderCountry" id="orderCountry" value="FR" />
+		<input type="text" name="orderCountry" id="orderCountry" value="<?php echo $_SESSION['orderCountry'] ?>" />
 	</div>
 	<div class="row">
 		<label for="orderTaxes">Order taxes</label>
-		<input type="text" name="orderTaxes" id="orderTaxes" value="50" />
+		<input type="text" name="orderTaxes" id="orderTaxes" value="<?php echo $_SESSION['orderTaxes'] ?>" />
 	</div>
 	<div class="row">
 		<label for="orderCurrency">Order currency</label>
-		<input type="text" name="orderCurrency" id="orderCurrency" value="978" />
+		<input type="text" name="orderCurrency" id="orderCurrency" value="<?php echo $_SESSION['orderCurrency'] ?>" />
 		<span class="help">(required)</span>
 	</div>
-	<div class="row">
-		<label for="orderAmount">Order amount</label>
-		<input type="text" name="orderAmount" id="orderAmount" value="1000" />
-		<span class="help">(required)</span>
-	</div>
-	<div class="row" <?php if($displayedPage == 'widgetPayment') echo "style='display:none'";?>>
+	<div class="row" <?php if(in_array($displayedPage,array('widgetPayment','configuration'))) echo "style='display:none'";?>>
 		<label for="orderDate">Order date</label>
 		<input type="text" name="orderDate" id="orderDate" value="<?php echo date('d/m/Y H:i')?>" />
 		<span class="help">(format : "dd/mm/yyyy HH24:MM")</span>
@@ -36,26 +71,26 @@
 		<label for="deliveryTime">Delivery time</label>
 		<select	name="deliveryTime" id="deliveryTime">
 			<option value=""></option>
-			<option value="1" selected="selected">1 (Standard)</option>
-			<option value="2">2 (Express)</option>
+			<option value="1" <?php if($_SESSION['deliveryTime'] == "1") echo "selected";?>>1 (Standard)</option>
+			<option value="2" <?php if($_SESSION['deliveryTime'] == "2") echo "selected";?>>2 (Express)</option>
 		</select>
 	</div>
 	<div class="row">
 		<label for="deliveryMode">Delivery mode</label>
 		<select	name="deliveryMode" id="deliveryMode">
 			<option value=""></option>
-			<option value="1">1 (Retrait chez le marchand)</option>
-			<option value="2">2 (Point retrait)</option>
-			<option value="3">3 (Retrait dans un a&#233;roport, une gare ou une agence de voyage)</option>
-			<option value="4" selected="selected">4 (Transporteur priv&#233;)</option>
-			<option value="5">5 (Emission d'un billet &#233;lectronique, t&#233;l&#233;chargements)</option>
+			<option value="1" <?php if($_SESSION['deliveryMode'] == "1") echo "selected";?>>1 (Retrait chez le marchand)</option>
+			<option value="2" <?php if($_SESSION['deliveryMode'] == "2") echo "selected";?>>2 (Point retrait)</option>
+			<option value="3" <?php if($_SESSION['deliveryMode'] == "3") echo "selected";?>>3 (Retrait dans un a&#233;roport, une gare ou une agence de voyage)</option>
+			<option value="4" <?php if($_SESSION['deliveryMode'] == "4") echo "selected";?>>4 (Transporteur priv&#233;)</option>
+			<option value="5" <?php if($_SESSION['deliveryMode'] == "5") echo "selected";?>>5 (Emission d'un billet &#233;lectronique, t&#233;l&#233;chargements)</option>
 		</select>
 	</div>
-	<div class="row">
+	<div class="row" <?php if($displayedPage == 'configuration') echo "style='display:none'";?>>
 		<label for="deliveryExpectedDate">Expected delivery date</label>
 		<input type="text" name="deliveryExpectedDate" id="deliveryExpectedDate" value="<?php echo date('d/m/Y', strtotime(sprintf('now + %d day', 4)))?>" />
 	</div>
-	<div class="row">
+	<div class="row" <?php if($displayedPage == 'configuration') echo "style='display:none'";?>>
 		<label for="deliveryExpectedDelay">Expected delivery delay</label>
 		<input type="text" name="deliveryExpectedDelay" id="deliveryExpectedDelay" value="4" />
 	</div>
@@ -67,85 +102,85 @@
     		<td>
     			<div class="row">
 					<label for="orderDetailRef1">Item 1 reference</label>
-					<input type="text" name="orderDetailRef1" id="orderDetailRef1" value="reference1" maxlength="50" />
+					<input type="text" name="orderDetailRef1" id="orderDetailRef1" value="<?php echo $_SESSION['orderDetailRef1'] ?>" maxlength="50" />
 				</div>
 				<div class="row">
 					<label for="orderDetailPrice1">Item 1 price</label>
-					<input type="text" name="orderDetailPrice1" id="orderDetailPrice1" value="400" />
+					<input type="text" name="orderDetailPrice1" id="orderDetailPrice1" value="<?php echo $_SESSION['orderDetailPrice1'] ?>" />
 				</div>
 				<div class="row">
 					<label for="orderDetailQuantity1">Item 1 quantity</label>
-					<input type="text" name="orderDetailQuantity1" id="orderDetailQuantity1" value="1" />
+					<input type="text" name="orderDetailQuantity1" id="orderDetailQuantity1" value="<?php echo $_SESSION['orderDetailQuantity1'] ?>" />
 				</div>
 				<div class="row">
 					<label for="orderDetailComment1">Item 1 comment</label>
-					<textarea name="orderDetailComment1" id="orderDetailComment1">Comment for item 1</textarea>
+					<textarea name="orderDetailComment1" id="orderDetailComment1"><?php echo $_SESSION['orderDetailComment1'] ?></textarea>
 				</div>
 				<div class="row">
 					<label for="orderDetailCategory1">Item 1 category</label>
-					<input type="text" name="orderDetailCategory1" id="orderDetailCategory1" value="10" />
+					<input type="text" name="orderDetailCategory1" id="orderDetailCategory1" value="<?php echo $_SESSION['orderDetailCategory1'] ?>" />
 				</div>
 				<div class="row">
 					<label for="orderDetailSubcategory1_1">Item 1 sub-category 1</label>
-					<input type="text" name="orderDetailSubcategory1_1" id="orderDetailSubcategory1_1" value="" />
+					<input type="text" name="orderDetailSubcategory1_1" id="orderDetailSubcategory1_1" value="<?php echo $_SESSION['orderDetailSubcategory1_1'] ?>" />
 				</div>
 				<div class="row">
 					<label for="orderDetailSubcategory2_1">Item 1 sub-category 2</label>
-					<input type="text" name="orderDetailSubcategory2_1" id="orderDetailSubcategory2_1" value="" />
+					<input type="text" name="orderDetailSubcategory2_1" id="orderDetailSubcategory2_1" value="<?php echo $_SESSION['orderDetailSubcategory2_1'] ?>" />
 				</div>				
 				<div class="row">
 					<label for="orderDetailBrand1">Item 1 brand</label>
-					<input type="text" name="orderDetailBrand1" id="orderDetailBrand1" value="br1" />
+					<input type="text" name="orderDetailBrand1" id="orderDetailBrand1" value="<?php echo $_SESSION['orderDetailBrand1'] ?>" />
 				</div>
 				<div class="row">
 					<label for="orderDetailAdditionalData1">Item 1 additional data</label>
-					<input type="text" name="orderDetailAdditionalData1" id="orderDetailAdditionalData1" value="" />
+					<input type="text" name="orderDetailAdditionalData1" id="orderDetailAdditionalData1" value="<?php echo $_SESSION['orderDetailAdditionalData1'] ?>" />
 				</div>
 				<div class="row">
 					<label for="orderDetailTaxRate1">Item 1 tax rate</label>
-					<input type="text" name="orderDetailTaxRate1" id="orderDetailTaxRate1" value="5" />
+					<input type="text" name="orderDetailTaxRate1" id="orderDetailTaxRate1" value="<?php echo $_SESSION['orderDetailTaxRate1'] ?>" />
 				</div>
     		</td>
     		<td>
     			<div class="row">
 					<label for="orderDetailRef2">Item 2 reference</label>
-					<input type="text" name="orderDetailRef2" id="orderDetailRef2" value="reference2" maxlength="50" />
+					<input type="text" name="orderDetailRef2" id="orderDetailRef2" value="<?php echo $_SESSION['orderDetailRef2'] ?>" maxlength="50" />
 				</div>	
 				<div class="row">
 					<label for="orderDetailPrice2">Item 2 price</label>
-					<input type="text" name="orderDetailPrice2" id="orderDetailPrice2" value="600" />
+					<input type="text" name="orderDetailPrice2" id="orderDetailPrice2" value="<?php echo $_SESSION['orderDetailPrice2'] ?>" />
 				</div>
 				<div class="row">
 					<label for="orderDetailQuantity2">Item 2 quantity</label>
-					<input type="text" name="orderDetailQuantity2" id="orderDetailQuantity2" value="1" />
+					<input type="text" name="orderDetailQuantity2" id="orderDetailQuantity2" value="<?php echo $_SESSION['orderDetailQuantity2'] ?>" />
 				</div>
 				<div class="row">
 					<label for="orderDetailComment2">Item 2 comment</label>
-					<textarea name="orderDetailComment2" id="orderDetailComment2">Comment for item 2</textarea>
+					<textarea name="orderDetailComment2" id="orderDetailComment2"><?php echo $_SESSION['orderDetailComment2'] ?></textarea>
 				</div>
 				<div class="row">
 					<label for="orderDetailCategory2">Item 2 category</label>
-					<input type="text" name="orderDetailCategory2" id="orderDetailCategory2" value="10" />
+					<input type="text" name="orderDetailCategory2" id="orderDetailCategory2" value="<?php echo $_SESSION['orderDetailCategory2'] ?>" />
 				</div>
 				<div class="row">
 					<label for="orderDetailSubcategory1_2">Item 2 sub-category 1</label>
-					<input type="text" name="orderDetailSubcategory1_2" id="orderDetailSubcategory1_2" value="" />
+					<input type="text" name="orderDetailSubcategory1_2" id="orderDetailSubcategory1_2" value="<?php echo $_SESSION['orderDetailSubcategory1_2'] ?>" />
 				</div>
 				<div class="row">
 					<label for="orderDetailSubcategory2_2">Item 2 sub-category 2</label>
-					<input type="text" name="orderDetailSubcategory2_2" id="orderDetailSubcategory2_2" value="" />
+					<input type="text" name="orderDetailSubcategory2_2" id="orderDetailSubcategory2_2" value="<?php echo $_SESSION['orderDetailSubcategory2_2'] ?>" />
 				</div>				
 				<div class="row">
 					<label for="orderDetailBrand2">Item 2 brand</label>
-					<input type="text" name="orderDetailBrand2" id="orderDetailBrand2" value="br2" />
+					<input type="text" name="orderDetailBrand2" id="orderDetailBrand2" value="<?php echo $_SESSION['orderDetailBrand2'] ?>" />
 				</div>
 				<div class="row">
 					<label for="orderDetailAdditionalData2">Item 2 additional data</label>
-					<input type="text" name="orderDetailAdditionalData2" id="orderDetailAdditionalData2" value="" />
+					<input type="text" name="orderDetailAdditionalData2" id="orderDetailAdditionalData2" value="<?php echo $_SESSION['orderDetailAdditionalData2'] ?>" />
 				</div>
 				<div class="row">
 					<label for="orderDetailTaxRate2">Item 2 tax rate</label>
-					<input type="text" name="orderDetailTaxRate2" id="orderDetailTaxRate2" value="5" />
+					<input type="text" name="orderDetailTaxRate2" id="orderDetailTaxRate2" value="<?php echo $_SESSION['orderDetailTaxRate2'] ?>" />
 				</div>   
     		</td>
     	</tr>
diff --git a/examples/index/configuration.php b/examples/index/configuration.php
index e99845a..f2df6ee 100644
--- a/examples/index/configuration.php
+++ b/examples/index/configuration.php
@@ -25,6 +25,7 @@ function deleteCss(){
 		<div class="row">
 			<label for="ENVIRONMENT">Environment</label>
 			<select name="ENVIRONMENT" id="ENVIRONMENT">
+				<option value="DEV" <?php if($_SESSION['ENVIRONMENT']=="DEV") echo "selected";?>>DEV</option>
 				<option value="HOMO" <?php if($_SESSION['ENVIRONMENT']=="HOMO") echo "selected";?>>HOMO</option>
 				<option value="PROD" <?php if($_SESSION['ENVIRONMENT']=="PROD") echo "selected";?>>PROD</option>
 			</select>
@@ -589,6 +590,7 @@ function deleteCss(){
 		<input type='hidden' id='deleteFile' name='deleteFile' value=0>		
 	</fieldset>
 	<?php include '../fieldset/buyer.php';?>
+	<?php include '../fieldset/order.php'?>
 	<?php include '../fieldset/privateDataList.php'?>
   <input type="submit" class="submit" value="Sauvegarder">
 </form>
\ No newline at end of file
diff --git a/examples/index/updateConfig.php b/examples/index/updateConfig.php
index dac1528..9a4d7c6 100644
--- a/examples/index/updateConfig.php
+++ b/examples/index/updateConfig.php
@@ -214,8 +214,37 @@
 	    fwrite($handle, '$_SESSION[\'pvdKey'.$n.'\'] = \''.$privateDataKey.'\';'.$nextLine);
 	    fwrite($handle, '$_SESSION[\'pvdValue'.$n.'\'] = \''.$_POST['privateDataValue'][$i].'\';'.$nextLine);
 	    $i ++;
-	}			
-
+	}
+	
+	fwrite($handle, $nextLine.'// order info'.$nextLine);
+	fwrite($handle, '$_SESSION[\'orderOrigin\'] = \''.$_POST['orderOrigin'].'\';'.$nextLine);
+	fwrite($handle, '$_SESSION[\'orderCountry\'] = \''.$_POST['orderCountry'].'\';'.$nextLine);
+	fwrite($handle, '$_SESSION[\'orderTaxes\'] = \''.$_POST['orderTaxes'].'\';'.$nextLine);
+	fwrite($handle, '$_SESSION[\'orderCurrency\'] = \''.$_POST['orderCurrency'].'\';'.$nextLine);
+	fwrite($handle, '$_SESSION[\'orderAmount\'] = \''.$_POST['orderAmount'].'\';'.$nextLine);
+	fwrite($handle, '$_SESSION[\'deliveryTime\'] = \''.$_POST['deliveryTime'].'\';'.$nextLine);
+	fwrite($handle, '$_SESSION[\'deliveryMode\'] = \''.$_POST['deliveryMode'].'\';'.$nextLine);
+	fwrite($handle, '$_SESSION[\'orderDetailRef1\'] = \''.$_POST['orderDetailRef1'].'\';'.$nextLine);
+	fwrite($handle, '$_SESSION[\'orderDetailPrice1\'] = \''.$_POST['orderDetailPrice1'].'\';'.$nextLine);
+	fwrite($handle, '$_SESSION[\'orderDetailQuantity1\'] = \''.$_POST['orderDetailQuantity1'].'\';'.$nextLine);
+	fwrite($handle, '$_SESSION[\'orderDetailComment1\'] = \''.$_POST['orderDetailComment1'].'\';'.$nextLine);
+	fwrite($handle, '$_SESSION[\'orderDetailCategory1\'] = \''.$_POST['orderDetailCategory1'].'\';'.$nextLine);
+	fwrite($handle, '$_SESSION[\'orderDetailSubcategory1_1\'] = \''.$_POST['orderDetailSubcategory1_1'].'\';'.$nextLine);
+	fwrite($handle, '$_SESSION[\'orderDetailSubcategory2_1\'] = \''.$_POST['orderDetailSubcategory2_1'].'\';'.$nextLine);
+	fwrite($handle, '$_SESSION[\'orderDetailBrand1\'] = \''.$_POST['orderDetailBrand1'].'\';'.$nextLine);
+	fwrite($handle, '$_SESSION[\'orderDetailAdditionalData1\'] = \''.$_POST['orderDetailAdditionalData1'].'\';'.$nextLine);
+	fwrite($handle, '$_SESSION[\'orderDetailTaxRate1\'] = \''.$_POST['orderDetailTaxRate1'].'\';'.$nextLine);
+	fwrite($handle, '$_SESSION[\'orderDetailRef2\'] = \''.$_POST['orderDetailRef2'].'\';'.$nextLine);
+	fwrite($handle, '$_SESSION[\'orderDetailPrice2\'] = \''.$_POST['orderDetailPrice2'].'\';'.$nextLine);
+	fwrite($handle, '$_SESSION[\'orderDetailQuantity2\'] = \''.$_POST['orderDetailQuantity2'].'\';'.$nextLine);
+	fwrite($handle, '$_SESSION[\'orderDetailComment2\'] = \''.$_POST['orderDetailComment2'].'\';'.$nextLine);
+	fwrite($handle, '$_SESSION[\'orderDetailCategory2\'] = \''.$_POST['orderDetailCategory2'].'\';'.$nextLine);
+	fwrite($handle, '$_SESSION[\'orderDetailSubcategory1_2\'] = \''.$_POST['orderDetailSubcategory1_2'].'\';'.$nextLine);
+	fwrite($handle, '$_SESSION[\'orderDetailSubcategory2_2\'] = \''.$_POST['orderDetailSubcategory2_2'].'\';'.$nextLine);
+	fwrite($handle, '$_SESSION[\'orderDetailBrand2\'] = \''.$_POST['orderDetailBrand2'].'\';'.$nextLine);
+	fwrite($handle, '$_SESSION[\'orderDetailAdditionalData2\'] = \''.$_POST['orderDetailAdditionalData2'].'\';'.$nextLine);
+	fwrite($handle, '$_SESSION[\'orderDetailTaxRate2\'] = \''.$_POST['orderDetailTaxRate2'].'\';'.$nextLine);
+	
 	fwrite($handle, "?> \n");
 	fclose($handle);
 }else{