TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prepare 2.0.0-RC1 version

Browse Source
This commit is contained in:
Manuel Raynaud
2014-03-03 14:35:27 +01:00
parent c7323d1c5b
commit c30abacfbc
7 changed files with 54 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -1,7 +1,7 @@
#2.0.0-beta5
#2.0.0-RC1
- Remove container from BaseAction.
- fix sending mail on order creation
- less files in default templates are already compile in css.
- less files in default templates are already compiled in css.
- all validator message are translated
- type argument is now a default argument and used for generating loop cache
- fix total amount without discount in backoffice. Fix #235
@@ -9,6 +9,8 @@
- Do not allow to cumulate the same coupon many times. Fix #217
- colissimo module is now fully configurable
- test suite are executed on PHP 5.4, 5.5, 5.6 and HHVM. Thelia is not fully compatible with HHVM
- add new attributes to loop pager (http://doc.thelia.net/en/documentation/loop/index.html#page-loop)
- we created a new github repo dedicated for modules : https://github.com/thelia-modules
#2.0.0-beta4
- Tinymce is now a dedicated module. You need to activate it.

2
Readme.md
View File

@@ -45,7 +45,7 @@ Installation
``` bash
$ curl -sS https://getcomposer.org/installer | php
$ php composer.phar create-project thelia/thelia path/ 2.0.0-beta4
$ php composer.phar create-project thelia/thelia path/ 2.0.0-RC1
```
Finish the installation using cli tools :

2
core/lib/Thelia/Core/Thelia.php
View File

@@ -58,7 +58,7 @@ use Thelia\Log\Tlog;
class Thelia extends Kernel
{
const THELIA_VERSION = '2.0.0-beta4';
const THELIA_VERSION = '2.0.0-RC1';
public function init()
{

3
core/lib/Thelia/Install/Update.php
View File

@@ -40,7 +40,8 @@ class Update
'0' => '2.0.0-beta1',
'1' => '2.0.0-beta2',
'2' => '2.0.0-beta3',
'3' => '2.0.0-beta4'
'3' => '2.0.0-beta4',
'4' => '2.0.0-RC1',
);
protected function isLatestVersion($version)

6
install/insert.sql
View File

File diff suppressed because one or more lines are too long

4
install/update/2.0.0-beta5.sql → install/update/2.0.0-RC1.sql
View File

@@ -9,11 +9,13 @@ SELECT @max := MAX(`id`) FROM `message`;
SET @max := @max+1;
INSERT INTO `message` (`id`, `name`, `secured`, `created_at`, `updated_at`, `version`, `version_created_at`, `version_created_by`) VALUES
(@max, 'lost_password', 1, NOW(), NOW(), 2, NOW(), NULL);
(@max, 'lost_password', NULL, NOW(), NOW(), 2, NOW(), NULL);
INSERT INTO `message_i18n` (`id`, `locale`, `title`, `subject`, `text_message`, `html_message`) VALUES
(@max, 'en_US', 'Your new password', 'Your new password', 'Your new passord is : {$password}', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r\n<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="fr">\r\n<head>\r\n<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\r\n<title>changing password email for {config key="urlsite"} </title>\r\n{literal}\r\n<style type="text/css">\r\nbody {font-family: Arial, Helvetica, sans-serif;font-size:100%;text-align:center;}\r\n#liencompte {margin:25px 0 ;text-align: middle;font-size:10pt;}\r\n#wrapper {width:480pt;margin:0 auto;}\r\n#entete {padding-bottom:20px;margin-bottom:10px;border-bottom:1px dotted #000;}\r\n#logotexte {float:left;width:180pt;height:75pt;border:1pt solid #000;font-size:18pt;text-align:center;}\r\n#logoimg{float:left;}\r\n#h2 {margin:0;padding:0;font-size:140%;text-align:center;}\r\n#h3 {margin:0;padding:0;font-size:120%;text-align:center;}\r\n</style>\r\n{/literal}\r\n</head>\r\n<body>\r\n<div id="wrapper">\r\n<div id="entete">\r\n<h1 id="logotexte">{config key="store_name"}</h1>\r\n<h2 id="info">Changement de mot de passe</h2>\r\n<h5 id="mdp"> You have lost your password <br />\r\nYour new password is <span style="font-size:80%">{$password}</span>.</h5>\r\n</div>\r\n</div>\r\n<p id="liencompte">Vous pouvez &agrave; pr&eacute;sent vous connecter sur <a href="{config key="urlsite"}">{config key="urlsite"}</a>.<br /> Please, change this password after your first connection</p>\r\n</body>\r\n</html>'),
(@max, 'fr_FR', 'Votre nouveau mot de passe', 'Votre nouveau mot de passe', 'Votre nouveau mot de passe est : {$password}', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">\r\n<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" lang="fr">\r\n<head>\r\n<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />\r\n<title>courriel de confirmation de changement de mot de passe de {config key="urlsite"} </title>\r\n{literal}\r\n<style type="text/css">\r\nbody {font-family: Arial, Helvetica, sans-serif;font-size:100%;text-align:center;}\r\n#liencompte {margin:25px 0 ;text-align: middle;font-size:10pt;}\r\n#wrapper {width:480pt;margin:0 auto;}\r\n#entete {padding-bottom:20px;margin-bottom:10px;border-bottom:1px dotted #000;}\r\n#logotexte {float:left;width:180pt;height:75pt;border:1pt solid #000;font-size:18pt;text-align:center;}\r\n#logoimg{float:left;}\r\n#h2 {margin:0;padding:0;font-size:140%;text-align:center;}\r\n#h3 {margin:0;padding:0;font-size:120%;text-align:center;}\r\n</style>\r\n{/literal}\r\n</head>\r\n<body>\r\n<div id="wrapper">\r\n<div id="entete">\r\n<h1 id="logotexte">{config key="store_name"}</h1>\r\n<h2 id="info">Changement de mot de passe</h2>\r\n<h5 id="mdp"> Vous avez perdu votre mot de passe. <br />\r\nVotre nouveau mot de passe est <span style="font-size:80%">{$password}</span>.</h5>\r\n</div>\r\n</div>\r\n<p id="liencompte">Vous pouvez &agrave; pr&eacute;sent vous connecter sur <a href="{config key="urlsite"}">{config key="urlsite"}</a>.<br /> N''oubliez pas de modifier votre mot de passe.</p>\r\n</body>\r\n</html>');
UPDATE `config` SET `value`='2.0.0-RC1' WHERE `name`='thelia_version';
UPDATE `config` SET `value`='RC1' WHERE `name`='thelia_extra_version';
SET FOREIGN_KEY_CHECKS = 1;

40
templates/frontOffice/default/badresponse.html Executable file
View File

@@ -0,0 +1,40 @@
{extends file="layout.tpl"}
{* Security *}
{block name="no-return-functions" prepend}
{check_auth context="front" role="CUSTOMER" login_tpl="login"}
{/block}
{* Breadcrumb *}
{block name='no-return-functions' append}
{$breadcrumbs = [
['title' => {intl l="Redirect to bank service"}]
]}
{/block}
{block name="body-class"}page-gotobankservice{/block}
{block name="main-content"}
<div class="panel">
<div class="panel-heading clearfix">
{intl l="A problem occured"}.
</div>
<!-- PAYMENT FORM TEMPLATE -->
<div class="panel-body">
<p>
{$msg}<br/>
{loop name="badresponseorder" type="order" id={$order_id}}
{$REF}
{/loop}
<br/>
{intl l="Please try again to order"}
</p>
</div>
</div>
<a class="btn btn-checkout-home" role="button" href="{url path="/"}">
<span>{intl l="Home"}</span>
</a>
{/block}
{block name="after-javascript-include"}{/block}