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

Merge branch 'master' of https://github.com/thelia/thelia

Browse Source
This commit is contained in:
Franck Allimant
2014-01-31 15:05:28 +01:00
parent 9c85013cec 67a9b39bf0
commit 0b156ed366
6 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/lib/Thelia/Core/Template/Loop/Order.php
View File

@@ -265,7 +265,6 @@ class Order extends BaseLoop implements SearchLoopInterface, PropelSearchLoopInt
->set("DELIVERY_MODULE", $order->getDeliveryModuleId()) ->set("DELIVERY_MODULE", $order->getDeliveryModuleId())
->set("STATUS", $order->getStatusId()) ->set("STATUS", $order->getStatusId())
->set("LANG", $order->getLangId()) ->set("LANG", $order->getLangId())
->set("POSTAGE", $order->getPostage())
->set("DISCOUNT", $order->getDiscount()) ->set("DISCOUNT", $order->getDiscount())
->set("TOTAL_TAX", $tax) ->set("TOTAL_TAX", $tax)
->set("TOTAL_AMOUNT", $amount - $tax) ->set("TOTAL_AMOUNT", $amount - $tax)

8
core/lib/Thelia/Core/Template/Loop/OrderCoupon.php
View File

@@ -78,17 +78,17 @@ class OrderCoupon extends BaseLoop implements PropelSearchLoopInterface
/** @var OrderCoupon $orderCoupon */ /** @var OrderCoupon $orderCoupon */
foreach ($loopResult->getResultDataCollection() as $orderCoupon) { foreach ($loopResult->getResultDataCollection() as $orderCoupon) {
$loopResultRow = new LoopResultRow($orderCoupon); $loopResultRow = new LoopResultRow($orderCoupon);
$conditions = $conditionFactory->unserializeConditionCollection( /*$conditions = $conditionFactory->unserializeConditionCollection(
$orderCoupon->getSerializedConditions() $orderCoupon->getSerializedConditions()
); );*/
$now = time(); $now = time();
$datediff = $orderCoupon->getExpirationDate()->getTimestamp() - $now; $datediff = $orderCoupon->getExpirationDate()->getTimestamp() - $now;
$daysLeftBeforeExpiration = floor($datediff/(60*60*24)); $daysLeftBeforeExpiration = floor($datediff/(60*60*24));
$cleanedConditions = array(); /*$cleanedConditions = array();
/*foreach ($conditions->getConditions() as $condition) { foreach ($conditions->getConditions() as $condition) {
$cleanedConditions[] = $condition->getToolTip(); $cleanedConditions[] = $condition->getToolTip();
}*/ }*/
$loopResultRow->set("ID", $orderCoupon->getId()) $loopResultRow->set("ID", $orderCoupon->getId())

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

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

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

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

4
install/insert.sql
View File

@@ -39,11 +39,11 @@ INSERT INTO `config` (`name`, `value`, `secured`, `hidden`, `created_at`, `updat
('store_name','', 0, 1, NOW(), NOW()), ('store_name','', 0, 1, NOW(), NOW()),
('store_email','', 0, 1, NOW(), NOW()), ('store_email','', 0, 1, NOW(), NOW()),
('one_domain_foreach_lang','0', 1, 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_major_version','2', 1, 1, NOW(), NOW()),
('thelia_minus_version','0', 1, 1, NOW(), NOW()), ('thelia_minus_version','0', 1, 1, NOW(), NOW()),
('thelia_release_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 INSERT INTO `config_i18n` (`id`, `locale`, `title`, `description`, `chapo`, `postscriptum`) VALUES

2
install/update/2.0.0-beta4.sql
View File

@@ -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'; UPDATE `config` SET `value`='beta4' WHERE `name`='thelia_extra_version';
-- Preferred locale for admin users -- 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'; UPDATE `admin` SET `locale`='en_US';
-- Unknown flag image path -- Unknown flag image path