springup/cmc-sales
2
0
Fork 0
Code Issues 49 Pull requests Actions Packages Projects Releases Wiki Activity

Tidying up PDF generation. Formatting in Quote viewing

Browse source
This commit is contained in:
Karl Cordes 2010-01-16 16:41:46 -07:00
parent 1d6aba8d90
commit 03e015ea2e
5 changed files with 237 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
controllers/quotes_controller.php
View file

@ -2,7 +2,7 @@
class QuotesController extends AppController { class QuotesController extends AppController {
var $name = 'Quotes'; var $name = 'Quotes';
var $helpers = array('Html', 'Form','Ajax', 'Time'); var $helpers = array('Html', 'Form','Ajax', 'Time', 'Number');
var $components = array('RequestHandler'); var $components = array('RequestHandler');
@ -16,8 +16,14 @@ class QuotesController extends AppController {
$this->Session->setFlash(__('Invalid Quote.', true)); $this->Session->setFlash(__('Invalid Quote.', true));
$this->redirect(array('action'=>'index')); $this->redirect(array('action'=>'index'));
} }
$quote = $this->Quote->read(null, $id);
$this->set('quote', $quote); if (empty($this->data)) {
$quote = $this->Quote->read(null, $id);
$this->data = $quote;
$this->set('quote', $quote);
}
$quoteProducts = $this->Quote->QuoteProduct->find('all', array('recursive' => 0, 'conditions' => array('QuoteProduct.quote_id' => $id), $quoteProducts = $this->Quote->QuoteProduct->find('all', array('recursive' => 0, 'conditions' => array('QuoteProduct.quote_id' => $id),
'order' => array('QuoteProduct.item_number ASC')) 'order' => array('QuoteProduct.item_number ASC'))
@ -25,6 +31,9 @@ class QuotesController extends AppController {
$this->set('customer', $this->Quote->Enquiry->Customer->read(null, $quote['Enquiry']['customer_id'])); $this->set('customer', $this->Quote->Enquiry->Customer->read(null, $quote['Enquiry']['customer_id']));
$this->set('quoteProducts', $quoteProducts); $this->set('quoteProducts', $quoteProducts);
$currencies = $this->Quote->Currency->find('list');
$this->set('currencies', $currencies);
} }
@ -78,7 +87,16 @@ class QuotesController extends AppController {
$this->redirect(array('action'=>'index')); $this->redirect(array('action'=>'index'));
} }
if (!empty($this->data)) { if (!empty($this->data)) {
$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)) { if ($this->Quote->save($this->data)) {
$this->Session->setFlash(__('The Quote has been saved', true)); $this->Session->setFlash(__('The Quote has been saved', true));
$thisquote = $this->Quote->id; $thisquote = $this->Quote->id;
$this->redirect(array('action' =>'view/'.$id), null, false); $this->redirect(array('action' =>'view/'.$id), null, false);
@ -97,7 +115,7 @@ class QuotesController extends AppController {
function pdf($id = null) { function pdf($id = null) {
Configure::write('debug',0); Configure::write('debug',1);
if(!$id) { if(!$id) {
$this->Session->setFlash(__('Invalid Quote', true)); $this->Session->setFlash(__('Invalid Quote', true));
$this->redirect(array('controller'=>'enquiries', 'action'=>'index')); $this->redirect(array('controller'=>'enquiries', 'action'=>'index'));
@ -111,10 +129,65 @@ class QuotesController extends AppController {
'order' => array('QuoteProduct.item_number ASC')) 'order' => array('QuoteProduct.item_number ASC'))
); );
$user = $this->Quote->Enquiry->User->find('first', array('conditions' => array('User.id' => $enquiry['Enquiry']['user_id'])));
/**
* Call the commercial Comments. Need to have already figured out what page to do this on..
*
* * Passing a data structure in the following format.
*
* $details = array(
* 'deliveryTime' => (String) eg. 2-3
* 'paymentTerms => (String) eg. 100% PAYMENT WITH ORDER || NET 30 DAYS FOR APPROVED ACCOUNTS
* 'daysValid' => (Int) eg. 30
* 'deliveryPoint' => (String) eg. EX-CMC Technologies, NSW. || EX-SUPPLIER NAME
* 'exchangeRate' => (String) eg. FIXED
* 'customsDuty' => (String) eg. NIL || 5%
* 'gst' => (String) eg. 10% EXTRA || Not Applicable for Export
* 'salesEngineer' => (String) eg. Karl Cordes || Con Carpis || Kenan Fernandes etc
* );
*
*
*/
if($enquiry['Enquiry']['gst'] == 1) {
$gstPhrase = "10% EXTRA";
}
else {
$gstPhrase = "Not Applicable for Export";
}
$commercialDetails = array (
'deliveryTime' => strtoupper($quote['Quote']['delivery_time']),
'paymentTerms' => strtoupper($quote['Quote']['payment_terms']),
'validFor' => $quote['Quote']['days_valid'],
'deliveryPoint' => strtoupper($quote['Quote']['delivery_point']),
'exchangeRate' => strtoupper($quote['Quote']['exchange_rate']),
'customsDuty' => strtoupper($quote['Quote']['customs_duty']),
'gst' => strtoupper($gstPhrase),
'salesEngineer' => strtoupper($user['User']['first_name'].' '.$user['User']['last_name'])
);
$this->set('commercialDetails', $commercialDetails);
debug($quote);
debug($commercialDetails);
$this->set('quote', $quote); $this->set('quote', $quote);
$this->set('enquiry', $enquiry); $this->set('enquiry', $enquiry);
$this->set('products', $quoteProducts); $this->set('products', $quoteProducts);
@ -122,5 +195,8 @@ class QuotesController extends AppController {
} }
} }
?> ?>

93
vendors/xtcpdf.php vendored
View file

@ -143,7 +143,14 @@ class XTCPDF extends TCPDF {
$this->Image(K_PATH_IMAGES.'cmclogosmall.jpg', 10, 10, 15, 13.6, null, 'http://www.cmctechnologies.com.au', null, false, null, 'L'); $this->Image(K_PATH_IMAGES.'cmclogosmall.jpg', 10, 10, 15, 13.6, null, 'http://www.cmctechnologies.com.au', null, false, null, 'L');
$this->SetFontSize(10); $this->SetFontSize(10);
$pageNo = $this->PageNoFormatted(); $pageNo = $this->PageNoFormatted();
$this->MultiCell(0,13.6, "$cmcRef PAGE $pageNo OF {nb}", '', 'R');
$currentX = $this->GetX();
$this->SetX($currentX + 40);
$this->MultiCell(100, 13.6, $cmcRef." CONTINUES", '','C', 0, 0);
$this->MultiCell(0,13.6, "PAGE $pageNo OF {nb}", '', 'R');
//$this->MultiCell($w, $h, $txt, $border, $align, $fill, $ln, $x, $y, $reseth, $stretch, $ishtml) //$this->MultiCell($w, $h, $txt, $border, $align, $fill, $ln, $x, $y, $reseth, $stretch, $ishtml)
//$this->Image($file, $x, $y, $w, $h, $type, $link, $align, $resize, $dpi) //$this->Image($file, $x, $y, $w, $h, $type, $link, $align, $resize, $dpi)
@ -157,8 +164,9 @@ class XTCPDF extends TCPDF {
* @param int $gst - 0 or 1 if GST is applicable. * @param int $gst - 0 or 1 if GST is applicable.
* @param <type> $products * @param <type> $products
* @param String $docType - the model name of the Products we want to put in the table. ie. QuoteProduct, or InvoiceProduct, etc * @param String $docType - the model name of the Products we want to put in the table. ie. QuoteProduct, or InvoiceProduct, etc
* @param Map $commercialDetails - the details array/map - passed to commercialComments()
*/ */
function productPage($principleName, $currency,$gst, $products ,$docType) { function productPage($principleName, $currency,$gst, $products ,$docType, $commercialDetails) {
$this->SetFontSize(10); $this->SetFontSize(10);
@ -185,7 +193,7 @@ class XTCPDF extends TCPDF {
$availableHeight = 253; //Figured out experimentally. Approx 253mm of space left for the actual table data after the header rows. $availableHeight = 253; //Figured out experimentally. Approx 253mm of space left for the actual table data after the header rows.
// echo "Remaining space on the page is: $availableHeight <br>"; // echo "Remaining space on the page is: $availableHeight <br>";
$pagesRequired = 1; $pagesRequired = 1;
@ -194,7 +202,7 @@ class XTCPDF extends TCPDF {
$remainingHeight = $availableHeight; $remainingHeight = $availableHeight;
$pageProducts = array(); //Array in the form $pageProducts[$pageNumber] = NUMBER_OF_ITEMS_ON_THIS_PAGE $pageProducts = array(); //Array in the form $pageProducts[$pageNumber] = NUMBER_OF_ITEMS_ON_THIS_PAGE
//Can see already the final summary total thing is going to be a bit of a bitch to do.
foreach ($products as $product) { foreach ($products as $product) {
@ -224,6 +232,7 @@ class XTCPDF extends TCPDF {
*/ */
if(end($products) == $product) { if(end($products) == $product) {
} }
@ -360,6 +369,28 @@ class XTCPDF extends TCPDF {
//End Page For //End Page For
} }
/**
* Call the commercial Comments. Need to have already figured out what page to do this on..
*
* * Passing a data structure in the following format.
*
* $details = array(
* 'deliveryTime' => (String) eg. 2-3
* 'timeScale' => (String) eg. WORKING DAYS || WEEKS || MONTHS
* 'paymentTerms => (String) eg. 100% PAYMENT WITH ORDER || NET 30 DAYS FOR APPROVED ACCOUNTS
* 'validFor' => (String) eg. 30 Days
* 'deliveryPoint' => (String) eg. EX-CMC Technologies, NSW. || EX-SUPPLIER NAME
* 'exchangeRate' => (String) eg. FIXED
* 'customsDuty' => (String) eg. NIL || 5%
* 'gst' => (String) eg. 10% EXTRA || Not Applicable for Export
* 'salesEngineer' => (String) eg. Karl Cordes || Con Carpis || Kenan Fernandes etc
* );
*
*
*/
$this->commercialComments($commercialDetails);
$this->AliasNbPages(); $this->AliasNbPages();
@ -384,6 +415,58 @@ class XTCPDF extends TCPDF {
else { else {
return $symbol.number_format($number, 0, '.', ','); return $symbol.number_format($number, 0, '.', ',');
} }
}
/**
*
* Print out the commercial comments in a CMC Quotation.
*
*
* Receives a data structure in the following format.
*
* $details = array(
* 'deliveryTime' => (String) eg. 2-3
* 'paymentTerms => (String) eg. 100% PAYMENT WITH ORDER || NET 30 DAYS FOR APPROVED ACCOUNTS
* 'validFor' => (String) eg. 30 Days
* 'deliveryPoint' => (String) eg. EX-CMC Technologies, NSW. || EX-SUPPLIER NAME
* 'exchangeRate' => (String) eg. FIXED
* 'customsDuty' => (String) eg. NIL || 5%
* 'gst' => (String) eg. 10% EXTRA || Not Applicable for Export
* 'salesEngineer' => (String) eg. Karl Cordes || Con Carpis || Kenan Fernandes etc
* );
*/
function commercialComments($details) {
//$this->MultiCell($w, $h, $txt, $border, $align, $fill, $ln, $x, $y, $reseth, $stretch, $ishtml)
$this->MultiCell(0, 0, "<b><u>Commercial Comments:</u></b>", 0, 'L', 0, 1, null, null, 1, null, true);
$validUntilDate = strtotime('now + '.$details["validFor"].' days');
$niceValidUntilDate = strtoupper(date('l j F Y',$validUntilDate));
$listHtmlContents = <<<ENDHTMLCONTENTS
<ol>
<li><b>DELIVERY</b> IS ESTIMATED AT {$details["deliveryTime"]} ({$details["deliveryPoint"]}) FROM RECEIPT OF YOUR TECHNICALLY AND COMMERCIALLY CLEAR ORDER.</li>
<li><b>PAYMENT TERMS:</b> {$details["paymentTerms"]}.</li>
<li><b>QUOTATION IS VALID</b> FOR: <u>{$details["validFor"]} DAYS</u> (UNTIL {$niceValidUntilDate}).</li>
<li>ALL PRICES ARE <u>{$details["deliveryPoint"]}</u>.</li>
<li>EXCHANGE RATE: {$details["exchangeRate"]}.</li>
<li>CUSTOMS DUTY INCLUDED AT: {$details["customsDuty"]}%.</li>
<li>GST: {$details["gst"]}.</li>
<li>WHEN PAYMENTS ARE MADE INTO OUR BANK ACCOUNT, BANK CHARGES ARE YOUR RESPONSIBILITY.<li>
</ol>
ANY VARIATIONS ON ITEMS 5. TO 7. WILL BE TO YOUR ACCOUNT. THIS QUOTATION IS BASED ON QUANTITIES STATED AND
IS SUBJECT TO CHANGE IF QUANTITIES VARY.
<br>
ENDHTMLCONTENTS;
$this->MultiCell(0, 0, $listHtmlContents, 0, 'L', 0, 1, null, null, 1, null, true);
$this->MultiCell(0, 0, "Signed: ____________________________", 0, 'L');
$this->MultiCell(0, 0, " ".$details["salesEngineer"], 0, 'L');
@ -394,6 +477,8 @@ class XTCPDF extends TCPDF {
} }

4
views/quotes/pdf.ctp
View file

@ -91,7 +91,9 @@ foreach ($quote['QuotePage'] as $page) {
$principle_name = strtoupper($enquiry['Principle']['name']); $principle_name = strtoupper($enquiry['Principle']['name']);
$tcpdf->productPage($principle_name, $quote['Currency'], $enquiry['Enquiry']['gst'], $products, 'QuoteProduct'); debug($commercialDetails);
$tcpdf->productPage($principle_name, $quote['Currency'], $enquiry['Enquiry']['gst'], $products, 'QuoteProduct', $commercialDetails);

61
views/quotes/view.ctp
View file

@ -98,11 +98,11 @@ foreach ($quote['QuotePage'] as $quotePage):
<td><?php echo $quote['Currency']['symbol'].$quoteProduct['QuoteProduct']['unit_price'];?></td> <td><?php echo $quote['Currency']['symbol'].$quoteProduct['QuoteProduct']['unit_price'];?></td>
<td><?php <td><?php
$thisNetPrice = $quoteProduct['QuoteProduct']['unit_price']*$quoteProduct['QuoteProduct']['quantity']; $thisNetPrice = $quoteProduct['QuoteProduct']['unit_price']*$quoteProduct['QuoteProduct']['quantity'];
$subTotal += $thisNetPrice; $subTotal += $thisNetPrice;
echo $quote['Currency']['symbol'].$thisNetPrice; ?></td> echo $quote['Currency']['symbol'].$thisNetPrice; ?></td>
<td class="actions"> <td class="actions">
<?php echo $html->link(__('View', true), array('controller'=> 'quote_products', 'action'=>'view', $quoteProduct['QuoteProduct']['id'])); ?> <?php echo $html->link(__('View', true), array('controller'=> 'quote_products', 'action'=>'view', $quoteProduct['QuoteProduct']['id'])); ?>
@ -131,18 +131,18 @@ foreach ($quote['QuotePage'] as $quotePage):
<td class="rightAlign">GST (10%)</td> <td class="rightAlign">GST (10%)</td>
<td></td> <td></td>
<td><?php <td><?php
if($quote['Enquiry']['gst'] == 1 ) { if($quote['Enquiry']['gst'] == 1 ) {
$gst = 0.1 * $subTotal; $gst = 0.1 * $subTotal;
echo $quote['Currency']['symbol'].$gst; echo $quote['Currency']['symbol'].$gst;
} }
else { else {
$gst = 0; $gst = 0;
echo "N/A"; echo "N/A";
} }
?></td> ?></td>
<td></td> <td></td>
</tr> </tr>
@ -154,9 +154,9 @@ foreach ($quote['QuotePage'] as $quotePage):
<td class="rightAlign">TOTAL PAYABLE</td> <td class="rightAlign">TOTAL PAYABLE</td>
<td></td> <td></td>
<td><?php <td><?php
$total = $subTotal + $gst; $total = $subTotal + $gst;
echo $quote['Currency']['symbol'].$total; echo $quote['Currency']['symbol'].$total;
?> ?>
</td> </td>
<td></td> <td></td>
</tr> </tr>
@ -176,9 +176,34 @@ foreach ($quote['QuotePage'] as $quotePage):
</ul> </ul>
</div> </div>
<div class="commercialComments">
<h3><?php __('Commercial Details');?></h3>
<?php echo $form->create('Quote');?>
<fieldset>
<?php
echo $form->input('id', array('type' => 'hidden', 'value' => $quote['Quote']['id']));
echo $form->input('enquiry_id', array('type' => 'hidden'));
echo $form->input('delivery_time');
echo $this->element('payment_terms_box');
echo $form->input('date_issued');
echo $form->input('days_valid', array('default'=>'30'));
echo $form->input('currency_id', array('label' => 'Sale Currency', 'options' => $currencies));
echo $form->input('delivery_point', array('default' => 'EX-CMC TECHNOLOGIES, ALEXANDRIA NSW'));
echo $form->input('exchange_rate', array('default' => 'FIXED'));
echo $form->input('customs_duty', array('default' => 'NIL'));
echo $form->end('Update Commercial Terms');
?>
</fieldset>
</div>
</div> </div>
<?php // debug($quote);
?>

8
webroot/css/quotenik.css
View file

@ -718,6 +718,7 @@ form.MER-inplace-select {
padding-right: 0; padding-right: 0;
margin: 0; margin: 0;
width: 100px; width: 100px;
font-size: 70%;
} }
select.MER-inplace-select { select.MER-inplace-select {
width: 100px; width: 100px;
@ -1127,3 +1128,10 @@ div.categorylist h3 a:hover {
div#costingwrapper { div#costingwrapper {
display: none; display: none;
} }
div.commercialComments {
clear: both;
display: block;
padding-top: 3%;
}