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

Fix cs

Browse Source 
modifié:         core/lib/Thelia/ImportExport/Export/Type/OrderExport.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/OrderExportTest.php
This commit is contained in:
Benjamin Perche
2014-07-31 16:55:46 +02:00
parent c85fe24d96
commit 9ff74bece8
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/lib/Thelia/ImportExport/Export/Type/OrderExport.php
View File

@@ -12,7 +12,6 @@
namespace Thelia\ImportExport\Export\Type; namespace Thelia\ImportExport\Export\Type;
use Propel\Runtime\ActiveQuery\Criteria; use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Runtime\ActiveQuery\Join;
use Propel\Runtime\ActiveQuery\ModelCriteria; use Propel\Runtime\ActiveQuery\ModelCriteria;
use Thelia\Core\FileFormat\FormatType; use Thelia\Core\FileFormat\FormatType;
use Thelia\Core\Template\Element\BaseLoop; use Thelia\Core\Template\Element\BaseLoop;
@@ -22,8 +21,6 @@ use Thelia\Model\Map\CountryI18nTableMap;
use Thelia\Model\Map\CurrencyTableMap; use Thelia\Model\Map\CurrencyTableMap;
use Thelia\Model\Map\CustomerTableMap; use Thelia\Model\Map\CustomerTableMap;
use Thelia\Model\Map\CustomerTitleI18nTableMap; use Thelia\Model\Map\CustomerTitleI18nTableMap;
use Thelia\Model\Map\ModuleTableMap;
use Thelia\Model\Map\OrderAddressTableMap;
use Thelia\Model\Map\OrderCouponTableMap; use Thelia\Model\Map\OrderCouponTableMap;
use Thelia\Model\Map\OrderProductTableMap; use Thelia\Model\Map\OrderProductTableMap;
use Thelia\Model\Map\OrderProductTaxTableMap; use Thelia\Model\Map\OrderProductTaxTableMap;
@@ -251,7 +248,7 @@ class OrderExport extends ExportHandler
} }
/** /**
* @param Lang $lang * @param Lang $lang
* @return ModelCriteria|array|BaseLoop * @return ModelCriteria|array|BaseLoop
*/ */
public function buildDataSet(Lang $lang) public function buildDataSet(Lang $lang)
@@ -280,7 +277,6 @@ class OrderExport extends ExportHandler
$line["order_TOTAL_WITH_DISCOUNT"] = ""; $line["order_TOTAL_WITH_DISCOUNT"] = "";
$line["order_TOTAL_WITH_DISCOUNT_AND_POSTAGE"] = ""; $line["order_TOTAL_WITH_DISCOUNT_AND_POSTAGE"] = "";
if (null === $previous || $previous !== $line[OrderTableMap::REF]) { if (null === $previous || $previous !== $line[OrderTableMap::REF]) {
$previous = $line[OrderTableMap::REF]; $previous = $line[OrderTableMap::REF];
@@ -432,4 +428,4 @@ class OrderExport extends ExportHandler
"tax_title", "tax_title",
]; ];
} }
} }

10
core/lib/Thelia/Tests/ImportExport/Export/OrderExportTest.php
View File

@@ -16,8 +16,6 @@ use Thelia\Core\Translation\Translator;
use Thelia\ImportExport\Export\Type\OrderExport; use Thelia\ImportExport\Export\Type\OrderExport;
use Thelia\Model\Lang; use Thelia\Model\Lang;
use Thelia\Model\Map\OrderCouponTableMap; use Thelia\Model\Map\OrderCouponTableMap;
use Thelia\Model\Map\OrderProductTableMap;
use Thelia\Model\Map\OrderProductTaxTableMap;
use Thelia\Model\OrderCouponQuery; use Thelia\Model\OrderCouponQuery;
use Thelia\Model\OrderProductQuery; use Thelia\Model\OrderProductQuery;
use Thelia\Model\OrderQuery; use Thelia\Model\OrderQuery;
@@ -47,11 +45,10 @@ class OrderExportTest extends \PHPUnit_Framework_TestCase
$count = $ordersProductQuery->count(); $count = $ordersProductQuery->count();
$this->assertEquals(count($data), $count); $this->assertEquals(count($data), $count);
/** /**
* For the rest of the test, 50 orders are much enough * For the rest of the test, 50 orders are much enough
*/ */
if ($count > 50) { if ($count > 50) {
$count = 50; $count = 50;
} }
@@ -97,7 +94,6 @@ class OrderExportTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($order->getTotalAmount($tax, false, true), $row["total_with_discount"]); $this->assertEquals($order->getTotalAmount($tax, false, true), $row["total_with_discount"]);
$this->assertEquals($order->getTotalAmount($tax, true, true), $row["total_discount_and_postage"]); $this->assertEquals($order->getTotalAmount($tax, true, true), $row["total_discount_and_postage"]);
$invoiceAddress = $order->getOrderAddressRelatedByInvoiceOrderAddressId(); $invoiceAddress = $order->getOrderAddressRelatedByInvoiceOrderAddressId();
$deliveryAddress = $order->getOrderAddressRelatedByDeliveryOrderAddressId(); $deliveryAddress = $order->getOrderAddressRelatedByDeliveryOrderAddressId();
@@ -127,7 +123,7 @@ class OrderExportTest extends \PHPUnit_Framework_TestCase
->filterByTitle($data[$i]["product_title"]) ->filterByTitle($data[$i]["product_title"])
->filterByTaxRuleTitle($data[$i]["tax_title"]) ->filterByTaxRuleTitle($data[$i]["tax_title"])
->filterByWasInPromo($data[$i]["was_in_promo"]) ->filterByWasInPromo($data[$i]["was_in_promo"])
->_if((bool)((int)$data[$i]["was_in_promo"])) ->_if((bool) ((int) $data[$i]["was_in_promo"]))
->filterByPromoPrice($data[$i]["price"]) ->filterByPromoPrice($data[$i]["price"])
->_else() ->_else()
->filterByPrice($data[$i]["price"]) ->filterByPrice($data[$i]["price"])
@@ -146,4 +142,4 @@ class OrderExportTest extends \PHPUnit_Framework_TestCase
} }
} }
} }
} }