OSB enhancements to date

This commit is contained in:
Deon George
2010-11-30 09:41:08 +11:00
parent 8715a2059b
commit ec6a542bc3
478 changed files with 23423 additions and 9309 deletions

View File

@@ -0,0 +1,45 @@
{assign var=meth value=':'|explode:$VAR._page}
<!-- {$meth.0}:{$meth.1} -->
{$method->exetm($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' module='service'}
<td>{$record.last_name}, {$record.first_name}</td>
<td>{$record.sid} ({$record.sku})</td>
<td>{$record.invoice_date}</td>
<td style="text-align: right;">{$list->format_currency_num($record.price,$record.billed_currency_id)}</td>
<td style="text-align: center;">
{if $record.billing_status == '1'}
<img src="themes/{$THEME_NAME}/images/icons/add_16.gif" alt="" style="border: 0px;"/>
{else}
<img src="themes/{$THEME_NAME}/images/icons/remov_16.gif" alt="" style="border: 0px;"/>
{/if}
{if $record.process_status == '1'}
<img src="themes/{$THEME_NAME}/images/icons/go_16.gif" alt="" style="border: 0px;"/>
{else}
<img src="themes/{$THEME_NAME}/images/icons/stop_16.gif" alt="" style="border: 0px;"/>
{/if}
<a href="?_page=core:search&amp;module=service&amp;service_invoice_id={$record.sid}"><img src="themes/{$THEME_NAME}/images/icons/tools_16.gif" alt="Services" style="border: 0px;"/></a>
<a href="?_page=account:view&amp;id={$record.account_id}"><img src="themes/{$THEME_NAME}/images/icons/user_16.gif" alt="" style="border: 0px;"/></a>
</td>
</tr>
{/foreach}
</table>
</td>
</tr>
</table>
</form>
</div>
{include file='file:../core/search_show_post-2.tpl'}
{/if}

View File

@@ -1,72 +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'}
{translate amount=$total_amount module=invoice}search_result_amount{/translate}<br/>
<br/>
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="table_background">
<tr>
<td>
<table width="100%" border="0" cellspacing="1" cellpadding="2">
<!-- DISPLAY THE SEARCH HEADING -->
<tr valign="middle" align="center" class="table_heading">
<td width="25" class="table_heading">&nbsp;</td>
<td class="table_heading">
<script type="text/javascript">document.write(search_heading('{translate module=invoice}field_account_id{/translate}','account_id'));</script>
</td>
<td class="table_heading">
<script type="text/javascript">document.write(search_heading('{translate module=service}field_id{/translate}','id'));</script>
</td>
<td class="table_heading">
<script type="text/javascript">document.write(search_heading('{translate module=invoice}XXX{/translate}Next Invoice Date','date_orig'));</script>
</td>
<td class="table_heading">
<script type="text/javascript">document.write(search_heading('{translate module=invoice}field_total_amt{/translate}','total_amt'));</script>
</td>
<td class="table_heading" style="width: 120px; text-align: right;">&nbsp;</td>
</tr>
<!-- LOOP THROUGH EACH RECORD -->
{foreach from=$invoice item=record}
<tr id="row{$record.sid}" onClick="row_sel('{$record.sid}',1);" onDblClick="window.location='?_page=service:view&id={$record.sid},';" onMouseOver="row_mouseover('{$record.sid}', 'row_mouse_over_select', 'row_mouse_over');" onMouseOut="row_mouseout('{$record.sid}', '{$record._C}', 'row_select');" class="{$record._C}">
<td align="center" width="25">
<input type="checkbox" name="record{$record.sid}" value="{$record.sid}" onClick="row_sel('{$record.sid}',1,'{$record._C}');"/>
<script type="text/javascript">row_sel('{$record.sid}',0,'{$record._C}'); record_arr[i] = '{$record.sid}'; i++;</script>
</td>
<td>{$record.last_name}, {$record.first_name}</td>
<td>{$record.sid} ({$record.sku})</td>
<td>{$record.invoice_date}</td>
<td><div align="right">{$list->format_currency_num($record.price,$record.billed_currency_id)}&nbsp;</div></td>
<td>
<center>
{if $record.billing_status == '1'}
<img src="themes/{$THEME_NAME}/images/icons/add_16.gif" border="0" vspace="2" hspace="2"/>
{else}
<img src="themes/{$THEME_NAME}/images/icons/remov_16.gif" border="0" vspace="2" hspace="2"/>
{/if}
{if $record.process_status == '1'}
<img src="themes/{$THEME_NAME}/images/icons/go_16.gif" border="0" vspace="2" hspace="2"/>
{else}
<img src="themes/{$THEME_NAME}/images/icons/stop_16.gif" border="0" vspace="2" hspace="2"/>
{/if}
<a href="?_page=core:search&module=service&service_invoice_id={$record.sid}"><img title=Services src="themes/{$THEME_NAME}/images/icons/tools_16.gif" border="0" alt="Services" vspace="2" hspace="2"/></a>
<a href="?_page=account:view&id={$record.account_id}"><img src="themes/{$THEME_NAME}/images/icons/user_16.gif" border="0" vspace="2" hspace="2"/></a>
</center>
</td>
</tr>
{/foreach}
<!-- END OF RESULT LOOP -->
</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

@@ -3,24 +3,26 @@
<td>
<table width="100%" border="0" cellspacing="1" cellpadding="0">
<tr valign="top">
<td class="table_heading">{translate module=invoice}thank_you{/translate}</td>
<td class="table_heading">{t}Thank You{/t}</td>
</tr>
<tr valign="top">
<td class="row1">
<table width="100%" border="0" cellspacing="3" cellpadding="1" class="row1">
<tr valign="top">
<td>{translate module=invoice}thank_you_text{/translate}</td>
<td style="font-size: 120%; font-weight: bold;">{t}We want to take this opportunity to thank you for your purchase/invoice payment!{/t}</td>
</tr>
<tr valign="top">
<td>
{if $VAR.id != ''}
<a href="?id={$VAR.id}&_page={if $VAR._next_page != ''}{$VAR._next_page}{else}invoice:user_view{/if}">{translate module="invoice"}invoice_link{/translate}</a>
{/if}
{t}From here you may{/t}
<ul>
{if $VAR.id != ''}
<li><a href="?id={$VAR.id}&_page={if $VAR._next_page != ''}{$VAR._next_page}{else}invoice:user_view{/if}">{t}Click here to review your invoice details{/t}</a></li>
{/if}
<li><a href="?_page=account:account">{t}Click here to return to your account{/t}</a></li>
<li><a href="?_page=product_cat:menu">{t}View our other products and services{/t}</a></li>
</ul>
</td>
</tr>
<tr valign="top">
<td><a href="?_page=account:account">{translate module="invoice"}account_link{/translate}</a></td>
</tr>
</table>
</td>
</tr>

View File

@@ -38,7 +38,8 @@
{include file='file:../core/user_search_show_tr_record.tpl'}
<td>{$record.id}</td>
<td>{$list->date_time($record.date_orig)}</td>
<td><div style="text-align: right">{$list->format_currency_num($record.total_amt, $record.actual_billed_currency_id)}</div></td>
<td><div style="text-align: right">{$list->format_currency_num($record.total_amt,$record.actual_billed_currency_id)}</div></td>
<td><div style="text-align: right">{$list->format_currency_num($record.balance,$record.actual_billed_currency_id)}</div></td>
<td style="text-align: center">
{if $record.billing_status == '1'}
<img src="themes/{$THEME_NAME}/images/icons/add_16.gif" alt="" style="border: 0px;"/>

View File

@@ -147,6 +147,41 @@
<div>
<br/>
</div>
{if $record.payment_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" class="table_background">
<td class="table_heading">{t}Payments Applied{/t}</td>
</tr>
<!-- Loop through each payment item record -->
<tr valign="top">
<td>
<table width="100%" border="0" cellspacing="1" cellpadding="0">
<tr valign="top" class="table_background">
<td style="width: 33%;"><b>{t}Payment Date{/t}</b></td>
<td style="width: 33%;"><b>{t}Payment Amount{/t}</b></td>
<td style="width: 33%;"><b>{t}Applied to this invoice{/t}</b></td>
</tr>
{foreach from=$record.payment_data item=pd}
<tr valign="top" class="table_background">
<td>{$list->date($pd.date_payment)}</td>
<td>{$list->format_currency_num($pd.total,$record.actual_billed_currency_id)}</td>
<td>{$list->format_currency_num($pd.alloc,$record.actual_billed_currency_id)}</td>
</tr>
{/foreach}
</table>
</td>
</tr>
</table>
</td>
</tr>
</table>
<div>
<br/>
</div>
{/if}
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="table_background">
<tr>
<td>
@@ -423,5 +458,5 @@
{/if}
<!-- custom tracking code -->
{$method->exe('invoice','custom_tracking')}
{$method->exe('invoice','drCustomTracking')}
{/if}

View File

@@ -18,11 +18,11 @@
elements[2] = 'affiliate';
{literal}
function approveInvoice(id,status) {
if(status.value == '1') {
document.location = '?_page=invoice:view&id='+id+'&do[]=invoice:approveInvoice';
function pApproveVoid(id,status) {
if(status == '1') {
document.location = '?_page=invoice:view&id='+id+'&do[]=invoice:pApproveInvoice';
} else {
document.location = '?_page=invoice:view&id='+id+'&do[]=invoice:voidInvoice';
document.location = '?_page=invoice:view&id='+id+'&do[]=invoice:pVoidInvoice';
}
}
@@ -32,14 +32,6 @@
document.forms.view.submit();
}
function approveInvoice(id,status,ids) {
if(status == '1') {
document.location = '?_page=invoice:view&id='+id+'&do[]=invoice:approveInvoice&ids='+ids;
} else {
document.location = '?_page=invoice:view&id='+id+'&do[]=invoice:voidInvoice&ids='+ids;
}
}
function displayArea() {
{/literal}
{if $VAR.area == ""}
@@ -155,6 +147,7 @@
{else}
{$list->format_currency_num($record.balance,$record.billed_currency_id)} (<a href="javascript:showReconcile('{$record.balance}');">{t}Reconcile Invoice{/t}</a>)
{/if}
({$list->format_currency_num($record.credit_amt,$record.billed_currency_id)})
</td>
<td style="width: 1%;">&nbsp;</td>
<td style="width: 32%;">
@@ -198,9 +191,9 @@
<td>&nbsp;</td>
<td>
{if $record.process_status == 1}
Yes (<a href="javascript:approveInvoice('{$record.id}',0);">{t}Void Invoice & Services{/t}</a>)
Yes (<a href="javascript:pApproveVoid('{$record.id}',0);">{t}Void Invoice & Services{/t}</a>)
{elseif $record.billing_status == 1}
No (<a href="javascript:approveInvoice('{$record.id}',1);">{t}Approve Invoice & Services{/t}</a>)
No (<a href="javascript:pApproveVoid('{$record.id}',1);">{t}Approve Invoice & Services{/t}</a>)
{else}
{t}Pending Billing{/t}
{/if}
@@ -299,13 +292,13 @@
{$record.notice_count}&nbsp;<a href="?_page=invoice:view&amp;account_id={$record.account_id}&amp;id={$record.id}&amp;ids={$VAR.ids}&amp;do[]=invoice:resend"><img src="themes/{$THEME_NAME}/images/icons/mail_16.gif" alt="Resend Invoice" width="16" height="16" style="border: 0px;"/></a>
</td>
<td style="width: 5%;"><b>{osb f=tf field=due_date}</b></td>
<td style="width: 45%;"><b>{$list->calender_view('invoice_due_date',$record.due_date,'form_field')}</b></td>
<td style="width: 45%;"><b>{$list->calender_view('invoice_due_date',$record.due_date,'form_field','')}</b></td>
</tr>
<tr valign="top">
<td><b>{osb f=tf field=notice_max}</b></td>
<td><input type="text" name="invoice_notice_max" value="{$record.notice_max}" size="2"/></td>
<td><b>{osb f=tf field=notice_next_date}</b></td>
<td><b>{$list->calender_view('invoice_notice_next_date',$record.notice_next_date,'form_field')}</b></td>
<td><b>{$list->calender_view('invoice_notice_next_date',$record.notice_next_date,'form_field','')}</b></td>
</tr>
<tr valign="top">
<td><b>{osb f=tf field=grace_period}</b></td>
@@ -563,7 +556,7 @@
<td align="right">&nbsp;
{if $record.type == 1 || $cart.service_id > 0}<b><a href="?_page=service:view&amp;id={$cart.service_id}">{$cart.service_id}</a></b> -{/if}
<b><a href="?_page=product:view&amp;id={$cart.product_id}">{$cart.sku}</a></b>
{if $cart.domain_name != ''}(<a href="?_page=service:view&amp;id={$cart.service_id}">{$cart.domain_name}. {$cart.domain_tld}</a>){/if}
{if $cart.domain_name != ''}(<a href="?_page=service:view&amp;id={$cart.service_id}">{$cart.domain_name}.{$cart.domain_tld}</a>){/if}
</td>
<td style="width: 5%; text-align: right;">
{if $cart.attribute_popup != ''}
@@ -682,7 +675,7 @@
<script type="text/javascript">
<!--
displayArea();
var invoice_id = {$record.id};
var invoice_id = '{$record.id}';
var account_id = '{$record.account_id}';
{literal}