From e5edf973fdeb1b673b142960068239493b747c47 Mon Sep 17 00:00:00 2001
From: Karl Cordes <karlcordes@gmail.com>
Date: Mon, 20 Jun 2011 15:12:41 +1000
Subject: [PATCH] Decimal helper added

---
 controllers/jobs_controller.php   |  2 +-
 controllers/quotes_controller.php |  4 ++--
 views/helpers/decimal.php         | 32 +++++++++++++++++++++++++++++++
 views/quotes/edit.ctp             |  3 +++
 webroot/js/document_add_edit.js   |  5 +++++
 5 files changed, 43 insertions(+), 3 deletions(-)
 create mode 100644 views/helpers/decimal.php

diff --git a/controllers/jobs_controller.php b/controllers/jobs_controller.php
index c0171db7..085e6d83 100755
--- a/controllers/jobs_controller.php
+++ b/controllers/jobs_controller.php
@@ -526,7 +526,7 @@ class JobsController extends AppController {
 	if(isset($this->data)) {
 	    //$data = json_decode($this->data);
 
-	    print_r($this->data);
+	   // print_r($this->data);
 	}
 
     }
diff --git a/controllers/quotes_controller.php b/controllers/quotes_controller.php
index 219eeee8..cf4067b2 100755
--- a/controllers/quotes_controller.php
+++ b/controllers/quotes_controller.php
@@ -96,13 +96,13 @@ class QuotesController extends AppController {
 	    $this->redirect(array('action'=>'index'));
 	}
 	if (!empty($this->data)) {
-	    $issuedate = $this->data['Quote']['date_issued'];
+	    /*$issuedate = $this->data['Quote']['date_issued'];
 	    $issuedate = $issuedate['year'].'-'.$issuedate['month'].'-'.$issuedate['day'];
 
 	    $validUntilDate = strtotime($issuedate."+ ".$this->data['Quote']['days_valid']." days");
 
 	    $this->data['Quote']['valid_until'] = date('Y-m-d', $validUntilDate);
-
+	    */
 
 	    if ($this->Quote->save($this->data)) {
 
diff --git a/views/helpers/decimal.php b/views/helpers/decimal.php
new file mode 100644
index 00000000..ea783971
--- /dev/null
+++ b/views/helpers/decimal.php
@@ -0,0 +1,32 @@
+<?
+class DecimalHelper extends AppHelper {
+
+    function formatDecimal($num) {
+	if(floor($num) == $num) { //whole number.
+	    $formatted = number_format($num, 0);
+	}
+	else {
+	    $formatted = number_format($num, 2);
+	}
+
+	return $this->output($formatted);
+    }
+
+    function formatMoney($number, $cents = 1) { // cents: 0=never, 1=if needed, 2=always
+	if (is_numeric($number)) { // a number
+	    if (!$number) { // zero
+		$money = ($cents == 2 ? '0.00' : '0'); // output zero
+	    } else { // value
+		if (floor($number) == $number) { // whole number
+		    $money = number_format($number, ($cents == 2 ? 2 : 0)); // format
+		} else { // cents
+		    $money = number_format(round($number, 2), ($cents == 0 ? 0 : 2)); // format
+		} // integer or decimal
+	    } // value
+	    return '$'.$money;
+	} // numeric
+    } // formatMoney
+
+}
+
+?>
diff --git a/views/quotes/edit.ctp b/views/quotes/edit.ctp
index 5755d802..5857067a 100755
--- a/views/quotes/edit.ctp
+++ b/views/quotes/edit.ctp
@@ -32,6 +32,9 @@ echo $form->input('enquiry_id', array('type'=>'hidden'));
 echo $form->input('currency_id');
 echo $form->input('revision', array('type'=>'hidden'));
 echo $form->input('delivery_time');
+echo $form->input('delivery_time_frame',array('type'=>'select', 'empty'=>'Choose Delivery Time Frame', 'options'=>array('WORKING DAYS'=>'WORKING DAYS', 'WORKING WEEKS'=>'WORKING WEEKS')));
+
+
 echo $form->input('payment_terms');
 echo $form->input('days_valid');
 echo $form->input('date_issued_display', array('id'=>'date_issued_display', 'label'=>'Date Issued', 'value'=>$this->element('isEmptyDate', array('date'=>$this->data['Quote']['date_issued']))));
diff --git a/webroot/js/document_add_edit.js b/webroot/js/document_add_edit.js
index ac71c342..31f47601 100644
--- a/webroot/js/document_add_edit.js
+++ b/webroot/js/document_add_edit.js
@@ -305,6 +305,11 @@ $(function() {
     });
 
 
+    $("#QuoteDeliveryTimeFrame").live('change', function() {
+	tf = $(this).val();
+	alert(tf);
+    });
+
 });