mirror of
https://github.com/retailcrm/PHPExcel.git
synced 2024-11-26 23:36:03 +03:00
Improved AdvancedValueBinder for currency.
This commit is contained in:
parent
701ff5adf1
commit
d1f172d8d6
@ -113,9 +113,11 @@ class PHPExcel_Cell_AdvancedValueBinder extends PHPExcel_Cell_DefaultValueBinder
|
|||||||
|
|
||||||
// Check for currency
|
// Check for currency
|
||||||
$currencyCode = PHPExcel_Shared_String::getCurrencyCode();
|
$currencyCode = PHPExcel_Shared_String::getCurrencyCode();
|
||||||
if (preg_match('/^'.preg_quote($currencyCode).' *(\d{1,3}(\,\d{3})*|(\d+))(\.\d{2})?$/', $value)) {
|
$decimalSeparator = PHPExcel_Shared_String::getDecimalSeparator();
|
||||||
|
$thousandsSeparator = PHPExcel_Shared_String::getThousandsSeparator();
|
||||||
|
if (preg_match('/^'.preg_quote($currencyCode).' *(\d{1,3}('.preg_quote($thousandsSeparator).'\d{3})*|(\d+))('.preg_quote($decimalSeparator).'\d{2})?$/', $value)) {
|
||||||
// Convert value to number
|
// Convert value to number
|
||||||
$value = (float) trim(str_replace(array($currencyCode,','), '', $value));
|
$value = (float) trim(str_replace(array($currencyCode, $thousandsSeparator, $decimalSeparator), array('', '', '.'), $value));
|
||||||
$cell->setValueExplicit( $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
|
$cell->setValueExplicit( $value, PHPExcel_Cell_DataType::TYPE_NUMERIC);
|
||||||
// Set style
|
// Set style
|
||||||
$cell->getParent()->getStyle( $cell->getCoordinate() )
|
$cell->getParent()->getStyle( $cell->getCoordinate() )
|
||||||
|
61
unitTests/Classes/PHPExcel/Cell/AdvancedValueBinderTest.php
Normal file
61
unitTests/Classes/PHPExcel/Cell/AdvancedValueBinderTest.php
Normal file
@ -0,0 +1,61 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
class AdvancedValueBinderTest extends PHPUnit_Framework_TestCase
|
||||||
|
{
|
||||||
|
public function setUp()
|
||||||
|
{
|
||||||
|
if (!defined('PHPEXCEL_ROOT')) {
|
||||||
|
define('PHPEXCEL_ROOT', APPLICATION_PATH . '/');
|
||||||
|
}
|
||||||
|
require_once(PHPEXCEL_ROOT . 'PHPExcel/Autoloader.php');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function provider()
|
||||||
|
{
|
||||||
|
if (!class_exists('PHPExcel_Style_NumberFormat')) {
|
||||||
|
$this->setUp();
|
||||||
|
}
|
||||||
|
$currencyUSD = PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_USD_SIMPLE;
|
||||||
|
$currencyEURO = str_replace('$', '€', PHPExcel_Style_NumberFormat::FORMAT_CURRENCY_USD_SIMPLE);
|
||||||
|
|
||||||
|
return array(
|
||||||
|
array('10%', 0.1, PHPExcel_Style_NumberFormat::FORMAT_PERCENTAGE_00, ',', '.', '$'),
|
||||||
|
array('$10.11', 10.11, $currencyUSD, ',', '.', '$'),
|
||||||
|
array('$1,010.12', 1010.12, $currencyUSD, ',', '.', '$'),
|
||||||
|
array('$20,20', 20.2, $currencyUSD, '.', ',', '$'),
|
||||||
|
array('$2.020,20', 2020.2, $currencyUSD, '.', ',', '$'),
|
||||||
|
array('€2.020,20', 2020.2, $currencyEURO, '.', ',', '€'),
|
||||||
|
array('€ 2.020,20', 2020.2, $currencyEURO, '.', ',', '€'),
|
||||||
|
array('€2,020.22', 2020.22, $currencyEURO, ',', '.', '€'),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dataProvider provider
|
||||||
|
*/
|
||||||
|
public function testCurrency($value, $valueBinded, $format, $thousandsSeparator, $decimalSeparator, $currencyCode)
|
||||||
|
{
|
||||||
|
$sheet = $this->getMock('PHPExcel_Worksheet', array('getStyle', 'getNumberFormat', 'setFormatCode'));
|
||||||
|
|
||||||
|
$sheet->expects($this->once())
|
||||||
|
->method('getStyle')
|
||||||
|
->will($this->returnSelf());
|
||||||
|
$sheet->expects($this->once())
|
||||||
|
->method('getNumberFormat')
|
||||||
|
->will($this->returnSelf());
|
||||||
|
$sheet->expects($this->once())
|
||||||
|
->method('setFormatCode')
|
||||||
|
->with($format)
|
||||||
|
->will($this->returnSelf());
|
||||||
|
|
||||||
|
PHPExcel_Shared_String::setCurrencyCode($currencyCode);
|
||||||
|
PHPExcel_Shared_String::setDecimalSeparator($decimalSeparator);
|
||||||
|
PHPExcel_Shared_String::setThousandsSeparator($thousandsSeparator);
|
||||||
|
|
||||||
|
$cell = new PHPExcel_Cell('A', 1, null, PHPExcel_Cell_DataType::TYPE_STRING, $sheet);
|
||||||
|
|
||||||
|
$binder = new PHPExcel_Cell_AdvancedValueBinder();
|
||||||
|
$binder->bindValue($cell, $value);
|
||||||
|
$this->assertEquals($valueBinded, $cell->getValue());
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user