diff --git a/config/core.php b/config/core.php index 74a45f05..e612b9e6 100755 --- a/config/core.php +++ b/config/core.php @@ -40,7 +40,7 @@ * In production mode, flash messages redirect after a time interval. * In development mode, you need to click the flash message to continue. */ - Configure::write('debug', 0); + Configure::write('debug', 1); /** * Application wide charset encoding */ diff --git a/controllers/quote_products_controller.php b/controllers/quote_products_controller.php index ad4762b2..2d4d4742 100644 --- a/controllers/quote_products_controller.php +++ b/controllers/quote_products_controller.php @@ -26,9 +26,13 @@ class QuoteProductsController extends AppController { if (!empty($this->data)) { $this->QuoteProduct->create(); + + if ($this->QuoteProduct->save($this->data)) { $quoteid = $this->data['QuoteProduct']['quote_id']; + + $this->Session->setFlash(__('Product Added to Quote Successfully', true)); $this->redirect(array('controller'=>'quotes', 'action'=>'view', $quoteid)); } else { diff --git a/views/layouts/default.ctp b/views/layouts/default.ctp index f5bb73ec..b018cb6a 100755 --- a/views/layouts/default.ctp +++ b/views/layouts/default.ctp @@ -14,54 +14,14 @@ echo $html->css('quotenik'); echo $scripts_for_layout; - echo $javascript->link('jquery'); - echo $javascript->link('jquery-ui'); + //echo $javascript->link('jquery'); + //echo $javascript->link('jquery-ui'); echo $javascript->link('prototype'); echo $javascript->link('scriptaculous'); - echo $javascript->link('qtip'); - echo $javascript->link('wymeditor/jquery.wymeditor.min'); - echo $javascript->link('wymeditor/plugins/hovertools/jquery.wymeditor.hovertools.js'); - echo $javascript->link('wymeditor/plugins/resizable/jquery.wymeditor.resizable.js'); + echo $javascript->link('ckeditor/ckeditor'); + ?> - - - - - - - @@ -175,8 +135,6 @@ if ($mem_usage < 1024) echo round($mem_usage/1048576,2)." megabytes"; echo "
"; -?> - ?> diff --git a/views/products/add.ctp b/views/products/add.ctp index d73f885a..bb2aa162 100755 --- a/views/products/add.ctp +++ b/views/products/add.ctp @@ -7,18 +7,20 @@ echo $form->input('principle_id'); echo $form->input('title'); - echo $form->input('description', array('class'=>'wymeditor')); + echo $form->input('description', array('id' => 'description', 'class'=>'ckeditor')); + + //echo $javascript->codeBlock("CKEDITOR.replace('description');"); echo $form->input('part_number'); echo $form->input('product_category_id'); echo $form->input('notes'); - echo $html->link('Show/Hide Costing Details', '#', array('onClick' => "Effect.toggle('costingdetails', 'appear'); return false;")); + //echo $html->link('Show/Hide Costing Details', '#', array('onClick' => "Effect.toggle('costingdetails', 'appear'); return false;")); echo $html->image('calculator.png'); - echo $ajax->div('costingdetails'); + //echo $ajax->div('costingdetails'); - echo $this->element('product_costing', array('modelName' => 'Product')); + //echo $this->element('product_costing', array('modelName' => 'Product')); - echo $ajax->divEnd('costingdetails'); + //echo $ajax->divEnd('costingdetails'); diff --git a/views/quote_products/add.ctp b/views/quote_products/add.ctp index cecdab60..1842abb0 100644 --- a/views/quote_products/add.ctp +++ b/views/quote_products/add.ctp @@ -15,8 +15,7 @@ echo $form->input('product_id', array('type' => 'select', 'id'=>'products')); - echo $ajax->observeField('products', array( - + echo $ajax->observeField('products', array( 'url' => 'product_options', 'frequency' => 0.2, 'update' => 'productoptions' diff --git a/views/quote_products/product_options.ctp b/views/quote_products/product_options.ctp index badfa12e..706e58a3 100644 --- a/views/quote_products/product_options.ctp +++ b/views/quote_products/product_options.ctp @@ -2,7 +2,6 @@ $i = 0; foreach ($options as $opt) { - $default_option = ''; foreach($opt['ProductOption'] as $prodopt) { diff --git a/views/quotes/view.ctp b/views/quotes/view.ctp index a8d13b25..ba3ab28f 100755 --- a/views/quotes/view.ctp +++ b/views/quotes/view.ctp @@ -12,15 +12,8 @@ else { __('Quote: '.$enquirynumber_link.' Revision '.$quote['Quote']['revision']); } ?> - - - - -

Cover Page

-link('View', array('controller'=> 'quote_pages', 'action'=>'show', $quotePage['id']), - array('update'=>'viewpage'.$i, 'indicator' => 'LoadingDiv','loading'=>'Effect.appear(\'viewpage\')')); +
+ +
+link(__('Edit', true), array('controller'=>'quote_pages', 'action'=>'edit',$quotePage['id']));?> - // 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'.$i, 'indicator' => 'LoadingDiv','loading'=>'Effect.toggle(\'viewpage\', \'blind\')')); - echo $html->link('Edit', array('controller'=>'quote_pages', 'action'=>'edit', $quotePage['id'])); - - -?> link(__('Delete', true), array('controller'=> 'quote_pages', 'action'=>'delete', $quotePage['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $quotePage['id'])); ?> @@ -71,27 +52,16 @@ else { -
- -

- - + - - - - - - - @@ -106,19 +76,12 @@ else { ?> > - - + - + - - - - - -
link(__('View', true), array('controller'=> 'quote_products', 'action'=>'view', $quoteProduct['id'])); ?> @@ -140,3 +103,5 @@ else { + + \ No newline at end of file diff --git a/webroot/css/quotenik.css b/webroot/css/quotenik.css index 103cdc0e..88eb332d 100755 --- a/webroot/css/quotenik.css +++ b/webroot/css/quotenik.css @@ -311,6 +311,7 @@ dl#showemail { div.quotepageview { overflow: scroll; border: black 1px solid; + width: auto; } .addressradio label { @@ -504,7 +505,12 @@ table.mer tr td.viewedit { font-size: x-small; white-space: nowrap; } - + + +table.quotetable { + width: auto; + } + table.quotetable tr.mostrecent td { background: #ADD8E6; }