From d06e03b7077549acee3f7b8d8f0dade84b6932ab Mon Sep 17 00:00:00 2001
From: vSchoener <vincent.schoener@prestashop.com>
Date: Fri, 18 Nov 2011 13:19:13 +0000
Subject: [PATCH] // Update Accounting, handle errors for Date and fix bug when
 default_account_number isn't set at all

---
 .../accounting_export/common_form.tpl         |  3 ++
 .../template/accounting_export/menu.tpl       | 36 ++++++++++++++++++-
 .../admin/AdminAccountingExportController.php |  4 ++-
 css/admin.css                                 | 11 ++++++
 4 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/admin-dev/themes/template/accounting_export/common_form.tpl b/admin-dev/themes/template/accounting_export/common_form.tpl
index a8eb50632..28324e4ee 100644
--- a/admin-dev/themes/template/accounting_export/common_form.tpl
+++ b/admin-dev/themes/template/accounting_export/common_form.tpl
@@ -35,14 +35,17 @@
 <label for="clientPrefix">{l s='Client prefix:'}</label>
 <div class="margin-form">
 	<input type="text" value="{$clientPrefix}" name="clientPrefix" />
+	<span class="input-error"></span>
 </div>
 
 <label for="beginDate">{l s='Begin to:'}</label>
 <div class="margin-form">
 	<input class="datepicker" id="beginDate_{$type}" type="text" name="beginDate" value="{$begin_date}" />
+	<span class="input-error">{l s="The date has not the right format"}</span>
 </div>
 
 <label for="endDate">{l s='End to:'}</label>
 <div class="margin-form">
 	<input class="datepicker" id="endDate_{$type}" type="text" name="endDate" value="{$end_date}" />
+	<span class="input-error">{l s="The date has not the right format"}</span>
 </div>
diff --git a/admin-dev/themes/template/accounting_export/menu.tpl b/admin-dev/themes/template/accounting_export/menu.tpl
index 530034a8f..c3e2f61a3 100644
--- a/admin-dev/themes/template/accounting_export/menu.tpl
+++ b/admin-dev/themes/template/accounting_export/menu.tpl
@@ -25,12 +25,42 @@
 *}
 
 <script type="text/javascript">
+	
+	function validateInputDate(input, displayError)
+	{
+		{literal}
+		dateRegex = /^\d{4}-\d{1,2}-\d{1,2}$/
+  	{/literal}
+			
+  	if (!input.val().match(dateRegex))
+  	{
+			input.parent().find('span.input-error').fadeIn('fast');
+			return false;
+		}
+		input.parent().find('span.input-error').css('display','none');
+		return true;
+	}
+	
+	function validateAccountingForm()
+	{
+		validation = true;
+		
+		$('span.input-error').css('display', 'none');
+		$('.datepicker:visible').each(function() {
+			if (!(validateInputDate($(this), true)))
+				validation = false;
+		});
+    
+		return validation;
+	}
+	
 	$(document).ready(function() {
 		$('#export_menu').find('a').each(function() {
 			$(this).click(function() {
 				blockID = 'block_' + $(this).attr('id');
 				if (!$('#' + blockID).is(':visible'))
 				{
+				
 					$('.formAccountingExport:visible').each(function() {
 						$(this).fadeOut('fast', function() {
 							$('#' + blockID).fadeIn('fast');
@@ -39,9 +69,13 @@
 				}
 			});
 		});
+		
 		$('#' + '{$defaultType}').fadeIn('fast');
 	
 		$('.datepicker').each(function() {
+			$(this).change(function() {
+				validateInputDate($(this), true);
+			});
 			$(this).datepicker({
 	     prevText: '',
 	     nextText: '',
@@ -52,7 +86,7 @@
     $('.formAccountingExport form input[type="submit"]').each(function()
     {
     	$(this).click(function() {
-    		// TODO : Handle errors
+    		return validateAccountingForm();
     	});
     });
 	});
diff --git a/controllers/admin/AdminAccountingExportController.php b/controllers/admin/AdminAccountingExportController.php
index f354e0d02..b52effbd9 100644
--- a/controllers/admin/AdminAccountingExportController.php
+++ b/controllers/admin/AdminAccountingExportController.php
@@ -308,6 +308,8 @@ class AdminAccountingExportControllerCore extends AdminController
 			case 1:
 				$line[2] = !empty($row['account']) ? $row['account'] : 
 					Configuration::get('default_account_number', NULL, NULL, $row['id_shop']);
+				// Force an empty string if Configuration send false
+				$line[2] = empty($line[2]) ? '' : $linep[2];
 				$line[5] = $row['product_price_ht'];
 				break;
 			case 2:
@@ -379,7 +381,7 @@ class AdminAccountingExportControllerCore extends AdminController
  					WHEN (acc_zs.`account_number` != "" AND acc_zs.`account_number` IS NOT NULL) THEN acc_zs.`account_number`
  					ELSE  ""
 				END AS account,
-				CONCAT(\''.Configuration::get('PS_INVOICE_PREFIX').'\', LPAD(o.`invoice_number`, 6, 0)) AS invoice_number,
+				CONCAT(\''.Configuration::get('PS_INVOICE_PREFIX').'\', LPAD(o.`invoice_number`, 6, "0")) AS invoice_number,
 				o.`total_paid_real`,
 				od.`product_price` AS product_price_ht,
 				pcc.`transaction_id`,
diff --git a/css/admin.css b/css/admin.css
index 298af4315..4aa4696d1 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -1810,3 +1810,14 @@ ul.connectedSortable li.module_list {
 .formAccountingExport {
 	display: none;
 }
+
+.input-error
+{
+	color:#D8000C;
+	font-size:12px;
+	font-weight:normal;
+	margin: 0 0 10px 0;
+	line-height: 20px;
+	padding: 10px 15px;
+	display:none;
+}
\ No newline at end of file