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

Merge branch 'master' of github.com:kzrl/CMC-Sales

Browse source
This commit is contained in:
Karl Cordes 2011-11-14 13:40:41 +11:00
parent a6f9444661 fa8fc960fa
commit 0c37d1ee3a
6 changed files with 729 additions and 720 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
views/costings/add.ctp
View file

@ -99,14 +99,5 @@ echo $form->input('sale_discount_amount', array('type'=>'hidden'));
echo $form->end('Submit');?> echo $form->end('Submit');?>
</div> </div>
<div class="actions">
<ul>
<li><?php echo $html->link(__('List Costings', true), array('action' => 'index'));?></li>
<li><?php echo $html->link(__('List Products', true), array('controller' => 'products', 'action' => 'index')); ?> </li>
<li><?php echo $html->link(__('New Product', true), array('controller' => 'products', 'action' => 'add')); ?> </li>
<li><?php echo $html->link(__('List Line Items', true), array('controller' => 'line_items', 'action' => 'index')); ?> </li>
<li><?php echo $html->link(__('New Line Item', true), array('controller' => 'line_items', 'action' => 'add')); ?> </li>
<li><?php echo $html->link(__('List Currencies', true), array('controller' => 'currencies', 'action' => 'index')); ?> </li>
<li><?php echo $html->link(__('New Purchase Currency', true), array('controller' => 'currencies', 'action' => 'add')); ?> </li>
</ul>
</div>

7
views/layouts/default.ctp
View file

@ -1,9 +1,7 @@
<?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> <!DOCTYPE html>
<html> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title> <title>
@ -221,6 +219,7 @@
<?php <?php
$mem_usage = memory_get_usage(true); $mem_usage = memory_get_usage(true);
if ($mem_usage < 1024) if ($mem_usage < 1024)

9
views/line_items/get_table.ctp
View file

@ -30,6 +30,15 @@
<? <?
$hasOptions = false; $hasOptions = false;
if(count($document['LineItem']) == 0):
?>
<tr class="no_items">
<td colspan="6"> No Line Items have been Added Yet!</td>
</tr>
<?
endif;
?>
<?
foreach($document['LineItem'] as $li):?> foreach($document['LineItem'] as $li):?>
<tr class="lineItem"> <tr class="lineItem">
<td> <td>

5
views/users/login.ctp
View file

@ -1,3 +1,6 @@
<div>
<fieldset>
<legend>Login</legend>
<?php <?php
if ($session->check('Message.auth')) $session->flash('auth'); if ($session->check('Message.auth')) $session->flash('auth');
echo $form->create('User', array('action' => 'login')); echo $form->create('User', array('action' => 'login'));
@ -6,3 +9,5 @@ echo $form->input('password');
echo $form->input('remember_me', array('label' => 'Keep me logged in on this Computer', 'type' => 'checkbox')); echo $form->input('remember_me', array('label' => 'Keep me logged in on this Computer', 'type' => 'checkbox'));
echo $form->end('Login'); echo $form->end('Login');
?> ?>
</fieldset>
</div>

6
webroot/css/quotenik.css
View file

@ -1643,3 +1643,9 @@ div.warning {
#extraModels li { #extraModels li {
font-size: 1.5em; font-size: 1.5em;
} }
tr.no_items {
font-size: 2em;
padding: 0.5em;
}

1
webroot/js/document_add_edit.js
View file

@ -2,7 +2,6 @@
* Could (should) tidy this up to move the Quote/Invoice etc Specific * Could (should) tidy this up to move the Quote/Invoice etc Specific
* functionality into seperate files. * functionality into seperate files.
* *
* Will do this at some point. Today I just need to hammer this out.
* *
* Karl - 20/5/2011 * Karl - 20/5/2011
*/ */