Added Payment, other minor fixes

This commit is contained in:
Deon George
2011-12-20 16:46:10 +11:00
parent c8fd44f844
commit a40ce27a16
31 changed files with 452 additions and 1280 deletions

View File

@@ -1,34 +0,0 @@
{assign var=meth value=':'|explode:$VAR._page}
<!-- {$meth.0}:{$meth.1} -->
{$method->exe($meth.0,$meth.1)}
{if ($method->result == FALSE)}
{$block->display('core:method_error')}
{else}
{include file='file:../core/search_show_pre.tpl'}
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="table_background">
<tr>
<td>
<table width="100%" border="0" cellspacing="1" cellpadding="2">
{$method->exe_noauth($meth.0,'tpl_search_show')}
{foreach from=$search_show item=record}
{include file='file:../core/search_show_tr_record.tpl'}
<td>{$record.id}</td>
<td>{$record.account_id}</td>
<td>{$list->date($record.date_orig)}</td>
<td>{$list->format_currency_num($record.total_amt,$record.billed_currency_id)}</td>
<td>{$list->format_currency_num($record.alloc_amt,$record.billed_currency_id)}</td>
<td>{$list->format_currency_num($record.balance,$record.billed_currency_id)}</td>
<td>{$list->format_currency_num($record.acct_bal,$record.billed_currency_id)}</td>
</tr>
{/foreach}
</table>
</td>
</tr>
</table>
{include file='file:../core/search_show_post-1.tpl'}
{include file='file:../core/search_show_post-2.tpl'}
{/if}

View File

@@ -1,34 +0,0 @@
{assign var=meth value=':'|explode:$VAR._page}
<!-- {$meth.0}:{$meth.1} -->
{$method->exe($meth.0,$meth.1)}
{if ($method->result == FALSE)}
{$block->display('core:method_error')}
{else}
{include file='file:../core/search_show_pre.tpl'}
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="table_background">
<tr>
<td>
<table width="100%" border="0" cellspacing="1" cellpadding="2">
{$method->exe_noauth($meth.0,'tpl_search_show')}
{foreach from=$search_show item=record}
{include file='file:../core/search_show_tr_record.tpl'}
<td>{$record.id}</td>
<td>{$record.account_id}</td>
<td>{$list->date($record.date_orig)}</td>
<td>{$list->format_currency_num($record.total_amt,$record.billed_currency_id)}</td>
<td>{$list->format_currency_num($record.alloc_amt,$record.billed_currency_id)}</td>
<td>{$list->format_currency_num($record.balance,$record.billed_currency_id)}</td>
<td>{$list->format_currency_num($record.acct_bal,$record.billed_currency_id)}</td>
</tr>
{/foreach}
</table>
</td>
</tr>
</table>
{include file='file:../core/search_show_post-1.tpl'}
{include file='file:../core/search_show_post-2.tpl'}
{/if}

View File

@@ -1,34 +0,0 @@
{assign var=meth value=':'|explode:$VAR._page}
<!-- {$meth.0}:{$meth.1} -->
{$method->exe($meth.0,$meth.1)}
{if ($method->result == FALSE)}
{$block->display('core:method_error')}
{else}
{include file='file:../core/search_show_pre.tpl'}
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="table_background">
<tr>
<td>
<table width="100%" border="0" cellspacing="1" cellpadding="2">
{$method->exe_noauth($meth.0,'tpl_search_show')}
{foreach from=$search_show item=record}
{include file='file:../core/search_show_tr_record.tpl'}
<td>{$record.id}</td>
<td>{$record.account_id}</td>
<td>{$record.invoice_id}</td>
<td>{$list->date($record.date_orig)}</td>
<td>{$list->format_currency_num($record.total_amt,$record.billed_currency_id)}</td>
<td>{$list->format_currency_num($record.billed_amt,$record.billed_currency_id)}</td>
<td>{$list->format_currency_num($record.alloc_amt,$record.billed_currency_id)}</td>
</tr>
{/foreach}
</table>
</td>
</tr>
</table>
{include file='file:../core/search_show_post-1.tpl'}
{include file='file:../core/search_show_post-2.tpl'}
{/if}

View File

@@ -1,66 +0,0 @@
{assign var=meth value=':'|explode:$VAR._page}
<!-- {$meth.0}:{$meth.1} -->
<!-- Display the form validation -->
{if $form_validation}
{$block->display('core:alert_fields')}
{/if}
<!-- Display the form to collect the input values -->
<form id="add" method="post" action="" enctype="multipart/form-data">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="table_background">
<tr>
<td>
<table width="100%" border="0" cellspacing="1" cellpadding="0">
<tr valign="top">
<td class="table_heading">{osb f=tt}</td>
</tr>
<tr valign="top">
<td class="row1">
<table width="100%" border="0" cellspacing="3" cellpadding="1" class="row1">
<tr valign="top">
<td style="width: 35%;">{osb f=tf field=account_id}</td>
<td style="width: 65%;">{osb f=autoselect module=account return=id field=payment_account_id default=$VAR.payment_account_id}</td>
</tr>
{if $VAR.payment_account_id}
<tr valign="top">
<td style="width: 35%;">{osb f=tf field=date_payment}</td>
<td style="width: 65%;">{$list->calender_add('payment_date_payment','now','form_field','')}</td>
</tr>
<tr valign="top">
<td style="width: 35%;">{osb f=tf field=checkout_plugin_id}</td>
<td style="width: 65%;">{$list->mmenu('no','payment_checkout_plugin_id','checkout','name',$VAR.payment_checkout_plugin_id,'active=1','',true)}</td>
</tr>
<tr valign="top">
<td style="width: 35%;">{osb f=tf field=total_amt}</td>
<td style="width: 65%;"><input type="text" name="payment_total_amt" value="{$VAR.payment_total_amt}" {if $payment_total_amt == true}class="form_field_error"{/if}/></td>
</tr>
<tr valign="top">
<td style="width: 35%;">{osb f=tf field=fees_amt}</td>
<td style="width: 65%;"><input type="text" name="payment_fees_amt" value="{$VAR.payment_fees_amt}" {if $payment_fees_amt == true}class="form_field_error"{/if}/></td>
</tr>
<tr valign="top">
<td style="width: 35%;">{osb f=tf field=notes}</td>
<td style="width: 65%;"><textarea name="payment_notes" cols="25" rows="2" {if $payment_notes == true}class="form_field_error"{/if}>{$VAR.payment_notes}</textarea></td>
</tr>
{include file='file:../core/add_tr_submit.tpl'}
{else}
<tr valign="top">
<td style="width: 35%;"><input type="hidden" name="_page" value="payment:add"/></td>
{include file='file:../core/view_td_submit.tpl'}
</tr>
{/if}
</table>
</td>
</tr>
</table>
</td>
</tr>
</table>
<div>
<input type="hidden" name="payment_source_id" value="{$smarty.const.SESS_ACCOUNT}">
</div>
</form>

View File

@@ -1,51 +0,0 @@
{assign var=meth value=':'|explode:$VAR._page}
<!-- {$meth.0}:{$meth.1} -->
<!-- @todo change to exe() -->
{$method->exe_noauth($meth.0,$meth.1)}
{if ($method->result == false)}
{$block->display('core:method_error')}
{else}
{include file='file:../core/search_show_pre.tpl'}
<!-- Display each record -->
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="table_background">
<tr>
<td>
<table width="100%" border="0" cellspacing="1" cellpadding="0">
<tr valign="top">
<td class="table_heading">{t}Invoice Date{/t}</td>
<td class="table_heading">{t}Invoice Number{/t}</td>
<td class="table_heading">{t}Invoice Amount{/t}</td>
<td class="table_heading">{t}Invoice Balance{/t}</td>
<td class="table_heading">{t}Allocate{/t}</td>
</tr>
{foreach from=$invoices item=record}
<tr id="row{$record.id}" onclick="row_sel('{$record.id}',1);" ondblclick="window.location='?_page=invoice:view&amp;id={$record.id},';" onmouseover="row_mouseover('{$record.id}','row_mouse_over_select','row_mouse_over');" onmouseout="row_mouseout('{$record.id}','{$record._C}','row_select');" class="{$record._C}">
<td>{$list->date($record.date_orig)}</td>
<td id="record{$record.id}" style="width: 150px;">{$record.id}</td>
<td>{$list->format_currency_num($record.total_amt,$smarty.const.SESS_CURRENCY)} ({$list->format_currency_num($record.credit_amt,$smarty.const.SESS_CURRENCY)})</td>
<td>{$list->format_currency_num($record.balance,$smarty.const.SESS_CURRENCY)}</td>
<td><input type="text" name="payment_item_allocate[{$record.id}]" value="{$record.alloc_amt}"/></td>
</tr>
{/foreach}
</table>
</td>
</tr>
<tr class="row1">
<td>&nbsp;</td>
</tr>
<tr class="row2">
{include file='file:../core/view_td_submit.tpl'}
</tr>
</table>
<div>
<input type="hidden" name="do[]" value="payment_item:allocate"/>
</div>
</form>
</div>
{/if}

View File

@@ -1,62 +0,0 @@
{assign var=meth value=':'|explode:$VAR._page}
<!-- {$meth.0}:{$meth.1} -->
{$method->exe($meth.0,$meth.1)}
{if ($method->result == false)}
{$block->display('core:method_error')}
{else}
<form id="search_form" method="post" action="" enctype="multipart/form-data">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="table_background">
<tr>
<td>
<table width="100%" border="0" cellspacing="1" cellpadding="0">
<tr valign="top">
<td class="table_heading">{osb f=tt}</td>
</tr>
<tr valign="top">
<td class="row1">
<table width="100%" border="0" cellspacing="3" cellpadding="1" class="row1">
<tr valign="top">
<td width="35%">{osb f=tf field=account_id}</td>
<td width="65%">{osb f=autoselect module=account return=id field=payment_account_id default=$record.account_id}</td>
</tr>
<tr valign="top">
<td width="35%">{osb f=tf field=source_id}</td>
<td width="65%">{osb f=autoselect module=account return=id field=payment_source_id default=$record.source_id}</td>
</tr>
<tr valign="top">
<td width="35%">{osb f=tf field=checkout_plugin_id}</td>
<td width="65%">{$list->menu('','payment_checkout_plugin_id','checkout','name','','form_menu',true)}</td>
</tr>
<tr valign="top">
<td width="35%">{osb f=tf field=billed_currency_id}</td>
<td width="65%">{$list->menu('','payment_billed_currency_id','currency','name','','form_menu',true)}</td>
</tr>
<tr valign="top">
<td width="35%">{osb f=tf field=date_orig}</td>
<td width="65%">{$list->calender_search('payment_date_orig',$VAR.payment_date_orig,'form_field','')}</td>
</tr>
<tr valign="top">
<td width="35%">{osb f=tf field=payment_date}</td>
<td width="65%">{$list->calender_search('payment_payment_date',$VAR.payment_payment_date,'form_field','')}</td>
</tr>
<tr valign="top">
<td width="35%">{osb f=tf field=refund_status}</td>
<td width="65%">{$list->bool('payment_refund_status','all')}</td>
</tr>
{include file='file:../core/search_post.tpl'}
</table>
</td>
</tr>
</table>
</td>
</tr>
</table>
</form>
{$block->display('core:saved_searches')}
{$block->display('core:recent_searches')}
{/if}

View File

@@ -1,12 +0,0 @@
{assign var=meth value=':'|explode:$VAR._page}
<!-- {$meth.0}:{$meth.1} -->
{$method->exe($meth.0,$meth.1)}
{if ($method->result == false)}
{$block->display('core:method_error')}
{else}
{include file='file:../core/search_show_pre.tpl'}
{$method->exe_noauth($meth.0,'tpl_search_show',$search_show)}
{include file='file:../core/search_show_post-1.tpl'}
{include file='file:../core/search_show_post-2.tpl'}
{/if}

View File

@@ -1,77 +0,0 @@
{assign var=meth value=':'|explode:$VAR._page}
<!-- {$meth.0}:{$meth.1} -->
{$method->exe($meth.0,$meth.1)}
{if ($method->result == false)}
{$block->display('core:method_error')}
{else}
{include file='file:../core/view_pre.tpl'}
<!-- Display the field validation -->
{if $form_validation}
{$block->display('core:alert_fields')}
{/if}
<!-- Display each record -->
<form id="view" method="post" action="" enctype="multipart/form-data">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="table_background">
<tr>
<td>
<table width="100%" border="0" cellspacing="1" cellpadding="0">
<tr valign="top">
<td class="table_heading">{osb f=tt} {$record.id}</td>
</tr>
<tr valign="top">
<td class="row1">
<table width="100%" border="0" cellspacing="3" cellpadding="1" class="row1">
<tr valign="top">
<td style="width: 35%;">{osb f=tf field=account_id}</td>
<td style="width: 65%;">{osb f=autoselect module=account return=id field=payment_account_id default=$record.account_id}</td>
</tr>
<tr valign="top">
<td style="width: 35%;">{osb f=tf field=date_payment}</td>
<td style="width: 65%;">{$list->calender_view('payment_date_payment',$record.date_payment,'form_field')}</td>
</tr>
<tr valign="top">
<td style="width: 35%;">{osb f=tf field=checkout_plugin_id}</td>
<td style="width: 65%;">{$list->mmenu('no','payment_checkout_plugin_id','checkout','name',$record.checkout_plugin_id,'active=1','',true)}</td>
</tr>
<tr valign="top">
<td style="width: 35%;">{osb f=tf field=total_amt}</td>
<td style="width: 65%;"><input type="text" name="payment_total_amt" value="{$record.total_amt}" {if $payment_total_amt == true}class="form_field_error"{/if}/></td>
</tr>
<tr valign="top">
<td style="width: 35%;">{osb f=tf field=fees_amt}</td>
<td style="width: 65%;"><input type="text" name="payment_fees_amt" value="{$record.fees_amt}" {if $payment_fees_amt == true}class="form_field_error"{/if}/></td>
</tr>
<tr valign="top">
<td style="width: 35%;">{osb f=tf field=notes}</td>
<td style="width: 65%;"><textarea name="payment_notes" cols="25" rows="2" {if $payment_notes == true}class="form_field_error"{/if}>{$record.notes}</textarea></td>
</tr>
</table>
</td>
</tr>
{include file='file:../core/view_tr_submit_delete.tpl'}
</table>
</td>
</tr>
</table>
{include file='file:../core/view_post.tpl'}
</form>
<iframe name="iframe" id="iframe" style="border:0px; width:0px; height:0px;" scrolling="auto" allowtransparency="true" frameborder="0" src="themes/{$THEME_NAME}/IEFrameWarningBypass.htm"></iframe>
<script type="text/javascript">
<!--
{literal}
function showUnpaidInvoices(payment,account) {
showIFrame('iframe',getPageWidth(650),350,'?_page=payment:allocate&payment_id='+payment);
}
showUnpaidInvoices({/literal}{$record.id}{literal});
{/literal}
//-->
</script>
{/if}