Changed jquery.get to jquery.ajax to solve caching issue in documents
This commit is contained in:
Karl Cordes
parent
b1ca8b4524
commit
05cadcf644
|
|
@ -61,7 +61,6 @@ $class = ' class="altrow"';?>
|
|||
<?php echo $enquiry['Enquiry']['comments']; ?>
|
||||
</span>
|
||||
|
||||
|
||||
</dd>
|
||||
<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Billing Address'); ?></dt>
|
||||
<dd<?php if ($i++ % 2 == 0) echo $class;?>>
|
||||
|
|
|
|||
|
|
@ -1,48 +1,42 @@
|
|||
<?php
|
||||
/* Quotenik 1.2 - Default Layout. Some Markup retained from CakePHP Default
|
||||
*/?>
|
||||
<?php /* Quotenik 1.2 - Default Layout. Some Markup retained from CakePHP Default
|
||||
*/ ?>
|
||||
|
||||
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta charset="utf-8">
|
||||
<title>
|
||||
<?php __('CMC'); ?>
|
||||
<?php echo $title_for_layout; ?>
|
||||
<?php __('CMC'); ?>
|
||||
<?php echo $title_for_layout; ?>
|
||||
</title>
|
||||
<?php
|
||||
|
||||
<?php
|
||||
$debugLevel = Configure::read('debug');
|
||||
|
||||
if($debugLevel > 0) {
|
||||
echo $html->meta('favicon.ico','/img/core.png', array('type'=>'icon'));
|
||||
}
|
||||
else {
|
||||
|
||||
if ($debugLevel > 0) {
|
||||
echo $html->meta('favicon.ico', '/img/core.png', array('type' => 'icon'));
|
||||
} else {
|
||||
echo $html->meta('icon');
|
||||
|
||||
}
|
||||
|
||||
echo $html->css('quotenik');
|
||||
echo $html->css('jquery-ui.custom.css');
|
||||
|
||||
echo $html->css('quotenik');
|
||||
echo $html->css('jquery-ui.custom.css');
|
||||
|
||||
|
||||
//echo $javascript->link('ckeditor/ckeditor');
|
||||
//echo $javascript->link('ckeditor/ckeditor');
|
||||
|
||||
echo $javascript->link('jquery');
|
||||
echo $javascript->link('jquery');
|
||||
|
||||
echo $javascript->link('jquery-ui');
|
||||
echo $javascript->link('jquery.form');
|
||||
echo $javascript->link('menu');
|
||||
echo $javascript->link('global');
|
||||
echo $javascript->link('search');
|
||||
echo $javascript->link('jquery.jeditable.mini');
|
||||
//echo $javascript->link('ckeditor/adapters/jquery');
|
||||
echo $javascript->link('jquery-ui');
|
||||
echo $javascript->link('jquery.form');
|
||||
echo $javascript->link('menu');
|
||||
echo $javascript->link('global');
|
||||
echo $javascript->link('search');
|
||||
echo $javascript->link('jquery.jeditable.mini');
|
||||
//echo $javascript->link('ckeditor/adapters/jquery');
|
||||
|
||||
echo $scripts_for_layout;
|
||||
|
||||
|
||||
?>
|
||||
echo $scripts_for_layout;
|
||||
?>
|
||||
|
||||
|
||||
</head>
|
||||
|
|
@ -54,47 +48,46 @@
|
|||
|
||||
<div id="username">
|
||||
|
||||
<?php
|
||||
if(isset($currentuser) == FALSE) {
|
||||
echo $html->link('Login', '/users/login');
|
||||
}
|
||||
else {
|
||||
$logoutlink = $html->link('Logout', '/users/logout');
|
||||
echo $html->link($currentuser['User']['username'], '/users/view/'. $currentuser['User']['id']). ' (' . $logoutlink.')';
|
||||
}
|
||||
?>
|
||||
<?php
|
||||
if (isset($currentuser) == FALSE) {
|
||||
echo $html->link('Login', '/users/login');
|
||||
} else {
|
||||
$logoutlink = $html->link('Logout', '/users/logout');
|
||||
echo $html->link($currentuser['User']['username'], '/users/view/' . $currentuser['User']['id']) . ' (' . $logoutlink . ')';
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
|
||||
<div id="navdiv">
|
||||
<ul id="nav">
|
||||
<li><?php echo $html->link('Enquiries', '/enquiries/index'); ?>
|
||||
<ul>
|
||||
<ul>
|
||||
<li class="last"><?php echo $html->link('Enquiry Register', '/enquiries/index'); ?></li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
<li><?php echo $html->link('Jobs', '/jobs/index'); ?>
|
||||
<ul>
|
||||
<ul>
|
||||
|
||||
<?
|
||||
if($currentuser['User']['access_level'] == 'manager' || $currentuser['User']['access_level'] == 'admin' ):
|
||||
?>
|
||||
<li><?=$html->link('Reports','/jobs/reports');?></li>
|
||||
<? endif;?>
|
||||
<?
|
||||
if ($currentuser['User']['access_level'] == 'manager' || $currentuser['User']['access_level'] == 'admin'):
|
||||
?>
|
||||
<li><?= $html->link('Reports', '/jobs/reports'); ?></li>
|
||||
<? endif; ?>
|
||||
<li class="last"><?php echo $html->link('Job List', '/jobs/index'); ?></li>
|
||||
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
<li><?php echo $html->link('Shipments','/shipments/index');?>
|
||||
<ul>
|
||||
<li class=""><?php echo $html->link('All Shipments', '/shipments/index');?></li>
|
||||
<li class=""><?php echo $html->link('Import Shipments', '/shipments/index/import');?></li>
|
||||
<li class=""><?php echo $html->link('Direct Shipments', '/shipments/index/direct');?></li>
|
||||
<li class=""><?php echo $html->link('Export Shipments', '/shipments/index/export');?></li>
|
||||
<li class="last"><?php echo $html->link('Local Shipments', '/shipments/index/local');?></li>
|
||||
</ul>
|
||||
</li>
|
||||
<li><?php echo $html->link('Shipments', '/shipments/index'); ?>
|
||||
<ul>
|
||||
<li class=""><?php echo $html->link('All Shipments', '/shipments/index'); ?></li>
|
||||
<li class=""><?php echo $html->link('Import Shipments', '/shipments/index/import'); ?></li>
|
||||
<li class=""><?php echo $html->link('Direct Shipments', '/shipments/index/direct'); ?></li>
|
||||
<li class=""><?php echo $html->link('Export Shipments', '/shipments/index/export'); ?></li>
|
||||
<li class="last"><?php echo $html->link('Local Shipments', '/shipments/index/local'); ?></li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
<li><?php echo $html->link('Customers', '/customers/index'); ?>
|
||||
<ul>
|
||||
|
|
@ -115,7 +108,7 @@
|
|||
<li><?php echo $html->link('Invoices', '/invoices/index'); ?>
|
||||
<ul>
|
||||
<li class=""><?php echo $html->link('Invoices Index', '/invoices/index'); ?></li>
|
||||
<li class="last"><?php echo $html->link('Print View', '/invoices/printView'); ?></li>
|
||||
<li class="last"><?php echo $html->link('Print View', '/invoices/printView'); ?></li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
|
|
@ -134,15 +127,14 @@
|
|||
</ul>
|
||||
</li>
|
||||
|
||||
<?php /*<li> echo $html->link('Users', '/users/index'); ?>
|
||||
<ul>
|
||||
<li> echo $html->link('Users Index', '/users/index'); </li>
|
||||
<li class="last"><?php echo $html->link('Add User', '/users/add'); </li>
|
||||
</ul>
|
||||
</li>*/
|
||||
?>
|
||||
<?php /* <li> echo $html->link('Users', '/users/index'); ?>
|
||||
<ul>
|
||||
<li> echo $html->link('Users Index', '/users/index'); </li>
|
||||
<li class="last"><?php echo $html->link('Add User', '/users/add'); </li>
|
||||
</ul>
|
||||
</li> */ ?>
|
||||
|
||||
<li><?php echo $html->link('Search', '/enquiries/search', array('id'=>'searchLink')); ?>
|
||||
<li><?php echo $html->link('Search', '/enquiries/search', array('id' => 'searchLink')); ?>
|
||||
</li>
|
||||
<li><?php echo $html->link('Help', '/pages/help'); ?>
|
||||
<ul>
|
||||
|
|
@ -157,22 +149,21 @@
|
|||
|
||||
</div>
|
||||
<div id="content">
|
||||
<?php
|
||||
if ($session->check('Message.flash')):
|
||||
$session->flash();
|
||||
endif;
|
||||
?>
|
||||
<div id="globalAjaxLoading"><?php echo $html->image('ajax-loader.gif'); ?></div>
|
||||
<?php echo $content_for_layout; ?>
|
||||
<?php
|
||||
if ($session->check('Message.flash')):
|
||||
$session->flash();
|
||||
endif;
|
||||
?>
|
||||
<div id="globalAjaxLoading"><?php echo $html->image('ajax-loader.gif'); ?></div>
|
||||
<?php echo $content_for_layout; ?>
|
||||
|
||||
</div>
|
||||
<div id="footer">
|
||||
<?php echo $html->link(
|
||||
$html->image('cake.power.gif', array('alt'=> __("CakePHP: the rapid development php framework", true), 'border'=>"0")),
|
||||
'http://www.cakephp.org/',
|
||||
array('target'=>'_new'), null, false
|
||||
);
|
||||
?>
|
||||
<?php
|
||||
echo $html->link(
|
||||
$html->image('cake.power.gif', array('alt' => __("CakePHP: the rapid development php framework", true), 'border' => "0")), 'http://www.cakephp.org/', array('target' => '_new'), null, false
|
||||
);
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -180,50 +171,48 @@
|
|||
|
||||
|
||||
|
||||
<?php
|
||||
echo $form->create('Enquiry', array('default'=>false, 'id'=>'searchForm', 'default'=>'false'));
|
||||
echo '<h2>Search';
|
||||
echo $html->image('system-search.png');
|
||||
echo '</h2>';
|
||||
echo "<p>Search for: Enquiry Number, Job Number, Customer, Contact or Customer Order Number</p>";
|
||||
<?php
|
||||
echo $form->create('Enquiry', array('default' => false, 'id' => 'searchForm', 'default' => 'false'));
|
||||
echo '<h2>Search';
|
||||
echo $html->image('system-search.png');
|
||||
echo '</h2>';
|
||||
echo "<p>Search for: Enquiry Number, Job Number, Customer, Contact or Customer Order Number</p>";
|
||||
|
||||
echo $form->input('Enquiry.search_string', array('label'=>false, 'id'=>'searchString'));
|
||||
echo $form->input('Enquiry.search_string', array('label' => false, 'id' => 'searchString'));
|
||||
?>
|
||||
|
||||
?>
|
||||
|
||||
<div class ="ui-widget">
|
||||
<button id="searchButton">Search</button>
|
||||
</div>
|
||||
<?
|
||||
echo $form->end();
|
||||
?>
|
||||
echo $form->end();
|
||||
?>
|
||||
|
||||
|
||||
|
||||
<div id="ajaxLoading"><?php echo $html->image('ajax-loader.gif'); ?></div>
|
||||
<div id="ajaxLoading"><?php echo $html->image('ajax-loader.gif'); ?></div>
|
||||
|
||||
|
||||
<div id="results"></div>
|
||||
</div>
|
||||
<div id="results"></div>
|
||||
</div>
|
||||
|
||||
|
||||
<?php
|
||||
$mem_usage = memory_get_usage(true);
|
||||
<?php
|
||||
$mem_usage = memory_get_usage(true);
|
||||
|
||||
if ($mem_usage < 1024)
|
||||
echo $mem_usage." bytes";
|
||||
elseif ($mem_usage < 1048576)
|
||||
echo round($mem_usage/1024,2)." kilobytes";
|
||||
else
|
||||
echo round($mem_usage/1048576,2)." megabytes";
|
||||
echo "<br/>";
|
||||
|
||||
?>
|
||||
if ($mem_usage < 1024)
|
||||
echo $mem_usage . " bytes";
|
||||
elseif ($mem_usage < 1048576)
|
||||
echo round($mem_usage / 1024, 2) . " kilobytes";
|
||||
else
|
||||
echo round($mem_usage / 1048576, 2) . " megabytes";
|
||||
echo "<br/>";
|
||||
?>
|
||||
|
||||
|
||||
<?php // debug($currentuser); ?>
|
||||
<?php // debug($currentuser); ?>
|
||||
|
||||
<?php echo $cakeDebug; ?>
|
||||
<?php echo $cakeDebug; ?>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -1093,9 +1093,8 @@ span.principle-emails {
|
|||
|
||||
span.enquiry-view-comments {
|
||||
color: #000000;
|
||||
font-size: 100%;
|
||||
font-size: 90%;
|
||||
text-align: left;
|
||||
line-height: 1;
|
||||
white-space: pre-line;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,9 @@ $(function() {
|
|||
$.post('/line_items/ajax_add', thisLineItemInputs, function(data) {
|
||||
|
||||
if(data == 'SUCCESS') {
|
||||
loadLineItems();
|
||||
$( "#addLineItemModal" ).dialog('close');
|
||||
|
||||
|
||||
}
|
||||
else {
|
||||
|
|
@ -50,13 +52,10 @@ $(function() {
|
|||
|
||||
},
|
||||
Cancel: function() {
|
||||
$( this ).dialog( "close" );
|
||||
loadLineItems();
|
||||
$( this ).dialog( "close" );
|
||||
|
||||
}
|
||||
},
|
||||
close: function() {
|
||||
loadLineItems();
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -410,10 +409,18 @@ function savePages() {
|
|||
function loadLineItems() {
|
||||
var documentID = $("#documentID").html();
|
||||
|
||||
$.get('/line_items/getTable/'+documentID, function(data) {
|
||||
/*$.get('/line_items/getTable/'+documentID, function(data) {
|
||||
$("#lineItems").html(data);
|
||||
});*/
|
||||
|
||||
$.ajax({
|
||||
url: '/line_items/getTable/'+documentID,
|
||||
cache: false,
|
||||
success: function(data) {
|
||||
$("#lineItems").html(data);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue