// Stock: Update Supplier order management and database in consequence

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9729 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dSevere
2011-10-28 16:04:21 +00:00
parent d9f8dfcce8
commit 4e04df6d98
5 changed files with 337 additions and 53 deletions
+43 -4
View File
@@ -50,10 +50,22 @@ class SupplierOrderStateCore extends ObjectModel
*/
public $receipt_state;
/**
* @var bool Tells if the the order is in a state corresponding to a product pending receipt
*/
public $pending_receipt;
/**
* @var string Display state in the specified color (Ex. #FFFF00)
*/
public $color;
protected $fieldsValidate = array(
'delivery_note' => 'isBool',
'editable' => 'isBool',
'receipt_state' => 'isBool'
'receipt_state' => 'isBool',
'pending_receipt' => 'isBool',
'color' => 'isColor'
);
protected $fieldsRequiredLang = array('name');
@@ -70,19 +82,46 @@ class SupplierOrderStateCore extends ObjectModel
*/
protected $identifier = 'id_supplier_order_state';
/**
* @see ObjectModel::getFields()
*/
public function getFields()
{
$this->validateFields();
$fields['delivery_note'] = (int)$this->delivery_note;
$fields['editable'] = (int)$this->editable;
$fields['receipt_state'] = (int)$this->receipt_state;
$fields['delivery_note'] = (bool)$this->delivery_note;
$fields['editable'] = (bool)$this->editable;
$fields['receipt_state'] = (bool)$this->receipt_state;
$fields['pending_receipt'] = (bool)$this->pending_receipt;
$fields['color'] = pSQL($this->color);
return $fields;
}
/**
* @see ObjectModel::getTranslationsFieldsChild()
*/
public function getTranslationsFieldsChild()
{
$this->validateFieldsLang();
return $this->getTranslationsFields(array('name'));
}
/**
* Gets the list of supplier order states
*
* @param int $id_lang The language id
* @return array
*/
public static function getSupplierOrderStates($id_lang = 0)
{
if ($id_lang == 0)
$id_lang = Context::getContext()->language->id;
$query = new DbQuery();
$query->select('sl.name, s.id_supplier_order_state');
$query->from('supplier_order_state s');
$query->leftjoin('supplier_order_state_lang sl ON (s.id_supplier_order_state = sl.id_supplier_order_state AND sl.id_lang='.(int)$id_lang.')');
return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query);
}
}