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

Add order date

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-08-04 14:56:07 +02:00
parent 83db209adf
commit 60b599f8c1
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -196,8 +196,10 @@ class OrderExport extends ExportHandler
"invoice_address_country_TITLE", "invoice_address_country_TITLE",
"invoice_address_PHONE", "invoice_address_PHONE",
"order_status_TITLE", "order_status_TITLE",
"currency_CODE" "currency_CODE",
OrderTableMap::CREATED_AT,
]) ])
->orderByCreatedAt(Criteria::DESC)
; ;
I18n::addI18nCondition( I18n::addI18nCondition(
@@ -288,6 +290,15 @@ class OrderExport extends ExportHandler
$line["order_TOTAL_WITH_DISCOUNT"] = $order->getTotalAmount($tax, false, true); $line["order_TOTAL_WITH_DISCOUNT"] = $order->getTotalAmount($tax, false, true);
$line["order_TOTAL_WITH_DISCOUNT_AND_POSTAGE"] = $order->getTotalAmount($tax, true, true); $line["order_TOTAL_WITH_DISCOUNT_AND_POSTAGE"] = $order->getTotalAmount($tax, true, true);
/**
* Format the date
*/
$date = new \DateTime($line[OrderTableMap::CREATED_AT]);
$line[OrderTableMap::CREATED_AT] = $date->format($lang->getDatetimeFormat());
$current++; $current++;
} else { } else {
/** /**
@@ -324,6 +335,7 @@ class OrderExport extends ExportHandler
$line["invoice_address_country_TITLE"] = ""; $line["invoice_address_country_TITLE"] = "";
$line["invoice_address_PHONE"] = ""; $line["invoice_address_PHONE"] = "";
$line["order_status_TITLE"] = ""; $line["order_status_TITLE"] = "";
$line[OrderTableMap::CREATED_AT] = "";
} }
$line["product_TAXED_PRICE"] = $line["product_PRICE"] + $line["product_TAX"]; $line["product_TAXED_PRICE"] = $line["product_PRICE"] + $line["product_TAX"];
@@ -378,6 +390,7 @@ class OrderExport extends ExportHandler
"invoice_address_PHONE" => "invoice_phone", "invoice_address_PHONE" => "invoice_phone",
"order_status_TITLE" => "status", "order_status_TITLE" => "status",
"currency_CODE" => "currency", "currency_CODE" => "currency",
OrderTableMap::CREATED_AT => "date",
]; ];
} }
@@ -385,6 +398,7 @@ class OrderExport extends ExportHandler
{ {
return [ return [
"ref", "ref",
"date",
"customer_ref", "customer_ref",
"discount", "discount",
"coupons", "coupons",

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

@@ -81,6 +81,11 @@ class OrderExportTest extends \PHPUnit_Framework_TestCase
$coupons === $row["coupons"] $coupons === $row["coupons"]
); );
$this->assertEquals(
$order->getCreatedAt()->format($lang->getDatetimeFormat()),
$row["date"]
);
$this->assertEquals($order->getCurrency()->getCode(), $row["currency"]); $this->assertEquals($order->getCurrency()->getCode(), $row["currency"]);
$this->assertEquals($order->getCustomer()->getRef(), $row["customer_ref"]); $this->assertEquals($order->getCustomer()->getRef(), $row["customer_ref"]);
$this->assertEquals($order->getOrderStatus()->setLocale($locale)->getTitle(), $row["status"]); $this->assertEquals($order->getOrderStatus()->setLocale($locale)->getTitle(), $row["status"]);