diff --git a/core/lib/Thelia/Core/Template/Loop/Order.php b/core/lib/Thelia/Core/Template/Loop/Order.php index c3e48dc8e..696dc7bc2 100644 --- a/core/lib/Thelia/Core/Template/Loop/Order.php +++ b/core/lib/Thelia/Core/Template/Loop/Order.php @@ -265,7 +265,6 @@ class Order extends BaseLoop implements SearchLoopInterface, PropelSearchLoopInt ->set("DELIVERY_MODULE", $order->getDeliveryModuleId()) ->set("STATUS", $order->getStatusId()) ->set("LANG", $order->getLangId()) - ->set("POSTAGE", $order->getPostage()) ->set("DISCOUNT", $order->getDiscount()) ->set("TOTAL_TAX", $tax) ->set("TOTAL_AMOUNT", $amount - $tax) diff --git a/core/lib/Thelia/Core/Template/Loop/OrderCoupon.php b/core/lib/Thelia/Core/Template/Loop/OrderCoupon.php index 13335d4c8..4ea880d01 100644 --- a/core/lib/Thelia/Core/Template/Loop/OrderCoupon.php +++ b/core/lib/Thelia/Core/Template/Loop/OrderCoupon.php @@ -78,17 +78,17 @@ class OrderCoupon extends BaseLoop implements PropelSearchLoopInterface /** @var OrderCoupon $orderCoupon */ foreach ($loopResult->getResultDataCollection() as $orderCoupon) { $loopResultRow = new LoopResultRow($orderCoupon); - $conditions = $conditionFactory->unserializeConditionCollection( + /*$conditions = $conditionFactory->unserializeConditionCollection( $orderCoupon->getSerializedConditions() - ); + );*/ $now = time(); $datediff = $orderCoupon->getExpirationDate()->getTimestamp() - $now; $daysLeftBeforeExpiration = floor($datediff/(60*60*24)); - $cleanedConditions = array(); + /*$cleanedConditions = array(); - /*foreach ($conditions->getConditions() as $condition) { + foreach ($conditions->getConditions() as $condition) { $cleanedConditions[] = $condition->getToolTip(); }*/ $loopResultRow->set("ID", $orderCoupon->getId()) diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php index 844eb3d29..cc85ad632 100644 --- a/core/lib/Thelia/Core/Thelia.php +++ b/core/lib/Thelia/Core/Thelia.php @@ -59,7 +59,7 @@ use Thelia\Log\Tlog; class Thelia extends Kernel { - const THELIA_VERSION = '2.0.0-beta3'; + const THELIA_VERSION = '2.0.0-beta4'; public function init() { diff --git a/core/lib/Thelia/Install/Update.php b/core/lib/Thelia/Install/Update.php index 923c8f1ab..ccab092c6 100644 --- a/core/lib/Thelia/Install/Update.php +++ b/core/lib/Thelia/Install/Update.php @@ -39,7 +39,8 @@ class Update protected static $version = array( '0' => '2.0.0-beta1', '1' => '2.0.0-beta2', - '2' => '2.0.0-beta3' + '2' => '2.0.0-beta3', + '3' => '2.0.0-beta4' ); protected function isLatestVersion($version) diff --git a/install/insert.sql b/install/insert.sql index 28f9843ed..947ac80bb 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-beta3', 1, 1, NOW(), NOW()), +('thelia_version','2.0.0-beta4', 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','beta3', 1, 1, NOW(), NOW()); +('thelia_extra_version','beta4', 1, 1, NOW(), NOW()); INSERT INTO `config_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `postscriptum`) VALUES diff --git a/install/update/2.0.0-beta4.sql b/install/update/2.0.0-beta4.sql index d54df3d55..9a1dc44d4 100644 --- a/install/update/2.0.0-beta4.sql +++ b/install/update/2.0.0-beta4.sql @@ -13,7 +13,7 @@ UPDATE `config` SET `value`='2.0.0-beta4' WHERE `name`='thelia_version'; UPDATE `config` SET `value`='beta4' WHERE `name`='thelia_extra_version'; -- Preferred locale for admin users -ALTER TABLE `admin` ADD `locale` VARCHAR(45) NOT NULL; +ALTER TABLE `admin` ADD `locale` VARCHAR(45) NOT NULL AFTER `password`; UPDATE `admin` SET `locale`='en_US'; -- Unknown flag image path