dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release

Browse Source
This commit is contained in:
vAugagneur
2013-03-20 17:28:58 +01:00
parent ecfb24dad4 02d58956c8
commit f8fd67e2c4
8 changed files with 89 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Product.php
+4 -1
View File
@@ -3944,7 +3944,10 @@ class ProductCore extends ObjectModel
$id_address_delivery = (int)$product_update['id_address_delivery'];
$product_quantity = (int)(isset($product_update['cart_quantity']) ? $product_update['cart_quantity'] : $product_update['product_quantity']);
$price = isset($product_update['price']) ? $product_update['price'] : $product_update['product_price'];
$price_wt = $price * (1 + ((isset($product_update['tax_rate']) ? $product_update['tax_rate'] : $product_update['rate']) * 0.01));
if (isset($product_update['price_wt']) && $product_update['price_wt'])
$price_wt = $product_update['price_wt'];
else
$price_wt = $price * (1 + ((isset($product_update['tax_rate']) ? $product_update['tax_rate'] : $product_update['rate']) * 0.01));
if (isset($customized_datas[$product_id][$product_attribute_id]))
foreach ($customized_datas[$product_id][$product_attribute_id][$id_address_delivery] as $customization)
classes/pdf/PDFGenerator.php
+30 -1
View File
@@ -39,7 +39,36 @@ class PDFGeneratorCore extends TCPDF
public $content;
public $font;
public $font_by_lang = array('ja' => 'cid0jp', 'bg' => 'freeserif', 'ru' => 'freeserif', 'el' => 'freeserif', 'vn' => 'dejavusans', 'pl' => 'dejavusans');
public $font_by_lang = array(
'ja' => 'cid0jp',
'bg' => 'freeserif',
'ru' => 'freeserif',
'uk' => 'freeserif',
'mk' => 'freeserif',
'el' => 'freeserif',
'vn' => 'dejavusans',
'pl' => 'dejavusans',
'ar' => 'dejavusans',
'fa' => 'dejavusans',
'ur' => 'dejavusans',
'az' => 'dejavusans',
'ca' => 'dejavusans',
'gl' => 'dejavusans',
'hr' => 'dejavusans',
'sr' => 'dejavusans',
'si' => 'dejavusans',
'cs' => 'dejavusans',
'sk' => 'dejavusans',
'ka' => 'dejavusans',
'he' => 'dejavusans',
'lo' => 'dejavusans',
'lv' => 'dejavusans',
'tr' => 'dejavusans',
'ko' => 'cid0kr',
'zh' => 'cid0cs',
'tw' => 'cid0cs',
'th' => 'freeserif'
);
public function __construct($use_cache = false)