Changeset 2751

Show
Ignore:
Timestamp:
02/19/10 11:43:11 (2 years ago)
Author:
areski
Message:

fix bug on paypal if account is disabled + add paypal AUD

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/common/lib/admin.defines.php

    r2747 r2751  
    3232**/ 
    3333 
    34 define ("PHP_QUICK_PROFILER", false); 
     34define ("PHP_QUICK_PROFILER", true); 
    3535// Include PHP-Quick-Profiler 
    3636require_once('PhpQuickProfiler.php'); 

  • trunk/common/lib/agent.defines.php

    r2747 r2751  
    3232**/ 
    3333 
    34 define ("PHP_QUICK_PROFILER", false); 
     34define ("PHP_QUICK_PROFILER", true); 
    3535// Include PHP-Quick-Profiler 
    3636require_once('PhpQuickProfiler.php'); 

  • trunk/common/lib/common.defines.php

    r2750 r2751  
    128128 
    129129// A2BILLING INFO   
    130 define ("COPYRIGHT", "A2Billing - Version 1.6.0 (Hickory) - Released : 16 February 2010, A2Billing is software licensed under the ".'<a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html" target="_blank">AGPL 3</a>' . ". <br/>" . "Copyright (C) 2004-2009 - Star2billing S.L. <a href=\"http://www.star2billing.com\" target=\"_blank\">http://www.star2billing.com/</a>"); 
     130define ("COPYRIGHT", "A2Billing 1.6.0 (Hickory), A2Billing is software licensed under the ".'<a href="http://www.fsf.org/licensing/licenses/agpl-3.0.html" target="_blank">AGPL 3</a>' . ". <br/>" . "Copyright (C) 2004-2010 - Star2billing S.L. <a href=\"http://www.star2billing.com\" target=\"_blank\">http://www.star2billing.com/</a>"); 
    131131 
    132132define ("CCMAINTITLE", gettext("A2Billing Portal")); 

  • trunk/common/lib/customer.defines.php

    r2747 r2751  
    3232**/ 
    3333 
    34 define ("PHP_QUICK_PROFILER", false); 
     34define ("PHP_QUICK_PROFILER", true); 
    3535// Include PHP-Quick-Profiler 
    3636require_once('PhpQuickProfiler.php'); 

  • trunk/common/lib/epayment/classes/order.php

    r2433 r2751  
    3636        if ($numrow == 0) {exit();} 
    3737        $customer_info =$resmax -> fetchRow(); 
    38         if ($customer_info [12] != "1" ) { 
     38        if ($customer_info [12] != "1" && $customer_info [12] != "8") { 
    3939                        exit(); 
    4040                } 

  • trunk/common/lib/epayment/methods/paypal.php

    r2351 r2751  
    6363                $my_currency = strtoupper($GLOBALS['A2B']->config['global']['base_currency']); 
    6464 
    65                 if (!in_array($my_currency, array('CAD', 'EUR', 'GBP', 'JPY', 'USD', 'MXN'))) { 
     65                if (!in_array($my_currency, array('CAD', 'EUR', 'GBP', 'JPY', 'USD', 'MXN', 'AUD'))) { 
    6666                        $my_currency = 'USD'; 
    6767                } 
    …… 
    8888        $my_currency = MODULE_PAYMENT_PAYPAL_CURRENCY; 
    8989        $base_currency = strtoupper($GLOBALS['A2B']->config['global']['base_currency']); 
    90         if($my_currency =='Selected Currency' && in_array($base_currency,array('CAD', 'EUR', 'GBP', 'JPY', 'USD', 'MXN')) ){ 
     90        if($my_currency =='Selected Currency' && in_array($base_currency,array('CAD', 'EUR', 'GBP', 'JPY', 'USD', 'MXN', 'AUD')) ){ 
    9191                $my_currency = $base_currency; 
    9292        } 
    93         elseif (!in_array($my_currency, array('CAD', 'EUR', 'GBP', 'JPY', 'USD', 'MXN'))) { 
     93        elseif (!in_array($my_currency, array('CAD', 'EUR', 'GBP', 'JPY', 'USD', 'MXN', 'AUD'))) { 
    9494                        $my_currency = 'USD'; 
    9595                }