[*] classes : new module architecture

modules/bankwire/bankwire.php

@@ -162,36 +162,6 @@ class BankWire extends PaymentModule
 		return $this->_html;
 	}
 
-	public function execPayment($cart)
-	{
-		return $this->actionPayment(true);
-	}
-	
-	public function actionPayment($direct_call = false)
-	{
-		$cart = Context::getContext()->cart;
-		
-		if (!$this->active)
-			return;
-		if (!$this->_checkCurrency($cart))
-			Tools::redirect('index.php?controller=order');
-
-		$this->context->smarty->assign(array(
-			'nbProducts' => $cart->nbProducts(),
-			'cust_currency' => $cart->id_currency,
-			'currencies' => $this->getCurrency((int)$cart->id_currency),
-			'total' => $cart->getOrderTotal(true, Cart::BOTH),
-			'this_path' => $this->_path,
-			'this_path_ssl' => Tools::getShopDomainSsl(true, true).__PS_BASE_URI__.'modules/'.$this->name.'/'
-		));
-
-		if (!$direct_call)
-			return $this->getTemplatePath('payment_execution.tpl');
-		else
-			// For retrocompatibility
-			return $this->display(__FILE__, 'payment_execution.tpl');
-	}
-
 	public function hookPayment($params)
 	{
 		if (!$this->active)

modules/bankwire/controllers/front/payment.php

@@ -0,0 +1,57 @@
+<?php
+/*
+* 2007-2011 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 <contact@prestashop.com>
+*  @copyright  2007-2011 PrestaShop SA
+*  @version  Release: $Revision$
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+/**
+ * @since 1.5.0
+ */
+class BankwirePaymentModuleFrontController extends ModuleFrontController
+{
+	public $display_column_left = false;
+
+	/**
+	 * @see FrontController::initContent()
+	 */
+	public function initContent()
+	{
+		parent::initContent();
+
+		$cart = $this->context->cart;
+		if (!$this->module->checkCurrency($cart))
+			Tools::redirect('index.php?controller=order');
+
+		$this->context->smarty->assign(array(
+			'nbProducts' => $cart->nbProducts(),
+			'cust_currency' => $cart->id_currency,
+			'currencies' => $this->module->getCurrency((int)$cart->id_currency),
+			'total' => $cart->getOrderTotal(true, Cart::BOTH),
+			'this_path' => $this->module->getPathUri(),
+			'this_path_ssl' => Tools::getShopDomainSsl(true, true).__PS_BASE_URI__.'modules/'.$this->module->name.'/'
+		));
+
+		$this->setTemplate('payment_execution.tpl');
+	}
+}

modules/bankwire/controllers/front/validation.php

@@ -28,22 +28,12 @@
 /**
  * @since 1.5.0
  */
-class ModuleBankwireController extends ModuleController
+class BankwireValidationModuleFrontController extends ModuleFrontController
 {
 	/**
 	 * @see FrontController::postProcess()
 	 */
 	public function postProcess()
-	{
-		$this->display_column_left = false;
-		if ($this->process == 'validation')
-			$this->processValidation();
-	}
-
-	/**
-	 * Validate bankwire payment
-	 */
-	public function processValidation()
 	{
 		$cart = $this->context->cart;
 		if ($cart->id_customer == 0 || $cart->id_address_delivery == 0 || $cart->id_address_invoice == 0 || !$this->module->active)
@@ -75,36 +65,4 @@ class ModuleBankwireController extends ModuleController
 		$this->module->validateOrder($cart->id, Configuration::get('PS_OS_BANKWIRE'), $total, $this->module->displayName, NULL, $mailVars, (int)$currency->id, false, $customer->secure_key);
 		Tools::redirect('index.php?controller=order-confirmation&id_cart='.$cart->id.'&id_module='.$this->module->id.'&id_order='.$this->module->currentOrder.'&key='.$customer->secure_key);
 	}
-
-	/**
-	 * @see FrontController::initContent()
-	 */
-	public function initContent()
-	{
-		parent::initContent();
-
-		if ($this->process == 'payment')
-			$this->assignPaymentExecution();
-	}
-
-	/**
-	 * Assign bankwire payment template
-	 */
-	public function assignPaymentExecution()
-	{
-		$cart = $this->context->cart;
-		if (!$this->module->checkCurrency($cart))
-			Tools::redirect('index.php?controller=order');
-
-		$this->context->smarty->assign(array(
-			'nbProducts' => $cart->nbProducts(),
-			'cust_currency' => $cart->id_currency,
-			'currencies' => $this->module->getCurrency((int)$cart->id_currency),
-			'total' => $cart->getOrderTotal(true, Cart::BOTH),
-			'this_path' => $this->module->getPathUri(),
-			'this_path_ssl' => Tools::getShopDomainSsl(true, true).__PS_BASE_URI__.'modules/'.$this->module->name.'/'
-		));
-
-		$this->setTemplate('payment_execution.tpl');
-	}
 }

modules/bankwire/fr.php

@@ -21,8 +21,6 @@ $_MODULE['<{bankwire}prestashop>bankwire_3ec365dd533ddb7ef3d1c111186ce872'] = 'D
 $_MODULE['<{bankwire}prestashop>bankwire_6b154cafbab54ba3a1e76a78c290c02a'] = 'Comme le code banque, l\'IBAN ou encore le BIC';
 $_MODULE['<{bankwire}prestashop>bankwire_f9a1a1bb716cbae0503d351ea2af4b34'] = 'Adresse de la banque';
 $_MODULE['<{bankwire}prestashop>bankwire_b17f3f4dcf653a5776792498a9b44d6a'] = 'Mettre à jour';
-$_MODULE['<{bankwire}prestashop>payment_5e1695822fc5af98f6b749ea3cbc9b4c'] = 'Payer par virement bancaire';
-$_MODULE['<{bankwire}prestashop>payment_eb1d50032721fa4c9d3518c417f91b9d'] = 'Payer par virement bancaire (traitement plus long)';
 $_MODULE['<{bankwire}prestashop>payment_execution_c5e8668ba5e211603955f0b5e913d83d'] = 'Paiement par virement bancaire';
 $_MODULE['<{bankwire}prestashop>payment_execution_f1d3b424cd68795ecaa552883759aceb'] = 'Récapitulatif de commande';
 $_MODULE['<{bankwire}prestashop>payment_execution_879f6b8877752685a966564d072f498f'] = 'Votre panier est vide.';
@@ -38,6 +36,8 @@ $_MODULE['<{bankwire}prestashop>payment_execution_3dd021316505c0204989f984246c6f
 $_MODULE['<{bankwire}prestashop>payment_execution_0881a11f7af33bc1b43e437391129d66'] = 'Merci de confirmer votre commande en cliquant sur \"Je confirme ma commande\"';
 $_MODULE['<{bankwire}prestashop>payment_execution_46b9e3665f187c739c55983f757ccda0'] = 'Je confirme ma commande';
 $_MODULE['<{bankwire}prestashop>payment_execution_569fd05bdafa1712c4f6be5b153b8418'] = 'Autres moyens de paiement';
+$_MODULE['<{bankwire}prestashop>payment_5e1695822fc5af98f6b749ea3cbc9b4c'] = 'Payer par virement bancaire';
+$_MODULE['<{bankwire}prestashop>payment_eb1d50032721fa4c9d3518c417f91b9d'] = 'Payer par virement bancaire (traitement plus long)';
 $_MODULE['<{bankwire}prestashop>payment_return_2e2117b7c81aa9ea6931641ea2c6499f'] = 'Votre commande sur';
 $_MODULE['<{bankwire}prestashop>payment_return_75fbf512d744977d62599cc3f0ae2bb4'] = 'a bien été enregistrée.';
 $_MODULE['<{bankwire}prestashop>payment_return_1552c5916ccfe019f35d91fd8955755e'] = 'Merci de nous envoyer un virement bancaire avec :';

modules/bankwire/payment.php

@@ -26,7 +26,7 @@
 */
 
 /**
- * @deprecated 1.5.0 This file is deprecated, use moduleController instead
+ * @deprecated 1.5.0 This file is deprecated, use moduleFrontController instead
  */
 
 /* SSL Management */
@@ -39,4 +39,4 @@ Tools::displayFileAsDeprecated();
 $controller = new FrontController();
 $controller->init();
 
-Tools::redirect('index.php?controller=module&module=bankwire&process=payment');
+Tools::redirect(Context::getContext()->link->getModuleLink('bankwire', 'payment'));

modules/bankwire/validation.php

@@ -26,7 +26,7 @@
 */
 
 /**
- * @deprecated 1.5.0 This file is deprecated, use moduleController instead
+ * @deprecated 1.5.0 This file is deprecated, use moduleFrontController instead
  */
 
 include(dirname(__FILE__).'/../../config/config.inc.php');