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

Starting quote views. AJAX viewing in a DIV of the Cover Pages.

Browse source
This commit is contained in:
Karl Cordes 2009-08-14 12:09:47 +10:00
parent 53cd0aac60
commit 1f8ab12454
20 changed files with 260 additions and 269 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/core.php
View file

@ -66,7 +66,7 @@
* 'admin' -> admin_index() and /admin/controller/index
* 'superuser' -> superuser_index() and /superuser/controller/index
*/
//Configure::write('Routing.admin', 'admin');
Configure::write('Routing.admin', 'admin');
/**
* Turn off all caching application-wide.

3
controllers/emails_controller.php
View file

@ -39,8 +39,9 @@ class EmailsController extends AppController {
function show($id = null) {
$this->layout = 'minimal';
$this->set('email', $this->Email->read(null, $id));
}
/* Violates DRY. Should probably clean this up at some point */
function printview($id = null) {
$this->layout = 'minimal';

43
controllers/enquiries_controller.php
View file

@ -1,15 +1,17 @@
<?php
App::import('Core', 'Sanitize');
class EnquiriesController extends AppController {
var $name = 'Enquiries';
var $helpers = array('Html', 'Form', 'Javascript', 'Time', 'Ajax', 'Number', 'Text', 'Cache');
var $paginate = array(
'contain' => false,
'limit' => 250,
'order'=>array('Enquiry.id' => 'desc'));
'order'=>array('Enquiry.id' => 'desc')
);
var $components = array('RequestHandler', 'Email');
@ -19,15 +21,13 @@ class EnquiriesController extends AppController {
function index() {
$this->Enquiry->recursive = 0;
$this->set('enquiries', $this->paginate());
$statuses = $this->Enquiry->Status->find('all');
$statuses = $this->Enquiry->Status->find('all', array('recursive'=>0));
$status_list = array();
foreach ($statuses as $status) {
$status_list[] = array($status['Status']['id'], $status['Status']['name']);
}
$this->set('status_list', $status_list);
//debug($this->paginate());
// $this->set('status_list', $this->Enquiry->Status->find('list'));
}
@ -36,17 +36,38 @@ class EnquiriesController extends AppController {
$this->Session->setFlash(__('Invalid Enquiry.', true));
$this->redirect(array('action'=>'index'));
}
$enquiry = $this->Enquiry->read(null, $id);
//$enquiry = $this->Enquiry->read(null, $id);
$enquiry = $this->Enquiry->find('first', array('recursive' => 0, 'conditions' => array('Enquiry.id'=>$id)
));
$this->set('enquiry', $enquiry);
$this->set('quotes', $enquiry['Quote']);
//$this->set('quotes', $this->Enquiry->Quote->find('all', array('conditions'=>array('Quote.enquiry_id'=>$id), 'order'=>'Quote.revision DESC')));
//$this->set('quotes', $enquiry['Quote']);
$this->set('quotes', $this->Enquiry->Quote->find('all', array('recursive' => 0, 'conditions'=>array('Quote.enquiry_id'=>$id), 'order'=>'Quote.revision DESC')));
$this->set('files', $this->Enquiry->EnquiryFile->find('all', array('conditions' => array('EnquiryFile.enquiry_id'=>$id), 'order' => 'EnquiryFile.created ASC')));
$this->set('emails', $this->Enquiry->Email->find('all', array('conditions' => array('Email.enquiry_id'=>$id), 'order' => 'Email.created DESC')));
/* Trying to optimise the queries for this part of the view - it's currently getting bogged down checking Email Attachments.
* Going to create an array describing whether a particular email ID has an attachment. Trying to avoid checking binary data in a find('all') call
*/
/*
$emails = $this->Enquiry->Email->find('all', array(
'recursive' => 0,
'contain' => 'EmailAttachment.id', 'EmailAttachment.email_id',
'fields' => array('Email.id', 'Email.created', 'Email.subject', 'Email.to', 'Email.from', 'Email.cc', 'Email.date'),
'conditions' => array('Email.enquiry_id'=>$id), 'order' => 'Email.created DESC'));
$this->set('emails', $emails);
TO DO:
* Fix up Email Attachment icon on email box. Currently broken -KC 6/8/09
$this->set('number_of_emails', $this->Enquiry->Email->find('count', array('conditions'=>array('Email.enquiry_id'=>$id))));
*/
$this->set('number_of_quotes', $this->Enquiry->Quote->find('count', array('conditions'=>array('Quote.enquiry_id'=>$id))));
$this->set('number_of_files', $this->Enquiry->EnquiryFile->find('count', array('conditions' => array('EnquiryFile.enquiry_id'=>$id))));
$this->set('principle_emails', $this->Enquiry->Principle->PrincipleContact->findAllByPrincipleId($enquiry['Enquiry']['principle_id']));
if($enquiry['Enquiry']['billing_address_id'] != 0) {
$this->set('billingaddress', $this->Enquiry->BillingAddress->findById($enquiry['Enquiry']['billing_address_id']));
}

11
controllers/quotes_controller.php
View file

@ -2,7 +2,9 @@
class QuotesController extends AppController {
var $name = 'Quotes';
var $helpers = array('Html', 'Form');
var $helpers = array('Html', 'Form','Ajax');
var $components = array('RequestHandler');
function index() {
$this->Quote->recursive = 0;
@ -29,6 +31,13 @@ class QuotesController extends AppController {
if ($this->Quote->save($this->data)) {
$quoteid = $this->Quote->id;
$this->Quote->QuotePage->create();
$this->data['QuotePage']['quote_id'] = $quoteid;
$this->data['QuotePage']['page_number'] = '1';
$this->Quote->QuotePage->save($this->data);
$this->Session->setFlash(__('The Quote has been saved', true));
$this->redirect(array('action'=>'view/'.$quoteid));
}

6
models/quote.php
View file

@ -33,7 +33,11 @@ class Quote extends AppModel {
'exclusive' => '',
'finderQuery' => '',
'counterQuery' => ''
)
),
'QuotePage' => array('className' => 'QuotePage',
'foreignKey' => 'quote_id',
'dependent' => true)
);
}

6
views/elements/quote_table.ctp
View file

@ -19,10 +19,10 @@
$i++;
?>
<tr<?php echo $class;?>>
<td><?php echo $quote['revision'];?></td>
<td><?php echo $time->nice($quote['created']);?></td>
<td><?php echo $quote['Quote']['revision'];?></td>
<td><?php echo $time->nice($quote['Quote']['created']);?></td>
<td class="actions">
<?php echo $html->link(__('View', true), array('controller'=> 'quotes', 'action'=>'view', $quote['id'])); ?>
<?php echo $html->link(__('View', true), array('controller'=> 'quotes', 'action'=>'view', $quote['Quote']['id'])); ?>
</td>
</tr>
<?php endforeach; ?>

10
views/enquiries/view.ctp
View file

@ -116,11 +116,15 @@ $boxdata['enquirynumber'] = $enquiry['Enquiry']['title'];
</div>
<? /*
<div class="related">
<h3><?php __($number_of_emails.' Emails for this Enquiry');?><?php echo $html->image('internet-mail.png'); ?></h3>
<?php echo $this->element('email_table_ajax', $enquiry); ?>
<h3>
<?php __($number_of_emails.' Emails for this Enquiry');?><?php echo $html->image('internet-mail.png'); ?></h3>
<?php //echo $this->element('email_table_ajax', $enquiry); ?>
<?php echo $this->element('email_table_ajax', $enquiry, array('cache'=>'+1 day')); ?>
</div>
*/
?>
<div class="related">
<h3><?php __($number_of_quotes.' Quotes in this Enquiry');?></h3>

6
views/helpers/fck.php
View file

@ -9,8 +9,10 @@ class FckHelper extends AppHelper {
*
* @param array $namepair - used to build textarea name for views, array('Model', 'fieldname')
* @param string $content
* @param int $width
* @param int $height
*/
function fckeditor($namepair, $content){
function fckeditor($namepair, $content, $width=600, $height=600){
$editor_name = 'data';
foreach ($namepair as $name){
$editor_name .= "[" . $name . "]";
@ -19,6 +21,8 @@ class FckHelper extends AppHelper {
$oFCKeditor = new FCKeditor($editor_name) ;
$oFCKeditor->BasePath = '/quotenik1.2/js/fckeditor/' ;
$oFCKeditor->Value = $content ;
$oFCKeditor->Width = $width;
$oFCKeditor->Height = $height;
$oFCKeditor->Create() ;
}
}

4
views/layouts/default.ctp
View file

@ -101,9 +101,9 @@ if (window.attachEvent) window.attachEvent("onload", sfHover);
</ul>
</li>
<li><h3><?php echo $html->link('Products', '/product_categories/index'); ?></h3>
<li><h3><?php echo $html->link('Products', '/products/index'); ?></h3>
<ul>
<li><?php echo $html->link('Product Index', '/product_categories/index'); ?></li>
<li><?php echo $html->link('Product Index', '/products/index'); ?></li>
<li><?php echo $html->link('Add Product', '/products/add'); ?></li>
</ul>
</li>

2
views/products/add.ctp
View file

@ -7,10 +7,12 @@
<?php
echo $form->input('principle_id');
echo $form->input('title');
echo "<div class=\"input text\">";
echo "<label for=\"data[Product][description\">Description</label>";
echo $fck->fckeditor(array('Product', 'description'), '');
echo "</div>";
//echo $form->input('description');
echo $form->input('part_number');
echo $form->input('product_category_id');

10
views/products/edit.ctp
View file

@ -6,7 +6,15 @@
echo $form->input('id');
echo $form->input('principle_id');
echo $form->input('title');
echo $form->input('description');
//echo $form->input('description');
echo "<div class=\"input text\">";
echo "<label for=\"data[Product][description\">Description</label>";
echo $fck->fckeditor(array('Product', 'description'), $description);
echo "</div>";
echo $form->input('part_number');
echo $form->input('cost_price_each');
echo $form->input('our_discount');

28
views/quote_products/add.ctp
View file

@ -3,36 +3,26 @@
<fieldset>
<legend><?php __('Add QuoteProduct');?></legend>
<?php
echo $form->input('itemnumber');
echo $form->input('item_number');
echo $form->input('option');
echo $form->input('quantity');
echo $form->input('costprice');
echo $form->input('cost_price');
echo $form->input('currency_id');
echo $form->input('ourdiscount');
echo $form->input('our_discount');
echo $form->input('packing');
echo $form->input('shippingweight');
echo $form->input('shippingcost');
echo $form->input('exchangerate');
echo $form->input('shipping_weight');
echo $form->input('shipping_cost');
echo $form->input('exchange_rate');
echo $form->input('duty');
echo $form->input('finance');
echo $form->input('misc');
echo $form->input('grosssellprice');
echo $form->input('grossgpdollars');
echo $form->input('grossgppercentage');
echo $form->input('netgpdollars');
echo $form->input('netgppercent');
echo $form->input('targetgp');
echo $form->input('gross_sell_price');
echo $form->input('target_gp');
echo $form->input('title');
echo $form->input('description');
echo $form->input('total_landed_cost');
echo $form->input('fob_countryof_export');
echo $form->input('quote_id');
echo $form->input('product_id');
echo $form->input('discount');
echo $form->input('discountamount');
echo $form->input('grosssellpriceeach');
echo $form->input('netsellpriceeach');
echo $form->input('netsellprice');
?>
</fieldset>
<?php echo $form->end('Submit');?>
@ -40,8 +30,6 @@
<div class="actions">
<ul>
<li><?php echo $html->link(__('List QuoteProducts', true), array('action' => 'index'));?></li>
<li><?php echo $html->link(__('List Principles', true), array('controller'=> 'principles', 'action'=>'index')); ?> </li>
<li><?php echo $html->link(__('New Principle', true), array('controller'=> 'principles', 'action'=>'add')); ?> </li>
<li><?php echo $html->link(__('List Currencies', true), array('controller' => 'currencies', 'action' => 'index')); ?> </li>
<li><?php echo $html->link(__('New Currency', true), array('controller' => 'currencies', 'action' => 'add')); ?> </li>
<li><?php echo $html->link(__('List Quotes', true), array('controller' => 'quotes', 'action' => 'index')); ?> </li>

28
views/quote_products/edit.ctp
View file

@ -4,36 +4,26 @@
<legend><?php __('Edit QuoteProduct');?></legend>
<?php
echo $form->input('id');
echo $form->input('itemnumber');
echo $form->input('item_number');
echo $form->input('option');
echo $form->input('quantity');
echo $form->input('costprice');
echo $form->input('cost_price');
echo $form->input('currency_id');
echo $form->input('ourdiscount');
echo $form->input('our_discount');
echo $form->input('packing');
echo $form->input('shippingweight');
echo $form->input('shippingcost');
echo $form->input('exchangerate');
echo $form->input('shipping_weight');
echo $form->input('shipping_cost');
echo $form->input('exchange_rate');
echo $form->input('duty');
echo $form->input('finance');
echo $form->input('misc');
echo $form->input('grosssellprice');
echo $form->input('grossgpdollars');
echo $form->input('grossgppercentage');
echo $form->input('netgpdollars');
echo $form->input('netgppercent');
echo $form->input('targetgp');
echo $form->input('gross_sell_price');
echo $form->input('target_gp');
echo $form->input('title');
echo $form->input('description');
echo $form->input('total_landed_cost');
echo $form->input('fob_countryof_export');
echo $form->input('quote_id');
echo $form->input('product_id');
echo $form->input('discount');
echo $form->input('discountamount');
echo $form->input('grosssellpriceeach');
echo $form->input('netsellpriceeach');
echo $form->input('netsellprice');
?>
</fieldset>
<?php echo $form->end('Submit');?>
@ -42,8 +32,6 @@
<ul>
<li><?php echo $html->link(__('Delete', true), array('action' => 'delete', $form->value('QuoteProduct.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $form->value('QuoteProduct.id'))); ?></li>
<li><?php echo $html->link(__('List QuoteProducts', true), array('action' => 'index'));?></li>
<li><?php echo $html->link(__('List Principles', true), array('controller'=> 'principles', 'action'=>'index')); ?> </li>
<li><?php echo $html->link(__('New Principle', true), array('controller'=> 'principles', 'action'=>'add')); ?> </li>
<li><?php echo $html->link(__('List Currencies', true), array('controller' => 'currencies', 'action' => 'index')); ?> </li>
<li><?php echo $html->link(__('New Currency', true), array('controller' => 'currencies', 'action' => 'add')); ?> </li>
<li><?php echo $html->link(__('List Quotes', true), array('controller' => 'quotes', 'action' => 'index')); ?> </li>

74
views/quote_products/index.ctp
View file

@ -9,36 +9,26 @@ echo $paginator->counter(array(
<table cellpadding="0" cellspacing="0">
<tr>
<th><?php echo $paginator->sort('id');?></th>
<th><?php echo $paginator->sort('itemnumber');?></th>
<th><?php echo $paginator->sort('item_number');?></th>
<th><?php echo $paginator->sort('option');?></th>
<th><?php echo $paginator->sort('quantity');?></th>
<th><?php echo $paginator->sort('costprice');?></th>
<th><?php echo $paginator->sort('cost_price');?></th>
<th><?php echo $paginator->sort('currency_id');?></th>
<th><?php echo $paginator->sort('ourdiscount');?></th>
<th><?php echo $paginator->sort('our_discount');?></th>
<th><?php echo $paginator->sort('packing');?></th>
<th><?php echo $paginator->sort('shippingweight');?></th>
<th><?php echo $paginator->sort('shippingcost');?></th>
<th><?php echo $paginator->sort('exchangerate');?></th>
<th><?php echo $paginator->sort('shipping_weight');?></th>
<th><?php echo $paginator->sort('shipping_cost');?></th>
<th><?php echo $paginator->sort('exchange_rate');?></th>
<th><?php echo $paginator->sort('duty');?></th>
<th><?php echo $paginator->sort('finance');?></th>
<th><?php echo $paginator->sort('misc');?></th>
<th><?php echo $paginator->sort('grosssellprice');?></th>
<th><?php echo $paginator->sort('grossgpdollars');?></th>
<th><?php echo $paginator->sort('grossgppercentage');?></th>
<th><?php echo $paginator->sort('netgpdollars');?></th>
<th><?php echo $paginator->sort('netgppercent');?></th>
<th><?php echo $paginator->sort('targetgp');?></th>
<th><?php echo $paginator->sort('gross_sell_price');?></th>
<th><?php echo $paginator->sort('target_gp');?></th>
<th><?php echo $paginator->sort('title');?></th>
<th><?php echo $paginator->sort('description');?></th>
<th><?php echo $paginator->sort('total_landed_cost');?></th>
<th><?php echo $paginator->sort('fob_countryof_export');?></th>
<th><?php echo $paginator->sort('quote_id');?></th>
<th><?php echo $paginator->sort('product_id');?></th>
<th><?php echo $paginator->sort('discount');?></th>
<th><?php echo $paginator->sort('discountamount');?></th>
<th><?php echo $paginator->sort('grosssellpriceeach');?></th>
<th><?php echo $paginator->sort('netsellpriceeach');?></th>
<th><?php echo $paginator->sort('netsellprice');?></th>
<th class="actions"><?php __('Actions');?></th>
</tr>
<?php
@ -54,7 +44,7 @@ foreach ($quoteProducts as $quoteProduct):
<?php echo $quoteProduct['QuoteProduct']['id']; ?>
</td>
<td>
<?php echo $quoteProduct['QuoteProduct']['itemnumber']; ?>
<?php echo $quoteProduct['QuoteProduct']['item_number']; ?>
</td>
<td>
<?php echo $quoteProduct['QuoteProduct']['option']; ?>
@ -63,25 +53,25 @@ foreach ($quoteProducts as $quoteProduct):
<?php echo $quoteProduct['QuoteProduct']['quantity']; ?>
</td>
<td>
<?php echo $quoteProduct['QuoteProduct']['costprice']; ?>
<?php echo $quoteProduct['QuoteProduct']['cost_price']; ?>
</td>
<td>
<?php echo $html->link($quoteProduct['Currency']['name'], array('controller' => 'currencies', 'action' => 'view', $quoteProduct['Currency']['id'])); ?>
</td>
<td>
<?php echo $quoteProduct['QuoteProduct']['ourdiscount']; ?>
<?php echo $quoteProduct['QuoteProduct']['our_discount']; ?>
</td>
<td>
<?php echo $quoteProduct['QuoteProduct']['packing']; ?>
</td>
<td>
<?php echo $quoteProduct['QuoteProduct']['shippingweight']; ?>
<?php echo $quoteProduct['QuoteProduct']['shipping_weight']; ?>
</td>
<td>
<?php echo $quoteProduct['QuoteProduct']['shippingcost']; ?>
<?php echo $quoteProduct['QuoteProduct']['shipping_cost']; ?>
</td>
<td>
<?php echo $quoteProduct['QuoteProduct']['exchangerate']; ?>
<?php echo $quoteProduct['QuoteProduct']['exchange_rate']; ?>
</td>
<td>
<?php echo $quoteProduct['QuoteProduct']['duty']; ?>
@ -93,22 +83,10 @@ foreach ($quoteProducts as $quoteProduct):
<?php echo $quoteProduct['QuoteProduct']['misc']; ?>
</td>
<td>
<?php echo $quoteProduct['QuoteProduct']['grosssellprice']; ?>
<?php echo $quoteProduct['QuoteProduct']['gross_sell_price']; ?>
</td>
<td>
<?php echo $quoteProduct['QuoteProduct']['grossgpdollars']; ?>
</td>
<td>
<?php echo $quoteProduct['QuoteProduct']['grossgppercentage']; ?>
</td>
<td>
<?php echo $quoteProduct['QuoteProduct']['netgpdollars']; ?>
</td>
<td>
<?php echo $quoteProduct['QuoteProduct']['netgppercent']; ?>
</td>
<td>
<?php echo $quoteProduct['QuoteProduct']['targetgp']; ?>
<?php echo $quoteProduct['QuoteProduct']['target_gp']; ?>
</td>
<td>
<?php echo $quoteProduct['QuoteProduct']['title']; ?>
@ -116,12 +94,6 @@ foreach ($quoteProducts as $quoteProduct):
<td>
<?php echo $quoteProduct['QuoteProduct']['description']; ?>
</td>
<td>
<?php echo $quoteProduct['QuoteProduct']['total_landed_cost']; ?>
</td>
<td>
<?php echo $quoteProduct['QuoteProduct']['fob_countryof_export']; ?>
</td>
<td>
<?php echo $html->link($quoteProduct['Quote']['id'], array('controller' => 'quotes', 'action' => 'view', $quoteProduct['Quote']['id'])); ?>
</td>
@ -131,18 +103,6 @@ foreach ($quoteProducts as $quoteProduct):
<td>
<?php echo $quoteProduct['QuoteProduct']['discount']; ?>
</td>
<td>
<?php echo $quoteProduct['QuoteProduct']['discountamount']; ?>
</td>
<td>
<?php echo $quoteProduct['QuoteProduct']['grosssellpriceeach']; ?>
</td>
<td>
<?php echo $quoteProduct['QuoteProduct']['netsellpriceeach']; ?>
</td>
<td>
<?php echo $quoteProduct['QuoteProduct']['netsellprice']; ?>
</td>
<td class="actions">
<?php echo $html->link(__('View', true), array('action' => 'view', $quoteProduct['QuoteProduct']['id'])); ?>
<?php echo $html->link(__('Edit', true), array('action' => 'edit', $quoteProduct['QuoteProduct']['id'])); ?>
@ -160,8 +120,6 @@ foreach ($quoteProducts as $quoteProduct):
<div class="actions">
<ul>
<li><?php echo $html->link(__('New QuoteProduct', true), array('action' => 'add')); ?></li>
<li><?php echo $html->link(__('List Principles', true), array('controller'=> 'principles', 'action'=>'index')); ?> </li>
<li><?php echo $html->link(__('New Principle', true), array('controller'=> 'principles', 'action'=>'add')); ?> </li>
<li><?php echo $html->link(__('List Currencies', true), array('controller' => 'currencies', 'action' => 'index')); ?> </li>
<li><?php echo $html->link(__('New Currency', true), array('controller' => 'currencies', 'action' => 'add')); ?> </li>
<li><?php echo $html->link(__('List Quotes', true), array('controller' => 'quotes', 'action' => 'index')); ?> </li>

84
views/quote_products/view.ctp
View file

@ -6,9 +6,9 @@
<?php echo $quoteProduct['QuoteProduct']['id']; ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Itemnumber'); ?></dt>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Item Number'); ?></dt>
<dd<?php if ($i++ % 2 == 0) echo $class;?>>
<?php echo $quoteProduct['QuoteProduct']['itemnumber']; ?>
<?php echo $quoteProduct['QuoteProduct']['item_number']; ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Option'); ?></dt>
@ -21,9 +21,9 @@
<?php echo $quoteProduct['QuoteProduct']['quantity']; ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Costprice'); ?></dt>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Cost Price'); ?></dt>
<dd<?php if ($i++ % 2 == 0) echo $class;?>>
<?php echo $quoteProduct['QuoteProduct']['costprice']; ?>
<?php echo $quoteProduct['QuoteProduct']['cost_price']; ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Currency'); ?></dt>
@ -31,9 +31,9 @@
<?php echo $html->link($quoteProduct['Currency']['name'], array('controller' => 'currencies', 'action' => 'view', $quoteProduct['Currency']['id'])); ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Ourdiscount'); ?></dt>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Our Discount'); ?></dt>
<dd<?php if ($i++ % 2 == 0) echo $class;?>>
<?php echo $quoteProduct['QuoteProduct']['ourdiscount']; ?>
<?php echo $quoteProduct['QuoteProduct']['our_discount']; ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Packing'); ?></dt>
@ -41,19 +41,19 @@
<?php echo $quoteProduct['QuoteProduct']['packing']; ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Shippingweight'); ?></dt>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Shipping Weight'); ?></dt>
<dd<?php if ($i++ % 2 == 0) echo $class;?>>
<?php echo $quoteProduct['QuoteProduct']['shippingweight']; ?>
<?php echo $quoteProduct['QuoteProduct']['shipping_weight']; ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Shippingcost'); ?></dt>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Shipping Cost'); ?></dt>
<dd<?php if ($i++ % 2 == 0) echo $class;?>>
<?php echo $quoteProduct['QuoteProduct']['shippingcost']; ?>
<?php echo $quoteProduct['QuoteProduct']['shipping_cost']; ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Exchangerate'); ?></dt>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Exchange Rate'); ?></dt>
<dd<?php if ($i++ % 2 == 0) echo $class;?>>
<?php echo $quoteProduct['QuoteProduct']['exchangerate']; ?>
<?php echo $quoteProduct['QuoteProduct']['exchange_rate']; ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Duty'); ?></dt>
@ -71,34 +71,14 @@
<?php echo $quoteProduct['QuoteProduct']['misc']; ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Grosssellprice'); ?></dt>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Gross Sell Price'); ?></dt>
<dd<?php if ($i++ % 2 == 0) echo $class;?>>
<?php echo $quoteProduct['QuoteProduct']['grosssellprice']; ?>
<?php echo $quoteProduct['QuoteProduct']['gross_sell_price']; ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Grossgpdollars'); ?></dt>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Target Gp'); ?></dt>
<dd<?php if ($i++ % 2 == 0) echo $class;?>>
<?php echo $quoteProduct['QuoteProduct']['grossgpdollars']; ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Grossgppercentage'); ?></dt>
<dd<?php if ($i++ % 2 == 0) echo $class;?>>
<?php echo $quoteProduct['QuoteProduct']['grossgppercentage']; ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Netgpdollars'); ?></dt>
<dd<?php if ($i++ % 2 == 0) echo $class;?>>
<?php echo $quoteProduct['QuoteProduct']['netgpdollars']; ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Netgppercent'); ?></dt>
<dd<?php if ($i++ % 2 == 0) echo $class;?>>
<?php echo $quoteProduct['QuoteProduct']['netgppercent']; ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Targetgp'); ?></dt>
<dd<?php if ($i++ % 2 == 0) echo $class;?>>
<?php echo $quoteProduct['QuoteProduct']['targetgp']; ?>
<?php echo $quoteProduct['QuoteProduct']['target_gp']; ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Title'); ?></dt>
@ -111,16 +91,6 @@
<?php echo $quoteProduct['QuoteProduct']['description']; ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Total Landed Cost'); ?></dt>
<dd<?php if ($i++ % 2 == 0) echo $class;?>>
<?php echo $quoteProduct['QuoteProduct']['total_landed_cost']; ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Fob Countryof Export'); ?></dt>
<dd<?php if ($i++ % 2 == 0) echo $class;?>>
<?php echo $quoteProduct['QuoteProduct']['fob_countryof_export']; ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Quote'); ?></dt>
<dd<?php if ($i++ % 2 == 0) echo $class;?>>
<?php echo $html->link($quoteProduct['Quote']['id'], array('controller' => 'quotes', 'action' => 'view', $quoteProduct['Quote']['id'])); ?>
@ -136,26 +106,6 @@
<?php echo $quoteProduct['QuoteProduct']['discount']; ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Discountamount'); ?></dt>
<dd<?php if ($i++ % 2 == 0) echo $class;?>>
<?php echo $quoteProduct['QuoteProduct']['discountamount']; ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Grosssellpriceeach'); ?></dt>
<dd<?php if ($i++ % 2 == 0) echo $class;?>>
<?php echo $quoteProduct['QuoteProduct']['grosssellpriceeach']; ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Netsellpriceeach'); ?></dt>
<dd<?php if ($i++ % 2 == 0) echo $class;?>>
<?php echo $quoteProduct['QuoteProduct']['netsellpriceeach']; ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Netsellprice'); ?></dt>
<dd<?php if ($i++ % 2 == 0) echo $class;?>>
<?php echo $quoteProduct['QuoteProduct']['netsellprice']; ?>
&nbsp;
</dd>
</dl>
</div>
<div class="actions">
@ -164,8 +114,6 @@
<li><?php echo $html->link(__('Delete QuoteProduct', true), array('action' => 'delete', $quoteProduct['QuoteProduct']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $quoteProduct['QuoteProduct']['id'])); ?> </li>
<li><?php echo $html->link(__('List QuoteProducts', true), array('action' => 'index')); ?> </li>
<li><?php echo $html->link(__('New QuoteProduct', true), array('action' => 'add')); ?> </li>
<li><?php echo $html->link(__('List Principles', true), array('controller'=> 'principles', 'action'=>'index')); ?> </li>
<li><?php echo $html->link(__('New Principle', true), array('controller'=> 'principles', 'action'=>'add')); ?> </li>
<li><?php echo $html->link(__('List Currencies', true), array('controller' => 'currencies', 'action' => 'index')); ?> </li>
<li><?php echo $html->link(__('New Currency', true), array('controller' => 'currencies', 'action' => 'add')); ?> </li>
<li><?php echo $html->link(__('List Quotes', true), array('controller' => 'quotes', 'action' => 'index')); ?> </li>

2
views/quotes/add.ctp
View file

@ -5,8 +5,6 @@
<?php
echo $form->input('enquiry_id');
echo $form->input('revision');
echo $form->input('first_page');
echo $form->input('attachments');
echo $form->input('delivery_time');
echo $form->input('payment_terms');
echo $form->input('days_valid');

2
views/quotes/edit.ctp
View file

@ -13,8 +13,6 @@
echo $form->input('id');
echo $form->input('enquiry_id', array('type'=>'hidden', 'value' => $enquiry['Enquiry']['id']));
echo $form->input('first_page');
echo $form->input('attachments');
echo $form->input('delivery_time');
echo $form->input('payment_terms');
echo $form->input('date_issued');

8
views/quotes/index.ctp
View file

@ -13,8 +13,6 @@ echo $paginator->counter(array(
<th><?php echo $paginator->sort('id');?></th>
<th><?php echo $paginator->sort('enquiry_id');?></th>
<th><?php echo $paginator->sort('revision');?></th>
<th><?php echo $paginator->sort('first_page');?></th>
<th><?php echo $paginator->sort('attachments');?></th>
<th><?php echo $paginator->sort('delivery_time');?></th>
<th><?php echo $paginator->sort('payment_terms');?></th>
<th><?php echo $paginator->sort('days_valid');?></th>
@ -44,12 +42,6 @@ foreach ($quotes as $quote):
<td>
<?php echo $quote['Quote']['revision']; ?>
</td>
<td>
<?php echo $quote['Quote']['first_page']; ?>
</td>
<td>
<?php echo $quote['Quote']['attachments']; ?>
</td>
<td>
<?php echo $quote['Quote']['delivery_time']; ?>
</td>

94
views/quotes/view.ctp
View file

@ -8,12 +8,14 @@ else {
__('Quote: '.$quote['Enquiry']['title'].' Revision '.$quote['Quote']['revision']);
}
?></h2>
<dl><?php $i = 0; $class = ' class="altrow"';?>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Created'); ?></dt>
<dd<?php if ($i++ % 2 == 0) echo $class;?>>
<?php echo $time->nice($quote['Quote']['created']); ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Modified'); ?></dt>
<dd<?php if ($i++ % 2 == 0) echo $class;?>>
<?php echo $time->nice($quote['Quote']['modified']); ?>
@ -29,16 +31,6 @@ else {
<?php echo $quote['Quote']['revision']; ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('First Page'); ?></dt>
<dd<?php if ($i++ % 2 == 0) echo $class;?>>
<?php echo $quote['Quote']['first_page']; ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Attachments'); ?></dt>
<dd<?php if ($i++ % 2 == 0) echo $class;?>>
<?php echo $quote['Quote']['attachments']; ?>
&nbsp;
</dd>
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Delivery Time'); ?></dt>
<dd<?php if ($i++ % 2 == 0) echo $class;?>>
<?php echo $quote['Quote']['delivery_time']; ?>
@ -63,16 +55,74 @@ else {
</div>
<div class="actions">
<ul>
<li><?php echo $html->link(__('Edit Quote', true), array('action'=>'edit', $quote['Quote']['id'])); ?> </li>
<li><?php echo $html->link(__('Delete Quote', true), array('action'=>'delete', $quote['Quote']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $quote['Quote']['id'])); ?> </li>
<li><?php echo $html->link(__('List Quotes', true), array('action'=>'index')); ?> </li>
<li><?php echo $html->link(__('New Quote', true), array('action'=>'add')); ?> </li>
<li><?php echo $html->link(__('List Enquiries', true), array('controller'=> 'enquiries', 'action'=>'index')); ?> </li>
<li><?php echo $html->link(__('New Enquiry', true), array('controller'=> 'enquiries', 'action'=>'add')); ?> </li>
<li><?php echo $html->link(__('List Quote Products', true), array('controller'=> 'quote_products', 'action'=>'index')); ?> </li>
<li><?php echo $html->link(__('New Quote Product', true), array('controller'=> 'quote_products', 'action'=>'add')); ?> </li>
<li><?php echo $html->link(__('Edit Details', true), array('action'=>'edit', $quote['Quote']['id'])); ?> </li>
</ul>
</div>
<div id="viewpage">
</div>
<div id="LoadingDiv" style="display: none;">
<?php echo $html->image('ajax-loader.gif'); ?>
</div>
<div class="related">
<h3><?php __('Cover Pages'); ?> </h3>
<?php if(!empty($quote['QuotePage'])): ?>
<table cellpadding = "0" cellspacing = "0">
<tr>
<th>Page Number</th>
<th class="actions"><?php __('Actions');?></th>
</tr>
<?php
$i = 0;
foreach ($quote['QuotePage'] as $quotePage):
$class = null;
if ($i++ % 2 == 0) {
$class = ' class="altrow"';
}
?>
<tr<?php echo $class;?>>
<td><?php echo $quotePage['page_number']; ?></td>
<td class="actions">
<?php echo $ajax->link('View', array('controller'=> 'quote_pages', 'action'=>'show', $quotePage['id']),
array('update'=>'viewpage', 'indicator' => 'LoadingDiv','loading'=>'Effect.appear(\'viewpage\')'));
// echo $ajax->link('View', array('controller'=> 'quote_pages', 'action'=>'show', $quotePage['id']),
//array('update'=>'viewpage', 'indicator' => 'LoadingDiv'));
?>
<?php // echo $html->link(__('Edit', true), array('controller'=> 'quote_pages', 'action'=>'edit', $quotePage['id']));
echo $ajax->link('Edit', array('controller'=> 'quote_pages', 'action'=>'edit', $quotePage['id']),
array('update'=>'viewpage', 'indicator' => 'LoadingDiv','loading'=>'Effect.appear(\'viewpage\')'));
?>
<?php echo $html->link(__('Delete', true), array('controller'=> 'quote_pages', 'action'=>'delete', $quotePage['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $quotePage['id'])); ?>
</td>
<?php endforeach; ?>
</table>
<?php endif; ?>
<div class="actions">
<ul>
<li><?php echo $html->link(__('New Cover Page', true), array('controller'=> 'quote_pages', 'action'=>'add/'.$quote['Quote']['id']));?> </li>
</ul>
</div>
</div>
<div class="related">
<h3><?php __('Related Quote Products');?></h3>
<?php if (!empty($quote['QuoteProduct'])):?>
@ -112,6 +162,8 @@ else {
<th><?php __('Netsellprice'); ?></th>
<th class="actions"><?php __('Actions');?></th>
</tr>
<?php
$i = 0;
foreach ($quote['QuoteProduct'] as $quoteProduct):
@ -121,6 +173,7 @@ else {
}
?>
<tr<?php echo $class;?>>
<td><?php echo $quoteProduct['id'];?></td>
<td><?php echo $quoteProduct['itemnumber'];?></td>
<td><?php echo $quoteProduct['option'];?></td>
@ -153,11 +206,14 @@ else {
<td><?php echo $quoteProduct['grosssellpriceeach'];?></td>
<td><?php echo $quoteProduct['netsellpriceeach'];?></td>
<td><?php echo $quoteProduct['netsellprice'];?></td>
<td class="actions">
<?php echo $html->link(__('View', true), array('controller'=> 'quote_products', 'action'=>'view', $quoteProduct['id'])); ?>
<?php echo $html->link(__('Edit', true), array('controller'=> 'quote_products', 'action'=>'edit', $quoteProduct['id'])); ?>
<?php echo $html->link(__('Delete', true), array('controller'=> 'quote_products', 'action'=>'delete', $quoteProduct['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $quoteProduct['id'])); ?>
</td>
</tr>
<?php endforeach; ?>
</table>
@ -168,4 +224,6 @@ else {
<li><?php echo $html->link(__('New Quote Product', true), array('controller'=> 'quote_products', 'action'=>'add'));?> </li>
</ul>
</div>
</div>

10
webroot/css/quotenik.css
View file

@ -293,6 +293,16 @@ dl#showemail {
margin: 0em 0em;
}
/* Quote Cover Page Viewing */
#viewpage {
/*width: 400px;
height: 400px;
*/
overflow: scroll;
border: black 1px solid;
}
.addressradio label {
display: block;
font-size: 110%;