Merge branch 'ticket-fidelite' into develop

This commit is contained in:
Marion Muszynski 2016-04-21 17:53:22 +02:00
commit e28d322bd1

View File

@ -51,7 +51,7 @@ class LoyaltyModule extends ObjectModel
$fields['id_customer'] = (int)$this->id_customer; $fields['id_customer'] = (int)$this->id_customer;
$fields['id_order'] = (int)$this->id_order; $fields['id_order'] = (int)$this->id_order;
$fields['id_discount'] = (int)$this->id_discount; $fields['id_discount'] = (int)$this->id_discount;
$fields['discount_value'] = (int)$this->discount_value; $fields['discount_value'] = (float)$this->discount_value;
$fields['date_add'] = pSQL($this->date_add); $fields['date_add'] = pSQL($this->date_add);
$fields['date_upd'] = pSQL($this->date_upd); $fields['date_upd'] = pSQL($this->date_upd);
return $fields; return $fields;