[-] BO : #PSCFI-4484 - Add historisation of the order status

classes/order/OrderState.php

@@ -59,6 +59,9 @@ class OrderStateCore extends ObjectModel
 	/** @var boolean Paid */
 	public $paid;
 	
+	/** @var boolean True if carrier has been deleted (staying in database as deleted) */
+	public $deleted = 0;
+
 	/**
 	 * @see ObjectModel::$definition
 	 */
@@ -76,6 +79,7 @@ class OrderStateCore extends ObjectModel
 			'delivery' =>	array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
 			'hidden' =>		array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
 			'paid' =>		array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
+			'deleted' =>	array('type' => self::TYPE_BOOL, 'validade' => 'isBool'),
 
 			// Lang fields
 			'name' => 		array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => 64),

controllers/admin/AdminStatusesController.php

@@ -32,7 +32,7 @@ class AdminStatusesControllerCore extends AdminController
 		$this->table = 'order_state';
 		$this->className = 'OrderState';
 		$this->lang = true;
-	 	$this->deleted = false;
+		$this->deleted = true;
 		$this->colorOnBackground = false;
 		$this->context = Context::getContext();
 		$this->imageType = 'gif';
@@ -502,6 +502,7 @@ class AdminStatusesControllerCore extends AdminController
 
 		if (Tools::isSubmit('submitAdd'.$this->table))
 		{
+			$this->deleted = false; // Disabling saving historisation
 			$_POST['invoice'] = (int)Tools::getValue('invoice_on');
 			$_POST['logable'] = (int)Tools::getValue('logable_on');
 			$_POST['send_email'] = (int)Tools::getValue('send_email_on');

install-dev/sql/db.sql

@@ -1252,6 +1252,7 @@ CREATE TABLE `PREFIX_order_state` (
   `delivery` tinyint(1) UNSIGNED NOT NULL default '0',
   `shipped` tinyint(1) UNSIGNED NOT NULL default '0',
   `paid` tinyint(1) UNSIGNED NOT NULL default '0',
+  `deleted` tinyint(1) UNSIGNED NOT NULL default '0',
   PRIMARY KEY  (`id_order_state`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 

install-dev/sql/upgrade/1.5.0.4.sql

@@ -1,2 +1,4 @@
 SET NAMES 'utf8';
 
+
+ALTER TABLE `PREFIX_order_state` ADD COLUMN `deleted` tinyint(1) UNSIGNED NOT NULL default '0' AFTER `paid`;

install-new/data/db_structure.sql

@@ -1252,6 +1252,7 @@ CREATE TABLE `PREFIX_order_state` (
   `delivery` tinyint(1) UNSIGNED NOT NULL default '0',
   `shipped` tinyint(1) UNSIGNED NOT NULL default '0',
   `paid` tinyint(1) UNSIGNED NOT NULL default '0',
+  `deleted` tinyint(1) UNSIGNED NOT NULL default '0',
   PRIMARY KEY  (`id_order_state`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;