deon/khosb
Archived
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Fixes for live environment and updates to admin/service/update

Browse Source
This commit is contained in:
Deon George
2011-07-22 11:04:20 +10:00
parent 27cdab1fe4
commit c8c4c5176d
41 changed files with 2457 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/invoice/PDF/pdf_invoice_itemised-tcpdf.inc.php
View File

@@ -203,7 +203,7 @@ class pdf_invoice_overview extends pdf_invoice_base {
$this->SetXY($x,$y); $this->Cell(0,0,'This invoice can also be paid by:'); $y += 4;
# Direct Credit
$logo = sprintf('%s/%s',PATH_THEMES.DEFAULT_THEME,'invoice/invoice-payment-dd.png');
$logo = sprintf('%s/%s','/afs/local/home/gh/.web/au.net.graytech.www/osb/modules/invoice/media/img/','invoice-payment-dd.png');
$this->Image($logo,$x+1,$y,8);
$this->SetFont('helvetica','B',8);
$this->SetXY($x+10,$y); $this->Cell(0,0,'Direct Credit to our Bank Account'); $y += 3;
@@ -231,7 +231,8 @@ class pdf_invoice_overview extends pdf_invoice_base {
# Paypal
$y += 3;
$logo = sprintf('%s/%s',PATH_THEMES.DEFAULT_THEME,'invoice/invoice-payment-pp.png');
// $logo = sprintf('%s/%s',PATH_THEMES.DEFAULT_THEME,'invoice/invoice-payment-pp.png');
$logo = sprintf('%s/%s','/afs/local/home/gh/.web/au.net.graytech.www/osb/modules/invoice/media/img/','invoice-payment-pp.png');
$this->Image($logo,$x+1,$y,8);
$this->SetFont('helvetica','B',8);
$this->SetXY($x+10,$y); $this->Cell(0,0,'Pay Pal/Credit Card'); $y += 3;

3
modules/invoice/invoice.inc.php
View File

@@ -618,7 +618,7 @@ class invoice extends OSB_module {
$account_where = '';
if (is_null($fields))
$fields = 'DISTINCT service.id AS sid,account.id AS account_id,invoice.id AS iid,FROM_UNIXTIME(service.date_next_invoice,\'%Y-%m-%d\') AS invoice_date,service.sku AS sku,service.price AS price,account.first_name AS first_name,account.last_name AS last_name,account.currency_id AS billed_currency_id,service.date_orig AS date_orig';
$fields = 'DISTINCT service.id AS sid,account.id AS account_id,FROM_UNIXTIME(service.date_next_invoice,\'%Y-%m-%d\') AS invoice_date,service.sku AS sku,service.price AS price,account.first_name AS first_name,account.last_name AS last_name,account.currency_id AS billed_currency_id,service.date_orig AS date_orig';
if (is_null($orderby))
$orderby = 'ORDER BY account_id,invoice_date,sid';
@@ -638,7 +638,6 @@ class invoice extends OSB_module {
SELECT %s
FROM {p}service AS service
JOIN {p}account AS account ON (service.account_id=account.id AND account.site_id={s})
LEFT JOIN {p}invoice AS invoice ON (service.invoice_id=invoice.id AND invoice.site_id={s})
%s
WHERE service.site_id={s}
AND service.active=1