Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[8674] XoopsModules/xpayment/releases/1.42/htdocs/modules /xpayment
|
From: <wis...@us...> - 2012-01-08 13:47:09
|
Revision: 8674
http://xoops.svn.sourceforge.net/xoops/?rev=8674&view=rev
Author: wishcraft
Date: 2012-01-08 13:47:02 +0000 (Sun, 08 Jan 2012)
Log Message:
-----------
XPayment 1.42 - Warnings & Notices (Requested Mamba) - See changelog.txt
Modified Paths:
--------------
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/admin/index.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/docs/changelog.txt
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/header.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/index.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/admin.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/main.php
XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/xoops_version.php
Modified: XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/admin/index.php
===================================================================
--- XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/admin/index.php 2012-01-08 13:22:31 UTC (rev 8673)
+++ XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/admin/index.php 2012-01-08 13:47:02 UTC (rev 8674)
@@ -1022,7 +1022,7 @@
$aboutAdmin = new ModuleAdmin();
$about = $aboutAdmin->renderabout($paypalitemno, false);
$donationform = array( 0 => '<form name="donation" id="donation" action="http://www.chronolabs.coop/modules/xpayment/" method="post" onsubmit="return xoopsFormValidate_donation();">',
- 1 => '<table class="outer" cellspacing="1" width="100%"><tbody><tr><th colspan="2">'.constant('_AM_SPIDERS_ABOUT_MAKEDONATE').'</th></tr><tr align="left" valign="top"><td class="head"><div class="xoops-form-element-caption-required"><span class="caption-text">Donation Amount</span><span class="caption-marker">*</span></div></td><td class="even"><select size="1" name="item[A][amount]" id="item[A][amount]" title="Donation Amount"><option value="5">5.00 AUD</option><option value="10">10.00 AUD</option><option value="20">20.00 AUD</option><option value="40">40.00 AUD</option><option value="60">60.00 AUD</option><option value="80">80.00 AUD</option><option value="90">90.00 AUD</option><option value="100">100.00 AUD</option><option value="200">200.00 AUD</option></select></td></tr><tr align="left" valign="top"><td class="head"></td><td class="even"><input class="formButton" name="submit" id="submit" value="'._SUBMIT.'" title="'._SUBMIT.'" type="submit"></td></tr></tbody></table>',
+ 1 => '<table class="outer" cellspacing="1" width="100%"><tbody><tr><th colspan="2">'.constant('_XPY_AM_MAKE_DONATION').'</th></tr><tr align="left" valign="top"><td class="head"><div class="xoops-form-element-caption-required"><span class="caption-text">Donation Amount</span><span class="caption-marker">*</span></div></td><td class="even"><select size="1" name="item[A][amount]" id="item[A][amount]" title="Donation Amount"><option value="5">5.00 AUD</option><option value="10">10.00 AUD</option><option value="20">20.00 AUD</option><option value="40">40.00 AUD</option><option value="60">60.00 AUD</option><option value="80">80.00 AUD</option><option value="90">90.00 AUD</option><option value="100">100.00 AUD</option><option value="200">200.00 AUD</option></select></td></tr><tr align="left" valign="top"><td class="head"></td><td class="even"><input class="formButton" name="submit" id="submit" value="'._SUBMIT.'" title="'._SUBMIT.'" type="submit"></td></tr></tbody></table>',
2 => '<input name="op" id="op" value="createinvoice" type="hidden"><input name="plugin" id="plugin" value="donations" type="hidden"><input name="donation" id="donation" value="1" type="hidden"><input name="drawfor" id="drawfor" value="Chronolabs Co-Operative" type="hidden"><input name="drawto" id="drawto" value="%s" type="hidden"><input name="drawto_email" id="drawto_email" value="%s" type="hidden"><input name="key" id="key" value="%s" type="hidden"><input name="currency" id="currency" value="AUD" type="hidden"><input name="weight_unit" id="weight_unit" value="kgs" type="hidden"><input name="item[A][cat]" id="item[A][cat]" value="XDN%s" type="hidden"><input name="item[A][name]" id="item[A][name]" value="Donation for %s" type="hidden"><input name="item[A][quantity]" id="item[A][quantity]" value="1" type="hidden"><input name="item[A][shipping]" id="item[A][shipping]" value="0" type="hidden"><input name="item[A][handling]" id="item[A][handling]" value="0" type="hidden"><input name="item[A][weight]" id="item[A][weight]" value="0" type="hidden"><input name="item[A][tax]" id="item[A][tax]" value="0" type="hidden"><input name="return" id="return" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"><input name="cancel" id="cancel" value="http://www.chronolabs.coop/modules/donations/success.php" type="hidden"></form>', 'D'=>'',
3 => '',
4 => '<!-- Start Form Validation JavaScript //-->
@@ -1042,7 +1042,7 @@
for($key=0;$key<=4;$key++) {
switch ($key) {
case 2:
- $donationform[$key] = sprintf($donationform[$key], $GLOBALS['xoopsConfig']['sitename'] . ' - ' . (strlen($GLOBALS['xoopsUser']->getVar('name'))>0?$GLOBALS['xoopsUser']->getVar('name'). ' ['.$GLOBALS['xoopsUser']->getVar('uname').']':$GLOBALS['xoopsUser']->getVar('uname')), $GLOBALS['xoopsUser']->getVar('email'), XOOPS_LICENSE_KEY, strtoupper($GLOBALS['spidersModule']->getVar('dirname')), strtoupper($GLOBALS['spidersModule']->getVar('dirname')). ' '.$GLOBALS['spidersModule']->getVar('name'));
+ $donationform[$key] = sprintf($donationform[$key], $GLOBALS['xoopsConfig']['sitename'] . ' - ' . (strlen($GLOBALS['xoopsUser']->getVar('name'))>0?$GLOBALS['xoopsUser']->getVar('name'). ' ['.$GLOBALS['xoopsUser']->getVar('uname').']':$GLOBALS['xoopsUser']->getVar('uname')), $GLOBALS['xoopsUser']->getVar('email'), XOOPS_LICENSE_KEY, strtoupper($GLOBALS['xpaymentModule']->getVar('dirname')), strtoupper($GLOBALS['xpaymentModule']->getVar('dirname')). ' '.$GLOBALS['xpaymentModule']->getVar('name'));
break;
}
}
Modified: XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/docs/changelog.txt
===================================================================
--- XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/docs/changelog.txt 2012-01-08 13:22:31 UTC (rev 8673)
+++ XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/docs/changelog.txt 2012-01-08 13:47:02 UTC (rev 8674)
@@ -1,5 +1,5 @@
========================================
- 2012/01/08 22:10:00 Version 1.42 STABLE
+ 2012/01/09 00:45:00 Version 1.42 STABLE
========================================
- Changed $GLOBALS['xoopsModule'] in module renamed to $GLOBALS['xpaymentModule'] /class/gateway, /class, /include, / (Wishcraft)
- Changed $GLOBALS['xoopsModuleConfig'] in module renamed to $GLOBALS['xpaymentModuleConfig'] /class/gateway, /class, /include, / (Wishcraft)
@@ -8,6 +8,7 @@
- Changed /xoops_version.php Manual transaction prefix code for invoice (Wishcraft)
- Changed /language/english/modinfo.php Manual transaction prefix code for invoice Preferences text (Wishcraft)
- Changed /templates/xpayment_payment.php Distinction between payment types with border & manual transaction prefix to invoice number (Wishcraft)
+ - Fixed Warnings & Notices (Requested by Mamba) (Wishcraft)
========================================
2012/01/05 8:59:00 Version 1.41 STABLE
Modified: XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/header.php
===================================================================
--- XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/header.php 2012-01-08 13:22:31 UTC (rev 8673)
+++ XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/header.php 2012-01-08 13:47:02 UTC (rev 8674)
@@ -28,7 +28,7 @@
include_once $GLOBALS['xoops']->path('/modules/xpayment/include/xpayment.forms.php');
xoops_load('pagenav');
- xoops_load('xoopsmailer');
+ xoops_load('xoopsmultimailer');
$GLOBALS['myts'] = MyTextSanitizer::getInstance();
@@ -39,6 +39,6 @@
include_once $GLOBALS['xoops']->path( "/class/template.php" );
$GLOBALS['xoopsTpl'] = new XoopsTpl();
+ $iid = 0;
-
?>
\ No newline at end of file
Modified: XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/index.php
===================================================================
--- XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/index.php 2012-01-08 13:22:31 UTC (rev 8673)
+++ XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/index.php 2012-01-08 13:47:02 UTC (rev 8674)
@@ -222,7 +222,7 @@
} elseif (isset($_GET['invoicenum'])&&$GLOBALS['xpaymentModuleConfig']['id_protect']==false) {
$invoice =& $invoice_handler->getInvoiceNumber($_GET['invoicenum']);
} else {
- $key = $_GET['iid'];
+ $key = (isset($_GET['iid'])?$_GET['iid']:0);
$criteria = new Criteria('offline', time(), '>=');
$criteria->setSort('iid');
$criteria->setOrder('DESC');
@@ -235,7 +235,7 @@
}
}
- if (!is_object($invoice)) {
+ if (!isset($invoice)) {
if ($GLOBALS['xpaymentModuleConfig']['htaccess']==true)
$url = XOOPS_URL.'/'.$GLOBALS['xpaymentModuleConfig']['baseurl'].'/index'.$GLOBALS['xpaymentModuleConfig']['endofurl'];
Modified: XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/admin.php
===================================================================
--- XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/admin.php 2012-01-08 13:22:31 UTC (rev 8673)
+++ XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/admin.php 2012-01-08 13:47:02 UTC (rev 8674)
@@ -61,13 +61,11 @@
define('_XPY_AM_TH_CREATED', 'Created');
define('_XPY_AM_TH_UPDATED', 'Updated');
define('_XPY_AM_TH_ACTIONED', 'Made');
- define('_XPY_AM_TH_PLUGIN', 'Plugin');
define('_XPY_AM_TH_UID', 'User');
define('_XPY_AM_TH_LIMIT', 'Limited');
define('_XPY_AM_TH_MINIMUM', 'Minimum Amount');
define('_XPY_AM_TH_MAXIMUM', 'Maximum Amount');
define('_XPY_AM_TH_REMITTION', 'Remittion');
- define('_XPY_MSG_INVOICE_PAID', 'Invoice Marked Paid!');
define('_XPY_AM_PAID', 'Amount Paid');
define('_XPY_AM_ADDRULE', 'Add/Edit Group Rule');
define('_XPY_AM_GROUP_FCT', 'Select Group');
@@ -188,7 +186,6 @@
define('_XPY_AM_TOTALWEIGHT_TH', 'Total Weight');
define('_XPY_AM_UNITWEIGHT_TH', 'Unit Weight');
define('_XPY_AM_GRANDAMOUUNT_TH', 'Grand Sum');
- define('_XPY_AM_TOTALAMOUUNT_TH', 'Total Amount');
define('_XPY_AM_TOTALSHIPPING_TH', 'Total Shipping');
define('_XPY_AM_TOTALHANDLING_TH', 'Total Handling');
define('_XPY_AM_TOTALTAX_TH', 'Total Tax');
@@ -313,7 +310,6 @@
define('_XPY_MSG_TAX_SAVED', 'Tax rates in current list saved!');
//Tax List
- define('_XPY_AM_TH_COUNTRY', 'Country Name');
define('_XPY_AM_TH_CODE', 'Code');
define('_XPY_AM_TH_RATE', 'Perentile Tax Rate');
define('_XPY_AM_TAX_H1', 'Automatic Tax Rates');
@@ -329,14 +325,10 @@
// Table Headers
define('_XPY_AM_TH_DID', 'Discount ID');
- define('_XPY_AM_TH_UID', 'User');
- define('_XPY_AM_TH_EMAIL', 'Email');
define('_XPY_AM_TH_VALIDTILL', 'Valid Till');
define('_XPY_AM_TH_REDEEMS', 'Redeems');
define('_XPY_AM_TH_DISCOUNT', 'Discount');
define('_XPY_AM_TH_REDEEMED', 'Redeemed');
- define('_XPY_AM_TH_CREATED', 'Created');
- define('_XPY_AM_TH_UPDATED', 'Updated');
define('_XPY_AM_TH_DISCOUNT_AMOUNT', 'Discount Amount');
//Permissions
@@ -519,4 +511,7 @@
// Emails
define('_XPY_EMAIL_REMINDER_SUBJECT','Reminder of a Generated Invoice for %s %s drawn to %s!');
+
+ // Version 1.42
+ define('_XPY_AM_MAKE_DONATION', 'Make XPayment Grand - Make a donation Today!');
?>
\ No newline at end of file
Modified: XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/main.php
===================================================================
--- XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/main.php 2012-01-08 13:22:31 UTC (rev 8673)
+++ XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/language/english/main.php 2012-01-08 13:47:02 UTC (rev 8674)
@@ -65,7 +65,6 @@
define('_XPY_MF_TOTALWEIGHT_TH', 'Total Weight');
define('_XPY_MF_UNITWEIGHT_TH', 'Unit Weight');
define('_XPY_MF_GRANDAMOUUNT_TH', 'Grand Sum');
- define('_XPY_MF_TOTALAMOUUNT_TH', 'Total Amount');
define('_XPY_MF_TOTALSHIPPING_TH', 'Total Shipping');
define('_XPY_MF_TOTALHANDLING_TH', 'Total Handling');
define('_XPY_MF_TOTALTAX_TH', 'Total Tax');
@@ -108,7 +107,6 @@
define('_XPY_MF_TH_MINIMUM', 'Minimum Amount');
define('_XPY_MF_TH_MAXIMUM', 'Maximum Amount');
define('_XPY_MF_TH_REMITTION', 'Remittion');
- define('_XPY_MF_PAID', 'Amount Paid');
define('_XPY_MF_ADDRULE', 'Add/Edit Group Rule');
define('_XPY_MF_GROUP_FCT', 'Select Group');
define('_XPY_MF_EDITGROUP', 'Edit Rule');
@@ -147,7 +145,6 @@
define('_XPY_MF_STATUS', 'Status');
define('_XPY_MF_DATE', 'Date');
define('_XPY_MF_GROSS', 'Gross');
- define('_XPY_MF_FEE', 'Fee');
define('_XPY_MF_SETTLE', 'Settlement');
define('_XPY_MF_EXCHANGERATE', 'Exchange Rate');
define('_XPY_MF_FIRSTNAME', 'Firstname');
@@ -255,20 +252,15 @@
define('_XPY_PDF_MF_TOTALWEIGHT_TH', 'Total Weight');
define('_XPY_PDF_MF_UNITWEIGHT_TH', 'Unit Weight');
define('_XPY_PDF_MF_TOTALTAX_TH', 'Tax Paid');
- define('_XPY_PDF_MF_TOTALWEIGHT_TH', 'Total Weight');
- define('_XPY_PDF_MF_UNITWEIGHT_TH', 'Unit Weight');
define('_XPY_PDF_MF_GRANDAMOUUNT_TH', 'Grand Sum');
- define('_XPY_PDF_MF_TOTALAMOUUNT_TH', 'Total Amount');
define('_XPY_PDF_MF_TOTALSHIPPING_TH', 'Total Shipping');
define('_XPY_PDF_MF_TOTALHANDLING_TH', 'Total Handling');
- define('_XPY_PDF_MF_TOTALTAX_TH', 'Total Tax');
define('_XPY_PDF_MF_BREAKDOWN_H2', 'Invoice Breakdown on Charges');
define('_XPY_PDF_MF_BREAKDOWN_P', 'This is the invoice break down on shipping, handling, taxes and totals.');
define('_XPY_PDF_MF_BREAKDOWN_H2B', 'Totals Breakdown on Charges');
define('_XPY_PDF_MF_BREAKDOWN_PB','This is the invoice continuing to break down in totals.');
define('_XPY_PDF_MF_GRANDAMOUNT', 'Total Grand Amount:');
define('_XPY_PDF_MF_PAID', 'Amount Paid');
- define('_XPY_PDF_MF_DONATION', 'Donation');
define('_XPY_PDF_MF_DUE', 'Invoice Due');
define('_XPY_PDF_MF_COLLECT', 'Invoice Collect on');
define('_XPY_PDF_MF_WAIT', 'Invoice Wait');
Modified: XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/xoops_version.php
===================================================================
--- XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/xoops_version.php 2012-01-08 13:22:31 UTC (rev 8673)
+++ XoopsModules/xpayment/releases/1.42/htdocs/modules/xpayment/xoops_version.php 2012-01-08 13:47:02 UTC (rev 8674)
@@ -30,7 +30,7 @@
$modversion['dirname'] = basename(dirname(__FILE__));
$modversion['name'] = ucfirst(basename(dirname(__FILE__)));
$modversion['version'] = "1.42";
-$modversion['releasedate'] = "2012-01-08";
+$modversion['releasedate'] = "2012-01-09";
$modversion['module_status']= "Stable";
$modversion['description'] = _MI_XPY_DESC;
$modversion['credits'] = _MI_XPY_CREDITS;
@@ -45,9 +45,9 @@
$modversion['icons16'] = 'Frameworks/moduleclasses/icons/16';
$modversion['icons32'] = 'Frameworks/moduleclasses/icons/32';
-$modversion['release_info'] = "Stable 2012/01/08";
+$modversion['release_info'] = "Stable 2012/01/09";
$modversion['release_file'] = XOOPS_URL."/modules/xpayment/docs/changelog.txt";
-$modversion['release_date'] = "2012/01/08";
+$modversion['release_date'] = "2012/01/09";
$modversion['author_realname'] = "Simon Antony Roberts";
$modversion['author_website_url'] = "http://www.chronolabs.org.au";
@@ -274,7 +274,7 @@
BSB: 0000000<br/>
ACCOUNT: 0000000<br/>
NAME: John Doe';
-
+$prefix = '';
foreach(explode(' ', $GLOBALS['xoopsConfig']['sitename']) as $word) {
$prefix .= strtoupper(substr($word,0,1));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
