Merge branch 'ticket/14716-order-mobile' into develop

This commit is contained in:
Michael RICOIS 2017-12-18 09:36:41 +01:00
commit 08ef1c0733

View File

@ -1,11 +1,8 @@
<?php
class Order extends OrderCore {
class Order extends OrderCore
{
/** @var boolean True if the order comes from app */
public $appli = 0;
/** @var int 1 if the order comes from mobile domain */
public $mobile = 0;
protected $fieldsValidate = array(
'id_address_delivery' => 'isUnsignedId',
@ -31,7 +28,6 @@ class Order extends OrderCore {
'shipping_number' => 'isUrl',
'conversion_rate' => 'isFloat',
'appli' => 'isBool',
'mobile' => 'isBool',
);
public function getFields()
@ -67,7 +63,6 @@ class Order extends OrderCore {
$fields['delivery_date'] = pSQL($this->delivery_date);
$fields['valid'] = (int)($this->valid) ? 1 : 0;
$fields['appli'] = (int)($this->appli) ? 1 : 0;
$fields['mobile'] = (int)($this->mobile) ? 1 : 0;
$fields['date_add'] = pSQL($this->date_add);
$fields['date_upd'] = pSQL($this->date_upd);