From d9dc274f7c0e2cf5902e81edec9b32e71a3f4c5c Mon Sep 17 00:00:00 2001 From: gCharmes Date: Fri, 27 Apr 2012 09:44:20 +0000 Subject: [PATCH] [-] MO : Remove modules from wrong branche git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14943 b9a71923-0436-4b27-9f14-aed3839534dd --- modules/authorizeaim/authorizeaim.php | 274 -- modules/authorizeaim/authorizeaim.tpl | 135 - .../backward_compatibility/Context.php | 222 - .../backward_compatibility/backward.php | 42 - .../backward_compatibility/index.php | 36 - modules/authorizeaim/cards/ax.gif | Bin 560 -> 0 bytes modules/authorizeaim/cards/discover.gif | Bin 504 -> 0 bytes modules/authorizeaim/cards/index.php | 36 - modules/authorizeaim/cards/mastercard.gif | Bin 595 -> 0 bytes modules/authorizeaim/cards/visa.gif | Bin 451 -> 0 bytes modules/authorizeaim/config.xml | 12 - modules/authorizeaim/cvv.png | Bin 8485 -> 0 bytes modules/authorizeaim/de.php | 44 - modules/authorizeaim/en.php | 4 - modules/authorizeaim/es.php | 43 - modules/authorizeaim/fr.php | 42 - modules/authorizeaim/help.png | Bin 911 -> 0 bytes .../authorizeaim/hookorderconfirmation.tpl | 36 - modules/authorizeaim/index.php | 36 - modules/authorizeaim/it.php | 44 - modules/authorizeaim/logo.gif | Bin 79 -> 0 bytes modules/authorizeaim/logo_authorize.png | Bin 6565 -> 0 bytes modules/authorizeaim/logoa.gif | Bin 2047 -> 0 bytes modules/authorizeaim/secure.png | Bin 611 -> 0 bytes modules/authorizeaim/validation.php | 133 - .../backward_compatibility/Context.php | 221 - .../backward_compatibility/backward.php | 24 - .../backward_compatibility/index.php | 18 - modules/cloudcache/cloudcache.php | 860 ---- modules/cloudcache/cloudcache_logo.png | Bin 9783 -> 0 bytes modules/cloudcache/cloudcache_ps_logo.png | Bin 26694 -> 0 bytes modules/cloudcache/config.xml | 12 - modules/cloudcache/coupon.png | Bin 19547 -> 0 bytes modules/cloudcache/es.php | 108 - modules/cloudcache/fr.php | 108 - modules/cloudcache/index.php | 36 - modules/cloudcache/jquery-plugins/index.php | 36 - .../jquery.easy-confirm-dialog.js | 155 - modules/cloudcache/lib/CloudCacheApi.php | 388 -- modules/cloudcache/lib/index.php | 36 - modules/cloudcache/lib/xmlrpc.inc.php | 3716 ----------------- modules/cloudcache/loading.gif | Bin 16810 -> 0 bytes modules/cloudcache/logo.gif | Bin 845 -> 0 bytes modules/cloudcache/override/classes/Tools.php | 180 - .../classes/controller/FrontController.php | 55 - .../override/classes/controller/index.php | 36 - modules/cloudcache/override/classes/index.php | 36 - modules/cloudcache/override/index.php | 36 - modules/cloudcache/script.js | 94 - modules/cloudcache/sql/index.php | 36 - modules/cloudcache/sql/sql-install.php | 21 - modules/cloudcache/sql/sql-uninstall.php | 5 - modules/cloudcache/style.css | 128 - modules/cloudcache/views/backOfficeTop.tpl | 35 - modules/cloudcache/views/content2.tpl | 360 -- modules/cloudcache/views/index.php | 36 - modules/shipwire/config.xml | 12 - modules/shipwire/cronjob_update.php | 54 - modules/shipwire/es.php | 68 - modules/shipwire/fr.php | 68 - modules/shipwire/index.php | 36 - modules/shipwire/lib/SWCurl.php | 111 - modules/shipwire/lib/ShipwireApi.php | 133 - .../shipwire/lib/ShipwireInventoryUpdate.php | 61 - modules/shipwire/lib/ShipwireOrder.php | 91 - modules/shipwire/lib/ShipwireTracking.php | 188 - modules/shipwire/lib/index.php | 36 - modules/shipwire/logo.gif | Bin 162 -> 0 bytes modules/shipwire/shipwire.php | 956 ----- modules/shipwire/shipwire_logo.png | Bin 10901 -> 0 bytes modules/shipwire/sql/index.php | 36 - modules/shipwire/sql/sql-install.php | 83 - modules/shipwire/sql/sql-uninstall.php | 32 - modules/shipwire/style.css | 102 - 74 files changed, 9982 deletions(-) delete mode 100644 modules/authorizeaim/authorizeaim.php delete mode 100644 modules/authorizeaim/authorizeaim.tpl delete mode 100755 modules/authorizeaim/backward_compatibility/Context.php delete mode 100755 modules/authorizeaim/backward_compatibility/backward.php delete mode 100755 modules/authorizeaim/backward_compatibility/index.php delete mode 100644 modules/authorizeaim/cards/ax.gif delete mode 100644 modules/authorizeaim/cards/discover.gif delete mode 100644 modules/authorizeaim/cards/index.php delete mode 100644 modules/authorizeaim/cards/mastercard.gif delete mode 100644 modules/authorizeaim/cards/visa.gif delete mode 100644 modules/authorizeaim/config.xml delete mode 100644 modules/authorizeaim/cvv.png delete mode 100644 modules/authorizeaim/de.php delete mode 100644 modules/authorizeaim/en.php delete mode 100644 modules/authorizeaim/es.php delete mode 100755 modules/authorizeaim/fr.php delete mode 100644 modules/authorizeaim/help.png delete mode 100644 modules/authorizeaim/hookorderconfirmation.tpl delete mode 100644 modules/authorizeaim/index.php delete mode 100644 modules/authorizeaim/it.php delete mode 100644 modules/authorizeaim/logo.gif delete mode 100644 modules/authorizeaim/logo_authorize.png delete mode 100644 modules/authorizeaim/logoa.gif delete mode 100644 modules/authorizeaim/secure.png delete mode 100644 modules/authorizeaim/validation.php delete mode 100644 modules/cloudcache/backward_compatibility/Context.php delete mode 100644 modules/cloudcache/backward_compatibility/backward.php delete mode 100644 modules/cloudcache/backward_compatibility/index.php delete mode 100644 modules/cloudcache/cloudcache.php delete mode 100644 modules/cloudcache/cloudcache_logo.png delete mode 100644 modules/cloudcache/cloudcache_ps_logo.png delete mode 100644 modules/cloudcache/config.xml delete mode 100644 modules/cloudcache/coupon.png delete mode 100644 modules/cloudcache/es.php delete mode 100644 modules/cloudcache/fr.php delete mode 100644 modules/cloudcache/index.php delete mode 100644 modules/cloudcache/jquery-plugins/index.php delete mode 100644 modules/cloudcache/jquery-plugins/jquery.easy-confirm-dialog.js delete mode 100644 modules/cloudcache/lib/CloudCacheApi.php delete mode 100644 modules/cloudcache/lib/index.php delete mode 100644 modules/cloudcache/lib/xmlrpc.inc.php delete mode 100644 modules/cloudcache/loading.gif delete mode 100644 modules/cloudcache/logo.gif delete mode 100644 modules/cloudcache/override/classes/Tools.php delete mode 100644 modules/cloudcache/override/classes/controller/FrontController.php delete mode 100644 modules/cloudcache/override/classes/controller/index.php delete mode 100644 modules/cloudcache/override/classes/index.php delete mode 100644 modules/cloudcache/override/index.php delete mode 100644 modules/cloudcache/script.js delete mode 100644 modules/cloudcache/sql/index.php delete mode 100644 modules/cloudcache/sql/sql-install.php delete mode 100644 modules/cloudcache/sql/sql-uninstall.php delete mode 100644 modules/cloudcache/style.css delete mode 100644 modules/cloudcache/views/backOfficeTop.tpl delete mode 100644 modules/cloudcache/views/content2.tpl delete mode 100644 modules/cloudcache/views/index.php delete mode 100644 modules/shipwire/config.xml delete mode 100644 modules/shipwire/cronjob_update.php delete mode 100644 modules/shipwire/es.php delete mode 100644 modules/shipwire/fr.php delete mode 100644 modules/shipwire/index.php delete mode 100644 modules/shipwire/lib/SWCurl.php delete mode 100644 modules/shipwire/lib/ShipwireApi.php delete mode 100644 modules/shipwire/lib/ShipwireInventoryUpdate.php delete mode 100644 modules/shipwire/lib/ShipwireOrder.php delete mode 100644 modules/shipwire/lib/ShipwireTracking.php delete mode 100644 modules/shipwire/lib/index.php delete mode 100644 modules/shipwire/logo.gif delete mode 100644 modules/shipwire/shipwire.php delete mode 100644 modules/shipwire/shipwire_logo.png delete mode 100644 modules/shipwire/sql/index.php delete mode 100644 modules/shipwire/sql/sql-install.php delete mode 100644 modules/shipwire/sql/sql-uninstall.php delete mode 100644 modules/shipwire/style.css diff --git a/modules/authorizeaim/authorizeaim.php b/modules/authorizeaim/authorizeaim.php deleted file mode 100644 index ceac3647a..000000000 --- a/modules/authorizeaim/authorizeaim.php +++ /dev/null @@ -1,274 +0,0 @@ - -* @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14011 $ -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -if (!defined('_PS_VERSION_')) - exit; - -class authorizeAIM extends PaymentModule -{ - public function __construct() - { - $this->name = 'authorizeaim'; - $this->tab = 'payments_gateways'; - $this->version = '1.3.2'; - $this->author = 'PrestaShop'; - //$this->limited_countries = array('us'); - $this->need_instance = 0; - - parent::__construct(); - - $this->displayName = 'Authorize.net AIM (Advanced Integration Method)'; - $this->description = $this->l('Receive payment with Authorize.net'); - - /* For 1.4.3 and less compatibility */ - $updateConfig = array( - 'PS_OS_CHEQUE' => 1, - 'PS_OS_PAYMENT' => 2, - 'PS_OS_PREPARATION' => 3, - 'PS_OS_SHIPPING' => 4, - 'PS_OS_DELIVERED' => 5, - 'PS_OS_CANCELED' => 6, - 'PS_OS_REFUND' => 7, - 'PS_OS_ERROR' => 8, - 'PS_OS_OUTOFSTOCK' => 9, - 'PS_OS_BANKWIRE' => 10, - 'PS_OS_PAYPAL' => 11, - 'PS_OS_WS_PAYMENT' => 12); - - foreach ($updateConfig as $u => $v) - if (!Configuration::get($u) || (int)Configuration::get($u) < 1) - { - if (defined('_'.$u.'_') && (int)constant('_'.$u.'_') > 0) - Configuration::updateValue($u, constant('_'.$u.'_')); - else - Configuration::updateValue($u, $v); - } - - /* Check if cURL is enabled */ - if (!is_callable('curl_exec')) - $this->warning = $this->l('cURL extension must be enabled on your server to use this module.'); - - /* Backward compatibility */ - require(_PS_MODULE_DIR_.$this->name.'/backward_compatibility/backward.php'); - } - - public function install() - { - return parent::install() && - $this->registerHook('orderConfirmation') && - $this->registerHook('payment') && - $this->registerHook('header') && - Configuration::updateValue('AUTHORIZE_AIM_DEMO', 1) && - Configuration::updateValue('AUTHORIZE_AIM_HOLD_REVIEW_OS', _PS_OS_ERROR); - } - - public function uninstall() - { - Configuration::deleteByName('AUTHORIZE_AIM_LOGIN_ID'); - Configuration::deleteByName('AUTHORIZE_AIM_KEY'); - Configuration::deleteByName('AUTHORIZE_AIM_DEMO'); - Configuration::deleteByName('AUTHORIZE_AIM_CARD_VISA'); - Configuration::deleteByName('AUTHORIZE_AIM_CARD_MASTERCARD'); - Configuration::deleteByName('AUTHORIZE_AIM_CARD_DISCOVER'); - Configuration::deleteByName('AUTHORIZE_AIM_CARD_AX'); - - Configuration::deleteByName('AUTHORIZE_AIM_HOLD_REVIEW_OS'); - - return parent::uninstall(); - } - - public function hookOrderConfirmation($params) - { - if ($params['objOrder']->module != $this->name) - return; - - if ($params['objOrder']->getCurrentState() != Configuration::get('PS_OS_ERROR')) - $this->context->smarty->assign(array('status' => 'ok', 'id_order' => intval($params['objOrder']->id))); - else - $this->context->smarty->assign('status', 'failed'); - - return $this->display(__FILE__, 'hookorderconfirmation.tpl'); - } - - public function getContent() - { - $html = ''; - if (Tools::isSubmit('submitModule')) - { - Configuration::updateValue('AUTHORIZE_AIM_LOGIN_ID', Tools::getvalue('authorizeaim_login_id')); - Configuration::updateValue('AUTHORIZE_AIM_KEY', Tools::getvalue('authorizeaim_key')); - Configuration::updateValue('AUTHORIZE_AIM_DEMO', Tools::getvalue('authorizeaim_demo_mode')); - Configuration::updateValue('AUTHORIZE_AIM_CARD_VISA', Tools::getvalue('authorizeaim_card_visa')); - Configuration::updateValue('AUTHORIZE_AIM_CARD_MASTERCARD', Tools::getvalue('authorizeaim_card_mastercard')); - Configuration::updateValue('AUTHORIZE_AIM_CARD_DISCOVER', Tools::getvalue('authorizeaim_card_discover')); - Configuration::updateValue('AUTHORIZE_AIM_CARD_AX', Tools::getvalue('authorizeaim_card_ax')); - - Configuration::updateValue('AUTHORIZE_AIM_HOLD_REVIEW_OS', Tools::getvalue('authorizeaim_hold_review_os')); - - $html .= $this->displayConfirmation($this->l('Configuration updated')); - } - - // For Hold for Review - $orderStates = OrderState::getOrderStates((int)$this->context->cookie->id_lang); - - - $html .= ' -

'.$this->displayName.'

-
'.$this->l('Help').' - -

'.$this->l('In your PrestaShop admin panel').'

- - '.$this->l('Fill the Login ID field with the one provided by Authorize.net').'
- - '.$this->l('Fill the key field with the transaction key provided by Authorize.net').'
- - '.$this->l('Warning: Your website must possess a SSL certificate to use the Authorize.net AIM payment system. You are responsible for the safety of your customers\' bank information. PrestaShop cannot be blamed for any security issue on your website.').'
-
-

-
-
- '.$this->l('Settings').' - -
- -
- -
- - '.$this->l('Production').' - - '.$this->l('Test').' -
- -
- - visa - - visa - - visa - - visa -
- - -
-
- - -
-
-
'; - - return $html; - } - - public function hookPayment($params) - { - if (Configuration::get('PS_SSL_ENABLED') || (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off')) - { - $invoiceAddress = new Address((int)$params['cart']->id_address_invoice); - - $authorizeAIMParams = array(); - $authorizeAIMParams['x_solution_ID'] = 'A1000006'; - $authorizeAIMParams['x_login'] = Configuration::get('AUTHORIZE_AIM_LOGIN_ID'); - $authorizeAIMParams['x_tran_key'] = Configuration::get('AUTHORIZE_AIM_KEY'); - $authorizeAIMParams['x_version'] = '3.1'; - $authorizeAIMParams['x_delim_data'] = 'TRUE'; - $authorizeAIMParams['x_delim_char'] = '|'; - $authorizeAIMParams['x_relay_response'] = 'FALSE'; - $authorizeAIMParams['x_type'] = 'AUTH_CAPTURE'; - $authorizeAIMParams['x_method'] = 'CC'; - $authorizeAIMParams['x_test_request'] = Configuration::get('AUTHORIZE_AIM_DEMO'); - $authorizeAIMParams['x_invoice_num'] = (int)$params['cart']->id; - $authorizeAIMParams['x_amount'] = number_format($params['cart']->getOrderTotal(true, 3), 2, '.', ''); - $authorizeAIMParams['x_address'] = $invoiceAddress->address1.' '.$invoiceAddress->address2; - $authorizeAIMParams['x_zip'] = $invoiceAddress->postcode; - $authorizeAIMParams['x_first_name'] = $this->context->customer->firstname; - $authorizeAIMParams['x_last_name'] = $this->context->customer->lastname; - - $isFailed = Tools::getValue('aimerror'); - - $cards = array(); - $cards['visa'] = Configuration::get('AUTHORIZE_AIM_CARD_VISA') == 'on' ? 1 : 0; - $cards['mastercard'] = Configuration::get('AUTHORIZE_AIM_CARD_MASTERCARD') == 'on' ? 1 : 0; - $cards['discover'] = Configuration::get('AUTHORIZE_AIM_CARD_DISCOVER') == 'on' ? 1 : 0; - $cards['ax'] = Configuration::get('AUTHORIZE_AIM_CARD_AX') == 'on' ? 1 : 0; - - if (method_exists('Tools', 'getShopDomainSsl')) - $url = 'https://'.Tools::getShopDomainSsl().__PS_BASE_URI__.'/modules/'.$this->name.'/'; - else - $url = 'https://'.$_SERVER['HTTP_HOST'].__PS_BASE_URI__.'modules/'.$this->name.'/'; - - $this->context->smarty->assign('p', $authorizeAIMParams); - $this->context->smarty->assign('cards', $cards); - $this->context->smarty->assign('isFailed', $isFailed); - $this->context->smarty->assign('new_base_dir', $url); - - return $this->display(__FILE__, 'authorizeaim.tpl'); - } - } - - public function hookHeader() - { - if (_PS_VERSION_ < '1.5') - Tools::addJS(_PS_JS_DIR_.'jquery/jquery.validate.creditcard2-1.0.1.js'); - else - $this->context->controller->addJqueryPlugin('validate-creditcard'); - } - - /** - * Set the detail of a payment - Call before the validate order init - * correctly the pcc object - * See Authorize documentation to know the associated key => value - * @param array fields - */ - public function setTransactionDetail($response) - { - // If Exist we can store the details - if (isset($this->pcc)) - { - $this->pcc->transaction_id = (string)$response[6]; - - // 50 => Card number (XXXX0000) - $this->pcc->card_number = (string)substr($response[50], -4); - - // 51 => Card Mark (Visa, Master card) - $this->pcc->card_brand = (string)$response[51]; - - $this->pcc->card_expiration = (string)Tools::getValue('x_exp_date'); - - // 68 => Owner name - $this->pcc->card_holder = (string)$response[68]; - } - } -} diff --git a/modules/authorizeaim/authorizeaim.tpl b/modules/authorizeaim/authorizeaim.tpl deleted file mode 100644 index d0627e227..000000000 --- a/modules/authorizeaim/authorizeaim.tpl +++ /dev/null @@ -1,135 +0,0 @@ -{* -* 2007-2012 PrestaShop -* -* NOTICE OF LICENSE -* -* This source file is subject to the Academic Free License (AFL 3.0) -* that is bundled with this package in the file LICENSE.txt. -* It is also available through the world-wide-web at this URL: -* http://opensource.org/licenses/afl-3.0.php -* If you did not receive a copy of the license and are unable to -* obtain it through the world-wide-web, please send an email -* to license@prestashop.com so we can send you a copy immediately. -* -* DISCLAIMER -* -* Do not edit or add to this file if you wish to upgrade PrestaShop to newer -* versions in the future. If you wish to customize PrestaShop for your -* needs please refer to http://www.prestashop.com for more information. -* -* @author PrestaShop SA -* @copyright 2007-2012 PrestaShop SA -* @version Release: $Revision: 14297 $ -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*} - -

- - {if $isFailed == 1} -

{l s='Error, please verify the card information' mod='authorizeaim'}

- {/if} - -
- - - {if $cards.visa == 1}{l s='visa logo' mod='authorizeaim'}{/if} - {if $cards.mastercard == 1}{l s='mastercard logo' mod='authorizeaim'}{/if} - {if $cards.discover == 1}{l s='discover logo' mod='authorizeaim'}{/if} - {if $cards.ax == 1}{l s='american express logo' mod='authorizeaim'}{/if} -   {l s='Secured credit card payment with Authorize.net' mod='authorizeaim'} - - - {if $isFailed == 0} -