From d9679eea7b2dcbdcf8fd9f29a93f94d5d1e0d649 Mon Sep 17 00:00:00 2001 From: "florian.azizian" <florian.azizian@maarch.org> Date: Fri, 1 Mar 2019 17:16:28 +0100 Subject: [PATCH] FEAT #9685 remove functions --- .../class/class_modules_tools_Abstract.php | 44 ------------------- package.json | 2 +- 2 files changed, 1 insertion(+), 45 deletions(-) diff --git a/modules/basket/class/class_modules_tools_Abstract.php b/modules/basket/class/class_modules_tools_Abstract.php index 42baedef67d..50b8f73cde0 100755 --- a/modules/basket/class/class_modules_tools_Abstract.php +++ b/modules/basket/class/class_modules_tools_Abstract.php @@ -260,32 +260,6 @@ abstract class basket_Abstract extends Database } } - /** - * Loads the baskets datas into session variables - * - */ - public function load_basket($primaryGroup, $userId) - { - $arr = array(); - $db = new Database(); - $stmt = $db->query( - "SELECT gb.basket_id FROM " . GROUPBASKET_TABLE . " gb, " - . BASKET_TABLE . " b WHERE gb.group_id = ? and gb.basket_id = b.basket_id order by b.basket_order, b.basket_name ", - array($primaryGroup) - ); - // $db->show(); - while ($res = $stmt->fetchObject()) { - $tmp = $this->get_baskets_data( - $res->basket_id, - $userId, - $primaryGroup - ); - //$this->show_array($tmp); - array_push($arr, $tmp); - } - return $arr; - } - public function load_basket_abs($userId) { $user = \User\models\UserModel::getByLogin(['login' => $userId, 'select' => ['id']]); @@ -860,22 +834,4 @@ abstract class basket_Abstract extends Database return $tab; } - - public function is_redirect_to_action_basket($basketId, $groupId) - { - $db = new Database(); - $stmt = $db->query( - "select result_page from " . GROUPBASKET_TABLE - . " where group_id = ? and basket_id = ?", - array($groupId,$basketId) - ); - $res = $stmt->fetchObject(); - - $basketIdPage = $res->result_page; - if ($basketIdPage == 'redirect_to_action') { - return true; - } else { - return false; - } - } } diff --git a/package.json b/package.json index 2cd9273bf19..9f46e5ff4b9 100755 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "@angular-devkit/build-angular": "^0.12.2", "@angular/animations": "^7.2.5", "@angular/cdk": "^7.3.3", - "@angular/cli": "^7.3.3", + "@angular/cli": "^7.3.4", "@angular/common": "^7.2.5", "@angular/compiler": "^7.2.5", "@angular/compiler-cli": "^7.2.5", -- GitLab