diff --git a/CHANGELOG.md b/CHANGELOG.md index dc813ed76..52eea3160 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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. diff --git a/Readme.md b/Readme.md index 0ae23b2f4..330a6f98a 100644 --- a/Readme.md +++ b/Readme.md @@ -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 : diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php index 2c8148c3e..2513541f0 100644 --- a/core/lib/Thelia/Core/Thelia.php +++ b/core/lib/Thelia/Core/Thelia.php @@ -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() { diff --git a/core/lib/Thelia/Install/Update.php b/core/lib/Thelia/Install/Update.php index ccab092c6..696c7da08 100644 --- a/core/lib/Thelia/Install/Update.php +++ b/core/lib/Thelia/Install/Update.php @@ -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) diff --git a/install/insert.sql b/install/insert.sql index 177d2e30e..2d53b3801 100644 --- a/install/insert.sql +++ b/install/insert.sql @@ -39,11 +39,11 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat ('store_name','', 0, 1, NOW(), NOW()), ('store_email','', 0, 1, NOW(), NOW()), ('one_domain_foreach_lang','0', 1, 1, NOW(), NOW()), -('thelia_version','2.0.0-beta4', 1, 1, NOW(), NOW()), +('thelia_version','2.0.0-RC1', 1, 1, NOW(), NOW()), ('thelia_major_version','2', 1, 1, NOW(), NOW()), ('thelia_minus_version','0', 1, 1, NOW(), NOW()), ('thelia_release_version','0', 1, 1, NOW(), NOW()), -('thelia_extra_version','beta4', 1, 1, NOW(), NOW()); +('thelia_extra_version','RC1', 1, 1, NOW(), NOW()); INSERT INTO `config_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `postscriptum`) VALUES @@ -1327,7 +1327,7 @@ INSERT INTO resource_i18n (`id`, `locale`, `title`) VALUES INSERT INTO `message` (`id`, `name`, `secured`, `created_at`, `updated_at`, `version`, `version_created_at`, `version_created_by`) VALUES (1, 'order_confirmation', NULL, NOW(), NOW(), 2, NOW(), NULL), -(2, 'lost_password', 1, NOW(), NOW(), 2, NOW(), NULL); +(2, 'lost_password', NULL, NOW(), NOW(), 2, NOW(), NULL); INSERT INTO `message_i18n` (`id`, `locale`, `title`, `subject`, `text_message`, `html_message`) VALUES (1, 'en_US', 'order confirmation', 'Commande : Commande : {$order_ref}', '{assign var="order_id" value=1}\r\n\r\n{loop name="order.invoice" type="order" id=$order_id customer="*"}\r\n {loop name="currency.order" type="currency" id=$CURRENCY}\r\n {assign "orderCurrency" $CODE}\r\n {/loop}\r\n{loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS}\r\n{loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop}{$FIRSTNAME} {$LASTNAME}\\r\\n\r\n{$ADDRESS1} {$ADDRESS2} {$ADDRESS3}\\r\\n\r\n{$ZIPCODE} {$CITY}\\r\\n\r\n{loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}\\r\\n\r\n{/loop}\r\nConfirmation de commande {$REF} du {format_date date=$INVOICE_DATE}\\r\\n\\r\\n\r\nLes articles commandés:\\r\\n\r\n{loop type="order_product" name="order-products" order=$ID}\r\n{if $WAS_IN_PROMO == 1}\r\n {assign "realPrice" $PROMO_PRICE}\r\n {assign "realTax" $PROMO_PRICE_TAX}\r\n {assign "realTaxedPrice" $TAXED_PROMO_PRICE}\r\n{else}\r\n {assign "realPrice" $PRICE}\r\n {assign "realTax" $PRICE_TAX}\r\n {assign "realTaxedPrice" $TAXED_PRICE}\r\n{/if}\r\n \\r\\n\r\n Article : {$TITLE}\r\n{ifloop rel="combinations"}\r\n {loop type="order_product_attribute_combination" name="combinations" order_product=$ID}\r\n {$ATTRIBUTE_TITLE} - {$ATTRIBUTE_AVAILABILITY_TITLE}\\r\\n\r\n{/loop}\r\n{/ifloop}\\r\\n\r\n Quantité : {$QUANTITY}\\r\\n\r\n Prix unitaire TTC : {$realTaxedPrice} {$orderCurrency}\\r\\n\r\n{/loop}\r\n\\r\\n-----------------------------------------\\r\\n\r\nMontant total TTC : {$TOTAL_TAXED_AMOUNT - $POSTAGE} {$orderCurrency} \\r\\n\r\nFrais de port TTC : {$POSTAGE} {$orderCurrency} \\r\\n\r\nSomme totale: {$TOTAL_TAXED_AMOUNT} {$orderCurrency} \\r\\n\r\n==================================\\r\\n\\r\\n\r\nVotre facture est disponible dans la rubrique mon compte sur {config key="url_site"}\r\n{/loop}', '{loop name="order.invoice" type="order" id=$order_id customer="*"}\r\n {loop name="currency.order" type="currency" id=$CURRENCY}\r\n {assign "orderCurrency" $SYMBOL}\r\n {/loop}\r\n{loop type="customer" name="customer.invoice" id=$CUSTOMER current="0"}\r\n {assign var="customer_ref" value=$REF}\r\n{/loop}\r\n\r\n\r\n\r\n \r\n courriel de confirmation de commande de {config key="url_site"} \r\n {literal}\r\n \r\n {/literal}\r\n\r\n\r\n
\r\n

{config key="store_name"}

\r\n

Confirmation de commande

\r\n

N° {$REF} du {format_date date=$INVOICE_DATE output="date"}

\r\n
\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n {loop type="order_product" name="order-products" order=$ID}\r\n {if $WAS_IN_PROMO == 1}\r\n {assign "realPrice" $PROMO_PRICE}\r\n {assign "realTax" $PROMO_PRICE_TAX}\r\n {assign "realTaxedPrice" $TAXED_PROMO_PRICE}\r\n {else}\r\n {assign "realPrice" $PRICE}\r\n {assign "realTax" $PRICE_TAX}\r\n {assign "realTaxedPrice" $TAXED_PRICE}\r\n {/if}\r\n \r\n \r\n \r\n \r\n \r\n \r\n {/loop}\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n
RéférenceDésignationP.U. €Qté
{$REF}{$TITLE}\r\n {ifloop rel="combinations"}\r\n {loop type="order_product_attribute_combination" name="combinations" order_product=$ID}\r\n {$ATTRIBUTE_TITLE} - {$ATTRIBUTE_AVAILABILITY_TITLE}
\r\n {/loop}\r\n {/ifloop}\r\n 		{$orderCurrency} {$realTaxedPrice}{$QUANTITY}
 
Montant total avant remise €{$orderCurrency} {$TOTAL_TAXED_AMOUNT - $POSTAGE}
Port €{$orderCurrency} {$POSTAGE}
Montant total de la commande €{$orderCurrency} {$TOTAL_TAXED_AMOUNT}
\r\n
\r\n

LIVRAISON : {loop name="delivery-module" type="module" id=$DELIVERY_MODULE}{$TITLE}{/loop}

\r\n {loop type="order_address" name="delivery_address" id=$INVOICE_ADDRESS}\r\n

N° de client : {$customer_ref}

\r\n

Nom :\r\n {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop} {$FIRSTNAME} {$LASTNAME}

\r\n

N° et rue :\r\n {$ADDRESS1}

\r\n

Complément : {$ADDRESS2}\r\n {$ADDRESS3}

\r\n

Code postal : {$ZIPCODE}

\r\n

Ville : {$CITY}

\r\n

Pays : {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}

\r\n
\r\n {/loop}\r\n
\r\n

FACTURATION : paiement par {loop name="payment-module" type="module" id=$PAYMENT_MODULE}{$TITLE}{/loop}

\r\n {loop type="order_address" name="delivery_address" id=$DELIVERY_ADDRESS}\r\n

N° de client : {$customer_ref}

\r\n

Nom :\r\n {loop type="title" name="order-invoice-address-title" id=$TITLE}{$LONG}{/loop} {$FIRSTNAME} {$LASTNAME}

\r\n

N° et rue :\r\n {$ADDRESS1}

\r\n

Complément : {$ADDRESS2}\r\n {$ADDRESS3}

\r\n

Code postal : {$ZIPCODE}

\r\n

Ville : {$CITY}

\r\n

Pays : {loop type="country" name="country_delivery" id=$COUNTRY}{$TITLE}{/loop}

\r\n
\r\n {/loop}\r\n

Le suivi de votre commande est disponible dans la rubrique mon compte sur {config key="url_site"}

\r\n
\r\n\r\n\r\n{/loop}'), diff --git a/install/update/2.0.0-beta5.sql b/install/update/2.0.0-RC1.sql similarity index 95% rename from install/update/2.0.0-beta5.sql rename to install/update/2.0.0-RC1.sql index 90944ceda..74a678aa4 100644 --- a/install/update/2.0.0-beta5.sql +++ b/install/update/2.0.0-RC1.sql @@ -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}', '\r\n\r\n\r\n\r\nchanging password email for {config key="urlsite"} \r\n{literal}\r\n\r\n{/literal}\r\n\r\n\r\n
\r\n
\r\n

{config key="store_name"}

\r\n

Changement de mot de passe

\r\n
You have lost your password
\r\nYour new password is {$password}.
\r\n
\r\n
\r\n

Vous pouvez à présent vous connecter sur {config key="urlsite"}.
Please, change this password after your first connection

\r\n\r\n'), (@max, 'fr_FR', 'Votre nouveau mot de passe', 'Votre nouveau mot de passe', 'Votre nouveau mot de passe est : {$password}', '\r\n\r\n\r\n\r\ncourriel de confirmation de changement de mot de passe de {config key="urlsite"} \r\n{literal}\r\n\r\n{/literal}\r\n\r\n\r\n
\r\n
\r\n

{config key="store_name"}

\r\n

Changement de mot de passe

\r\n
Vous avez perdu votre mot de passe.
\r\nVotre nouveau mot de passe est {$password}.
\r\n
\r\n
\r\n

Vous pouvez à présent vous connecter sur {config key="urlsite"}.
N''oubliez pas de modifier votre mot de passe.

\r\n\r\n'); +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; \ No newline at end of file diff --git a/templates/frontOffice/default/badresponse.html b/templates/frontOffice/default/badresponse.html new file mode 100755 index 000000000..47f5bb503 --- /dev/null +++ b/templates/frontOffice/default/badresponse.html @@ -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"} +
+ +
+ {intl l="A problem occured"}. +
+ +
+

+ {$msg}
+ {loop name="badresponseorder" type="order" id={$order_id}} + {$REF} + {/loop} +
+ {intl l="Please try again to order"} +

+
+
+ + {intl l="Home"} + +{/block} + +{block name="after-javascript-include"}{/block} \ No newline at end of file