Merge pull request #284 from roadster31/basemodulecontroller

Various improvements, and URL calculation fix

templates/frontOffice/default/I18n/en_US.php

@@ -36,6 +36,7 @@ return array(
     'Choose your delivery method' => 'Choose your delivery method',
     'Choose your payment method' => 'Choose your payment method',
     'Code :' => 'Code :',
+    'Connecting to the secure payment server, please wait a few seconds...' => 'Connection au serveur depaiement sécurisé, merci de patienter.',
     'Contact Us' => 'Contact Us',
     'Continue Shopping' => 'Continue Shopping',
     'Copyright' => 'Copyright',
@@ -68,6 +69,7 @@ return array(
     'Grid' => 'Grid',
     'Home' => 'Home',
     'I\'ve read and agreed on <a href=\'#\'>Terms &amp; Conditions</a>' => 'I\'ve read and agreed on <a href=\'#\'>Terms &amp; Conditions</a>',
+    'If nothing happens within 10 seconds, <a id="force-submit-payment-form" href="#">please click here</a>.' => 'Si rien ne se passe dans les 10 prochaines secondes, <a id="force-submit-payment-form" href="#">merci de cliquer ici</a>. ',
     'In Stock' => 'In Stock',
     'Instagram' => 'Instagram',
     'Language' => 'Language',
@@ -113,6 +115,7 @@ return array(
     'Pagination' => 'Pagination',
     'Password' => 'Password',
     'Password Forgotten' => 'Password Forgotten',
+    'Pay with %module_title' => 'Payer avec %module_title',
     'Personal Information' => 'Personal Information',
     'Placeholder address label' => 'Home, Work office, other',
     'Placeholder address1' => '76 Ninth Avenue',
@@ -177,6 +180,7 @@ return array(
     'Sign In' => 'Sign In',
     'Sign up to receive our latest news.' => 'Sign up to receive our latest news.',
     'Skip to content' => 'Skip to content',
+    'Sorry, your cart is empty. There\'s nothing to pay.' => 'Désolé, mais votre panier est vide. Il n\'y a rien à payer.',
     'Sort By' => 'Sort By',
     'Special Price:' => 'Special Price:',
     'Status' => 'Status',
@@ -189,6 +193,7 @@ return array(
     'Thelia V2' => 'Thelia V2',
     'Toggle navigation' => 'Toggle navigation',
     'Total' => 'Total',
+    'Try again' => 'Merci de ré-essayer.',
     'Twitter' => 'Twitter',
     'Unit Price' => 'Unit Price',
     'Update' => 'Update',
@@ -204,6 +209,7 @@ return array(
     'View order %ref as pdf document' => 'View order %ref as pdf document',
     'View product' => 'View product',
     'Warning' => 'Warning',
+    'We\'re sorry, a problem occured during the payement process, and your payment has not been accepted.' => 'Nous sommes désolés, votre paiement n\'a opas été accepté.',
     'Welcome to Thelia. This is a demo site built with Thelia V2 an E-Commerce solution based on Symfony 2.' => 'Welcome to Thelia. This is a demo site built with Thelia V2 an E-Commerce solution based on Symfony 2.',
     'You are here:' => 'You are here:',
     'You choose to pay by' => 'You choose to pay by',

templates/frontOffice/default/I18n/fr_FR.php

@@ -36,6 +36,7 @@ return array(
     'Choose your delivery method' => 'Choisissez votre moyen de livraison',
     'Choose your payment method' => 'Choisissez voter moyen de paiement',
     'Code :' => 'Code : ',
+    'Connecting to the secure payment server, please wait a few seconds...' => 'Connexion au serveur sécurisé, merci de patienter quelques secondes.',
     'Contact Us' => 'Contactez-nous',
     'Continue Shopping' => 'Continuer mes achats',
     'Copyright' => 'Copyright',
@@ -68,6 +69,7 @@ return array(
     'Grid' => 'Grille',
     'Home' => 'Accueil',
     'I\'ve read and agreed on <a href=\'#\'>Terms &amp; Conditions</a>' => 'J\'ai lu et j\'accepte les <a href=\'#\'>CGV</a>',
+    'If nothing happens within 10 seconds, <a id="force-submit-payment-form" href="#">please click here</a>.' => 'Si rien ne se passe dans les 10 secondes, <a id="force-submit-payment-form" href="#">meri de cliquer ici</a>. ',
     'In Stock' => 'Disponible',
     'Instagram' => 'Instagram',
     'Language' => 'Langue',
@@ -113,6 +115,7 @@ return array(
     'Pagination' => 'Pagination',
     'Password' => 'Mot de passe',
     'Password Forgotten' => 'Mot de passe oublié',
+    'Pay with %module_title' => 'Payer avec %module_title ',
     'Personal Information' => 'Informations personnelles',
     'Placeholder address label' => 'Maison, Domicile, Travail...',
     'Placeholder address1' => 'Adresse',
@@ -172,6 +175,7 @@ return array(
     'Sign In' => 'Se connecter',
     'Sign up to receive our latest news.' => 'Inscrivez-vous pour recevoir les dernières nouveautés.',
     'Skip to content' => 'Aller au contenu',
+    'Sorry, your cart is empty. There\'s nothing to pay.' => 'Désolé, votre panier est vide. Il n\'y a rien à payer.',
     'Sort By' => 'Trier par',
     'Special Price:' => 'Prix promo',
     'Status' => 'Etat',
@@ -184,6 +188,7 @@ return array(
     'Thelia V2' => 'Thelia v2',
     'Toggle navigation' => 'Basculer la navigation',
     'Total' => 'Total',
+    'Try again' => 'Ré-essayer le paiement',
     'Twitter' => 'Twitter',
     'Unit Price' => 'Prix unitaire',
     'Update' => 'Mettre à jour',
@@ -199,6 +204,7 @@ return array(
     'View order %ref as pdf document' => 'Ouvrir la commande %ref dans un pdf',
     'View product' => 'Voir le produit',
     'Warning' => 'Attention',
+    'We\'re sorry, a problem occured and your payment was not successful.' => 'Nous sommes désolés, un problème est survenu lors du paiement.',
     'Welcome to Thelia. This is a demo site built with Thelia V2 an E-Commerce solution based on Symfony 2.' => 'Bienvenue sur ce site Thelia. ce site est un site de démonstration motorisé par la solution e-commerce libre Thelia v2 basée sur Symfony 2.',
     'You are here:' => 'Vous êtes ici :',
     'You choose to pay by' => 'Vous avez choisi de payer par',

templates/frontOffice/default/order-failed.html

@@ -0,0 +1,50 @@
+{extends file="layout.tpl"}
+
+{* Security *}
+{block name="no-return-functions" prepend}
+    {check_auth role="CUSTOMER" login_tpl="login"}
+{/block}
+
+{* Body Class *}
+{block name="body-class"}page-order-payment{/block}
+
+{* Breadcrumb *}
+{block name='no-return-functions' append}
+    {$breadcrumbs = [
+        ['title' => {intl l="Cart"}, 'url'=>{url path="/cart"}],
+        ['title' => {intl l="Secure Payment"}, 'url'=>{url path="/order/pay"}]
+    ]}
+{/block}
+
+
+{block name="main-content"}
+    <div class="main">
+        <article class="col-main clearfix" role="main" aria-labelledby="main-label">
+
+            <h1 id="main-label" class="page-header">{intl l="Your Cart"}</h1>
+
+            {include file="misc/checkout-progress.tpl" step="last"}
+
+            {loop type="order" name="failed-order" id=$failed_order_id}
+
+            <div id="payment-failure" class="panel">
+                <div class="panel-heading">
+                    <h3 class="panel-title">{intl l="You choose to pay by"} : <span class="payment-method">{loop name="payment-module" type="module" id=$PAYMENT_MODULE}{$TITLE}{/loop}</span></h3>
+                </div>
+                <div class="panel-body">
+                    <h3>{intl l="We're sorry, a problem occured and your payment was not successful."}</h3>
+                    {if null !== $failed_order_message}
+                        <p>{$failed_order_message}</p>
+                    {/if}
+
+                    <a href="{url path="/order/invoice"}" role="button" class="btn btn-checkout"><span>{intl l="Try again"}</span></a>
+                </div>
+            </div>
+
+            {/loop}
+
+            <a href="{navigate to="index"}" role="button" class="btn btn-checkout-home"><span>{intl l="Go home"}</span></a>
+
+        </article>
+    </div>
+{/block}