From 1f8ab124542d951e81476901536d033744c77bea Mon Sep 17 00:00:00 2001 From: Karl Cordes Date: Fri, 14 Aug 2009 12:09:47 +1000 Subject: [PATCH] Starting quote views. AJAX viewing in a DIV of the Cover Pages. --- config/core.php | 2 +- controllers/emails_controller.php | 3 +- controllers/enquiries_controller.php | 43 ++++++++--- controllers/quotes_controller.php | 11 ++- models/quote.php | 6 +- views/elements/quote_table.ctp | 6 +- views/enquiries/view.ctp | 10 ++- views/helpers/fck.php | 10 ++- views/layouts/default.ctp | 4 +- views/products/add.ctp | 4 +- views/products/edit.ctp | 10 ++- views/quote_products/add.ctp | 42 ++++------ views/quote_products/edit.ctp | 44 ++++------- views/quote_products/index.ctp | 102 ++++++++----------------- views/quote_products/view.ctp | 110 +++++++-------------------- views/quotes/add.ctp | 2 - views/quotes/edit.ctp | 2 - views/quotes/index.ctp | 8 -- views/quotes/view.ctp | 100 +++++++++++++++++++----- webroot/css/quotenik.css | 10 +++ 20 files changed, 260 insertions(+), 269 deletions(-) diff --git a/config/core.php b/config/core.php index 8ca869eb..b9fe639a 100755 --- a/config/core.php +++ b/config/core.php @@ -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. diff --git a/controllers/emails_controller.php b/controllers/emails_controller.php index 146db243..51a508c1 100644 --- a/controllers/emails_controller.php +++ b/controllers/emails_controller.php @@ -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'; diff --git a/controllers/enquiries_controller.php b/controllers/enquiries_controller.php index 847eefa6..4df27fe5 100755 --- a/controllers/enquiries_controller.php +++ b/controllers/enquiries_controller.php @@ -1,15 +1,17 @@ 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'])); } diff --git a/controllers/quotes_controller.php b/controllers/quotes_controller.php index fcb88571..016731f4 100755 --- a/controllers/quotes_controller.php +++ b/controllers/quotes_controller.php @@ -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)); } diff --git a/models/quote.php b/models/quote.php index a9a10cac..938d6625 100755 --- a/models/quote.php +++ b/models/quote.php @@ -33,7 +33,11 @@ class Quote extends AppModel { 'exclusive' => '', 'finderQuery' => '', 'counterQuery' => '' - ) + ), + 'QuotePage' => array('className' => 'QuotePage', + 'foreignKey' => 'quote_id', + 'dependent' => true) + ); } diff --git a/views/elements/quote_table.ctp b/views/elements/quote_table.ctp index 4f90626e..ed2ab838 100644 --- a/views/elements/quote_table.ctp +++ b/views/elements/quote_table.ctp @@ -19,10 +19,10 @@ $i++; ?> > - - nice($quote['created']);?> + + nice($quote['Quote']['created']);?> - link(__('View', true), array('controller'=> 'quotes', 'action'=>'view', $quote['id'])); ?> + link(__('View', true), array('controller'=> 'quotes', 'action'=>'view', $quote['Quote']['id'])); ?> diff --git a/views/enquiries/view.ctp b/views/enquiries/view.ctp index 2809db10..5450ed1f 100755 --- a/views/enquiries/view.ctp +++ b/views/enquiries/view.ctp @@ -116,11 +116,15 @@ $boxdata['enquirynumber'] = $enquiry['Enquiry']['title']; + -

image('internet-mail.png'); ?>

- element('email_table_ajax', $enquiry); ?> +

+image('internet-mail.png'); ?>

+ element('email_table_ajax', $enquiry); ?> + element('email_table_ajax', $enquiry, array('cache'=>'+1 day')); ?> - + */ +?>

diff --git a/views/helpers/fck.php b/views/helpers/fck.php index c81e5e2e..0cd8a6df 100644 --- a/views/helpers/fck.php +++ b/views/helpers/fck.php @@ -9,8 +9,10 @@ class FckHelper extends AppHelper { * * @param array $namepair - used to build textarea name for views, array('Model', 'fieldname') * @param string $content - */ - function fckeditor($namepair, $content){ + * @param int $width + * @param int $height + */ + function fckeditor($namepair, $content, $width=600, $height=600){ $editor_name = 'data'; foreach ($namepair as $name){ $editor_name .= "[" . $name . "]"; @@ -19,7 +21,9 @@ class FckHelper extends AppHelper { $oFCKeditor = new FCKeditor($editor_name) ; $oFCKeditor->BasePath = '/quotenik1.2/js/fckeditor/' ; $oFCKeditor->Value = $content ; - $oFCKeditor->Create() ; + $oFCKeditor->Width = $width; + $oFCKeditor->Height = $height; + $oFCKeditor->Create() ; } } diff --git a/views/layouts/default.ctp b/views/layouts/default.ctp index 30555186..a48cb32f 100755 --- a/views/layouts/default.ctp +++ b/views/layouts/default.ctp @@ -101,9 +101,9 @@ if (window.attachEvent) window.attachEvent("onload", sfHover); -

  • link('Products', '/product_categories/index'); ?>

    +

  • link('Products', '/products/index'); ?>

      -
    • link('Product Index', '/product_categories/index'); ?>
      • +
    • link('Product Index', '/products/index'); ?>
    • link('Add Product', '/products/add'); ?>
    • diff --git a/views/products/add.ctp b/views/products/add.ctp index 3ed686d7..3a7b52ba 100755 --- a/views/products/add.ctp +++ b/views/products/add.ctp @@ -7,11 +7,13 @@ input('principle_id'); echo $form->input('title'); + echo "
    "; echo ""; echo $fck->fckeditor(array('Product', 'description'), ''); echo "
    "; - //echo $form->input('description'); + + //echo $form->input('description'); echo $form->input('part_number'); echo $form->input('product_category_id'); echo $ajax->link('Enter Costing Info', array('controller'=> 'products', 'action' => 'add_costing'), array( 'update' => 'costingdetails')); diff --git a/views/products/edit.ctp b/views/products/edit.ctp index 60b06678..b0483c70 100755 --- a/views/products/edit.ctp +++ b/views/products/edit.ctp @@ -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 "
    "; + echo ""; + echo $fck->fckeditor(array('Product', 'description'), $description); + echo "
    "; + + echo $form->input('part_number'); echo $form->input('cost_price_each'); echo $form->input('our_discount'); diff --git a/views/quote_products/add.ctp b/views/quote_products/add.ctp index e8c42b34..54d06a0f 100644 --- a/views/quote_products/add.ctp +++ b/views/quote_products/add.ctp @@ -3,50 +3,38 @@
    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'); ?>
    end('Submit');?>
      -
    • link(__('List QuoteProducts', true), array('action'=>'index'));?>
      • -
    • link(__('List Principles', true), array('controller'=> 'principles', 'action'=>'index')); ?>
      • -
    • link(__('New Principle', true), array('controller'=> 'principles', 'action'=>'add')); ?>
      • -
    • link(__('List Currencies', true), array('controller'=> 'currencies', 'action'=>'index')); ?>
      • -
    • link(__('New Currency', true), array('controller'=> 'currencies', 'action'=>'add')); ?>
      • -
    • link(__('List Quotes', true), array('controller'=> 'quotes', 'action'=>'index')); ?>
      • -
    • link(__('New Quote', true), array('controller'=> 'quotes', 'action'=>'add')); ?>
      • -
    • link(__('List Products', true), array('controller'=> 'products', 'action'=>'index')); ?>
      • -
    • link(__('New Product', true), array('controller'=> 'products', 'action'=>'add')); ?>
      • +
    • link(__('List QuoteProducts', true), array('action' => 'index'));?>
      • +
    • link(__('List Currencies', true), array('controller' => 'currencies', 'action' => 'index')); ?>
      • +
    • link(__('New Currency', true), array('controller' => 'currencies', 'action' => 'add')); ?>
      • +
    • link(__('List Quotes', true), array('controller' => 'quotes', 'action' => 'index')); ?>
      • +
    • link(__('New Quote', true), array('controller' => 'quotes', 'action' => 'add')); ?>
      • +
    • link(__('List Products', true), array('controller' => 'products', 'action' => 'index')); ?>
      • +
    • link(__('New Product', true), array('controller' => 'products', 'action' => 'add')); ?>
    diff --git a/views/quote_products/edit.ctp b/views/quote_products/edit.ctp index f994573f..dee57c87 100644 --- a/views/quote_products/edit.ctp +++ b/views/quote_products/edit.ctp @@ -4,51 +4,39 @@ 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'); ?> end('Submit');?>
      -
    • 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'))); ?>
      • -
    • link(__('List QuoteProducts', true), array('action'=>'index'));?>
      • -
    • link(__('List Principles', true), array('controller'=> 'principles', 'action'=>'index')); ?>
      • -
    • link(__('New Principle', true), array('controller'=> 'principles', 'action'=>'add')); ?>
      • -
    • link(__('List Currencies', true), array('controller'=> 'currencies', 'action'=>'index')); ?>
      • -
    • link(__('New Currency', true), array('controller'=> 'currencies', 'action'=>'add')); ?>
      • -
    • link(__('List Quotes', true), array('controller'=> 'quotes', 'action'=>'index')); ?>
      • -
    • link(__('New Quote', true), array('controller'=> 'quotes', 'action'=>'add')); ?>
      • -
    • link(__('List Products', true), array('controller'=> 'products', 'action'=>'index')); ?>
      • -
    • link(__('New Product', true), array('controller'=> 'products', 'action'=>'add')); ?>
      • +
    • 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'))); ?>
      • +
    • link(__('List QuoteProducts', true), array('action' => 'index'));?>
      • +
    • link(__('List Currencies', true), array('controller' => 'currencies', 'action' => 'index')); ?>
      • +
    • link(__('New Currency', true), array('controller' => 'currencies', 'action' => 'add')); ?>
      • +
    • link(__('List Quotes', true), array('controller' => 'quotes', 'action' => 'index')); ?>
      • +
    • link(__('New Quote', true), array('controller' => 'quotes', 'action' => 'add')); ?>
      • +
    • link(__('List Products', true), array('controller' => 'products', 'action' => 'index')); ?>
      • +
    • link(__('New Product', true), array('controller' => 'products', 'action' => 'add')); ?>
    diff --git a/views/quote_products/index.ctp b/views/quote_products/index.ctp index 6587f5d1..596aec5e 100644 --- a/views/quote_products/index.ctp +++ b/views/quote_products/index.ctp @@ -9,36 +9,26 @@ echo $paginator->counter(array( - + - + - + - - - + + + - - - - - - + + - - - - - - - - - - - - - - - - @@ -155,18 +115,16 @@ foreach ($quoteProducts as $quoteProduct):
    prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?> | numbers();?> - next(__('next', true).' >>', array(), null, array('class'=>'disabled'));?> + next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
      -
    • link(__('New QuoteProduct', true), array('action'=>'add')); ?>
      • -
    • link(__('List Principles', true), array('controller'=> 'principles', 'action'=>'index')); ?>
      • -
    • link(__('New Principle', true), array('controller'=> 'principles', 'action'=>'add')); ?>
      • -
    • link(__('List Currencies', true), array('controller'=> 'currencies', 'action'=>'index')); ?>
      • -
    • link(__('New Currency', true), array('controller'=> 'currencies', 'action'=>'add')); ?>
      • -
    • link(__('List Quotes', true), array('controller'=> 'quotes', 'action'=>'index')); ?>
      • -
    • link(__('New Quote', true), array('controller'=> 'quotes', 'action'=>'add')); ?>
      • -
    • link(__('List Products', true), array('controller'=> 'products', 'action'=>'index')); ?>
      • -
    • link(__('New Product', true), array('controller'=> 'products', 'action'=>'add')); ?>
      • +
    • link(__('New QuoteProduct', true), array('action' => 'add')); ?>
      • +
    • link(__('List Currencies', true), array('controller' => 'currencies', 'action' => 'index')); ?>
      • +
    • link(__('New Currency', true), array('controller' => 'currencies', 'action' => 'add')); ?>
      • +
    • link(__('List Quotes', true), array('controller' => 'quotes', 'action' => 'index')); ?>
      • +
    • link(__('New Quote', true), array('controller' => 'quotes', 'action' => 'add')); ?>
      • +
    • link(__('List Products', true), array('controller' => 'products', 'action' => 'index')); ?>
      • +
    • link(__('New Product', true), array('controller' => 'products', 'action' => 'add')); ?>
    diff --git a/views/quote_products/view.ctp b/views/quote_products/view.ctp index 81328a6a..6976d71c 100644 --- a/views/quote_products/view.ctp +++ b/views/quote_products/view.ctp @@ -6,9 +6,9 @@   - > + > > - +   > @@ -21,19 +21,19 @@   - > + > > - +   > > - link($quoteProduct['Currency']['name'], array('controller'=> 'currencies', 'action'=>'view', $quoteProduct['Currency']['id'])); ?> + link($quoteProduct['Currency']['name'], array('controller' => 'currencies', 'action' => 'view', $quoteProduct['Currency']['id'])); ?>   - > + > > - +   > @@ -41,19 +41,19 @@   - > + > > - +   - > + > > - +   - > + > > - +   > @@ -71,34 +71,14 @@   - > + > > - +   - > + > > - -   - - > - > - -   - - > - > - -   - - > - > - -   - - > - > - +   > @@ -111,24 +91,14 @@   - > - > - -   - - > - > - -   - > > - link($quoteProduct['Quote']['id'], array('controller'=> 'quotes', 'action'=>'view', $quoteProduct['Quote']['id'])); ?> + link($quoteProduct['Quote']['id'], array('controller' => 'quotes', 'action' => 'view', $quoteProduct['Quote']['id'])); ?>   > > - link($quoteProduct['Product']['title'], array('controller'=> 'products', 'action'=>'view', $quoteProduct['Product']['id'])); ?> + link($quoteProduct['Product']['title'], array('controller' => 'products', 'action' => 'view', $quoteProduct['Product']['id'])); ?>   > @@ -136,41 +106,19 @@   - > - > - -   - - > - > - -   - - > - > - -   - - > - > - -   -
      -
    • link(__('Edit QuoteProduct', true), array('action'=>'edit', $quoteProduct['QuoteProduct']['id'])); ?>
      • -
    • link(__('Delete QuoteProduct', true), array('action'=>'delete', $quoteProduct['QuoteProduct']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $quoteProduct['QuoteProduct']['id'])); ?>
      • -
    • link(__('List QuoteProducts', true), array('action'=>'index')); ?>
      • -
    • link(__('New QuoteProduct', true), array('action'=>'add')); ?>
      • -
    • link(__('List Principles', true), array('controller'=> 'principles', 'action'=>'index')); ?>
      • -
    • link(__('New Principle', true), array('controller'=> 'principles', 'action'=>'add')); ?>
      • -
    • link(__('List Currencies', true), array('controller'=> 'currencies', 'action'=>'index')); ?>
      • -
    • link(__('New Currency', true), array('controller'=> 'currencies', 'action'=>'add')); ?>
      • -
    • link(__('List Quotes', true), array('controller'=> 'quotes', 'action'=>'index')); ?>
      • -
    • link(__('New Quote', true), array('controller'=> 'quotes', 'action'=>'add')); ?>
      • -
    • link(__('List Products', true), array('controller'=> 'products', 'action'=>'index')); ?>
      • -
    • link(__('New Product', true), array('controller'=> 'products', 'action'=>'add')); ?>
      • +
    • link(__('Edit QuoteProduct', true), array('action' => 'edit', $quoteProduct['QuoteProduct']['id'])); ?>
      • +
    • link(__('Delete QuoteProduct', true), array('action' => 'delete', $quoteProduct['QuoteProduct']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $quoteProduct['QuoteProduct']['id'])); ?>
      • +
    • link(__('List QuoteProducts', true), array('action' => 'index')); ?>
      • +
    • link(__('New QuoteProduct', true), array('action' => 'add')); ?>
      • +
    • link(__('List Currencies', true), array('controller' => 'currencies', 'action' => 'index')); ?>
      • +
    • link(__('New Currency', true), array('controller' => 'currencies', 'action' => 'add')); ?>
      • +
    • link(__('List Quotes', true), array('controller' => 'quotes', 'action' => 'index')); ?>
      • +
    • link(__('New Quote', true), array('controller' => 'quotes', 'action' => 'add')); ?>
      • +
    • link(__('List Products', true), array('controller' => 'products', 'action' => 'index')); ?>
      • +
    • link(__('New Product', true), array('controller' => 'products', 'action' => 'add')); ?>
    diff --git a/views/quotes/add.ctp b/views/quotes/add.ctp index 64e82b10..9c939651 100755 --- a/views/quotes/add.ctp +++ b/views/quotes/add.ctp @@ -5,8 +5,6 @@ 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'); diff --git a/views/quotes/edit.ctp b/views/quotes/edit.ctp index 7bc96a8d..b7e56dd3 100755 --- a/views/quotes/edit.ctp +++ b/views/quotes/edit.ctp @@ -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'); diff --git a/views/quotes/index.ctp b/views/quotes/index.ctp index df3f8e6c..e558b7c0 100755 --- a/views/quotes/index.ctp +++ b/views/quotes/index.ctp @@ -13,8 +13,6 @@ echo $paginator->counter(array(     - - @@ -44,12 +42,6 @@ foreach ($quotes as $quote): - - diff --git a/views/quotes/view.ctp b/views/quotes/view.ctp index ee66a834..445f749c 100755 --- a/views/quotes/view.ctp +++ b/views/quotes/view.ctp @@ -8,12 +8,14 @@ else { __('Quote: '.$quote['Enquiry']['title'].' Revision '.$quote['Quote']['revision']); } ?> +
    > > nice($quote['Quote']['created']); ?>   + > > nice($quote['Quote']['modified']); ?> @@ -29,16 +31,6 @@ else {   - > - > - -   - - > - > - -   - > > @@ -60,19 +52,77 @@ else {  
    - +
      -
    • link(__('Edit Quote', true), array('action'=>'edit', $quote['Quote']['id'])); ?>
      • -
    • link(__('Delete Quote', true), array('action'=>'delete', $quote['Quote']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $quote['Quote']['id'])); ?>
      • -
    • link(__('List Quotes', true), array('action'=>'index')); ?>
      • -
    • link(__('New Quote', true), array('action'=>'add')); ?>
      • -
    • link(__('List Enquiries', true), array('controller'=> 'enquiries', 'action'=>'index')); ?>
      • -
    • link(__('New Enquiry', true), array('controller'=> 'enquiries', 'action'=>'add')); ?>
      • -
    • link(__('List Quote Products', true), array('controller'=> 'quote_products', 'action'=>'index')); ?>
      • -
    • link(__('New Quote Product', true), array('controller'=> 'quote_products', 'action'=>'add')); ?>
      • +
    • link(__('Edit Details', true), array('action'=>'edit', $quote['Quote']['id'])); ?>
    + + +
    +
    + + + +
    +

    + +
    sort('id');?>sort('itemnumber');?>sort('item_number');?> sort('option');?> sort('quantity');?>sort('costprice');?>sort('cost_price');?> sort('currency_id');?>sort('ourdiscount');?>sort('our_discount');?> sort('packing');?>sort('shippingweight');?>sort('shippingcost');?>sort('exchangerate');?>sort('shipping_weight');?>sort('shipping_cost');?>sort('exchange_rate');?> sort('duty');?> sort('finance');?> sort('misc');?>sort('grosssellprice');?>sort('grossgpdollars');?>sort('grossgppercentage');?>sort('netgpdollars');?>sort('netgppercent');?>sort('targetgp');?>sort('gross_sell_price');?>sort('target_gp');?> sort('title');?> sort('description');?>sort('total_landed_cost');?>sort('fob_countryof_export');?> sort('quote_id');?> sort('product_id');?> sort('discount');?>sort('discountamount');?>sort('grosssellpriceeach');?>sort('netsellpriceeach');?>sort('netsellprice');?>
    - + @@ -63,25 +53,25 @@ foreach ($quoteProducts as $quoteProduct): - + - link($quoteProduct['Currency']['name'], array('controller'=> 'currencies', 'action'=>'view', $quoteProduct['Currency']['id'])); ?> + link($quoteProduct['Currency']['name'], array('controller' => 'currencies', 'action' => 'view', $quoteProduct['Currency']['id'])); ?> - + - + - + - + @@ -93,22 +83,10 @@ foreach ($quoteProducts as $quoteProduct): - + - - - - - - - - - + @@ -117,36 +95,18 @@ foreach ($quoteProducts as $quoteProduct): - + link($quoteProduct['Quote']['id'], array('controller' => 'quotes', 'action' => 'view', $quoteProduct['Quote']['id'])); ?> - - - link($quoteProduct['Quote']['id'], array('controller'=> 'quotes', 'action'=>'view', $quoteProduct['Quote']['id'])); ?> - - link($quoteProduct['Product']['title'], array('controller'=> 'products', 'action'=>'view', $quoteProduct['Product']['id'])); ?> + link($quoteProduct['Product']['title'], array('controller' => 'products', 'action' => 'view', $quoteProduct['Product']['id'])); ?> - - - - - - - - - link(__('View', true), array('action'=>'view', $quoteProduct['QuoteProduct']['id'])); ?> - link(__('Edit', true), array('action'=>'edit', $quoteProduct['QuoteProduct']['id'])); ?> - link(__('Delete', true), array('action'=>'delete', $quoteProduct['QuoteProduct']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $quoteProduct['QuoteProduct']['id'])); ?> + link(__('View', true), array('action' => 'view', $quoteProduct['QuoteProduct']['id'])); ?> + link(__('Edit', true), array('action' => 'edit', $quoteProduct['QuoteProduct']['id'])); ?> + link(__('Delete', true), array('action' => 'delete', $quoteProduct['QuoteProduct']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $quoteProduct['QuoteProduct']['id'])); ?>
    sort('id');?> sort('enquiry_id');?> sort('revision');?>sort('first_page');?>sort('attachments');?> sort('delivery_time');?> sort('payment_terms');?> sort('days_valid');?> - - - -
    + + + + + + + > + + + + + + + +
    Page Number
    + 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')); +?> + + +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\')')); +?> + + +link(__('Delete', true), array('controller'=> 'quote_pages', 'action'=>'delete', $quotePage['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $quotePage['id'])); ?> +
    + + +
    +
      +
    • link(__('New Cover Page', true), array('controller'=> 'quote_pages', 'action'=>'add/'.$quote['Quote']['id']));?>
      • +
    +
    + + + + + +

    @@ -112,7 +162,9 @@ else { - > + @@ -153,11 +206,14 @@ else { - + + link(__('View', true), array('controller'=> 'quote_products', 'action'=>'view', $quoteProduct['id'])); ?> link(__('Edit', true), array('controller'=> 'quote_products', 'action'=>'edit', $quoteProduct['id'])); ?> link(__('Delete', true), array('controller'=> 'quote_products', 'action'=>'delete', $quoteProduct['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $quoteProduct['id'])); ?> + + @@ -168,4 +224,6 @@ else {
  • link(__('New Quote Product', true), array('controller'=> 'quote_products', 'action'=>'add'));?>
    • + + diff --git a/webroot/css/quotenik.css b/webroot/css/quotenik.css index 120477ab..0f01b37e 100755 --- a/webroot/css/quotenik.css +++ b/webroot/css/quotenik.css @@ -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%;