Skip to content
Snippets Groups Projects
Commit 35b7d69b authored by Florian Azizian's avatar Florian Azizian
Browse files

change basket_res_order by default + fix error confirm_status in indexingBasket

parent 881ba386
No related branches found
No related tags found
No related merge requests found
......@@ -65,9 +65,14 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module,
$templatesControler = new templates_controler();
$templates = array();
$stmt = $db->query("SELECT destination FROM res_letterbox WHERE res_id = (?)", [$res_id]);
$resultDest = $stmt->fetchObject();
$destination = $resultDest->destination;
if(is_integer($res_id)){
$stmt = $db->query("SELECT destination FROM res_letterbox WHERE res_id = (?)", [$res_id]);
$resultDest = $stmt->fetchObject();
$destination = $resultDest->destination;
} else {
$destination = '';
}
if ($destination <> '') {
$templates = $templatesControler->getAllTemplatesForProcess($destination);
} else {
......
......@@ -19,9 +19,9 @@ ALTER TABLE groupbasket_status DROP COLUMN IF EXISTS "order";
ALTER TABLE groupbasket_status ADD COLUMN "order" integer;
UPDATE groupbasket_status SET "order" = 0 WHERE status_id = 'NEW';
UPDATE groupbasket_status SET "order" = 1 WHERE status_id != 'NEW';
UPDATE baskets SET basket_res_order = 'res_id' WHERE basket_res_order IS NULL;
UPDATE baskets SET basket_res_order = 'res_id desc' WHERE basket_res_order IS NULL;
ALTER TABLE baskets ALTER COLUMN basket_res_order SET NOT NULL;
ALTER TABLE baskets ALTER COLUMN basket_res_order SET DEFAULT 'res_id';
ALTER TABLE baskets ALTER COLUMN basket_res_order SET DEFAULT 'res_id desc';
ALTER TABLE groupbasket_status ALTER COLUMN "order" SET NOT NULL;
DO $$ BEGIN
IF (SELECT count(TABLE_NAME) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'users_baskets') = 1 THEN
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment