Merge branch 'fix/order' into develop

This commit is contained in:
Michael RICOIS 2017-12-22 14:42:49 +01:00
commit c09890dea8

View File

@ -1,7 +1,7 @@
<?php <?php
class Order extends OrderCore class Order extends OrderCore
{ {
/** @var boolean True if the order comes from app */ /** @var int True if the order comes from app */
public $appli = 0; public $appli = 0;
protected $fieldsValidate = array( protected $fieldsValidate = array(
@ -27,7 +27,7 @@ class Order extends OrderCore
'total_wrapping' => 'isPrice', 'total_wrapping' => 'isPrice',
'shipping_number' => 'isUrl', 'shipping_number' => 'isUrl',
'conversion_rate' => 'isFloat', 'conversion_rate' => 'isFloat',
'appli' => 'isBool', 'appli' => 'isUnsignedInt',
); );
public function getFields() public function getFields()